Merge "Adding validate before switch feature."
diff --git a/Android.bp b/Android.bp
index f97cf72..e19ca84 100644
--- a/Android.bp
+++ b/Android.bp
@@ -922,6 +922,7 @@
"core/java/android/annotation/UnsupportedAppUsage.java",
"core/java/android/net/DhcpResults.java",
"core/java/android/util/LocalLog.java",
+ "core/java/com/android/internal/annotations/GuardedBy.java",
"core/java/com/android/internal/annotations/VisibleForTesting.java",
"core/java/com/android/internal/util/HexDump.java",
"core/java/com/android/internal/util/IndentingPrintWriter.java",
diff --git a/api/current.txt b/api/current.txt
index 10d1697..6b88547 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5811,6 +5811,7 @@
method public final void setInterruptionFilter(int);
method public void setNotificationDelegate(@NonNull String);
method public void setNotificationPolicy(@NonNull android.app.NotificationManager.Policy);
+ method public boolean shouldHideSilentStatusBarIcons();
method public boolean updateAutomaticZenRule(String, android.app.AutomaticZenRule);
field public static final String ACTION_APP_BLOCK_STATE_CHANGED = "android.app.action.APP_BLOCK_STATE_CHANGED";
field public static final String ACTION_AUTOMATIC_ZEN_RULE = "android.app.action.AUTOMATIC_ZEN_RULE";
@@ -12978,7 +12979,7 @@
method @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder removeOpenFlags(int);
method @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setCursorFactory(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory);
method @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setErrorHandler(@Nullable android.database.DatabaseErrorHandler);
- method @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setIdleConnectionTimeout(@IntRange(from=0) long);
+ method @Deprecated @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setIdleConnectionTimeout(@IntRange(from=0) long);
method @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setJournalMode(@NonNull String);
method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setLookasideConfig(@IntRange(from=0) int, @IntRange(from=0) int);
method @NonNull public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setOpenFlags(int);
@@ -13039,7 +13040,7 @@
method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int);
method public void onOpen(android.database.sqlite.SQLiteDatabase);
method public abstract void onUpgrade(android.database.sqlite.SQLiteDatabase, int, int);
- method public void setIdleConnectionTimeout(@IntRange(from=0) long);
+ method @Deprecated public void setIdleConnectionTimeout(@IntRange(from=0) long);
method public void setLookasideConfig(@IntRange(from=0) int, @IntRange(from=0) int);
method public void setOpenParams(@NonNull android.database.sqlite.SQLiteDatabase.OpenParams);
method public void setWriteAheadLoggingEnabled(boolean);
@@ -13551,10 +13552,12 @@
method public static android.graphics.Bitmap createScaledBitmap(@NonNull android.graphics.Bitmap, int, int, boolean);
method public int describeContents();
method public void eraseColor(@ColorInt int);
+ method public void eraseColor(@ColorLong long);
method @CheckResult public android.graphics.Bitmap extractAlpha();
method @CheckResult public android.graphics.Bitmap extractAlpha(android.graphics.Paint, int[]);
method public int getAllocationByteCount();
method public int getByteCount();
+ method public android.graphics.Color getColor(int, int);
method @Nullable public android.graphics.ColorSpace getColorSpace();
method public android.graphics.Bitmap.Config getConfig();
method public int getDensity();
@@ -13580,6 +13583,7 @@
method public void reconfigure(int, int, android.graphics.Bitmap.Config);
method public void recycle();
method public boolean sameAs(android.graphics.Bitmap);
+ method public void setColorSpace(@NonNull android.graphics.ColorSpace);
method public void setConfig(android.graphics.Bitmap.Config);
method public void setDensity(int);
method public void setHasAlpha(boolean);
@@ -13766,8 +13770,10 @@
method public void drawBitmapMesh(@NonNull android.graphics.Bitmap, int, int, @NonNull float[], int, @Nullable int[], int, @Nullable android.graphics.Paint);
method public void drawCircle(float, float, float, @NonNull android.graphics.Paint);
method public void drawColor(@ColorInt int);
+ method public void drawColor(@ColorLong long);
method @Deprecated public void drawColor(@ColorInt int, @NonNull android.graphics.PorterDuff.Mode);
method public void drawColor(@ColorInt int, @NonNull android.graphics.BlendMode);
+ method public void drawColor(@ColorLong long, @NonNull android.graphics.BlendMode);
method public void drawDoubleRoundRect(@NonNull android.graphics.RectF, float, float, @NonNull android.graphics.RectF, float, float, @NonNull android.graphics.Paint);
method public void drawDoubleRoundRect(@NonNull android.graphics.RectF, float[], @NonNull android.graphics.RectF, float[], @NonNull android.graphics.Paint);
method public void drawLine(float, float, float, float, @NonNull android.graphics.Paint);
@@ -14379,6 +14385,7 @@
method @Nullable public android.graphics.BlendMode getBlendMode();
method @ColorInt public int getColor();
method public android.graphics.ColorFilter getColorFilter();
+ method @ColorLong public long getColorLong();
method public boolean getFillPath(android.graphics.Path, android.graphics.Path);
method public int getFlags();
method public String getFontFeatureSettings();
@@ -14399,6 +14406,7 @@
method public float getRunAdvance(CharSequence, int, int, int, int, boolean, int);
method public android.graphics.Shader getShader();
method @ColorInt public int getShadowLayerColor();
+ method @ColorLong public long getShadowLayerColorLong();
method public float getShadowLayerDx();
method public float getShadowLayerDy();
method public float getShadowLayerRadius();
@@ -14453,6 +14461,7 @@
method public void setAntiAlias(boolean);
method public void setBlendMode(@Nullable android.graphics.BlendMode);
method public void setColor(@ColorInt int);
+ method public void setColor(@ColorLong long);
method public android.graphics.ColorFilter setColorFilter(android.graphics.ColorFilter);
method public void setDither(boolean);
method public void setElegantTextHeight(boolean);
@@ -14469,6 +14478,7 @@
method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
method public android.graphics.Shader setShader(android.graphics.Shader);
method public void setShadowLayer(float, float, float, @ColorInt int);
+ method public void setShadowLayer(float, float, float, @ColorLong long);
method public void setStrikeThruText(boolean);
method public void setStrokeCap(android.graphics.Paint.Cap);
method public void setStrokeJoin(android.graphics.Paint.Join);
@@ -30390,6 +30400,7 @@
method public void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
method public void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
method public void requestConnectionInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener);
+ method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestDeviceInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener);
method public void requestDiscoveryState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener);
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
method public void requestNetworkInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener);
@@ -30438,6 +30449,10 @@
method public void onConnectionInfoAvailable(android.net.wifi.p2p.WifiP2pInfo);
}
+ public static interface WifiP2pManager.DeviceInfoListener {
+ method public void onDeviceInfoAvailable(android.net.wifi.p2p.WifiP2pDevice);
+ }
+
public static interface WifiP2pManager.DiscoveryStateListener {
method public void onDiscoveryStateAvailable(int);
}
@@ -36522,7 +36537,7 @@
field public static final String ACCOUNT_TYPE_LOCAL = "LOCAL";
field public static final String ACTION_EVENT_REMINDER = "android.intent.action.EVENT_REMINDER";
field public static final String ACTION_HANDLE_CUSTOM_EVENT = "android.provider.calendar.action.HANDLE_CUSTOM_EVENT";
- field public static final String ACTION_VIEW_WORK_CALENDAR_EVENT = "android.provider.calendar.action.VIEW_WORK_CALENDAR_EVENT";
+ field public static final String ACTION_VIEW_MANAGED_PROFILE_CALENDAR_EVENT = "android.provider.calendar.action.VIEW_MANAGED_PROFILE_CALENDAR_EVENT";
field public static final String AUTHORITY = "com.android.calendar";
field public static final String CALLER_IS_SYNCADAPTER = "caller_is_syncadapter";
field public static final android.net.Uri CONTENT_URI;
@@ -41550,6 +41565,7 @@
method public void onNotificationRemoved(android.service.notification.StatusBarNotification);
method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
+ method public void onStatusBarIconsBehaviorChanged(boolean);
method public final void requestInterruptionFilter(int);
method public final void requestListenerHints(int);
method public static void requestRebind(android.content.ComponentName);
@@ -45057,6 +45073,7 @@
method public boolean setVoiceMailNumber(String, String);
method @Deprecated public void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);
method @Deprecated public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean);
+ method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void switchMultiSimConfig(int);
method public boolean updateAvailableNetworks(java.util.List<android.telephony.AvailableNetworkInfo>);
field public static final String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
field public static final String ACTION_NETWORK_COUNTRY_CHANGED = "android.telephony.action.NETWORK_COUNTRY_CHANGED";
@@ -52869,7 +52886,7 @@
method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, long);
method public final void notifyViewAppeared(@NonNull android.view.ViewStructure);
method public final void notifyViewDisappeared(@NonNull android.view.autofill.AutofillId);
- method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence, int);
+ method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence);
method public final void notifyViewsDisappeared(@NonNull android.view.autofill.AutofillId, @NonNull long[]);
}
@@ -52881,6 +52898,9 @@
public final class UserDataRemovalRequest implements android.os.Parcelable {
method public int describeContents();
+ method @NonNull public String getPackageName();
+ method @NonNull public java.util.List<android.view.contentcapture.UserDataRemovalRequest.UriRequest> getUriRequests();
+ method public boolean isForEverything();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.view.contentcapture.UserDataRemovalRequest> CREATOR;
}
@@ -52892,6 +52912,11 @@
method @NonNull public android.view.contentcapture.UserDataRemovalRequest.Builder forEverything();
}
+ public final class UserDataRemovalRequest.UriRequest {
+ method @NonNull public android.net.Uri getUri();
+ method @NonNull public boolean isRecursive();
+ }
+
}
package android.view.inputmethod {
@@ -58111,13 +58136,13 @@
ctor public ByteArrayOutputStream(int);
method public void reset();
method public int size();
- method public byte[] toByteArray();
+ method @NonNull public byte[] toByteArray();
method @NonNull public String toString(@NonNull String) throws java.io.UnsupportedEncodingException;
method @Deprecated @NonNull public String toString(int);
method public void write(int);
- method public void write(byte[], int, int);
+ method public void write(@NonNull byte[], int, int);
method public void writeTo(@NonNull java.io.OutputStream) throws java.io.IOException;
- field protected byte[] buf;
+ field @NonNull protected byte[] buf;
field protected int count;
}
@@ -58288,12 +58313,12 @@
method public boolean isHidden();
method public long lastModified();
method public long length();
- method public String[] list();
- method public String[] list(@Nullable java.io.FilenameFilter);
- method public java.io.File[] listFiles();
- method public java.io.File[] listFiles(@Nullable java.io.FilenameFilter);
- method public java.io.File[] listFiles(@Nullable java.io.FileFilter);
- method public static java.io.File[] listRoots();
+ method @Nullable public String[] list();
+ method @Nullable public String[] list(@Nullable java.io.FilenameFilter);
+ method @Nullable public java.io.File[] listFiles();
+ method @Nullable public java.io.File[] listFiles(@Nullable java.io.FilenameFilter);
+ method @Nullable public java.io.File[] listFiles(@Nullable java.io.FileFilter);
+ method @NonNull public static java.io.File[] listRoots();
method public boolean mkdir();
method public boolean mkdirs();
method public boolean renameTo(@NonNull java.io.File);
@@ -58782,8 +58807,8 @@
method protected void clearError();
method public void close();
method public void flush();
- method @NonNull public java.io.PrintWriter format(@NonNull String, java.lang.Object...);
- method @NonNull public java.io.PrintWriter format(@Nullable java.util.Locale, @NonNull String, java.lang.Object...);
+ method @NonNull public java.io.PrintWriter format(@NonNull String, @NonNull java.lang.Object...);
+ method @NonNull public java.io.PrintWriter format(@Nullable java.util.Locale, @NonNull String, @NonNull java.lang.Object...);
method public void print(boolean);
method public void print(char);
method public void print(int);
@@ -58793,8 +58818,8 @@
method public void print(char[]);
method public void print(@Nullable String);
method public void print(@Nullable Object);
- method @NonNull public java.io.PrintWriter printf(@NonNull String, java.lang.Object...);
- method @NonNull public java.io.PrintWriter printf(@Nullable java.util.Locale, @NonNull String, java.lang.Object...);
+ method @NonNull public java.io.PrintWriter printf(@NonNull String, @NonNull java.lang.Object...);
+ method @NonNull public java.io.PrintWriter printf(@Nullable java.util.Locale, @NonNull String, @NonNull java.lang.Object...);
method public void println();
method public void println(boolean);
method public void println(char);
@@ -59620,45 +59645,45 @@
method @NonNull public static Class<?> forName(@NonNull String) throws java.lang.ClassNotFoundException;
method @NonNull public static Class<?> forName(@NonNull String, boolean, @Nullable ClassLoader) throws java.lang.ClassNotFoundException;
method @Nullable public <A extends java.lang.annotation.Annotation> A getAnnotation(@NonNull Class<A>);
- method public java.lang.annotation.Annotation[] getAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getAnnotations();
method @NonNull public <A extends java.lang.annotation.Annotation> A[] getAnnotationsByType(@NonNull Class<A>);
method @Nullable public String getCanonicalName();
method @Nullable public ClassLoader getClassLoader();
- method public Class<?>[] getClasses();
+ method @NonNull public Class<?>[] getClasses();
method @Nullable public Class<?> getComponentType();
- method @NonNull public java.lang.reflect.Constructor<T> getConstructor(Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
- method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Constructor<T> getConstructor(@Nullable Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
method @Nullable public <A extends java.lang.annotation.Annotation> A getDeclaredAnnotation(@NonNull Class<A>);
- method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
- method public Class<?>[] getDeclaredClasses();
- method @NonNull public java.lang.reflect.Constructor<T> getDeclaredConstructor(Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
- method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
+ method @NonNull public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method @NonNull public Class<?>[] getDeclaredClasses();
+ method @NonNull public java.lang.reflect.Constructor<T> getDeclaredConstructor(@Nullable Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
method @NonNull public java.lang.reflect.Field getDeclaredField(@NonNull String) throws java.lang.NoSuchFieldException;
- method public java.lang.reflect.Field[] getDeclaredFields();
- method @NonNull public java.lang.reflect.Method getDeclaredMethod(@NonNull String, Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
- method public java.lang.reflect.Method[] getDeclaredMethods() throws java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Field[] getDeclaredFields();
+ method @NonNull public java.lang.reflect.Method getDeclaredMethod(@NonNull String, @Nullable Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Method[] getDeclaredMethods() throws java.lang.SecurityException;
method @Nullable public Class<?> getDeclaringClass();
method @Nullable public Class<?> getEnclosingClass();
method @Nullable public java.lang.reflect.Constructor<?> getEnclosingConstructor();
method @Nullable public java.lang.reflect.Method getEnclosingMethod();
- method public T[] getEnumConstants();
+ method @Nullable public T[] getEnumConstants();
method @NonNull public java.lang.reflect.Field getField(@NonNull String) throws java.lang.NoSuchFieldException;
- method public java.lang.reflect.Field[] getFields() throws java.lang.SecurityException;
- method public java.lang.reflect.Type[] getGenericInterfaces();
+ method @NonNull public java.lang.reflect.Field[] getFields() throws java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Type[] getGenericInterfaces();
method @Nullable public java.lang.reflect.Type getGenericSuperclass();
- method public Class<?>[] getInterfaces();
- method @NonNull public java.lang.reflect.Method getMethod(@NonNull String, Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
- method public java.lang.reflect.Method[] getMethods() throws java.lang.SecurityException;
+ method @NonNull public Class<?>[] getInterfaces();
+ method @NonNull public java.lang.reflect.Method getMethod(@NonNull String, @Nullable Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method @NonNull public java.lang.reflect.Method[] getMethods() throws java.lang.SecurityException;
method public int getModifiers();
method @NonNull public String getName();
method @Nullable public Package getPackage();
method @Nullable public java.security.ProtectionDomain getProtectionDomain();
method @Nullable public java.net.URL getResource(@NonNull String);
method @Nullable public java.io.InputStream getResourceAsStream(@NonNull String);
- method public Object[] getSigners();
+ method @Nullable public Object[] getSigners();
method @NonNull public String getSimpleName();
method @Nullable public Class<? super T> getSuperclass();
- method public java.lang.reflect.TypeVariable<java.lang.Class<T>>[] getTypeParameters();
+ method @NonNull public java.lang.reflect.TypeVariable<java.lang.Class<T>>[] getTypeParameters();
method public boolean isAnnotation();
method public boolean isAnonymousClass();
method public boolean isArray();
@@ -60545,8 +60570,8 @@
method @NonNull public static String copyValueOf(char[]);
method public boolean endsWith(@NonNull String);
method public boolean equalsIgnoreCase(@Nullable String);
- method @NonNull public static String format(@NonNull String, java.lang.Object...);
- method @NonNull public static String format(@NonNull java.util.Locale, @NonNull String, java.lang.Object...);
+ method @NonNull public static String format(@NonNull String, @NonNull java.lang.Object...);
+ method @NonNull public static String format(@NonNull java.util.Locale, @NonNull String, @NonNull java.lang.Object...);
method @Deprecated public void getBytes(int, int, byte[], int);
method public byte[] getBytes(@NonNull String) throws java.io.UnsupportedEncodingException;
method public byte[] getBytes(@NonNull java.nio.charset.Charset);
@@ -60558,7 +60583,7 @@
method public int indexOf(@NonNull String, int);
method @NonNull public String intern();
method public boolean isEmpty();
- method @NonNull public static String join(@NonNull CharSequence, java.lang.CharSequence...);
+ method @NonNull public static String join(@NonNull CharSequence, @Nullable java.lang.CharSequence...);
method @NonNull public static String join(@NonNull CharSequence, @NonNull Iterable<? extends java.lang.CharSequence>);
method public int lastIndexOf(int);
method public int lastIndexOf(int, int);
@@ -60573,8 +60598,8 @@
method @NonNull public String replace(@NonNull CharSequence, @NonNull CharSequence);
method @NonNull public String replaceAll(@NonNull String, @NonNull String);
method @NonNull public String replaceFirst(@NonNull String, @NonNull String);
- method public String[] split(@NonNull String, int);
- method public String[] split(@NonNull String);
+ method @NonNull public String[] split(@NonNull String, int);
+ method @NonNull public String[] split(@NonNull String);
method public boolean startsWith(@NonNull String, int);
method public boolean startsWith(@NonNull String);
method @NonNull public CharSequence subSequence(int, int);
@@ -60775,7 +60800,7 @@
method public long getId();
method @NonNull public final String getName();
method public final int getPriority();
- method public StackTraceElement[] getStackTrace();
+ method @NonNull public StackTraceElement[] getStackTrace();
method @NonNull public java.lang.Thread.State getState();
method @Nullable public final ThreadGroup getThreadGroup();
method @Nullable public java.lang.Thread.UncaughtExceptionHandler getUncaughtExceptionHandler();
@@ -60873,13 +60898,13 @@
method @Nullable public Throwable getCause();
method @Nullable public String getLocalizedMessage();
method @Nullable public String getMessage();
- method public StackTraceElement[] getStackTrace();
- method public final Throwable[] getSuppressed();
+ method @NonNull public StackTraceElement[] getStackTrace();
+ method @NonNull public final Throwable[] getSuppressed();
method @NonNull public Throwable initCause(@Nullable Throwable);
method public void printStackTrace();
method public void printStackTrace(@NonNull java.io.PrintStream);
method public void printStackTrace(@NonNull java.io.PrintWriter);
- method public void setStackTrace(StackTraceElement[]);
+ method public void setStackTrace(@NonNull StackTraceElement[]);
}
public class TypeNotPresentException extends java.lang.RuntimeException {
@@ -61202,8 +61227,8 @@
public class AccessibleObject implements java.lang.reflect.AnnotatedElement {
ctor protected AccessibleObject();
method @Nullable public <T extends java.lang.annotation.Annotation> T getAnnotation(@NonNull Class<T>);
- method public java.lang.annotation.Annotation[] getAnnotations();
- method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public boolean isAccessible();
method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException;
method public void setAccessible(boolean) throws java.lang.SecurityException;
@@ -61211,10 +61236,10 @@
public interface AnnotatedElement {
method @Nullable public <T extends java.lang.annotation.Annotation> T getAnnotation(@NonNull Class<T>);
- method public java.lang.annotation.Annotation[] getAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getAnnotations();
method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(@NonNull Class<T>);
method @Nullable public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(@NonNull Class<T>);
- method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(@NonNull Class<T>);
method public default boolean isAnnotationPresent(@NonNull Class<? extends java.lang.annotation.Annotation>);
}
@@ -61249,20 +61274,20 @@
method public int getModifiers();
method @NonNull public String getName();
method public java.lang.annotation.Annotation[][] getParameterAnnotations();
- method public Class<?>[] getParameterTypes();
+ method @NonNull public Class<?>[] getParameterTypes();
method public java.lang.reflect.TypeVariable<java.lang.reflect.Constructor<T>>[] getTypeParameters();
method @NonNull public T newInstance(java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.InstantiationException, java.lang.reflect.InvocationTargetException;
method @NonNull public String toGenericString();
}
public abstract class Executable extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
- method public abstract Class<?>[] getExceptionTypes();
- method public java.lang.reflect.Type[] getGenericExceptionTypes();
- method public java.lang.reflect.Type[] getGenericParameterTypes();
- method public abstract java.lang.annotation.Annotation[][] getParameterAnnotations();
+ method @NonNull public abstract Class<?>[] getExceptionTypes();
+ method @NonNull public java.lang.reflect.Type[] getGenericExceptionTypes();
+ method @NonNull public java.lang.reflect.Type[] getGenericParameterTypes();
+ method @NonNull public abstract java.lang.annotation.Annotation[][] getParameterAnnotations();
method public int getParameterCount();
- method public abstract Class<?>[] getParameterTypes();
- method public java.lang.reflect.Parameter[] getParameters();
+ method @NonNull public abstract Class<?>[] getParameterTypes();
+ method @NonNull public java.lang.reflect.Parameter[] getParameters();
method public final boolean isAnnotationPresent(@NonNull Class<? extends java.lang.annotation.Annotation>);
method public boolean isSynthetic();
method public boolean isVarArgs();
@@ -61351,7 +61376,7 @@
method @NonNull public Class<?>[] getParameterTypes();
method @NonNull public Class<?> getReturnType();
method @NonNull public java.lang.reflect.TypeVariable<java.lang.reflect.Method>[] getTypeParameters();
- method @Nullable public Object invoke(@Nullable Object, java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
+ method @Nullable public Object invoke(@Nullable Object, @Nullable java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
method public boolean isBridge();
method public boolean isDefault();
method @NonNull public String toGenericString();
@@ -61394,8 +61419,8 @@
public final class Parameter implements java.lang.reflect.AnnotatedElement {
method @Nullable public <T extends java.lang.annotation.Annotation> T getAnnotation(@NonNull Class<T>);
- method public java.lang.annotation.Annotation[] getAnnotations();
- method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getAnnotations();
+ method @NonNull public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method @NonNull public java.lang.reflect.Executable getDeclaringExecutable();
method public int getModifiers();
method @NonNull public String getName();
@@ -61408,7 +61433,7 @@
}
public interface ParameterizedType extends java.lang.reflect.Type {
- method public java.lang.reflect.Type[] getActualTypeArguments();
+ method @NonNull public java.lang.reflect.Type[] getActualTypeArguments();
method @Nullable public java.lang.reflect.Type getOwnerType();
method @NonNull public java.lang.reflect.Type getRawType();
}
@@ -61416,9 +61441,9 @@
public class Proxy implements java.io.Serializable {
ctor protected Proxy(@NonNull java.lang.reflect.InvocationHandler);
method @NonNull public static java.lang.reflect.InvocationHandler getInvocationHandler(@NonNull Object) throws java.lang.IllegalArgumentException;
- method @NonNull public static Class<?> getProxyClass(@Nullable ClassLoader, Class<?>...) throws java.lang.IllegalArgumentException;
+ method @NonNull public static Class<?> getProxyClass(@Nullable ClassLoader, @NonNull Class<?>...) throws java.lang.IllegalArgumentException;
method public static boolean isProxyClass(@NonNull Class<?>);
- method @NonNull public static Object newProxyInstance(@Nullable ClassLoader, Class<?>[], @NonNull java.lang.reflect.InvocationHandler) throws java.lang.IllegalArgumentException;
+ method @NonNull public static Object newProxyInstance(@Nullable ClassLoader, @NonNull Class<?>[], @NonNull java.lang.reflect.InvocationHandler) throws java.lang.IllegalArgumentException;
field protected java.lang.reflect.InvocationHandler h;
}
@@ -61432,7 +61457,7 @@
}
public interface TypeVariable<D extends java.lang.reflect.GenericDeclaration> extends java.lang.reflect.Type {
- method public java.lang.reflect.Type[] getBounds();
+ method @NonNull public java.lang.reflect.Type[] getBounds();
method @NonNull public D getGenericDeclaration();
method @NonNull public String getName();
}
@@ -61444,8 +61469,8 @@
}
public interface WildcardType extends java.lang.reflect.Type {
- method public java.lang.reflect.Type[] getLowerBounds();
- method public java.lang.reflect.Type[] getUpperBounds();
+ method @NonNull public java.lang.reflect.Type[] getLowerBounds();
+ method @NonNull public java.lang.reflect.Type[] getUpperBounds();
}
}
@@ -62489,7 +62514,7 @@
public abstract class ByteBuffer extends java.nio.Buffer implements java.lang.Comparable<java.nio.ByteBuffer> {
method @NonNull public static java.nio.ByteBuffer allocate(int);
method @NonNull public static java.nio.ByteBuffer allocateDirect(int);
- method public final byte[] array();
+ method @NonNull public final byte[] array();
method public final int arrayOffset();
method @NonNull public abstract java.nio.CharBuffer asCharBuffer();
method @NonNull public abstract java.nio.DoubleBuffer asDoubleBuffer();
@@ -62503,8 +62528,8 @@
method @NonNull public abstract java.nio.ByteBuffer duplicate();
method public abstract byte get();
method public abstract byte get(int);
- method @NonNull public java.nio.ByteBuffer get(byte[], int, int);
- method @NonNull public java.nio.ByteBuffer get(byte[]);
+ method @NonNull public java.nio.ByteBuffer get(@NonNull byte[], int, int);
+ method @NonNull public java.nio.ByteBuffer get(@NonNull byte[]);
method public abstract char getChar();
method public abstract char getChar(int);
method public abstract double getDouble();
@@ -62523,8 +62548,8 @@
method @NonNull public abstract java.nio.ByteBuffer put(byte);
method @NonNull public abstract java.nio.ByteBuffer put(int, byte);
method @NonNull public java.nio.ByteBuffer put(@NonNull java.nio.ByteBuffer);
- method @NonNull public java.nio.ByteBuffer put(byte[], int, int);
- method @NonNull public final java.nio.ByteBuffer put(byte[]);
+ method @NonNull public java.nio.ByteBuffer put(@NonNull byte[], int, int);
+ method @NonNull public final java.nio.ByteBuffer put(@NonNull byte[]);
method @NonNull public abstract java.nio.ByteBuffer putChar(char);
method @NonNull public abstract java.nio.ByteBuffer putChar(int, char);
method @NonNull public abstract java.nio.ByteBuffer putDouble(double);
@@ -62538,8 +62563,8 @@
method @NonNull public abstract java.nio.ByteBuffer putShort(short);
method @NonNull public abstract java.nio.ByteBuffer putShort(int, short);
method @NonNull public abstract java.nio.ByteBuffer slice();
- method @NonNull public static java.nio.ByteBuffer wrap(byte[], int, int);
- method @NonNull public static java.nio.ByteBuffer wrap(byte[]);
+ method @NonNull public static java.nio.ByteBuffer wrap(@NonNull byte[], int, int);
+ method @NonNull public static java.nio.ByteBuffer wrap(@NonNull byte[]);
}
public final class ByteOrder {
@@ -64372,20 +64397,20 @@
public abstract class MessageDigest extends java.security.MessageDigestSpi {
ctor protected MessageDigest(@NonNull String);
- method public byte[] digest();
- method public int digest(byte[], int, int) throws java.security.DigestException;
- method public byte[] digest(byte[]);
+ method @NonNull public byte[] digest();
+ method public int digest(@NonNull byte[], int, int) throws java.security.DigestException;
+ method @NonNull public byte[] digest(@NonNull byte[]);
method @NonNull public final String getAlgorithm();
method public final int getDigestLength();
method @NonNull public static java.security.MessageDigest getInstance(@NonNull String) throws java.security.NoSuchAlgorithmException;
method @NonNull public static java.security.MessageDigest getInstance(@NonNull String, @NonNull String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method @NonNull public static java.security.MessageDigest getInstance(@NonNull String, @NonNull java.security.Provider) throws java.security.NoSuchAlgorithmException;
method @NonNull public final java.security.Provider getProvider();
- method public static boolean isEqual(byte[], byte[]);
+ method public static boolean isEqual(@Nullable byte[], @Nullable byte[]);
method public void reset();
method public void update(byte);
- method public void update(byte[], int, int);
- method public void update(byte[]);
+ method public void update(@NonNull byte[], int, int);
+ method public void update(@NonNull byte[]);
method public final void update(@NonNull java.nio.ByteBuffer);
}
@@ -66992,7 +67017,7 @@
method @NonNull public final StringBuffer format(@NonNull Object, @NonNull StringBuffer, @NonNull java.text.FieldPosition);
method @NonNull public abstract StringBuffer format(@NonNull java.util.Date, @NonNull StringBuffer, @NonNull java.text.FieldPosition);
method @NonNull public final String format(@NonNull java.util.Date);
- method public static java.util.Locale[] getAvailableLocales();
+ method @NonNull public static java.util.Locale[] getAvailableLocales();
method @NonNull public java.util.Calendar getCalendar();
method @NonNull public static final java.text.DateFormat getDateInstance();
method @NonNull public static final java.text.DateFormat getDateInstance(int);
@@ -67232,7 +67257,7 @@
method @NonNull public final String format(long);
method @NonNull public abstract StringBuffer format(double, @NonNull StringBuffer, @NonNull java.text.FieldPosition);
method @NonNull public abstract StringBuffer format(long, @NonNull StringBuffer, @NonNull java.text.FieldPosition);
- method public static java.util.Locale[] getAvailableLocales();
+ method @NonNull public static java.util.Locale[] getAvailableLocales();
method @Nullable public java.util.Currency getCurrency();
method @NonNull public static final java.text.NumberFormat getCurrencyInstance();
method @NonNull public static java.text.NumberFormat getCurrencyInstance(@NonNull java.util.Locale);
@@ -68886,8 +68911,8 @@
method public boolean remove(@Nullable Object);
method public boolean removeAll(@NonNull java.util.Collection<?>);
method public boolean retainAll(@NonNull java.util.Collection<?>);
- method public Object[] toArray();
- method public <T> T[] toArray(T[]);
+ method @NonNull public Object[] toArray();
+ method @NonNull public <T> T[] toArray(@NonNull T[]);
}
public abstract class AbstractList<E> extends java.util.AbstractCollection<E> implements java.util.List<E> {
@@ -68996,161 +69021,161 @@
}
public class Arrays {
- method @NonNull @java.lang.SafeVarargs public static <T> java.util.List<T> asList(T...);
- method public static int binarySearch(long[], long);
- method public static int binarySearch(long[], int, int, long);
- method public static int binarySearch(int[], int);
- method public static int binarySearch(int[], int, int, int);
- method public static int binarySearch(short[], short);
- method public static int binarySearch(short[], int, int, short);
- method public static int binarySearch(char[], char);
- method public static int binarySearch(char[], int, int, char);
- method public static int binarySearch(byte[], byte);
- method public static int binarySearch(byte[], int, int, byte);
- method public static int binarySearch(double[], double);
- method public static int binarySearch(double[], int, int, double);
- method public static int binarySearch(float[], float);
- method public static int binarySearch(float[], int, int, float);
- method public static int binarySearch(Object[], @NonNull Object);
- method public static int binarySearch(Object[], int, int, @NonNull Object);
- method public static <T> int binarySearch(T[], T, @Nullable java.util.Comparator<? super T>);
- method public static <T> int binarySearch(T[], int, int, T, @Nullable java.util.Comparator<? super T>);
- method public static <T> T[] copyOf(T[], int);
- method public static <T, U> T[] copyOf(U[], int, @NonNull Class<? extends T[]>);
- method public static byte[] copyOf(byte[], int);
- method public static short[] copyOf(short[], int);
- method public static int[] copyOf(int[], int);
- method public static long[] copyOf(long[], int);
- method public static char[] copyOf(char[], int);
- method public static float[] copyOf(float[], int);
- method public static double[] copyOf(double[], int);
- method public static boolean[] copyOf(boolean[], int);
- method public static <T> T[] copyOfRange(T[], int, int);
- method public static <T, U> T[] copyOfRange(U[], int, int, @NonNull Class<? extends T[]>);
- method public static byte[] copyOfRange(byte[], int, int);
- method public static short[] copyOfRange(short[], int, int);
- method public static int[] copyOfRange(int[], int, int);
- method public static long[] copyOfRange(long[], int, int);
- method public static char[] copyOfRange(char[], int, int);
- method public static float[] copyOfRange(float[], int, int);
- method public static double[] copyOfRange(double[], int, int);
- method public static boolean[] copyOfRange(boolean[], int, int);
- method public static boolean deepEquals(Object[], Object[]);
- method public static int deepHashCode(Object[]);
- method @NonNull public static String deepToString(Object[]);
- method public static boolean equals(long[], long[]);
- method public static boolean equals(int[], int[]);
- method public static boolean equals(short[], short[]);
- method public static boolean equals(char[], char[]);
- method public static boolean equals(byte[], byte[]);
- method public static boolean equals(boolean[], boolean[]);
- method public static boolean equals(double[], double[]);
- method public static boolean equals(float[], float[]);
- method public static boolean equals(Object[], Object[]);
- method public static void fill(long[], long);
- method public static void fill(long[], int, int, long);
- method public static void fill(int[], int);
- method public static void fill(int[], int, int, int);
- method public static void fill(short[], short);
- method public static void fill(short[], int, int, short);
- method public static void fill(char[], char);
- method public static void fill(char[], int, int, char);
- method public static void fill(byte[], byte);
- method public static void fill(byte[], int, int, byte);
- method public static void fill(boolean[], boolean);
- method public static void fill(boolean[], int, int, boolean);
- method public static void fill(double[], double);
- method public static void fill(double[], int, int, double);
- method public static void fill(float[], float);
- method public static void fill(float[], int, int, float);
- method public static void fill(Object[], @Nullable Object);
- method public static void fill(Object[], int, int, @Nullable Object);
- method public static int hashCode(long[]);
- method public static int hashCode(int[]);
- method public static int hashCode(short[]);
- method public static int hashCode(char[]);
- method public static int hashCode(byte[]);
- method public static int hashCode(boolean[]);
- method public static int hashCode(float[]);
- method public static int hashCode(double[]);
- method public static int hashCode(Object[]);
- method public static <T> void parallelPrefix(T[], @NonNull java.util.function.BinaryOperator<T>);
- method public static <T> void parallelPrefix(T[], int, int, @NonNull java.util.function.BinaryOperator<T>);
- method public static void parallelPrefix(long[], @NonNull java.util.function.LongBinaryOperator);
- method public static void parallelPrefix(long[], int, int, @NonNull java.util.function.LongBinaryOperator);
- method public static void parallelPrefix(double[], @NonNull java.util.function.DoubleBinaryOperator);
- method public static void parallelPrefix(double[], int, int, @NonNull java.util.function.DoubleBinaryOperator);
- method public static void parallelPrefix(int[], @NonNull java.util.function.IntBinaryOperator);
- method public static void parallelPrefix(int[], int, int, @NonNull java.util.function.IntBinaryOperator);
- method public static <T> void parallelSetAll(T[], @NonNull java.util.function.IntFunction<? extends T>);
- method public static void parallelSetAll(int[], @NonNull java.util.function.IntUnaryOperator);
- method public static void parallelSetAll(long[], @NonNull java.util.function.IntToLongFunction);
- method public static void parallelSetAll(double[], @NonNull java.util.function.IntToDoubleFunction);
- method public static void parallelSort(byte[]);
- method public static void parallelSort(byte[], int, int);
- method public static void parallelSort(char[]);
- method public static void parallelSort(char[], int, int);
- method public static void parallelSort(short[]);
- method public static void parallelSort(short[], int, int);
- method public static void parallelSort(int[]);
- method public static void parallelSort(int[], int, int);
- method public static void parallelSort(long[]);
- method public static void parallelSort(long[], int, int);
- method public static void parallelSort(float[]);
- method public static void parallelSort(float[], int, int);
- method public static void parallelSort(double[]);
- method public static void parallelSort(double[], int, int);
- method public static <T extends java.lang.Comparable<? super T>> void parallelSort(T[]);
- method public static <T extends java.lang.Comparable<? super T>> void parallelSort(T[], int, int);
- method public static <T> void parallelSort(T[], @Nullable java.util.Comparator<? super T>);
- method public static <T> void parallelSort(T[], int, int, @Nullable java.util.Comparator<? super T>);
- method public static <T> void setAll(T[], @NonNull java.util.function.IntFunction<? extends T>);
- method public static void setAll(int[], @NonNull java.util.function.IntUnaryOperator);
- method public static void setAll(long[], @NonNull java.util.function.IntToLongFunction);
- method public static void setAll(double[], @NonNull java.util.function.IntToDoubleFunction);
- method public static void sort(int[]);
- method public static void sort(int[], int, int);
- method public static void sort(long[]);
- method public static void sort(long[], int, int);
- method public static void sort(short[]);
- method public static void sort(short[], int, int);
- method public static void sort(char[]);
- method public static void sort(char[], int, int);
- method public static void sort(byte[]);
- method public static void sort(byte[], int, int);
- method public static void sort(float[]);
- method public static void sort(float[], int, int);
- method public static void sort(double[]);
- method public static void sort(double[], int, int);
- method public static void sort(Object[]);
- method public static void sort(Object[], int, int);
- method public static <T> void sort(T[], @Nullable java.util.Comparator<? super T>);
- method public static <T> void sort(T[], int, int, @Nullable java.util.Comparator<? super T>);
- method @NonNull public static <T> java.util.Spliterator<T> spliterator(T[]);
- method @NonNull public static <T> java.util.Spliterator<T> spliterator(T[], int, int);
- method @NonNull public static java.util.Spliterator.OfInt spliterator(int[]);
- method @NonNull public static java.util.Spliterator.OfInt spliterator(int[], int, int);
- method @NonNull public static java.util.Spliterator.OfLong spliterator(long[]);
- method @NonNull public static java.util.Spliterator.OfLong spliterator(long[], int, int);
- method @NonNull public static java.util.Spliterator.OfDouble spliterator(double[]);
- method @NonNull public static java.util.Spliterator.OfDouble spliterator(double[], int, int);
- method @NonNull public static <T> java.util.stream.Stream<T> stream(T[]);
- method @NonNull public static <T> java.util.stream.Stream<T> stream(T[], int, int);
- method @NonNull public static java.util.stream.IntStream stream(int[]);
- method @NonNull public static java.util.stream.IntStream stream(int[], int, int);
- method @NonNull public static java.util.stream.LongStream stream(long[]);
- method @NonNull public static java.util.stream.LongStream stream(long[], int, int);
- method @NonNull public static java.util.stream.DoubleStream stream(double[]);
- method @NonNull public static java.util.stream.DoubleStream stream(double[], int, int);
- method @NonNull public static String toString(long[]);
- method @NonNull public static String toString(int[]);
- method @NonNull public static String toString(short[]);
- method @NonNull public static String toString(char[]);
- method @NonNull public static String toString(byte[]);
- method @NonNull public static String toString(boolean[]);
- method @NonNull public static String toString(float[]);
- method @NonNull public static String toString(double[]);
- method @NonNull public static String toString(Object[]);
+ method @NonNull @java.lang.SafeVarargs public static <T> java.util.List<T> asList(@NonNull T...);
+ method public static int binarySearch(@NonNull long[], long);
+ method public static int binarySearch(@NonNull long[], int, int, long);
+ method public static int binarySearch(@NonNull int[], int);
+ method public static int binarySearch(@NonNull int[], int, int, int);
+ method public static int binarySearch(@NonNull short[], short);
+ method public static int binarySearch(@NonNull short[], int, int, short);
+ method public static int binarySearch(@NonNull char[], char);
+ method public static int binarySearch(@NonNull char[], int, int, char);
+ method public static int binarySearch(@NonNull byte[], byte);
+ method public static int binarySearch(@NonNull byte[], int, int, byte);
+ method public static int binarySearch(@NonNull double[], double);
+ method public static int binarySearch(@NonNull double[], int, int, double);
+ method public static int binarySearch(@NonNull float[], float);
+ method public static int binarySearch(@NonNull float[], int, int, float);
+ method public static int binarySearch(@NonNull Object[], @NonNull Object);
+ method public static int binarySearch(@NonNull Object[], int, int, @NonNull Object);
+ method public static <T> int binarySearch(@NonNull T[], T, @Nullable java.util.Comparator<? super T>);
+ method public static <T> int binarySearch(@NonNull T[], int, int, T, @Nullable java.util.Comparator<? super T>);
+ method @NonNull public static <T> T[] copyOf(@NonNull T[], int);
+ method @NonNull public static <T, U> T[] copyOf(@NonNull U[], int, @NonNull Class<? extends T[]>);
+ method @NonNull public static byte[] copyOf(@NonNull byte[], int);
+ method @NonNull public static short[] copyOf(@NonNull short[], int);
+ method @NonNull public static int[] copyOf(@NonNull int[], int);
+ method @NonNull public static long[] copyOf(@NonNull long[], int);
+ method @NonNull public static char[] copyOf(@NonNull char[], int);
+ method @NonNull public static float[] copyOf(@NonNull float[], int);
+ method @NonNull public static double[] copyOf(@NonNull double[], int);
+ method @NonNull public static boolean[] copyOf(@NonNull boolean[], int);
+ method @NonNull public static <T> T[] copyOfRange(@NonNull T[], int, int);
+ method @NonNull public static <T, U> T[] copyOfRange(@NonNull U[], int, int, @NonNull Class<? extends T[]>);
+ method @NonNull public static byte[] copyOfRange(@NonNull byte[], int, int);
+ method @NonNull public static short[] copyOfRange(@NonNull short[], int, int);
+ method @NonNull public static int[] copyOfRange(@NonNull int[], int, int);
+ method @NonNull public static long[] copyOfRange(@NonNull long[], int, int);
+ method @NonNull public static char[] copyOfRange(@NonNull char[], int, int);
+ method @NonNull public static float[] copyOfRange(@NonNull float[], int, int);
+ method @NonNull public static double[] copyOfRange(@NonNull double[], int, int);
+ method @NonNull public static boolean[] copyOfRange(@NonNull boolean[], int, int);
+ method public static boolean deepEquals(@Nullable Object[], @Nullable Object[]);
+ method public static int deepHashCode(@Nullable Object[]);
+ method @NonNull public static String deepToString(@Nullable Object[]);
+ method public static boolean equals(@Nullable long[], @Nullable long[]);
+ method public static boolean equals(@Nullable int[], @Nullable int[]);
+ method public static boolean equals(@Nullable short[], @Nullable short[]);
+ method public static boolean equals(@Nullable char[], @Nullable char[]);
+ method public static boolean equals(@Nullable byte[], @Nullable byte[]);
+ method public static boolean equals(@Nullable boolean[], @Nullable boolean[]);
+ method public static boolean equals(@Nullable double[], @Nullable double[]);
+ method public static boolean equals(@Nullable float[], @Nullable float[]);
+ method public static boolean equals(@Nullable Object[], @Nullable Object[]);
+ method public static void fill(@NonNull long[], long);
+ method public static void fill(@NonNull long[], int, int, long);
+ method public static void fill(@NonNull int[], int);
+ method public static void fill(@NonNull int[], int, int, int);
+ method public static void fill(@NonNull short[], short);
+ method public static void fill(@NonNull short[], int, int, short);
+ method public static void fill(@NonNull char[], char);
+ method public static void fill(@NonNull char[], int, int, char);
+ method public static void fill(@NonNull byte[], byte);
+ method public static void fill(@NonNull byte[], int, int, byte);
+ method public static void fill(@NonNull boolean[], boolean);
+ method public static void fill(@NonNull boolean[], int, int, boolean);
+ method public static void fill(@NonNull double[], double);
+ method public static void fill(@NonNull double[], int, int, double);
+ method public static void fill(@NonNull float[], float);
+ method public static void fill(@NonNull float[], int, int, float);
+ method public static void fill(@NonNull Object[], @Nullable Object);
+ method public static void fill(@NonNull Object[], int, int, @Nullable Object);
+ method public static int hashCode(@Nullable long[]);
+ method public static int hashCode(@Nullable int[]);
+ method public static int hashCode(@Nullable short[]);
+ method public static int hashCode(@Nullable char[]);
+ method public static int hashCode(@Nullable byte[]);
+ method public static int hashCode(@Nullable boolean[]);
+ method public static int hashCode(@Nullable float[]);
+ method public static int hashCode(@Nullable double[]);
+ method public static int hashCode(@Nullable Object[]);
+ method public static <T> void parallelPrefix(@NonNull T[], @NonNull java.util.function.BinaryOperator<T>);
+ method public static <T> void parallelPrefix(@NonNull T[], int, int, @NonNull java.util.function.BinaryOperator<T>);
+ method public static void parallelPrefix(@NonNull long[], @NonNull java.util.function.LongBinaryOperator);
+ method public static void parallelPrefix(@NonNull long[], int, int, @NonNull java.util.function.LongBinaryOperator);
+ method public static void parallelPrefix(@NonNull double[], @NonNull java.util.function.DoubleBinaryOperator);
+ method public static void parallelPrefix(@NonNull double[], int, int, @NonNull java.util.function.DoubleBinaryOperator);
+ method public static void parallelPrefix(@NonNull int[], @NonNull java.util.function.IntBinaryOperator);
+ method public static void parallelPrefix(@NonNull int[], int, int, @NonNull java.util.function.IntBinaryOperator);
+ method public static <T> void parallelSetAll(@NonNull T[], @NonNull java.util.function.IntFunction<? extends T>);
+ method public static void parallelSetAll(@NonNull int[], @NonNull java.util.function.IntUnaryOperator);
+ method public static void parallelSetAll(@NonNull long[], @NonNull java.util.function.IntToLongFunction);
+ method public static void parallelSetAll(@NonNull double[], @NonNull java.util.function.IntToDoubleFunction);
+ method public static void parallelSort(@NonNull byte[]);
+ method public static void parallelSort(@NonNull byte[], int, int);
+ method public static void parallelSort(@NonNull char[]);
+ method public static void parallelSort(@NonNull char[], int, int);
+ method public static void parallelSort(@NonNull short[]);
+ method public static void parallelSort(@NonNull short[], int, int);
+ method public static void parallelSort(@NonNull int[]);
+ method public static void parallelSort(@NonNull int[], int, int);
+ method public static void parallelSort(@NonNull long[]);
+ method public static void parallelSort(@NonNull long[], int, int);
+ method public static void parallelSort(@NonNull float[]);
+ method public static void parallelSort(@NonNull float[], int, int);
+ method public static void parallelSort(@NonNull double[]);
+ method public static void parallelSort(@NonNull double[], int, int);
+ method public static <T extends java.lang.Comparable<? super T>> void parallelSort(@NonNull T[]);
+ method public static <T extends java.lang.Comparable<? super T>> void parallelSort(@NonNull T[], int, int);
+ method public static <T> void parallelSort(@NonNull T[], @Nullable java.util.Comparator<? super T>);
+ method public static <T> void parallelSort(@NonNull T[], int, int, @Nullable java.util.Comparator<? super T>);
+ method public static <T> void setAll(@NonNull T[], @NonNull java.util.function.IntFunction<? extends T>);
+ method public static void setAll(@NonNull int[], @NonNull java.util.function.IntUnaryOperator);
+ method public static void setAll(@NonNull long[], @NonNull java.util.function.IntToLongFunction);
+ method public static void setAll(@NonNull double[], @NonNull java.util.function.IntToDoubleFunction);
+ method public static void sort(@NonNull int[]);
+ method public static void sort(@NonNull int[], int, int);
+ method public static void sort(@NonNull long[]);
+ method public static void sort(@NonNull long[], int, int);
+ method public static void sort(@NonNull short[]);
+ method public static void sort(@NonNull short[], int, int);
+ method public static void sort(@NonNull char[]);
+ method public static void sort(@NonNull char[], int, int);
+ method public static void sort(@NonNull byte[]);
+ method public static void sort(@NonNull byte[], int, int);
+ method public static void sort(@NonNull float[]);
+ method public static void sort(@NonNull float[], int, int);
+ method public static void sort(@NonNull double[]);
+ method public static void sort(@NonNull double[], int, int);
+ method public static void sort(@NonNull Object[]);
+ method public static void sort(@NonNull Object[], int, int);
+ method public static <T> void sort(@NonNull T[], @Nullable java.util.Comparator<? super T>);
+ method public static <T> void sort(@NonNull T[], int, int, @Nullable java.util.Comparator<? super T>);
+ method @NonNull public static <T> java.util.Spliterator<T> spliterator(@NonNull T[]);
+ method @NonNull public static <T> java.util.Spliterator<T> spliterator(@NonNull T[], int, int);
+ method @NonNull public static java.util.Spliterator.OfInt spliterator(@NonNull int[]);
+ method @NonNull public static java.util.Spliterator.OfInt spliterator(@NonNull int[], int, int);
+ method @NonNull public static java.util.Spliterator.OfLong spliterator(@NonNull long[]);
+ method @NonNull public static java.util.Spliterator.OfLong spliterator(@NonNull long[], int, int);
+ method @NonNull public static java.util.Spliterator.OfDouble spliterator(@NonNull double[]);
+ method @NonNull public static java.util.Spliterator.OfDouble spliterator(@NonNull double[], int, int);
+ method @NonNull public static <T> java.util.stream.Stream<T> stream(@NonNull T[]);
+ method @NonNull public static <T> java.util.stream.Stream<T> stream(@NonNull T[], int, int);
+ method @NonNull public static java.util.stream.IntStream stream(@NonNull int[]);
+ method @NonNull public static java.util.stream.IntStream stream(@NonNull int[], int, int);
+ method @NonNull public static java.util.stream.LongStream stream(@NonNull long[]);
+ method @NonNull public static java.util.stream.LongStream stream(@NonNull long[], int, int);
+ method @NonNull public static java.util.stream.DoubleStream stream(@NonNull double[]);
+ method @NonNull public static java.util.stream.DoubleStream stream(@NonNull double[], int, int);
+ method @NonNull public static String toString(@Nullable long[]);
+ method @NonNull public static String toString(@Nullable int[]);
+ method @NonNull public static String toString(@Nullable short[]);
+ method @NonNull public static String toString(@Nullable char[]);
+ method @NonNull public static String toString(@Nullable byte[]);
+ method @NonNull public static String toString(@Nullable boolean[]);
+ method @NonNull public static String toString(@Nullable float[]);
+ method @NonNull public static String toString(@Nullable double[]);
+ method @NonNull public static String toString(@Nullable Object[]);
}
public class Base64 {
@@ -69234,7 +69259,7 @@
method public int getActualMaximum(int);
method public int getActualMinimum(int);
method @NonNull public static java.util.Set<java.lang.String> getAvailableCalendarTypes();
- method public static java.util.Locale[] getAvailableLocales();
+ method @NonNull public static java.util.Locale[] getAvailableLocales();
method @NonNull public String getCalendarType();
method @Nullable public String getDisplayName(int, int, @NonNull java.util.Locale);
method @Nullable public java.util.Map<java.lang.String,java.lang.Integer> getDisplayNames(int, int, @NonNull java.util.Locale);
@@ -69322,8 +69347,8 @@
field public static final int YEAR = 1; // 0x1
field public static final int ZONE_OFFSET = 15; // 0xf
field protected boolean areFieldsSet;
- field protected int[] fields;
- field protected boolean[] isSet;
+ field @NonNull protected int[] fields;
+ field @NonNull protected boolean[] isSet;
field protected boolean isTimeSet;
field protected long time;
}
@@ -69334,7 +69359,7 @@
method @NonNull public java.util.Calendar.Builder set(int, int);
method @NonNull public java.util.Calendar.Builder setCalendarType(@NonNull String);
method @NonNull public java.util.Calendar.Builder setDate(int, int, int);
- method @NonNull public java.util.Calendar.Builder setFields(int...);
+ method @NonNull public java.util.Calendar.Builder setFields(@NonNull int...);
method @NonNull public java.util.Calendar.Builder setInstant(long);
method @NonNull public java.util.Calendar.Builder setInstant(@NonNull java.util.Date);
method @NonNull public java.util.Calendar.Builder setLenient(boolean);
@@ -69364,12 +69389,12 @@
method public int size();
method @NonNull public default java.util.Spliterator<E> spliterator();
method @NonNull public default java.util.stream.Stream<E> stream();
- method public Object[] toArray();
- method public <T> T[] toArray(T[]);
+ method @NonNull public Object[] toArray();
+ method @NonNull public <T> T[] toArray(@NonNull T[]);
}
public class Collections {
- method @java.lang.SafeVarargs public static <T> boolean addAll(@NonNull java.util.Collection<? super T>, T...);
+ method @java.lang.SafeVarargs public static <T> boolean addAll(@NonNull java.util.Collection<? super T>, @NonNull T...);
method @NonNull public static <T> java.util.Queue<T> asLifoQueue(@NonNull java.util.Deque<T>);
method public static <T> int binarySearch(@NonNull java.util.List<? extends java.lang.Comparable<? super T>>, @NonNull T);
method public static <T> int binarySearch(@NonNull java.util.List<? extends T>, T, @Nullable java.util.Comparator<? super T>);
@@ -69887,7 +69912,7 @@
method @NonNull public static java.util.List<java.lang.String> filterTags(@NonNull java.util.List<java.util.Locale.LanguageRange>, @NonNull java.util.Collection<java.lang.String>, @NonNull java.util.Locale.FilteringMode);
method @NonNull public static java.util.List<java.lang.String> filterTags(@NonNull java.util.List<java.util.Locale.LanguageRange>, @NonNull java.util.Collection<java.lang.String>);
method @NonNull public static java.util.Locale forLanguageTag(@NonNull String);
- method public static java.util.Locale[] getAvailableLocales();
+ method @NonNull public static java.util.Locale[] getAvailableLocales();
method @NonNull public String getCountry();
method @NonNull public static java.util.Locale getDefault();
method @NonNull public static java.util.Locale getDefault(@NonNull java.util.Locale.Category);
@@ -69905,8 +69930,8 @@
method @NonNull public java.util.Set<java.lang.Character> getExtensionKeys();
method @NonNull public String getISO3Country() throws java.util.MissingResourceException;
method @NonNull public String getISO3Language() throws java.util.MissingResourceException;
- method public static String[] getISOCountries();
- method public static String[] getISOLanguages();
+ method @NonNull public static String[] getISOCountries();
+ method @NonNull public static String[] getISOLanguages();
method @NonNull public String getLanguage();
method @NonNull public String getScript();
method @NonNull public java.util.Set<java.lang.String> getUnicodeLocaleAttributes();
@@ -70100,7 +70125,7 @@
method public static <T> int compare(T, T, @NonNull java.util.Comparator<? super T>);
method public static boolean deepEquals(@Nullable Object, @Nullable Object);
method public static boolean equals(@Nullable Object, @Nullable Object);
- method public static int hash(java.lang.Object...);
+ method public static int hash(@Nullable java.lang.Object...);
method public static int hashCode(@Nullable Object);
method public static boolean isNull(@Nullable Object);
method public static boolean nonNull(@Nullable Object);
@@ -70765,7 +70790,7 @@
method public void addElement(E);
method public int capacity();
method @NonNull public Object clone();
- method public void copyInto(Object[]);
+ method public void copyInto(@NonNull Object[]);
method public E elementAt(int);
method @NonNull public java.util.Enumeration<E> elements();
method public void ensureCapacity(int);
@@ -70785,7 +70810,7 @@
method public void trimToSize();
field protected int capacityIncrement;
field protected int elementCount;
- field protected Object[] elementData;
+ field @NonNull protected Object[] elementData;
}
public class WeakHashMap<K, V> extends java.util.AbstractMap<K,V> implements java.util.Map<K,V> {
@@ -71176,7 +71201,7 @@
public class CopyOnWriteArrayList<E> implements java.lang.Cloneable java.util.List<E> java.util.RandomAccess java.io.Serializable {
ctor public CopyOnWriteArrayList();
ctor public CopyOnWriteArrayList(@NonNull java.util.Collection<? extends E>);
- ctor public CopyOnWriteArrayList(E[]);
+ ctor public CopyOnWriteArrayList(@NonNull E[]);
method public boolean add(E);
method public void add(int, E);
method public boolean addAll(@NonNull java.util.Collection<? extends E>);
@@ -71204,8 +71229,8 @@
method public E set(int, E);
method public int size();
method @NonNull public java.util.List<E> subList(int, int);
- method public Object[] toArray();
- method public <T> T[] toArray(T[]);
+ method @NonNull public Object[] toArray();
+ method @NonNull public <T> T[] toArray(@NonNull T[]);
}
public class CopyOnWriteArraySet<E> extends java.util.AbstractSet<E> implements java.io.Serializable {
@@ -72957,7 +72982,7 @@
method public void config(@NonNull java.util.function.Supplier<java.lang.String>);
method public void entering(@Nullable String, @Nullable String);
method public void entering(@Nullable String, @Nullable String, @Nullable Object);
- method public void entering(@Nullable String, @Nullable String, Object[]);
+ method public void entering(@Nullable String, @Nullable String, @Nullable Object[]);
method public void exiting(@Nullable String, @Nullable String);
method public void exiting(@Nullable String, @Nullable String, @Nullable Object);
method public void fine(@Nullable String);
@@ -72970,7 +72995,7 @@
method @NonNull public static java.util.logging.Logger getAnonymousLogger(@Nullable String);
method @Nullable public java.util.logging.Filter getFilter();
method @NonNull public static final java.util.logging.Logger getGlobal();
- method public java.util.logging.Handler[] getHandlers();
+ method @NonNull public java.util.logging.Handler[] getHandlers();
method @Nullable public java.util.logging.Level getLevel();
method @NonNull public static java.util.logging.Logger getLogger(@NonNull String);
method @NonNull public static java.util.logging.Logger getLogger(@NonNull String, @Nullable String);
@@ -72986,7 +73011,7 @@
method public void log(@NonNull java.util.logging.Level, @Nullable String);
method public void log(@NonNull java.util.logging.Level, @NonNull java.util.function.Supplier<java.lang.String>);
method public void log(@NonNull java.util.logging.Level, @Nullable String, @Nullable Object);
- method public void log(@NonNull java.util.logging.Level, @Nullable String, Object[]);
+ method public void log(@NonNull java.util.logging.Level, @Nullable String, @Nullable Object[]);
method public void log(@NonNull java.util.logging.Level, @Nullable String, @Nullable Throwable);
method public void log(@NonNull java.util.logging.Level, @Nullable Throwable, @NonNull java.util.function.Supplier<java.lang.String>);
method public void logp(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable String);
@@ -72997,8 +73022,8 @@
method public void logp(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable Throwable, @NonNull java.util.function.Supplier<java.lang.String>);
method @Deprecated public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable String, @Nullable String);
method @Deprecated public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable String, @Nullable String, @Nullable Object);
- method @Deprecated public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable String, @Nullable String, Object[]);
- method public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable java.util.ResourceBundle, @Nullable String, java.lang.Object...);
+ method @Deprecated public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable String, @Nullable String, @Nullable Object[]);
+ method public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable java.util.ResourceBundle, @Nullable String, @Nullable java.lang.Object...);
method @Deprecated public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable String, @Nullable String, @Nullable Throwable);
method public void logrb(@NonNull java.util.logging.Level, @Nullable String, @Nullable String, @Nullable java.util.ResourceBundle, @Nullable String, @Nullable Throwable);
method public void removeHandler(@Nullable java.util.logging.Handler) throws java.lang.SecurityException;
@@ -73260,8 +73285,8 @@
method public static boolean matches(@NonNull String, @NonNull CharSequence);
method @NonNull public String pattern();
method @NonNull public static String quote(@NonNull String);
- method public String[] split(@NonNull CharSequence, int);
- method public String[] split(@NonNull CharSequence);
+ method @NonNull public String[] split(@NonNull CharSequence, int);
+ method @NonNull public String[] split(@NonNull CharSequence);
method @NonNull public java.util.stream.Stream<java.lang.String> splitAsStream(@NonNull CharSequence);
field public static final int CANON_EQ = 128; // 0x80
field public static final int CASE_INSENSITIVE = 2; // 0x2
diff --git a/api/system-current.txt b/api/system-current.txt
index 00676c8..d061d01 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -501,6 +501,13 @@
method public org.json.JSONObject toJson() throws org.json.JSONException;
}
+ public class NotificationManager {
+ method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
+ method @Nullable public android.content.ComponentName getAllowedNotificationAssistantForUser(android.os.UserHandle);
+ method public void setNotificationAssistantAccessGranted(android.content.ComponentName, boolean);
+ method public void setNotificationAssistantAccessGrantedForUser(android.content.ComponentName, android.os.UserHandle, boolean);
+ }
+
public final class StatsManager {
method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void addConfig(long, byte[]) throws android.app.StatsManager.StatsUnavailableException;
method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean addConfiguration(long, byte[]);
@@ -983,6 +990,7 @@
}
public static final class AppPredictionContext.Builder {
+ ctor public AppPredictionContext.Builder(@NonNull android.content.Context);
method public android.app.prediction.AppPredictionContext build();
method public android.app.prediction.AppPredictionContext.Builder setExtras(@Nullable android.os.Bundle);
method public android.app.prediction.AppPredictionContext.Builder setPredictedTargetCount(int);
@@ -1014,6 +1022,8 @@
}
public final class AppTarget implements android.os.Parcelable {
+ ctor public AppTarget(@NonNull android.app.prediction.AppTargetId, @NonNull String, @Nullable String, @NonNull android.os.UserHandle);
+ ctor public AppTarget(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo, @Nullable String);
method public int describeContents();
method @Nullable public String getClassName();
method @NonNull public android.app.prediction.AppTargetId getId();
@@ -1044,6 +1054,7 @@
}
public final class AppTargetId implements android.os.Parcelable {
+ ctor public AppTargetId(@NonNull String);
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetId> CREATOR;
@@ -1312,6 +1323,7 @@
field public static final String ACTION_DEVICE_CUSTOMIZATION_READY = "android.intent.action.DEVICE_CUSTOMIZATION_READY";
field public static final String ACTION_FACTORY_RESET = "android.intent.action.FACTORY_RESET";
field public static final String ACTION_GLOBAL_BUTTON = "android.intent.action.GLOBAL_BUTTON";
+ field public static final String ACTION_INCIDENT_REPORT_READY = "android.intent.action.INCIDENT_REPORT_READY";
field public static final String ACTION_INSTALL_INSTANT_APP_PACKAGE = "android.intent.action.INSTALL_INSTANT_APP_PACKAGE";
field public static final String ACTION_INSTANT_APP_RESOLVER_SETTINGS = "android.intent.action.INSTANT_APP_RESOLVER_SETTINGS";
field public static final String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";
@@ -1717,9 +1729,9 @@
public final class RollbackInfo implements android.os.Parcelable {
method public int describeContents();
method public java.util.List<android.content.pm.VersionedPackage> getCausePackages();
+ method public int getCommittedSessionId();
method public java.util.List<android.content.rollback.PackageRollbackInfo> getPackages();
method public int getRollbackId();
- method public int getSessionId();
method public boolean isStaged();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.rollback.RollbackInfo> CREATOR;
@@ -2959,10 +2971,12 @@
public final class GnssMeasurementCorrections implements android.os.Parcelable {
method public int describeContents();
method public double getAltitudeMeters();
+ method public double getHorizontalPositionUncertaintyMeters();
method public double getLatitudeDegrees();
method public double getLongitudeDegrees();
method @Nullable public java.util.List<android.location.GnssSingleSatCorrection> getSingleSatCorrectionList();
method public long getToaGpsNanosecondsOfWeek();
+ method public double getVerticalPositionUncertaintyMeters();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.location.GnssMeasurementCorrections> CREATOR;
}
@@ -2971,10 +2985,12 @@
ctor public GnssMeasurementCorrections.Builder();
method public android.location.GnssMeasurementCorrections build();
method public android.location.GnssMeasurementCorrections.Builder setAltitudeMeters(double);
+ method public android.location.GnssMeasurementCorrections.Builder setHorizontalPositionUncertaintyMeters(double);
method public android.location.GnssMeasurementCorrections.Builder setLatitudeDegrees(double);
method public android.location.GnssMeasurementCorrections.Builder setLongitudeDegrees(double);
method public android.location.GnssMeasurementCorrections.Builder setSingleSatCorrectionList(@Nullable java.util.List<android.location.GnssSingleSatCorrection>);
method public android.location.GnssMeasurementCorrections.Builder setToaGpsNanosecondsOfWeek(long);
+ method public android.location.GnssMeasurementCorrections.Builder setVerticalPositionUncertaintyMeters(double);
}
public final class GnssReflectingPlane implements android.os.Parcelable {
@@ -3609,7 +3625,7 @@
public abstract static class ControllerLink.ControllerStub {
ctor public ControllerLink.ControllerStub();
- method public void adjustVolume(@NonNull String, @NonNull String, @NonNull android.media.session.ControllerCallbackLink, boolean, int, int);
+ method public void adjustVolume(@NonNull String, @NonNull String, @NonNull android.media.session.ControllerCallbackLink, int, int);
method public void fastForward(@NonNull String, @NonNull android.media.session.ControllerCallbackLink);
method @Nullable public android.os.Bundle getExtras();
method public long getFlags();
@@ -3639,7 +3655,7 @@
method public void seekTo(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, long);
method public void sendCommand(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.ResultReceiver);
method public void sendCustomAction(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, @NonNull String, @Nullable android.os.Bundle);
- method public boolean sendMediaButton(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, boolean, @NonNull android.view.KeyEvent);
+ method public boolean sendMediaButton(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, @NonNull android.view.KeyEvent);
method public void setVolumeTo(@NonNull String, @NonNull String, @NonNull android.media.session.ControllerCallbackLink, int, int);
method public void skipToQueueItem(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, long);
method public void stop(@NonNull String, @NonNull android.media.session.ControllerCallbackLink);
@@ -4090,6 +4106,7 @@
public class CaptivePortal implements android.os.Parcelable {
ctor public CaptivePortal(android.os.IBinder);
+ method public void logEvent(int, String);
method public void useNetwork();
field public static final int APP_RETURN_DISMISSED = 0; // 0x0
field public static final int APP_RETURN_UNWANTED = 1; // 0x1
@@ -4972,8 +4989,16 @@
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.WifiUsabilityStatsEntry> CREATOR;
+ field public static final int PROBE_STATUS_FAILURE = 3; // 0x3
+ field public static final int PROBE_STATUS_NO_PROBE = 1; // 0x1
+ field public static final int PROBE_STATUS_SUCCESS = 2; // 0x2
+ field public static final int PROBE_STATUS_UNKNOWN = 0; // 0x0
field public final int linkSpeedMbps;
+ field public final int probeElapsedTimeMsSinceLastUpdate;
+ field public final int probeMcsRateSinceLastUpdate;
+ field public final int probeStatusSinceLastUpdate;
field public final int rssi;
+ field public final int rxLinkSpeedMbps;
field public final long timeStampMs;
field public final long totalBackgroundScanTimeMs;
field public final long totalBeaconRx;
@@ -5350,11 +5375,17 @@
public class IncidentManager {
method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void approveReport(android.net.Uri);
method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void cancelAuthorization(android.os.IncidentManager.AuthListener);
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void deleteIncidentReports(android.net.Uri);
method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void denyReport(android.net.Uri);
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) @Nullable public android.os.IncidentManager.IncidentReport getIncidentReport(android.net.Uri);
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) @NonNull public java.util.List<android.net.Uri> getIncidentReportList(String);
method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List<android.os.IncidentManager.PendingReport> getPendingReports();
method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs);
method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener);
field public static final int FLAG_CONFIRMATION_DIALOG = 1; // 0x1
+ field public static final int PRIVACY_POLICY_AUTO = 200; // 0xc8
+ field public static final int PRIVACY_POLICY_EXPLICIT = 100; // 0x64
+ field public static final int PRIVACY_POLICY_LOCAL = 0; // 0x0
}
public static class IncidentManager.AuthListener {
@@ -5363,6 +5394,17 @@
method public void onReportDenied();
}
+ public static class IncidentManager.IncidentReport implements java.io.Closeable android.os.Parcelable {
+ ctor public IncidentManager.IncidentReport(android.os.Parcel);
+ method public void close();
+ method public int describeContents();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public long getPrivacyPolicy();
+ method public long getTimestamp();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.IncidentManager.IncidentReport> CREATOR;
+ }
+
public static class IncidentManager.PendingReport {
ctor public IncidentManager.PendingReport(@NonNull android.net.Uri);
method public int getFlags();
@@ -5811,6 +5853,11 @@
field public static final String NAMESPACE = "activity_manager";
}
+ public static interface DeviceConfig.ActivityManagerNativeBoot {
+ field public static final String NAMESPACE = "activity_manager_native_boot";
+ field public static final String OFFLOAD_QUEUE_ENABLED = "offload_queue_enabled";
+ }
+
public static interface DeviceConfig.AttentionManagerService {
field public static final String NAMESPACE = "attention_manager_service";
field public static final String PROPERTY_COMPONENT_NAME = "component_name";
@@ -5821,10 +5868,10 @@
field public static final String NAMESPACE = "content_capture";
}
- public static interface DeviceConfig.FsiBoot {
- field public static final String NAMESPACE = "fsi_boot";
- field public static final String OOB_ENABLED = "oob_enabled";
- field public static final String OOB_WHITELIST = "oob_whitelist";
+ public static interface DeviceConfig.DexBoot {
+ field public static final String NAMESPACE = "dex_boot";
+ field public static final String PRIV_APPS_OOB_ENABLED = "priv_apps_oob_enabled";
+ field public static final String PRIV_APPS_OOB_WHITELIST = "priv_apps_oob_whitelist";
}
public static interface DeviceConfig.IntelligenceAttention {
@@ -7884,12 +7931,12 @@
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();
- method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getPreferredNetworkTypeBitmap();
+ method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmap();
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();
method public int getSimApplicationState();
method public int getSimCardState();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getSimLocale();
- method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSupportedRadioAccessFamily();
+ method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getSupportedRadioAccessFamily();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.UiccSlotInfo[] getUiccSlotsInfo();
method @Nullable public android.os.Bundle getVisualVoicemailSettings();
@@ -7917,7 +7964,7 @@
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultisimCarrierRestriction(boolean);
- method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmap(int);
+ method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmap(long);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerState(int);
@@ -7942,25 +7989,26 @@
field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";
field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";
field public static final long MAX_NUMBER_VERIFICATION_TIMEOUT_MILLIS = 60000L; // 0xea60L
- field public static final int NETWORK_TYPE_BITMASK_1xRTT = 128; // 0x80
- field public static final int NETWORK_TYPE_BITMASK_CDMA = 16; // 0x10
- field public static final int NETWORK_TYPE_BITMASK_EDGE = 4; // 0x4
- field public static final int NETWORK_TYPE_BITMASK_EHRPD = 16384; // 0x4000
- field public static final int NETWORK_TYPE_BITMASK_EVDO_0 = 32; // 0x20
- field public static final int NETWORK_TYPE_BITMASK_EVDO_A = 64; // 0x40
- field public static final int NETWORK_TYPE_BITMASK_EVDO_B = 4096; // 0x1000
- field public static final int NETWORK_TYPE_BITMASK_GPRS = 2; // 0x2
- field public static final int NETWORK_TYPE_BITMASK_GSM = 65536; // 0x10000
- field public static final int NETWORK_TYPE_BITMASK_HSDPA = 256; // 0x100
- field public static final int NETWORK_TYPE_BITMASK_HSPA = 1024; // 0x400
- field public static final int NETWORK_TYPE_BITMASK_HSPAP = 32768; // 0x8000
- field public static final int NETWORK_TYPE_BITMASK_HSUPA = 512; // 0x200
- field public static final int NETWORK_TYPE_BITMASK_LTE = 8192; // 0x2000
- field public static final int NETWORK_TYPE_BITMASK_LTE_CA = 524288; // 0x80000
- field public static final int NETWORK_TYPE_BITMASK_NR = 1048576; // 0x100000
- field public static final int NETWORK_TYPE_BITMASK_TD_SCDMA = 131072; // 0x20000
- field public static final int NETWORK_TYPE_BITMASK_UMTS = 8; // 0x8
- field public static final int NETWORK_TYPE_BITMASK_UNKNOWN = 1; // 0x1
+ field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
+ field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
+ field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L
+ field public static final long NETWORK_TYPE_BITMASK_EHRPD = 8192L; // 0x2000L
+ field public static final long NETWORK_TYPE_BITMASK_EVDO_0 = 16L; // 0x10L
+ field public static final long NETWORK_TYPE_BITMASK_EVDO_A = 32L; // 0x20L
+ field public static final long NETWORK_TYPE_BITMASK_EVDO_B = 2048L; // 0x800L
+ field public static final long NETWORK_TYPE_BITMASK_GPRS = 1L; // 0x1L
+ field public static final long NETWORK_TYPE_BITMASK_GSM = 32768L; // 0x8000L
+ field public static final long NETWORK_TYPE_BITMASK_HSDPA = 128L; // 0x80L
+ field public static final long NETWORK_TYPE_BITMASK_HSPA = 512L; // 0x200L
+ field public static final long NETWORK_TYPE_BITMASK_HSPAP = 16384L; // 0x4000L
+ field public static final long NETWORK_TYPE_BITMASK_HSUPA = 256L; // 0x100L
+ field public static final long NETWORK_TYPE_BITMASK_IWLAN = 131072L; // 0x20000L
+ field public static final long NETWORK_TYPE_BITMASK_LTE = 4096L; // 0x1000L
+ field public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L
+ field public static final long NETWORK_TYPE_BITMASK_NR = 524288L; // 0x80000L
+ field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L
+ field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L
+ field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L
field public static final int RADIO_POWER_OFF = 0; // 0x0
field public static final int RADIO_POWER_ON = 1; // 0x1
field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2
@@ -9374,17 +9422,6 @@
method public void setContentCaptureFeatureEnabled(boolean);
}
- public final class UserDataRemovalRequest implements android.os.Parcelable {
- method @NonNull public String getPackageName();
- method @NonNull public java.util.List<android.view.contentcapture.UserDataRemovalRequest.UriRequest> getUriRequests();
- method public boolean isForEverything();
- }
-
- public final class UserDataRemovalRequest.UriRequest {
- method @NonNull public android.net.Uri getUri();
- method @NonNull public boolean isRecursive();
- }
-
public final class ViewNode extends android.app.assist.AssistStructure.ViewNode {
method @Nullable public android.view.autofill.AutofillId getParentAutofillId();
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 01faa23..db547ed 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -242,6 +242,7 @@
public class NotificationManager {
method public android.content.ComponentName getEffectsSuppressor();
+ method public boolean matchesCallFilter(android.os.Bundle);
}
public final class PictureInPictureParams implements android.os.Parcelable {
@@ -332,6 +333,91 @@
}
+package android.app.prediction {
+
+ public final class AppPredictionContext implements android.os.Parcelable {
+ method public int describeContents();
+ method @Nullable public android.os.Bundle getExtras();
+ method @NonNull public String getPackageName();
+ method public int getPredictedTargetCount();
+ method public String getUiSurface();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.prediction.AppPredictionContext> CREATOR;
+ }
+
+ public static final class AppPredictionContext.Builder {
+ ctor public AppPredictionContext.Builder(@NonNull android.content.Context);
+ method public android.app.prediction.AppPredictionContext build();
+ method public android.app.prediction.AppPredictionContext.Builder setExtras(@Nullable android.os.Bundle);
+ method public android.app.prediction.AppPredictionContext.Builder setPredictedTargetCount(int);
+ method public android.app.prediction.AppPredictionContext.Builder setUiSurface(@Nullable String);
+ }
+
+ public final class AppPredictionManager {
+ method public android.app.prediction.AppPredictor createAppPredictionSession(@NonNull android.app.prediction.AppPredictionContext);
+ }
+
+ public final class AppPredictionSessionId implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.prediction.AppPredictionSessionId> CREATOR;
+ }
+
+ public final class AppPredictor {
+ method public void destroy();
+ method public android.app.prediction.AppPredictionSessionId getSessionId();
+ method public void notifyAppTargetEvent(@NonNull android.app.prediction.AppTargetEvent);
+ method public void notifyLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);
+ method public void registerPredictionUpdates(@NonNull java.util.concurrent.Executor, @NonNull android.app.prediction.AppPredictor.Callback);
+ method public void requestPredictionUpdate();
+ method @Nullable public void sortTargets(@NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);
+ method public void unregisterPredictionUpdates(@NonNull android.app.prediction.AppPredictor.Callback);
+ }
+
+ public static interface AppPredictor.Callback {
+ method public void onTargetsAvailable(@NonNull java.util.List<android.app.prediction.AppTarget>);
+ }
+
+ public final class AppTarget implements android.os.Parcelable {
+ ctor public AppTarget(@NonNull android.app.prediction.AppTargetId, @NonNull String, @Nullable String, @NonNull android.os.UserHandle);
+ method public int describeContents();
+ method @Nullable public String getClassName();
+ method @NonNull public android.app.prediction.AppTargetId getId();
+ method @NonNull public String getPackageName();
+ method public int getRank();
+ method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo();
+ method @NonNull public android.os.UserHandle getUser();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.prediction.AppTarget> CREATOR;
+ }
+
+ public final class AppTargetEvent implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public int getAction();
+ method @NonNull public String getLaunchLocation();
+ method @Nullable public android.app.prediction.AppTarget getTarget();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ACTION_DISMISS = 2; // 0x2
+ field public static final int ACTION_LAUNCH = 1; // 0x1
+ field public static final int ACTION_PIN = 3; // 0x3
+ field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetEvent> CREATOR;
+ }
+
+ public static final class AppTargetEvent.Builder {
+ ctor public AppTargetEvent.Builder(@Nullable android.app.prediction.AppTarget, int);
+ method public android.app.prediction.AppTargetEvent build();
+ method public android.app.prediction.AppTargetEvent.Builder setLaunchLocation(String);
+ }
+
+ public final class AppTargetId implements android.os.Parcelable {
+ ctor public AppTargetId(@NonNull String);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetId> CREATOR;
+ }
+
+}
+
package android.app.role {
public final class RoleManager {
@@ -518,22 +604,10 @@
package android.graphics {
- public final class Bitmap implements android.os.Parcelable {
- method public void eraseColor(@ColorLong long);
- method public void setColorSpace(@NonNull android.graphics.ColorSpace);
- }
-
public final class ImageDecoder implements java.lang.AutoCloseable {
method @AnyThread @NonNull public static android.graphics.ImageDecoder.Source createSource(android.content.res.Resources, java.io.InputStream, int);
}
- public class Paint {
- method @ColorLong public long getColorLong();
- method @ColorLong public long getShadowLayerColorLong();
- method public void setColor(@ColorLong long);
- method public void setShadowLayer(float, float, float, @ColorLong long);
- }
-
}
package android.graphics.drawable {
@@ -753,6 +827,17 @@
method public android.media.BufferingParams.Builder setResumePlaybackMarkMs(int);
}
+ public class MediaPlayer2 implements android.media.AudioRouting java.lang.AutoCloseable {
+ method public android.media.MediaPlayer2.DrmInfo getDrmInfo(@NonNull android.media.DataSourceDesc);
+ method public android.media.MediaDrm.KeyRequest getDrmKeyRequest(@NonNull android.media.DataSourceDesc, @Nullable byte[], @Nullable byte[], @Nullable String, int, @Nullable java.util.Map<java.lang.String,java.lang.String>) throws android.media.MediaPlayer2.NoDrmSchemeException;
+ method public String getDrmPropertyString(@NonNull android.media.DataSourceDesc, @NonNull String) throws android.media.MediaPlayer2.NoDrmSchemeException;
+ method public Object prepareDrm(@NonNull android.media.DataSourceDesc, @NonNull java.util.UUID);
+ method public byte[] provideDrmKeyResponse(@NonNull android.media.DataSourceDesc, @Nullable byte[], @NonNull byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer2.NoDrmSchemeException;
+ method public void releaseDrm(@NonNull android.media.DataSourceDesc) throws android.media.MediaPlayer2.NoDrmSchemeException;
+ method public void restoreDrmKeys(@NonNull android.media.DataSourceDesc, @NonNull byte[]) throws android.media.MediaPlayer2.NoDrmSchemeException;
+ method public void setDrmPropertyString(@NonNull android.media.DataSourceDesc, @NonNull String, @NonNull String) throws android.media.MediaPlayer2.NoDrmSchemeException;
+ }
+
public final class PlaybackParams implements android.os.Parcelable {
method public int getAudioStretchMode();
method public android.media.PlaybackParams setAudioStretchMode(int);
@@ -803,6 +888,7 @@
public class CaptivePortal implements android.os.Parcelable {
ctor public CaptivePortal(android.os.IBinder);
+ method public void logEvent(int, String);
method public void useNetwork();
field public static final int APP_RETURN_DISMISSED = 0; // 0x0
field public static final int APP_RETURN_UNWANTED = 1; // 0x1
@@ -1285,11 +1371,17 @@
public class IncidentManager {
method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void approveReport(android.net.Uri);
method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void cancelAuthorization(android.os.IncidentManager.AuthListener);
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void deleteIncidentReports(android.net.Uri);
method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void denyReport(android.net.Uri);
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) @Nullable public android.os.IncidentManager.IncidentReport getIncidentReport(android.net.Uri);
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) @NonNull public java.util.List<android.net.Uri> getIncidentReportList(String);
method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List<android.os.IncidentManager.PendingReport> getPendingReports();
method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs);
method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener);
field public static final int FLAG_CONFIRMATION_DIALOG = 1; // 0x1
+ field public static final int PRIVACY_POLICY_AUTO = 200; // 0xc8
+ field public static final int PRIVACY_POLICY_EXPLICIT = 100; // 0x64
+ field public static final int PRIVACY_POLICY_LOCAL = 0; // 0x0
}
public static class IncidentManager.AuthListener {
@@ -1298,6 +1390,17 @@
method public void onReportDenied();
}
+ public static class IncidentManager.IncidentReport implements java.io.Closeable android.os.Parcelable {
+ ctor public IncidentManager.IncidentReport(android.os.Parcel);
+ method public void close();
+ method public int describeContents();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public long getPrivacyPolicy();
+ method public long getTimestamp();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.IncidentManager.IncidentReport> CREATOR;
+ }
+
public static class IncidentManager.PendingReport {
ctor public IncidentManager.PendingReport(@NonNull android.net.Uri);
method public int getFlags();
@@ -1755,6 +1858,24 @@
}
+package android.service.appprediction {
+
+ public abstract class AppPredictionService extends android.app.Service {
+ ctor public AppPredictionService();
+ method @MainThread public abstract void onAppTargetEvent(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull android.app.prediction.AppTargetEvent);
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public void onCreatePredictionSession(@NonNull android.app.prediction.AppPredictionContext, @NonNull android.app.prediction.AppPredictionSessionId);
+ method @MainThread public void onDestroyPredictionSession(@NonNull android.app.prediction.AppPredictionSessionId);
+ method @MainThread public abstract void onLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);
+ method @MainThread public abstract void onRequestPredictionUpdate(@NonNull android.app.prediction.AppPredictionSessionId);
+ method @MainThread public abstract void onSortAppTargets(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);
+ method @MainThread public void onStartPredictionUpdates();
+ method @MainThread public void onStopPredictionUpdates();
+ method public final void updatePredictions(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>);
+ }
+
+}
+
package android.service.autofill {
public abstract class AutofillFieldClassificationService extends android.app.Service {
@@ -2146,6 +2267,7 @@
method public static int getRawZigZag64Size(long);
method public int getReadPos();
method public int getReadableSize();
+ method public int getSize();
method public int getWriteBufIndex();
method public int getWriteIndex();
method public int getWritePos();
@@ -2205,6 +2327,7 @@
method @Deprecated public void endRepeatedObject(long);
method public void flush();
method public byte[] getBytes();
+ method public int getRawSize();
method public static long makeFieldId(int, long);
method public long start(long);
method @Deprecated public long startObject(long);
@@ -2366,6 +2489,10 @@
method public boolean isSystemGroup();
}
+ public abstract class LayoutInflater {
+ method public void setPrecompiledLayoutsEnabledForTesting(boolean);
+ }
+
public final class MotionEvent extends android.view.InputEvent implements android.os.Parcelable {
method public void setActionButton(int);
method public void setButtonState(int);
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 812a2f2..6f01d7c 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -288,6 +288,7 @@
DebugElapsedClock debug_elapsed_clock = 10046;
DebugFailingElapsedClock debug_failing_elapsed_clock = 10047;
NumBiometricsEnrolled num_faces_enrolled = 10048;
+ RoleHolder role_holder = 10049;
}
// DO NOT USE field numbers above 100,000 in AOSP.
@@ -2968,6 +2969,9 @@
optional bool is_crypto = 3;
// The client that this acquisition was received for.
optional android.hardware.biometrics.ClientEnum client = 4;
+ // If authentication requires user confirmation. See BiometricPrompt's
+ // setRequireConfirmation(bool) method.
+ optional bool require_confirmation = 5;
enum State {
UNKNOWN = 0;
@@ -2977,12 +2981,12 @@
}
// State of the current auth attempt.
- optional State state = 5;
+ optional State state = 6;
// Time it took to authenticate. For BiometricPrompt where setRequireConfirmation(false) is
// specified and supported by the biometric modality, this is from the first ACQUIRED_GOOD to
// AUTHENTICATED. for setRequireConfirmation(true), this is from PENDING_CONFIRMATION to
// CONFIRMED.
- optional int64 latency_millis = 6;
+ optional int64 latency_millis = 7;
}
/**
@@ -3970,6 +3974,20 @@
optional int32 num_enrolled = 2;
}
+/**
+ * A mapping of role holder -> role
+ */
+message RoleHolder {
+ // uid of the role holder
+ optional int32 uid = 1 [(is_uid) = true];
+
+ // package name of the role holder
+ optional string package_name = 2;
+
+ // the role held
+ optional string role = 3;
+}
+
message AggStats {
optional int64 min = 1;
diff --git a/cmds/statsd/src/external/StatsCompanionServicePuller.cpp b/cmds/statsd/src/external/StatsCompanionServicePuller.cpp
index 4e4b8f3..f37d2be 100644
--- a/cmds/statsd/src/external/StatsCompanionServicePuller.cpp
+++ b/cmds/statsd/src/external/StatsCompanionServicePuller.cpp
@@ -55,6 +55,10 @@
Status status = statsCompanionServiceCopy->pullData(mTagId, &returned_value);
if (!status.isOk()) {
ALOGW("StatsCompanionServicePuller::pull failed for %d", mTagId);
+ StatsdStats::getInstance().noteStatsCompanionPullFailed(mTagId);
+ if (status.exceptionCode() == Status::Exception::EX_TRANSACTION_FAILED) {
+ StatsdStats::getInstance().noteStatsCompanionPullBinderTransactionFailed(mTagId);
+ }
return false;
}
data->clear();
diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp
index ba7bcc4..6f3eeaa 100644
--- a/cmds/statsd/src/external/StatsPullerManager.cpp
+++ b/cmds/statsd/src/external/StatsPullerManager.cpp
@@ -220,6 +220,9 @@
// BuildInformation.
{android::util::BUILD_INFORMATION,
{.puller = new StatsCompanionServicePuller(android::util::BUILD_INFORMATION)}},
+ // RoleHolder.
+ {android::util::ROLE_HOLDER,
+ {.puller = new StatsCompanionServicePuller(android::util::ROLE_HOLDER)}},
};
StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) {
@@ -231,6 +234,9 @@
if (kAllPullAtomInfo.find(tagId) != kAllPullAtomInfo.end()) {
bool ret = kAllPullAtomInfo.find(tagId)->second.puller->Pull(data);
VLOG("pulled %d items", (int)data->size());
+ if (!ret) {
+ StatsdStats::getInstance().notePullFailed(tagId);
+ }
return ret;
} else {
VLOG("Unknown tagId %d", tagId);
diff --git a/cmds/statsd/src/guardrail/StatsdStats.cpp b/cmds/statsd/src/guardrail/StatsdStats.cpp
index f4d0144..37ccad5 100644
--- a/cmds/statsd/src/guardrail/StatsdStats.cpp
+++ b/cmds/statsd/src/guardrail/StatsdStats.cpp
@@ -403,6 +403,60 @@
mSystemServerRestartSec.push_back(timeSec);
}
+void StatsdStats::notePullFailed(int atomId) {
+ lock_guard<std::mutex> lock(mLock);
+ mPulledAtomStats[atomId].pullFailed++;
+}
+
+void StatsdStats::noteStatsCompanionPullFailed(int atomId) {
+ lock_guard<std::mutex> lock(mLock);
+ mPulledAtomStats[atomId].statsCompanionPullFailed++;
+}
+
+void StatsdStats::noteStatsCompanionPullBinderTransactionFailed(int atomId) {
+ lock_guard<std::mutex> lock(mLock);
+ mPulledAtomStats[atomId].statsCompanionPullBinderTransactionFailed++;
+}
+
+void StatsdStats::noteEmptyData(int atomId) {
+ lock_guard<std::mutex> lock(mLock);
+ mPulledAtomStats[atomId].emptyData++;
+}
+
+void StatsdStats::noteHardDimensionLimitReached(int metricId) {
+ lock_guard<std::mutex> lock(mLock);
+ getAtomMetricStats(metricId).hardDimensionLimitReached++;
+}
+
+void StatsdStats::noteLateLogEventSkipped(int metricId) {
+ lock_guard<std::mutex> lock(mLock);
+ getAtomMetricStats(metricId).lateLogEventSkipped++;
+}
+
+void StatsdStats::noteSkippedForwardBuckets(int metricId) {
+ lock_guard<std::mutex> lock(mLock);
+ getAtomMetricStats(metricId).skippedForwardBuckets++;
+}
+
+void StatsdStats::noteBadValueType(int metricId) {
+ lock_guard<std::mutex> lock(mLock);
+ getAtomMetricStats(metricId).badValueType++;
+}
+
+void StatsdStats::noteConditionChangeInNextBucket(int metricId) {
+ lock_guard<std::mutex> lock(mLock);
+ getAtomMetricStats(metricId).conditionChangeInNextBucket++;
+}
+
+StatsdStats::AtomMetricStats& StatsdStats::getAtomMetricStats(int metricId) {
+ auto atomMetricStatsIter = mAtomMetricStats.find(metricId);
+ if (atomMetricStatsIter != mAtomMetricStats.end()) {
+ return atomMetricStatsIter->second;
+ }
+ auto emplaceResult = mAtomMetricStats.emplace(metricId, AtomMetricStats());
+ return emplaceResult.first->second;
+}
+
void StatsdStats::reset() {
lock_guard<std::mutex> lock(mLock);
resetInternalLocked();
@@ -442,6 +496,7 @@
pullStats.second.pullTimeout = 0;
pullStats.second.pullExceedMaxDelay = 0;
}
+ mAtomMetricStats.clear();
}
string buildTimeString(int64_t timeSec) {
@@ -713,6 +768,10 @@
android::os::statsd::writePullerStatsToStream(pair, &proto);
}
+ for (const auto& pair : mAtomMetricStats) {
+ android::os::statsd::writeAtomMetricStatsToStream(pair, &proto);
+ }
+
if (mAnomalyAlarmRegisteredStats > 0) {
uint64_t token = proto.start(FIELD_TYPE_MESSAGE | FIELD_ID_ANOMALY_ALARM_STATS);
proto.write(FIELD_TYPE_INT32 | FIELD_ID_ANOMALY_ALARMS_REGISTERED,
diff --git a/cmds/statsd/src/guardrail/StatsdStats.h b/cmds/statsd/src/guardrail/StatsdStats.h
index dc647f8..01e9ca1 100644
--- a/cmds/statsd/src/guardrail/StatsdStats.h
+++ b/cmds/statsd/src/guardrail/StatsdStats.h
@@ -318,6 +318,53 @@
void noteLogLost(int32_t wallClockTimeSec, int32_t count, int lastError);
/**
+ * Records that the pull of an atom has failed
+ */
+ void notePullFailed(int atomId);
+
+ /**
+ * Records that the pull of StatsCompanionService atom has failed
+ */
+ void noteStatsCompanionPullFailed(int atomId);
+
+ /**
+ * Records that the pull of a StatsCompanionService atom has failed due to a failed binder
+ * transaction. This can happen when StatsCompanionService returns too
+ * much data (the max Binder parcel size is 1MB)
+ */
+ void noteStatsCompanionPullBinderTransactionFailed(int atomId);
+
+ /**
+ * A pull with no data occurred
+ */
+ void noteEmptyData(int atomId);
+
+ /**
+ * Hard limit was reached in the cardinality of an atom
+ */
+ void noteHardDimensionLimitReached(int atomId);
+
+ /**
+ * A log event was too late, arrived in the wrong bucket and was skipped
+ */
+ void noteLateLogEventSkipped(int atomId);
+
+ /**
+ * Buckets were skipped as time elapsed without any data for them
+ */
+ void noteSkippedForwardBuckets(int atomId);
+
+ /**
+ * An unsupported value type was received
+ */
+ void noteBadValueType(int atomId);
+
+ /**
+ * A condition change was too late, arrived in the wrong bucket and was skipped
+ */
+ void noteConditionChangeInNextBucket(int atomId);
+
+ /**
* Reset the historical stats. Including all stats in icebox, and the tracked stats about
* metrics, matchers, and atoms. The active configs will be kept and StatsdStats will continue
* to collect stats after reset() has been called.
@@ -349,8 +396,20 @@
long dataError = 0;
long pullTimeout = 0;
long pullExceedMaxDelay = 0;
+ long pullFailed = 0;
+ long statsCompanionPullFailed = 0;
+ long statsCompanionPullBinderTransactionFailed = 0;
+ long emptyData = 0;
} PulledAtomStats;
+ typedef struct {
+ long hardDimensionLimitReached = 0;
+ long lateLogEventSkipped = 0;
+ long skippedForwardBuckets = 0;
+ long badValueType = 0;
+ long conditionChangeInNextBucket = 0;
+ } AtomMetricStats;
+
private:
StatsdStats();
@@ -378,6 +437,9 @@
// Maps PullAtomId to its stats. The size is capped by the puller atom counts.
std::map<int, PulledAtomStats> mPulledAtomStats;
+ // Maps metric ID to its stats. The size is capped by the number of metrics.
+ std::map<int, AtomMetricStats> mAtomMetricStats;
+
struct LogLossStats {
LogLossStats(int32_t sec, int32_t count, int32_t error)
: mWallClockSec(sec), mCount(count), mLastError(error) {
@@ -414,6 +476,12 @@
void addToIceBoxLocked(std::shared_ptr<ConfigStats>& stats);
+ /**
+ * Get a reference to AtomMetricStats for a metric. If none exists, create it. The reference
+ * will live as long as `this`.
+ */
+ StatsdStats::AtomMetricStats& getAtomMetricStats(int metricId);
+
FRIEND_TEST(StatsdStatsTest, TestValidConfigAdd);
FRIEND_TEST(StatsdStatsTest, TestInvalidConfigAdd);
FRIEND_TEST(StatsdStatsTest, TestConfigRemove);
diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
index 5645461..6aa8e84 100644
--- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
@@ -322,6 +322,7 @@
if (eventTimeNs < mCurrentBucketStartTimeNs) {
VLOG("Skip event due to late arrival: %lld vs %lld", (long long)eventTimeNs,
(long long)mCurrentBucketStartTimeNs);
+ StatsdStats::getInstance().noteConditionChangeInNextBucket(mMetricId);
return;
}
@@ -359,6 +360,12 @@
}
StatsdStats::getInstance().notePullDelay(mPullTagId, pullDelayNs);
+ if (timestampNs < mCurrentBucketStartTimeNs) {
+ // The data will be skipped in onMatchedLogEventInternalLocked, but we don't want to report
+ // for every event, just the pull
+ StatsdStats::getInstance().noteLateLogEventSkipped(mMetricId);
+ }
+
for (const auto& data : allData) {
// make a copy before doing and changes
LogEvent localCopy = data->makeCopy();
@@ -380,6 +387,7 @@
if (mCondition) {
if (allData.size() == 0) {
VLOG("Data pulled is empty");
+ StatsdStats::getInstance().noteEmptyData(mPullTagId);
return;
}
// For scheduled pulled data, the effective event time is snap to the nearest
@@ -394,6 +402,7 @@
if (bucketEndTime < mCurrentBucketStartTimeNs) {
VLOG("Skip bucket end pull due to late arrival: %lld vs %lld", (long long)bucketEndTime,
(long long)mCurrentBucketStartTimeNs);
+ StatsdStats::getInstance().noteLateLogEventSkipped(mMetricId);
return;
}
for (const auto& data : allData) {
@@ -442,6 +451,7 @@
if (newTupleCount > mDimensionHardLimit) {
ALOGE("ValueMetric %lld dropping data for dimension key %s", (long long)mMetricId,
newKey.toString().c_str());
+ StatsdStats::getInstance().noteHardDimensionLimitReached(mMetricId);
return true;
}
}
@@ -539,6 +549,7 @@
Value value;
if (!getDoubleOrLong(event, matcher, value)) {
VLOG("Failed to get value %d from event %s", i, event.ToString().c_str());
+ StatsdStats::getInstance().noteBadValueType(mMetricId);
return;
}
interval.seenNewData = true;
@@ -656,6 +667,7 @@
if (numBucketsForward > 1) {
VLOG("Skipping forward %lld buckets", (long long)numBucketsForward);
+ StatsdStats::getInstance().noteSkippedForwardBuckets(mMetricId);
// take base again in future good bucket.
resetBase();
}
diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto
index e8de875..cca09ac 100644
--- a/cmds/statsd/src/stats_log.proto
+++ b/cmds/statsd/src/stats_log.proto
@@ -403,9 +403,23 @@
optional int64 data_error = 9;
optional int64 pull_timeout = 10;
optional int64 pull_exceed_max_delay = 11;
+ optional int64 pull_failed = 12;
+ optional int64 stats_companion_pull_failed = 13;
+ optional int64 stats_companion_pull_binder_transaction_failed = 14;
+ optional int64 empty_data = 15;
}
repeated PulledAtomStats pulled_atom_stats = 10;
+ message AtomMetricStats {
+ optional int64 metric_id = 1;
+ optional int64 hard_dimension_limit_reached = 2;
+ optional int64 late_log_event_skipped = 3;
+ optional int64 skipped_forward_buckets = 4;
+ optional int64 bad_value_type = 5;
+ optional int64 condition_change_in_next_bucket = 6;
+ }
+ repeated AtomMetricStats atom_metric_stats = 17;
+
message LoggerErrorStats {
optional int32 logger_disconnection_sec = 1;
optional int32 error_code = 2;
diff --git a/cmds/statsd/src/stats_log_util.cpp b/cmds/statsd/src/stats_log_util.cpp
index 7de0bb3..9c9985e 100644
--- a/cmds/statsd/src/stats_log_util.cpp
+++ b/cmds/statsd/src/stats_log_util.cpp
@@ -66,6 +66,18 @@
const int FIELD_ID_DATA_ERROR = 9;
const int FIELD_ID_PULL_TIMEOUT = 10;
const int FIELD_ID_PULL_EXCEED_MAX_DELAY = 11;
+const int FIELD_ID_PULL_FAILED = 12;
+const int FIELD_ID_STATS_COMPANION_FAILED = 13;
+const int FIELD_ID_STATS_COMPANION_BINDER_TRANSACTION_FAILED = 14;
+const int FIELD_ID_EMPTY_DATA = 15;
+// for AtomMetricStats proto
+const int FIELD_ID_ATOM_METRIC_STATS = 17;
+const int FIELD_ID_METRIC_ID = 1;
+const int FIELD_ID_HARD_DIMENSION_LIMIT_REACHED = 2;
+const int FIELD_ID_LATE_LOG_EVENT_SKIPPED = 3;
+const int FIELD_ID_SKIPPED_FORWARD_BUCKETS = 4;
+const int FIELD_ID_BAD_VALUE_TYPE = 5;
+const int FIELD_ID_CONDITION_CHANGE_IN_NEXT_BUCKET = 6;
namespace {
@@ -456,6 +468,32 @@
(long long)pair.second.pullTimeout);
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_PULL_EXCEED_MAX_DELAY,
(long long)pair.second.pullExceedMaxDelay);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_PULL_FAILED,
+ (long long)pair.second.pullFailed);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_STATS_COMPANION_FAILED,
+ (long long)pair.second.statsCompanionPullFailed);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_STATS_COMPANION_BINDER_TRANSACTION_FAILED,
+ (long long)pair.second.statsCompanionPullBinderTransactionFailed);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_EMPTY_DATA,
+ (long long)pair.second.emptyData);
+ protoOutput->end(token);
+}
+
+void writeAtomMetricStatsToStream(const std::pair<int, StatsdStats::AtomMetricStats> &pair,
+ util::ProtoOutputStream *protoOutput) {
+ uint64_t token = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_ATOM_METRIC_STATS |
+ FIELD_COUNT_REPEATED);
+ protoOutput->write(FIELD_TYPE_INT32 | FIELD_ID_METRIC_ID, (int32_t)pair.first);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_HARD_DIMENSION_LIMIT_REACHED,
+ (long long)pair.second.hardDimensionLimitReached);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_LATE_LOG_EVENT_SKIPPED,
+ (long long)pair.second.lateLogEventSkipped);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_FORWARD_BUCKETS,
+ (long long)pair.second.skippedForwardBuckets);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BAD_VALUE_TYPE,
+ (long long)pair.second.badValueType);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_CONDITION_CHANGE_IN_NEXT_BUCKET,
+ (long long)pair.second.conditionChangeInNextBucket);
protoOutput->end(token);
}
diff --git a/cmds/statsd/src/stats_log_util.h b/cmds/statsd/src/stats_log_util.h
index 61f31eb..dcea0e6 100644
--- a/cmds/statsd/src/stats_log_util.h
+++ b/cmds/statsd/src/stats_log_util.h
@@ -73,6 +73,10 @@
void writePullerStatsToStream(const std::pair<int, StatsdStats::PulledAtomStats>& pair,
util::ProtoOutputStream* protoOutput);
+// Helper function to write AtomMetricStats to ProtoOutputStream
+void writeAtomMetricStatsToStream(const std::pair<int, StatsdStats::AtomMetricStats> &pair,
+ util::ProtoOutputStream *protoOutput);
+
template<class T>
bool parseProtoOutputStream(util::ProtoOutputStream& protoOutput, T* message) {
std::string pbBytes;
diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt
index 8e7a58b..a748959 100644
--- a/config/hiddenapi-greylist.txt
+++ b/config/hiddenapi-greylist.txt
@@ -1942,7 +1942,6 @@
Lcom/android/internal/R$id;->titleDivider:I
Lcom/android/internal/R$id;->titleDividerTop:I
Lcom/android/internal/R$id;->title_container:I
-Lcom/android/internal/R$id;->title_icon:I
Lcom/android/internal/R$id;->title_template:I
Lcom/android/internal/R$id;->topPanel:I
Lcom/android/internal/R$id;->up:I
diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index ce5d8a5..eae7d6b 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -28,15 +28,12 @@
import android.content.Intent;
import android.hardware.display.DisplayManager;
import android.hardware.display.VirtualDisplay;
-import android.hardware.input.InputManager;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.IWindowManager;
-import android.view.InputDevice;
-import android.view.MotionEvent;
import android.view.SurfaceControl;
import android.view.SurfaceHolder;
import android.view.SurfaceSession;
@@ -51,9 +48,7 @@
import java.util.List;
/**
- * Activity container that allows launching activities into itself and does input forwarding.
- * <p>Creation of this view is only allowed to callers who have
- * {@link android.Manifest.permission#INJECT_EVENTS} permission.
+ * Activity container that allows launching activities into itself.
* <p>Activity launching into this container is restricted by the same rules that apply to launching
* on VirtualDisplays.
* @hide
@@ -76,9 +71,8 @@
private StateCallback mActivityViewCallback;
private IActivityTaskManager mActivityTaskManager;
- private IInputForwarder mInputForwarder;
- // Temp container to store view coordinates on screen.
- private final int[] mLocationOnScreen = new int[2];
+ // Temp container to store view coordinates in window.
+ private final int[] mLocationInWindow = new int[2];
private TaskStackListener mTaskStackListener;
@@ -280,7 +274,7 @@
}
/**
- * Triggers an update of {@link ActivityView}'s location on screen to properly set touch exclude
+ * Triggers an update of {@link ActivityView}'s location in window to properly set touch exclude
* regions and avoid focus switches by touches on this view.
*/
public void onLocationChanged() {
@@ -295,45 +289,14 @@
/** Send current location and size to the WM to set tap exclude region for this view. */
private void updateLocation() {
try {
- getLocationOnScreen(mLocationOnScreen);
+ getLocationInWindow(mLocationInWindow);
WindowManagerGlobal.getWindowSession().updateTapExcludeRegion(getWindow(), hashCode(),
- mLocationOnScreen[0], mLocationOnScreen[1], getWidth(), getHeight());
+ mLocationInWindow[0], mLocationInWindow[1], getWidth(), getHeight());
} catch (RemoteException e) {
e.rethrowAsRuntimeException();
}
}
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- return injectInputEvent(event) || super.onTouchEvent(event);
- }
-
- @Override
- public boolean onGenericMotionEvent(MotionEvent event) {
- if (event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) {
- if (injectInputEvent(event)) {
- return true;
- }
- }
- return super.onGenericMotionEvent(event);
- }
-
- private boolean injectInputEvent(MotionEvent event) {
- if (mInputForwarder != null) {
- try {
- // The touch event that the ActivityView gets is in View space, but the event needs
- // to get forwarded in screen space. This offsets the touch event by the location
- // the ActivityView is on screen and sends it to the input forwarder.
- getLocationOnScreen(mLocationOnScreen);
- event.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]);
- return mInputForwarder.forwardEvent(event);
- } catch (RemoteException e) {
- e.rethrowAsRuntimeException();
- }
- }
- return false;
- }
-
private class SurfaceCallback implements SurfaceHolder.Callback {
@Override
public void surfaceCreated(SurfaceHolder surfaceHolder) {
@@ -416,7 +379,6 @@
}
mTmpTransaction.show(mRootSurfaceControl).apply();
- mInputForwarder = InputManager.getInstance().createInputForwarder(displayId);
mTaskStackListener = new TaskStackListenerImpl();
try {
mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
@@ -432,9 +394,6 @@
mSurfaceView.getHolder().removeCallback(mSurfaceCallback);
- if (mInputForwarder != null) {
- mInputForwarder = null;
- }
cleanTapExcludeRegion();
if (mTaskStackListener != null) {
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index acc7094..fde1d29e 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -26,7 +26,6 @@
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
-import android.content.Intent;
import android.database.Cursor;
import android.database.CursorWrapper;
import android.net.ConnectivityManager;
@@ -37,7 +36,6 @@
import android.os.FileUtils;
import android.os.ParcelFileDescriptor;
import android.provider.Downloads;
-import android.provider.MediaStore.Images;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.text.TextUtils;
@@ -399,14 +397,14 @@
/** if a file is designated as a MediaScanner scannable file, the following value is
* stored in the database column {@link Downloads.Impl#COLUMN_MEDIA_SCANNED}.
*/
- private static final int SCANNABLE_VALUE_YES = 0;
+ private static final int SCANNABLE_VALUE_YES = Downloads.Impl.MEDIA_NOT_SCANNED;
// value of 1 is stored in the above column by DownloadProvider after it is scanned by
// MediaScanner
/** if a file is designated as a file that should not be scanned by MediaScanner,
* the following value is stored in the database column
* {@link Downloads.Impl#COLUMN_MEDIA_SCANNED}.
*/
- private static final int SCANNABLE_VALUE_NO = 2;
+ private static final int SCANNABLE_VALUE_NO = Downloads.Impl.MEDIA_NOT_SCANNABLE;
/**
* This download is visible but only shows in the notifications
@@ -1264,19 +1262,6 @@
throw new IllegalStateException("Failed to rename to " + after);
}
- // Update MediaProvider if necessary
- if (mimeType.startsWith("image/")) {
- context.getContentResolver().delete(Images.Media.EXTERNAL_CONTENT_URI,
- Images.Media.DATA + "=?",
- new String[] {
- before.getAbsolutePath()
- });
-
- Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
- intent.setData(Uri.fromFile(after));
- context.sendBroadcast(intent);
- }
-
ContentValues values = new ContentValues();
values.put(Downloads.Impl.COLUMN_TITLE, displayName);
values.put(Downloads.Impl._DATA, after.toString());
@@ -1329,8 +1314,7 @@
* @param description the description that would appear for this file in Downloads App.
* @param isMediaScannerScannable true if the file is to be scanned by MediaScanner. Files
* scanned by MediaScanner appear in the applications used to view media (for example,
- * Gallery app). Starting from {@link android.os.Build.VERSION_CODES#Q}, this argument is
- * ignored and the file is always scanned by MediaScanner.
+ * Gallery app).
* @param mimeType mimetype of the file.
* @param path absolute pathname to the file. The file should be world-readable, so that it can
* be managed by the Downloads App and any other app that is used to read it (for example,
@@ -1359,8 +1343,7 @@
* @param description the description that would appear for this file in Downloads App.
* @param isMediaScannerScannable true if the file is to be scanned by MediaScanner. Files
* scanned by MediaScanner appear in the applications used to view media (for example,
- * Gallery app). Starting from {@link android.os.Build.VERSION_CODES#Q}, this argument is
- * ignored and the file is always scanned by MediaScanner.
+ * Gallery app).
* @param mimeType mimetype of the file.
* @param path absolute pathname to the file. The file should be world-readable, so that it can
* be managed by the Downloads App and any other app that is used to read it (for example,
diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl
index 8953940..df04a6b 100644
--- a/core/java/android/app/INotificationManager.aidl
+++ b/core/java/android/app/INotificationManager.aidl
@@ -65,6 +65,9 @@
boolean areNotificationsEnabled(String pkg);
int getPackageImportance(String pkg);
+ boolean shouldHideSilentStatusIcons(String callingPkg);
+ void setHideSilentStatusIcons(boolean hide);
+
void setBubblesAllowed(String pkg, int uid, boolean allowed);
boolean areBubblesAllowed(String pkg);
boolean areBubblesAllowedForPackage(String pkg, int uid);
@@ -151,6 +154,8 @@
void setNotificationAssistantAccessGrantedForUser(in ComponentName assistant, int userId, boolean enabled);
List<String> getEnabledNotificationListenerPackages();
List<ComponentName> getEnabledNotificationListeners(int userId);
+ ComponentName getAllowedNotificationAssistantForUser(int userId);
+ ComponentName getAllowedNotificationAssistant();
int getZenMode();
ZenModeConfig getZenModeConfig();
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 621f134..8207e0a 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -20,6 +20,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
+import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
@@ -353,7 +354,8 @@
public static final int IMPORTANCE_MIN = 1;
/**
- * Low notification importance: shows everywhere, but is not intrusive.
+ * Low notification importance: Shows in the shade, and potentially in the status bar
+ * (see {@link #shouldHideSilentStatusBarIcons()}), but is not audibly intrusive.
*/
public static final int IMPORTANCE_LOW = 2;
@@ -826,6 +828,7 @@
/**
* @hide
*/
+ @TestApi
public boolean matchesCallFilter(Bundle extras) {
INotificationManager service = getService();
try {
@@ -1153,6 +1156,19 @@
}
}
+ /**
+ * Checks whether the user has approved a given
+ * {@link android.service.notification.NotificationAssistantService}.
+ *
+ * <p>
+ * The assistant service must belong to the calling app.
+ *
+ * <p>
+ * Apps can request notification assistant access by sending the user to the activity that
+ * matches the system intent action
+ * TODO: STOPSHIP: Add correct intent
+ * {@link android.provider.Settings#ACTION_MANAGE_DEFAULT_APPS_SETTINGS}.
+ */
public boolean isNotificationAssistantAccessGranted(ComponentName assistant) {
INotificationManager service = getService();
try {
@@ -1162,6 +1178,22 @@
}
}
+ /**
+ * Returns whether the user wants silent notifications (see {@link #IMPORTANCE_LOW} to appear
+ * in the status bar.
+ *
+ * <p>Only available for {@link #isNotificationListenerAccessGranted(ComponentName) notification
+ * listeners}.
+ */
+ public boolean shouldHideSilentStatusBarIcons() {
+ INotificationManager service = getService();
+ try {
+ return service.shouldHideSilentStatusIcons(mContext.getOpPackageName());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
/** @hide */
public boolean isNotificationPolicyAccessGrantedForPackage(String pkg) {
INotificationManager service = getService();
@@ -1248,6 +1280,45 @@
}
}
+ /**
+ * Grants/revokes Notification Assistant access to {@code assistant} for current user.
+ *
+ * @param assistant Name of component to grant/revoke access or {@code null} to revoke access to
+ * current assistant
+ * @param granted Grant/revoke access
+ * @hide
+ */
+ @SystemApi
+ public void setNotificationAssistantAccessGranted(ComponentName assistant, boolean granted) {
+ INotificationManager service = getService();
+ try {
+ service.setNotificationAssistantAccessGranted(assistant, granted);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Grants/revokes Notification Assistant access to {@code assistant} for given user.
+ *
+ * @param assistant Name of component to grant/revoke access or {@code null} to revoke access to
+ * current assistant
+ * @param user handle to associate assistant with
+ * @param granted Grant/revoke access
+ * @hide
+ */
+ @SystemApi
+ public void setNotificationAssistantAccessGrantedForUser(ComponentName assistant,
+ UserHandle user, boolean granted) {
+ INotificationManager service = getService();
+ try {
+ service.setNotificationAssistantAccessGrantedForUser(assistant, user.getIdentifier(),
+ granted);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
/** @hide */
public List<ComponentName> getEnabledNotificationListeners(int userId) {
INotificationManager service = getService();
@@ -1258,6 +1329,29 @@
}
}
+ /** @hide */
+ @SystemApi
+ public @Nullable ComponentName getAllowedNotificationAssistantForUser(UserHandle user) {
+ INotificationManager service = getService();
+ try {
+ return service.getAllowedNotificationAssistantForUser(user.getIdentifier());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /** @hide */
+ @SystemApi
+ public @Nullable ComponentName getAllowedNotificationAssistant() {
+ INotificationManager service = getService();
+ try {
+ return service.getAllowedNotificationAssistant();
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+
private Context mContext;
private static void checkRequired(String name, Object value) {
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index b8f4385..f0d0aad 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -9614,12 +9614,18 @@
}
/**
- * Allows the device owner to enable or disable the backup service.
+ * Allows the device owner or profile owner to enable or disable the backup service.
*
- * <p> Backup service manages all backup and restore mechanisms on the device. Setting this to
- * false will prevent data from being backed up or restored.
+ * <p> Each user has its own backup service which manages the backup and restore mechanisms in
+ * that user. Disabling the backup service will prevent data from being backed up or restored.
*
- * <p> Backup service is off by default when device owner is present.
+ * <p> Device owner calls this API to control backup services across all users on the device.
+ * Profile owner can use this API to enable or disable the profile's backup service. However,
+ * for a managed profile its backup functionality is only enabled if both the device owner
+ * and the profile owner have enabled the backup service.
+ *
+ * <p> By default, backup service is disabled on a device with device owner, and within a
+ * managed profile.
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param enabled {@code true} to enable the backup service, {@code false} to disable it.
@@ -9635,7 +9641,12 @@
}
/**
- * Return whether the backup service is enabled by the device owner.
+ * Return whether the backup service is enabled by the device owner or profile owner for the
+ * current user, as previously set by {@link #setBackupServiceEnabled(ComponentName, boolean)}.
+ *
+ * <p> Whether the backup functionality is actually enabled or not depends on settings from both
+ * the current user and the device owner, please see
+ * {@link #setBackupServiceEnabled(ComponentName, boolean)} for details.
*
* <p> Backup service manages all backup and restore mechanisms on the device.
*
diff --git a/core/java/android/app/prediction/AppPredictionContext.java b/core/java/android/app/prediction/AppPredictionContext.java
index 87ccb66..2fbe6e36 100644
--- a/core/java/android/app/prediction/AppPredictionContext.java
+++ b/core/java/android/app/prediction/AppPredictionContext.java
@@ -18,6 +18,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.content.Context;
import android.os.Bundle;
import android.os.Parcel;
@@ -29,6 +30,7 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppPredictionContext implements Parcelable {
private final int mPredictedTargetCount;
@@ -73,6 +75,17 @@
}
@Override
+ public boolean equals(Object o) {
+ if (o == this) return true;
+ if (!getClass().equals(o != null ? o.getClass() : null)) return false;
+
+ AppPredictionContext other = (AppPredictionContext) o;
+ return mPredictedTargetCount == other.mPredictedTargetCount
+ && mUiSurface.equals(other.mUiSurface)
+ && mPackageName.equals(other.mPackageName);
+ }
+
+ @Override
public int describeContents() {
return 0;
}
@@ -104,6 +117,7 @@
* @hide
*/
@SystemApi
+ @TestApi
public static final class Builder {
@NonNull
@@ -116,8 +130,12 @@
private Bundle mExtras;
/**
+ * TODO(b/123591863): Add java docs
+ *
* @hide
*/
+ @SystemApi
+ @TestApi
public Builder(@NonNull Context context) {
mPackageName = context.getPackageName();
}
diff --git a/core/java/android/app/prediction/AppPredictionManager.java b/core/java/android/app/prediction/AppPredictionManager.java
index f8578d4..99f78f1 100644
--- a/core/java/android/app/prediction/AppPredictionManager.java
+++ b/core/java/android/app/prediction/AppPredictionManager.java
@@ -17,6 +17,7 @@
import android.annotation.NonNull;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.content.Context;
import com.android.internal.util.Preconditions;
@@ -26,6 +27,7 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppPredictionManager {
private final Context mContext;
diff --git a/core/java/android/app/prediction/AppPredictionSessionId.java b/core/java/android/app/prediction/AppPredictionSessionId.java
index 1d7308e..1e76c24 100644
--- a/core/java/android/app/prediction/AppPredictionSessionId.java
+++ b/core/java/android/app/prediction/AppPredictionSessionId.java
@@ -17,6 +17,7 @@
import android.annotation.NonNull;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -26,6 +27,7 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppPredictionSessionId implements Parcelable {
private final String mId;
diff --git a/core/java/android/app/prediction/AppPredictor.java b/core/java/android/app/prediction/AppPredictor.java
index 2ddbd08..12d6ce3 100644
--- a/core/java/android/app/prediction/AppPredictor.java
+++ b/core/java/android/app/prediction/AppPredictor.java
@@ -19,6 +19,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.app.prediction.IPredictionCallback.Stub;
import android.content.Context;
import android.content.pm.ParceledListSlice;
@@ -63,6 +64,7 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppPredictor {
private static final String TAG = AppPredictor.class.getSimpleName();
@@ -102,6 +104,10 @@
* Notifies the prediction service of an app target event.
*/
public void notifyAppTargetEvent(@NonNull AppTargetEvent event) {
+ if (mIsClosed.get()) {
+ throw new IllegalStateException("This client has already been destroyed.");
+ }
+
try {
mPredictionManager.notifyAppTargetEvent(mSessionId, event);
} catch (RemoteException e) {
@@ -114,6 +120,10 @@
*/
public void notifyLocationShown(@NonNull String launchLocation,
@NonNull List<AppTargetId> targetIds) {
+ if (mIsClosed.get()) {
+ throw new IllegalStateException("This client has already been destroyed.");
+ }
+
try {
mPredictionManager.notifyLocationShown(mSessionId, launchLocation,
new ParceledListSlice<>(targetIds));
@@ -130,6 +140,10 @@
*/
public void registerPredictionUpdates(@NonNull @CallbackExecutor Executor callbackExecutor,
@NonNull AppPredictor.Callback callback) {
+ if (mIsClosed.get()) {
+ throw new IllegalStateException("This client has already been destroyed.");
+ }
+
if (mRegisteredCallbacks.containsKey(callback)) {
// Skip if this callback is already registered
return;
@@ -149,6 +163,10 @@
* callback until the callback is re-registered.
*/
public void unregisterPredictionUpdates(@NonNull AppPredictor.Callback callback) {
+ if (mIsClosed.get()) {
+ throw new IllegalStateException("This client has already been destroyed.");
+ }
+
if (!mRegisteredCallbacks.containsKey(callback)) {
// Skip if this callback was never registered
return;
@@ -168,6 +186,10 @@
* @see Callback#onTargetsAvailable(List)
*/
public void requestPredictionUpdate() {
+ if (mIsClosed.get()) {
+ throw new IllegalStateException("This client has already been destroyed.");
+ }
+
try {
mPredictionManager.requestPredictionUpdate(mSessionId);
} catch (RemoteException e) {
@@ -182,6 +204,10 @@
@Nullable
public void sortTargets(@NonNull List<AppTarget> targets,
@NonNull Executor callbackExecutor, @NonNull Consumer<List<AppTarget>> callback) {
+ if (mIsClosed.get()) {
+ throw new IllegalStateException("This client has already been destroyed.");
+ }
+
try {
mPredictionManager.sortAppTargets(mSessionId, new ParceledListSlice(targets),
new CallbackWrapper(callbackExecutor, callback));
@@ -206,6 +232,8 @@
} catch (RemoteException e) {
Log.e(TAG, "Failed to notify app target event", e);
}
+ } else {
+ throw new IllegalStateException("This client has already been destroyed.");
}
}
@@ -222,6 +250,16 @@
}
/**
+ * TODO(b/123591863): Add java docs
+ *
+ * @hide
+ */
+ @TestApi
+ public AppPredictionSessionId getSessionId() {
+ return mSessionId;
+ }
+
+ /**
* Callback for receiving prediction updates.
*/
public interface Callback {
diff --git a/core/java/android/app/prediction/AppTarget.java b/core/java/android/app/prediction/AppTarget.java
index 99c1c44..b924cec 100644
--- a/core/java/android/app/prediction/AppTarget.java
+++ b/core/java/android/app/prediction/AppTarget.java
@@ -18,6 +18,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.content.pm.ShortcutInfo;
import android.os.Parcel;
import android.os.Parcelable;
@@ -30,6 +31,7 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppTarget implements Parcelable {
private final AppTargetId mId;
@@ -42,8 +44,12 @@
private int mRank;
/**
+ * TODO(b/123591863): Add java docs
+ *
* @hide
*/
+ @SystemApi
+ @TestApi
public AppTarget(@NonNull AppTargetId id, @NonNull String packageName,
@Nullable String className, @NonNull UserHandle user) {
mId = id;
@@ -55,15 +61,19 @@
}
/**
+ * TODO(b/123591863): Add java docs
+ *
* @hide
*/
- public AppTarget(@NonNull AppTargetId id, @NonNull ShortcutInfo shortcutInfo) {
+ @SystemApi
+ public AppTarget(@NonNull AppTargetId id, @NonNull ShortcutInfo shortcutInfo,
+ @Nullable String className) {
mId = id;
mShortcutInfo = Preconditions.checkNotNull(shortcutInfo);
mPackageName = mShortcutInfo.getPackage();
mUser = mShortcutInfo.getUserHandle();
- mClassName = null;
+ mClassName = className;
}
private AppTarget(Parcel parcel) {
@@ -71,13 +81,12 @@
mShortcutInfo = parcel.readTypedObject(ShortcutInfo.CREATOR);
if (mShortcutInfo == null) {
mPackageName = parcel.readString();
- mClassName = parcel.readString();
mUser = UserHandle.of(parcel.readInt());
} else {
mPackageName = mShortcutInfo.getPackage();
mUser = mShortcutInfo.getUserHandle();
- mClassName = null;
}
+ mClassName = parcel.readString();
mRank = parcel.readInt();
}
@@ -129,11 +138,32 @@
mRank = rank;
}
+ /**
+ * Returns the rank for the target.
+ */
public int getRank() {
return mRank;
}
@Override
+ public boolean equals(Object o) {
+ if (!getClass().equals(o != null ? o.getClass() : null)) return false;
+
+ AppTarget other = (AppTarget) o;
+ boolean sameClassName = (mClassName == null && other.mClassName == null)
+ || (mClassName != null && mClassName.equals(other.mClassName));
+ boolean sameShortcutInfo = (mShortcutInfo == null && other.mShortcutInfo == null)
+ || (mShortcutInfo != null && other.mShortcutInfo != null
+ && mShortcutInfo.getId() == other.mShortcutInfo.getId());
+ return mId.equals(other.mId)
+ && mPackageName.equals(other.mPackageName)
+ && sameClassName
+ && mUser.equals(other.mUser)
+ && sameShortcutInfo
+ && mRank == other.mRank;
+ }
+
+ @Override
public int describeContents() {
return 0;
}
@@ -144,9 +174,9 @@
dest.writeTypedObject(mShortcutInfo, flags);
if (mShortcutInfo == null) {
dest.writeString(mPackageName);
- dest.writeString(mClassName);
dest.writeInt(mUser.getIdentifier());
}
+ dest.writeString(mClassName);
dest.writeInt(mRank);
}
diff --git a/core/java/android/app/prediction/AppTargetEvent.java b/core/java/android/app/prediction/AppTargetEvent.java
index 18317e1..37e41de 100644
--- a/core/java/android/app/prediction/AppTargetEvent.java
+++ b/core/java/android/app/prediction/AppTargetEvent.java
@@ -19,6 +19,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -30,6 +31,7 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppTargetEvent implements Parcelable {
/**
@@ -96,6 +98,16 @@
}
@Override
+ public boolean equals(Object o) {
+ if (!getClass().equals(o != null ? o.getClass() : null)) return false;
+
+ AppTargetEvent other = (AppTargetEvent) o;
+ return mTarget.equals(other.mTarget)
+ && mLocation.equals(other.mLocation)
+ && mAction == other.mAction;
+ }
+
+ @Override
public int describeContents() {
return 0;
}
@@ -126,6 +138,7 @@
* @hide
*/
@SystemApi
+ @TestApi
public static final class Builder {
private AppTarget mTarget;
private String mLocation;
diff --git a/core/java/android/app/prediction/AppTargetId.java b/core/java/android/app/prediction/AppTargetId.java
index 0b8fb47..639ba78 100644
--- a/core/java/android/app/prediction/AppTargetId.java
+++ b/core/java/android/app/prediction/AppTargetId.java
@@ -17,6 +17,7 @@
import android.annotation.NonNull;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -25,14 +26,19 @@
* @hide
*/
@SystemApi
+@TestApi
public final class AppTargetId implements Parcelable {
@NonNull
private final String mId;
/**
+ * TODO(b/123591863): Add java docs
+ *
* @hide
*/
+ @SystemApi
+ @TestApi
public AppTargetId(@NonNull String id) {
mId = id;
}
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 8d14091..a3021f3 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -971,7 +971,8 @@
*
* @param target The Intent that the user will be selecting an activity
* to perform.
- * @param title Optional title that will be displayed in the chooser.
+ * @param title Optional title that will be displayed in the chooser,
+ * only when the target action is not ACTION_SEND or ACTION_SEND_MULTIPLE.
* @return Return a new Intent object that you can hand to
* {@link Context#startActivity(Intent) Context.startActivity()} and
* related methods.
@@ -998,7 +999,8 @@
*
* @param target The Intent that the user will be selecting an activity
* to perform.
- * @param title Optional title that will be displayed in the chooser.
+ * @param title Optional title that will be displayed in the chooser,
+ * only when the target action is not ACTION_SEND or ACTION_SEND_MULTIPLE.
* @param sender Optional IntentSender to be called when a choice is made.
* @return Return a new Intent object that you can hand to
* {@link Context#startActivity(Intent) Context.startActivity()} and
@@ -1487,6 +1489,24 @@
"android.intent.action.PENDING_INCIDENT_REPORTS_CHANGED";
/**
+ * An incident report has been taken, and the user has approved it for sharing.
+ * <p>
+ * This will be sent directly to the registered receiver, which must have
+ * both the DUMP and USAGE_STATS permissions.
+ * <p>
+ * After receiving this, the application should wait until a suitable time
+ * (e.g. network available), get the list of available reports with
+ * {@link IncidentManager#getIncidentReportList IncidentManager.getIncidentReportList(String)}
+ * and then when the reports have been successfully uploaded, call
+ * {@link IncidentManager#deleteIncidentReport IncidentManager.deleteIncidentReport(Uri)}.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_INCIDENT_REPORT_READY =
+ "android.intent.action.INCIDENT_REPORT_READY";
+
+ /**
* Activity Action: Show power usage information to the user.
* <p>Input: Nothing.
* <p>Output: Nothing.
diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java
index 63f01cc..b0b1874 100644
--- a/core/java/android/content/pm/RegisteredServicesCache.java
+++ b/core/java/android/content/pm/RegisteredServicesCache.java
@@ -17,6 +17,7 @@
package android.content.pm;
import android.Manifest;
+import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -176,7 +177,8 @@
mContext.registerReceiver(mUserRemovedReceiver, userFilter);
}
- private final void handlePackageEvent(Intent intent, int userId) {
+ @VisibleForTesting
+ protected void handlePackageEvent(Intent intent, int userId) {
// Don't regenerate the services map when the package is removed or its
// ASEC container unmounted as a step in replacement. The subsequent
// _ADDED / _AVAILABLE call will regenerate the map in the final state.
@@ -238,6 +240,9 @@
public void invalidateCache(int userId) {
synchronized (mServicesLock) {
+ if (DEBUG) {
+ Slog.d(TAG, "invalidating cache for " + userId + " " + mInterfaceName);
+ }
final UserServices<V> user = findOrCreateUserLocked(userId);
user.services = null;
onServicesChangedLocked(userId);
@@ -467,34 +472,48 @@
* or null to assume that everything is affected.
* @param userId the user for whom to update the services map.
*/
- private void generateServicesMap(int[] changedUids, int userId) {
+ private void generateServicesMap(@Nullable int[] changedUids, int userId) {
if (DEBUG) {
Slog.d(TAG, "generateServicesMap() for " + userId + ", changed UIDs = "
+ Arrays.toString(changedUids));
}
- final ArrayList<ServiceInfo<V>> serviceInfos = new ArrayList<>();
- final List<ResolveInfo> resolveInfos = queryIntentServices(userId);
- for (ResolveInfo resolveInfo : resolveInfos) {
- try {
- ServiceInfo<V> info = parseServiceInfo(resolveInfo);
- if (info == null) {
- Log.w(TAG, "Unable to load service info " + resolveInfo.toString());
- continue;
- }
- serviceInfos.add(info);
- } catch (XmlPullParserException|IOException e) {
- Log.w(TAG, "Unable to load service info " + resolveInfo.toString(), e);
- }
- }
-
synchronized (mServicesLock) {
final UserServices<V> user = findOrCreateUserLocked(userId);
- final boolean firstScan = user.services == null;
- if (firstScan) {
+ final boolean cacheInvalid = user.services == null;
+ if (cacheInvalid) {
user.services = Maps.newHashMap();
}
+ final ArrayList<ServiceInfo<V>> serviceInfos = new ArrayList<>();
+ final List<ResolveInfo> resolveInfos = queryIntentServices(userId);
+
+ for (ResolveInfo resolveInfo : resolveInfos) {
+ try {
+ // when changedUids == null, we want to do a rescan of everything, this means
+ // it's the initial scan, and containsUid will trivially return true
+ // when changedUids != null, we got here because a package changed, but
+ // invalidateCache could have been called (thus user.services == null), and we
+ // should query from PackageManager again
+ if (!cacheInvalid
+ && !containsUid(
+ changedUids, resolveInfo.serviceInfo.applicationInfo.uid)) {
+ if (DEBUG) {
+ Slog.d(TAG, "Skipping parseServiceInfo for " + resolveInfo);
+ }
+ continue;
+ }
+ ServiceInfo<V> info = parseServiceInfo(resolveInfo);
+ if (info == null) {
+ Log.w(TAG, "Unable to load service info " + resolveInfo.toString());
+ continue;
+ }
+ serviceInfos.add(info);
+ } catch (XmlPullParserException | IOException e) {
+ Log.w(TAG, "Unable to load service info " + resolveInfo.toString(), e);
+ }
+ }
+
StringBuilder changes = new StringBuilder();
boolean changed = false;
for (ServiceInfo<V> info : serviceInfos) {
@@ -515,7 +534,7 @@
changed = true;
user.services.put(info.type, info);
user.persistentServices.put(info.type, info.uid);
- if (!(user.mPersistentServicesFileDidNotExist && firstScan)) {
+ if (!(user.mPersistentServicesFileDidNotExist && cacheInvalid)) {
notifyListener(info.type, userId, false /* removed */);
}
} else if (previousUid == info.uid) {
diff --git a/core/java/android/content/rollback/PackageRollbackInfo.java b/core/java/android/content/rollback/PackageRollbackInfo.java
index 4644a83..d4ed35a 100644
--- a/core/java/android/content/rollback/PackageRollbackInfo.java
+++ b/core/java/android/content/rollback/PackageRollbackInfo.java
@@ -16,10 +16,14 @@
package android.content.rollback;
+import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.content.pm.VersionedPackage;
import android.os.Parcel;
import android.os.Parcelable;
+import android.util.IntArray;
+
+import java.util.ArrayList;
/**
* Information about a rollback available for a particular package.
@@ -33,6 +37,38 @@
private final VersionedPackage mVersionRolledBackTo;
/**
+ * Encapsulates information required to restore a snapshot of an app's userdata.
+ *
+ * @hide
+ */
+ public static class RestoreInfo {
+ public final int userId;
+ public final int appId;
+ public final String seInfo;
+
+ public RestoreInfo(int userId, int appId, String seInfo) {
+ this.userId = userId;
+ this.appId = appId;
+ this.seInfo = seInfo;
+ }
+ }
+
+ /*
+ * The list of users for which we need to backup userdata for this package. Backups of
+ * credential encrypted data are listed as pending if the user hasn't unlocked their device
+ * with credentials yet.
+ */
+ // NOTE: Not a part of the Parcelable representation of this object.
+ private final IntArray mPendingBackups;
+
+ /**
+ * The list of users for which we need to restore userdata for this package. This field is
+ * non-null only after a rollback for this package has been committed.
+ */
+ // NOTE: Not a part of the Parcelable representation of this object.
+ private final ArrayList<RestoreInfo> mPendingRestores;
+
+ /**
* Returns the name of the package to roll back from.
*/
public String getPackageName() {
@@ -54,15 +90,46 @@
}
/** @hide */
+ public IntArray getPendingBackups() {
+ return mPendingBackups;
+ }
+
+ /** @hide */
+ public ArrayList<RestoreInfo> getPendingRestores() {
+ return mPendingRestores;
+ }
+
+ /** @hide */
+ public RestoreInfo getRestoreInfo(int userId) {
+ for (RestoreInfo ri : mPendingRestores) {
+ if (ri.userId == userId) {
+ return ri;
+ }
+ }
+
+ return null;
+ }
+
+ /** @hide */
+ public void removeRestoreInfo(RestoreInfo ri) {
+ mPendingRestores.remove(ri);
+ }
+
+ /** @hide */
public PackageRollbackInfo(VersionedPackage packageRolledBackFrom,
- VersionedPackage packageRolledBackTo) {
+ VersionedPackage packageRolledBackTo,
+ @NonNull IntArray pendingBackups, @NonNull ArrayList<RestoreInfo> pendingRestores) {
this.mVersionRolledBackFrom = packageRolledBackFrom;
this.mVersionRolledBackTo = packageRolledBackTo;
+ this.mPendingBackups = pendingBackups;
+ this.mPendingRestores = pendingRestores;
}
private PackageRollbackInfo(Parcel in) {
this.mVersionRolledBackFrom = VersionedPackage.CREATOR.createFromParcel(in);
this.mVersionRolledBackTo = VersionedPackage.CREATOR.createFromParcel(in);
+ this.mPendingRestores = null;
+ this.mPendingBackups = null;
}
@Override
diff --git a/core/java/android/content/rollback/RollbackInfo.java b/core/java/android/content/rollback/RollbackInfo.java
index 1111b43..3fd2476 100644
--- a/core/java/android/content/rollback/RollbackInfo.java
+++ b/core/java/android/content/rollback/RollbackInfo.java
@@ -83,7 +83,7 @@
* Returns the session ID for the committed rollback for staged rollbacks.
* Only applicable for rollbacks that have been committed.
*/
- public int getSessionId() {
+ public int getCommittedSessionId() {
// TODO: Support rollback of staged installs.
return PackageInstaller.SessionInfo.INVALID_ID;
}
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index f9c2c3e..a1b0803 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -2644,10 +2644,29 @@
* Sets the maximum number of milliseconds that SQLite connection is allowed to be idle
* before it is closed and removed from the pool.
*
+ * <p>DO NOT USE this method unless you fully understand the implication
+ * of what it does.
+ * A connection timeout allows the system to internally close a connection to a SQLite
+ * database after a given timeout.
+ * This is good for reducing app's memory consumption, but it has
+ * side effects that are hard to predict. For example, SQLite internally maintains
+ * a lot of "per-connection" states that apps can typically modify with a {@code PRAGMA}
+ * statement, and such states will be reset once the connection is closed.
+ * The system does not provide a callback that would allow apps to
+ * reconfigure a newly created connection and thus there's no way to re-configure
+ * connections when they're re-made internally. Do not use it unless you're sure
+ * your app uses no per-connection states.
+ *
* @param idleConnectionTimeoutMs timeout in milliseconds. Use {@link Long#MAX_VALUE}
* to allow unlimited idle connections.
+ *
+ * @see SQLiteOpenHelper#setIdleConnectionTimeout(long)
+ *
+ * @deprecated DO NOT USE this method unless you fully understand the implication
+ * of what it does.
*/
@NonNull
+ @Deprecated
public Builder setIdleConnectionTimeout(
@IntRange(from = 0) long idleConnectionTimeoutMs) {
Preconditions.checkArgument(idleConnectionTimeoutMs >= 0,
diff --git a/core/java/android/database/sqlite/SQLiteOpenHelper.java b/core/java/android/database/sqlite/SQLiteOpenHelper.java
index 19c6745..ceeecbc 100644
--- a/core/java/android/database/sqlite/SQLiteOpenHelper.java
+++ b/core/java/android/database/sqlite/SQLiteOpenHelper.java
@@ -263,9 +263,21 @@
* <p>This method should be called from the constructor of the subclass,
* before opening the database
*
+ * <p>DO NOT USE this method unless you fully understand the implication
+ * of what it does.
+ * See the javadoc of
+ * {@link SQLiteDatabase.OpenParams.Builder#setIdleConnectionTimeout(long)}
+ * for the details.
+ *
* @param idleConnectionTimeoutMs timeout in milliseconds. Use {@link Long#MAX_VALUE} value
* to allow unlimited idle connections.
+ *
+ * @see SQLiteDatabase.OpenParams.Builder#setIdleConnectionTimeout(long)
+ *
+ * @deprecated DO NOT USE this method unless you fully understand the implication
+ * of what it does.
*/
+ @Deprecated
public void setIdleConnectionTimeout(@IntRange(from = 0) final long idleConnectionTimeoutMs) {
synchronized (this) {
if (mDatabase != null && mDatabase.isOpen()) {
diff --git a/core/java/android/net/CaptivePortal.java b/core/java/android/net/CaptivePortal.java
index 3b01266..3ab35e1 100644
--- a/core/java/android/net/CaptivePortal.java
+++ b/core/java/android/net/CaptivePortal.java
@@ -117,4 +117,17 @@
} catch (RemoteException e) {
}
}
+
+ /**
+ * Log a captive portal login event.
+ * @hide
+ */
+ @SystemApi
+ @TestApi
+ public void logEvent(int eventId, String packageName) {
+ try {
+ ICaptivePortal.Stub.asInterface(mBinder).logEvent(eventId, packageName);
+ } catch (RemoteException e) {
+ }
+ }
}
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 3bae12e..ef8ca9e 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2918,11 +2918,11 @@
}
}
- /** {@hide} */
+ /** {@hide} - returns the factory serial number */
@UnsupportedAppUsage
- public void registerNetworkFactory(Messenger messenger, String name) {
+ public int registerNetworkFactory(Messenger messenger, String name) {
try {
- mService.registerNetworkFactory(messenger, name);
+ return mService.registerNetworkFactory(messenger, name);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2938,6 +2938,10 @@
}
}
+ // TODO : remove this method. It is a stopgap measure to help sheperding a number
+ // of dependent changes that would conflict throughout the automerger graph. Having this
+ // temporarily helps with the process of going through with all these dependent changes across
+ // the entire tree.
/**
* @hide
* Register a NetworkAgent with ConnectivityService.
@@ -2945,8 +2949,20 @@
*/
public int registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp,
NetworkCapabilities nc, int score, NetworkMisc misc) {
+ return registerNetworkAgent(messenger, ni, lp, nc, score, misc,
+ NetworkFactory.SerialNumber.NONE);
+ }
+
+ /**
+ * @hide
+ * Register a NetworkAgent with ConnectivityService.
+ * @return NetID corresponding to NetworkAgent.
+ */
+ public int registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp,
+ NetworkCapabilities nc, int score, NetworkMisc misc, int factorySerialNumber) {
try {
- return mService.registerNetworkAgent(messenger, ni, lp, nc, score, misc);
+ return mService.registerNetworkAgent(messenger, ni, lp, nc, score, misc,
+ factorySerialNumber);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java
index 6c291c2..6f9e65f 100644
--- a/core/java/android/net/DhcpResults.java
+++ b/core/java/android/net/DhcpResults.java
@@ -17,6 +17,7 @@
package android.net;
import android.annotation.UnsupportedAppUsage;
+import android.net.shared.InetAddressUtils;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
@@ -73,19 +74,21 @@
public StaticIpConfiguration toStaticIpConfiguration() {
final StaticIpConfiguration s = new StaticIpConfiguration();
// All these except dnsServers are immutable, so no need to make copies.
- s.ipAddress = ipAddress;
- s.gateway = gateway;
- s.dnsServers.addAll(dnsServers);
- s.domains = domains;
+ s.setIpAddress(ipAddress);
+ s.setGateway(gateway);
+ for (InetAddress addr : dnsServers) {
+ s.addDnsServer(addr);
+ }
+ s.setDomains(domains);
return s;
}
public DhcpResults(StaticIpConfiguration source) {
if (source != null) {
- ipAddress = source.ipAddress;
- gateway = source.gateway;
- dnsServers.addAll(source.dnsServers);
- domains = source.domains;
+ ipAddress = source.getIpAddress();
+ gateway = source.getGateway();
+ dnsServers.addAll(source.getDnsServers());
+ domains = source.getDomains();
}
}
@@ -177,7 +180,7 @@
toStaticIpConfiguration().writeToParcel(dest, flags);
dest.writeInt(leaseDuration);
dest.writeInt(mtu);
- NetworkUtils.parcelInetAddress(dest, serverAddress, flags);
+ InetAddressUtils.parcelInetAddress(dest, serverAddress, flags);
dest.writeString(vendorInfo);
}
@@ -191,7 +194,7 @@
final DhcpResults dhcpResults = new DhcpResults(s);
dhcpResults.leaseDuration = in.readInt();
dhcpResults.mtu = in.readInt();
- dhcpResults.serverAddress = (Inet4Address) NetworkUtils.unparcelInetAddress(in);
+ dhcpResults.serverAddress = (Inet4Address) InetAddressUtils.unparcelInetAddress(in);
dhcpResults.vendorInfo = in.readString();
return dhcpResults;
}
@@ -200,7 +203,7 @@
// Not part of the superclass because they're only used by the JNI iterface to the DHCP daemon.
public boolean setIpAddress(String addrString, int prefixLength) {
try {
- Inet4Address addr = (Inet4Address) NetworkUtils.numericToInetAddress(addrString);
+ Inet4Address addr = (Inet4Address) InetAddresses.parseNumericAddress(addrString);
ipAddress = new LinkAddress(addr, prefixLength);
} catch (IllegalArgumentException|ClassCastException e) {
Log.e(TAG, "setIpAddress failed with addrString " + addrString + "/" + prefixLength);
@@ -211,7 +214,7 @@
public boolean setGateway(String addrString) {
try {
- gateway = NetworkUtils.numericToInetAddress(addrString);
+ gateway = InetAddresses.parseNumericAddress(addrString);
} catch (IllegalArgumentException e) {
Log.e(TAG, "setGateway failed with addrString " + addrString);
return true;
@@ -222,7 +225,7 @@
public boolean addDns(String addrString) {
if (TextUtils.isEmpty(addrString) == false) {
try {
- dnsServers.add(NetworkUtils.numericToInetAddress(addrString));
+ dnsServers.add(InetAddresses.parseNumericAddress(addrString));
} catch (IllegalArgumentException e) {
Log.e(TAG, "addDns failed with addrString " + addrString);
return true;
diff --git a/core/java/android/net/ICaptivePortal.aidl b/core/java/android/net/ICaptivePortal.aidl
index 56ae57d..707b4f6 100644
--- a/core/java/android/net/ICaptivePortal.aidl
+++ b/core/java/android/net/ICaptivePortal.aidl
@@ -22,4 +22,5 @@
*/
oneway interface ICaptivePortal {
void appResponse(int response);
+ void logEvent(int eventId, String packageName);
}
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index fd7360f..f88adc2 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -139,14 +139,14 @@
void setAirplaneMode(boolean enable);
- void registerNetworkFactory(in Messenger messenger, in String name);
+ int registerNetworkFactory(in Messenger messenger, in String name);
boolean requestBandwidthUpdate(in Network network);
void unregisterNetworkFactory(in Messenger messenger);
int registerNetworkAgent(in Messenger messenger, in NetworkInfo ni, in LinkProperties lp,
- in NetworkCapabilities nc, int score, in NetworkMisc misc);
+ in NetworkCapabilities nc, int score, in NetworkMisc misc, in int factorySerialNumber);
NetworkRequest requestNetwork(in NetworkCapabilities networkCapabilities,
in Messenger messenger, int timeoutSec, in IBinder binder, int legacy);
diff --git a/core/java/android/net/INetworkMonitorCallbacks.aidl b/core/java/android/net/INetworkMonitorCallbacks.aidl
index 0bc2575..a8682f9 100644
--- a/core/java/android/net/INetworkMonitorCallbacks.aidl
+++ b/core/java/android/net/INetworkMonitorCallbacks.aidl
@@ -26,4 +26,5 @@
void notifyPrivateDnsConfigResolved(in PrivateDnsConfigParcel config);
void showProvisioningNotification(String action);
void hideProvisioningNotification();
+ void logCaptivePortalLoginEvent(int eventId, String packageName);
}
\ No newline at end of file
diff --git a/core/java/android/net/INetworkStackConnector.aidl b/core/java/android/net/INetworkStackConnector.aidl
index 8b64f1c..e052488 100644
--- a/core/java/android/net/INetworkStackConnector.aidl
+++ b/core/java/android/net/INetworkStackConnector.aidl
@@ -16,6 +16,7 @@
package android.net;
import android.net.INetworkMonitorCallbacks;
+import android.net.NetworkParcelable;
import android.net.dhcp.DhcpServingParamsParcel;
import android.net.dhcp.IDhcpServerCallbacks;
import android.net.ip.IIpClientCallbacks;
@@ -24,6 +25,7 @@
oneway interface INetworkStackConnector {
void makeDhcpServer(in String ifName, in DhcpServingParamsParcel params,
in IDhcpServerCallbacks cb);
- void makeNetworkMonitor(int netId, String name, in INetworkMonitorCallbacks cb);
+ void makeNetworkMonitor(in NetworkParcelable network, String name,
+ in INetworkMonitorCallbacks cb);
void makeIpClient(in String ifName, in IIpClientCallbacks callbacks);
}
\ No newline at end of file
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 99bfc14..204c25f 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -58,6 +58,7 @@
private static final long BW_REFRESH_MIN_WIN_MS = 500;
private boolean mPollLceScheduled = false;
private AtomicBoolean mPollLcePending = new AtomicBoolean(false);
+ public final int mFactorySerialNumber;
private static final int BASE = Protocol.BASE_NETWORK_AGENT;
@@ -193,16 +194,31 @@
*/
public static final int CMD_PREVENT_AUTOMATIC_RECONNECT = BASE + 15;
+ // TODO : remove these two constructors. They are a stopgap measure to help sheperding a number
+ // of dependent changes that would conflict throughout the automerger graph. Having these
+ // temporarily helps with the process of going through with all these dependent changes across
+ // the entire tree.
public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
NetworkCapabilities nc, LinkProperties lp, int score) {
- this(looper, context, logTag, ni, nc, lp, score, null);
+ this(looper, context, logTag, ni, nc, lp, score, null, NetworkFactory.SerialNumber.NONE);
+ }
+ public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
+ NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc) {
+ this(looper, context, logTag, ni, nc, lp, score, misc, NetworkFactory.SerialNumber.NONE);
}
public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
- NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc) {
+ NetworkCapabilities nc, LinkProperties lp, int score, int factorySerialNumber) {
+ this(looper, context, logTag, ni, nc, lp, score, null, factorySerialNumber);
+ }
+
+ public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
+ NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc,
+ int factorySerialNumber) {
super(looper);
LOG_TAG = logTag;
mContext = context;
+ mFactorySerialNumber = factorySerialNumber;
if (ni == null || nc == null || lp == null) {
throw new IllegalArgumentException();
}
@@ -211,7 +227,8 @@
ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(
Context.CONNECTIVITY_SERVICE);
netId = cm.registerNetworkAgent(new Messenger(this), new NetworkInfo(ni),
- new LinkProperties(lp), new NetworkCapabilities(nc), score, misc);
+ new LinkProperties(lp), new NetworkCapabilities(nc), score, misc,
+ factorySerialNumber);
}
@Override
diff --git a/core/java/android/net/NetworkFactory.java b/core/java/android/net/NetworkFactory.java
index 181cab4..0dfe7a4 100644
--- a/core/java/android/net/NetworkFactory.java
+++ b/core/java/android/net/NetworkFactory.java
@@ -32,6 +32,7 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* A NetworkFactory is an entity that creates NetworkAgent objects.
@@ -49,6 +50,20 @@
* @hide
**/
public class NetworkFactory extends Handler {
+ /** @hide */
+ public static class SerialNumber {
+ // Guard used by no network factory.
+ public static final int NONE = -1;
+ // A hardcoded serial number for NetworkAgents representing VPNs. These agents are
+ // not created by any factory, so they use this constant for clarity instead of NONE.
+ public static final int VPN = -2;
+ private static final AtomicInteger sNetworkFactorySerialNumber = new AtomicInteger(1);
+ /** Returns a unique serial number for a factory. */
+ public static final int nextSerialNumber() {
+ return sNetworkFactorySerialNumber.getAndIncrement();
+ }
+ }
+
private static final boolean DBG = true;
private static final boolean VDBG = false;
@@ -64,7 +79,7 @@
* disregard any that it will never be able to service, for example
* those requiring a different bearer.
* msg.obj = NetworkRequest
- * msg.arg1 = score - the score of the any network currently satisfying this
+ * msg.arg1 = score - the score of the network currently satisfying this
* request. If this bearer knows in advance it cannot
* exceed this score it should not try to connect, holding the request
* for the future.
@@ -74,6 +89,8 @@
* with the same NetworkRequest but an updated score.
* Also, network conditions may change for this bearer
* allowing for a better score in the future.
+ * msg.arg2 = the serial number of the factory currently responsible for the
+ * NetworkAgent handling this request, or SerialNumber.NONE if none.
*/
public static final int CMD_REQUEST_NETWORK = BASE;
@@ -107,6 +124,7 @@
private int mRefCount = 0;
private Messenger mMessenger = null;
+ private int mSerialNumber;
@UnsupportedAppUsage
public NetworkFactory(Looper looper, Context context, String logTag,
@@ -121,7 +139,8 @@
if (DBG) log("Registering NetworkFactory");
if (mMessenger == null) {
mMessenger = new Messenger(this);
- ConnectivityManager.from(mContext).registerNetworkFactory(mMessenger, LOG_TAG);
+ mSerialNumber = ConnectivityManager.from(mContext).registerNetworkFactory(mMessenger,
+ LOG_TAG);
}
}
@@ -137,7 +156,7 @@
public void handleMessage(Message msg) {
switch (msg.what) {
case CMD_REQUEST_NETWORK: {
- handleAddRequest((NetworkRequest)msg.obj, msg.arg1);
+ handleAddRequest((NetworkRequest) msg.obj, msg.arg1, msg.arg2);
break;
}
case CMD_CANCEL_REQUEST: {
@@ -159,11 +178,13 @@
public final NetworkRequest request;
public int score;
public boolean requested; // do we have a request outstanding, limited by score
+ public int factorySerialNumber;
- public NetworkRequestInfo(NetworkRequest request, int score) {
+ NetworkRequestInfo(NetworkRequest request, int score, int factorySerialNumber) {
this.request = request;
this.score = score;
this.requested = false;
+ this.factorySerialNumber = factorySerialNumber;
}
@Override
@@ -172,16 +193,51 @@
}
}
+ /**
+ * Add a NetworkRequest that the bearer may want to attempt to satisfy.
+ * @see #CMD_REQUEST_NETWORK
+ *
+ * @param request the request to handle.
+ * @param score the score of the NetworkAgent currently satisfying this request.
+ * @param servingFactorySerialNumber the serial number of the NetworkFactory that
+ * created the NetworkAgent currently satisfying this request.
+ */
+ // TODO : remove this method. It is a stopgap measure to help sheperding a number
+ // of dependent changes that would conflict throughout the automerger graph. Having this
+ // temporarily helps with the process of going through with all these dependent changes across
+ // the entire tree.
@VisibleForTesting
protected void handleAddRequest(NetworkRequest request, int score) {
+ handleAddRequest(request, score, SerialNumber.NONE);
+ }
+
+ /**
+ * Add a NetworkRequest that the bearer may want to attempt to satisfy.
+ * @see #CMD_REQUEST_NETWORK
+ *
+ * @param request the request to handle.
+ * @param score the score of the NetworkAgent currently satisfying this request.
+ * @param servingFactorySerialNumber the serial number of the NetworkFactory that
+ * created the NetworkAgent currently satisfying this request.
+ */
+ @VisibleForTesting
+ protected void handleAddRequest(NetworkRequest request, int score,
+ int servingFactorySerialNumber) {
NetworkRequestInfo n = mNetworkRequests.get(request.requestId);
if (n == null) {
- if (DBG) log("got request " + request + " with score " + score);
- n = new NetworkRequestInfo(request, score);
+ if (DBG) {
+ log("got request " + request + " with score " + score
+ + " and serial " + servingFactorySerialNumber);
+ }
+ n = new NetworkRequestInfo(request, score, servingFactorySerialNumber);
mNetworkRequests.put(n.request.requestId, n);
} else {
- if (VDBG) log("new score " + score + " for exisiting request " + request);
+ if (VDBG) {
+ log("new score " + score + " for exisiting request " + request
+ + " with serial " + servingFactorySerialNumber);
+ }
n.score = score;
+ n.factorySerialNumber = servingFactorySerialNumber;
}
if (VDBG) log(" my score=" + mScore + ", my filter=" + mCapabilityFilter);
@@ -231,16 +287,19 @@
}
private void evalRequest(NetworkRequestInfo n) {
- if (VDBG) log("evalRequest");
- if (n.requested == false && n.score < mScore &&
- n.request.networkCapabilities.satisfiedByNetworkCapabilities(
- mCapabilityFilter) && acceptRequest(n.request, n.score)) {
+ if (VDBG) {
+ log("evalRequest");
+ log(" n.requests = " + n.requested);
+ log(" n.score = " + n.score);
+ log(" mScore = " + mScore);
+ log(" n.factorySerialNumber = " + n.factorySerialNumber);
+ log(" mSerialNumber = " + mSerialNumber);
+ }
+ if (shouldNeedNetworkFor(n)) {
if (VDBG) log(" needNetworkFor");
needNetworkFor(n.request, n.score);
n.requested = true;
- } else if (n.requested == true &&
- (n.score > mScore || n.request.networkCapabilities.satisfiedByNetworkCapabilities(
- mCapabilityFilter) == false || acceptRequest(n.request, n.score) == false)) {
+ } else if (shouldReleaseNetworkFor(n)) {
if (VDBG) log(" releaseNetworkFor");
releaseNetworkFor(n.request);
n.requested = false;
@@ -249,10 +308,39 @@
}
}
+ private boolean shouldNeedNetworkFor(NetworkRequestInfo n) {
+ // If this request is already tracked, it doesn't qualify for need
+ return !n.requested
+ // If the score of this request is higher or equal to that of this factory and some
+ // other factory is responsible for it, then this factory should not track the request
+ // because it has no hope of satisfying it.
+ && (n.score < mScore || n.factorySerialNumber == mSerialNumber)
+ // If this factory can't satisfy the capability needs of this request, then it
+ // should not be tracked.
+ && n.request.networkCapabilities.satisfiedByNetworkCapabilities(mCapabilityFilter)
+ // Finally if the concrete implementation of the factory rejects the request, then
+ // don't track it.
+ && acceptRequest(n.request, n.score);
+ }
+
+ private boolean shouldReleaseNetworkFor(NetworkRequestInfo n) {
+ // Don't release a request that's not tracked.
+ return n.requested
+ // The request should be released if it can't be satisfied by this factory. That
+ // means either of the following conditions are met :
+ // - Its score is too high to be satisfied by this factory and it's not already
+ // assigned to the factory
+ // - This factory can't satisfy the capability needs of the request
+ // - The concrete implementation of the factory rejects the request
+ && ((n.score > mScore && n.factorySerialNumber != mSerialNumber)
+ || !n.request.networkCapabilities.satisfiedByNetworkCapabilities(
+ mCapabilityFilter)
+ || !acceptRequest(n.request, n.score));
+ }
+
private void evalRequests() {
for (int i = 0; i < mNetworkRequests.size(); i++) {
NetworkRequestInfo n = mNetworkRequests.valueAt(i);
-
evalRequest(n);
}
}
@@ -280,16 +368,6 @@
if (--mRefCount == 0) stopNetwork();
}
-
- public void addNetworkRequest(NetworkRequest networkRequest, int score) {
- sendMessage(obtainMessage(CMD_REQUEST_NETWORK,
- new NetworkRequestInfo(networkRequest, score)));
- }
-
- public void removeNetworkRequest(NetworkRequest networkRequest) {
- sendMessage(obtainMessage(CMD_CANCEL_REQUEST, networkRequest));
- }
-
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public void setScoreFilter(int score) {
sendMessage(obtainMessage(CMD_SET_SCORE, score, 0));
@@ -304,6 +382,10 @@
return mNetworkRequests.size();
}
+ public int getSerialNumber() {
+ return mSerialNumber;
+ }
+
protected void log(String s) {
Log.d(LOG_TAG, s);
}
@@ -321,10 +403,11 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("{").append(LOG_TAG).append(" - ScoreFilter=").
- append(mScore).append(", Filter=").append(mCapabilityFilter).append(", requests=").
- append(mNetworkRequests.size()).append(", refCount=").append(mRefCount).
- append("}");
+ StringBuilder sb = new StringBuilder("{").append(LOG_TAG).append(" - mSerialNumber=")
+ .append(mSerialNumber).append(", ScoreFilter=")
+ .append(mScore).append(", Filter=").append(mCapabilityFilter).append(", requests=")
+ .append(mNetworkRequests.size()).append(", refCount=").append(mRefCount)
+ .append("}");
return sb.toString();
}
}
diff --git a/core/java/android/net/NetworkStack.java b/core/java/android/net/NetworkStack.java
index d277034..ac6bff0 100644
--- a/core/java/android/net/NetworkStack.java
+++ b/core/java/android/net/NetworkStack.java
@@ -104,10 +104,11 @@
*
* <p>The INetworkMonitor will be returned asynchronously through the provided callbacks.
*/
- public void makeNetworkMonitor(Network network, String name, INetworkMonitorCallbacks cb) {
+ public void makeNetworkMonitor(
+ NetworkParcelable network, String name, INetworkMonitorCallbacks cb) {
requestConnector(connector -> {
try {
- connector.makeNetworkMonitor(network.netId, name, cb);
+ connector.makeNetworkMonitor(network, name, cb);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 39db4fe..6a17203 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -23,7 +23,6 @@
import android.annotation.UnsupportedAppUsage;
import android.net.shared.Inet4AddressUtils;
import android.os.Build;
-import android.os.Parcel;
import android.system.ErrnoException;
import android.system.Os;
import android.util.Log;
@@ -252,32 +251,6 @@
}
/**
- * Writes an InetAddress to a parcel. The address may be null. This is likely faster than
- * calling writeSerializable.
- */
- protected static void parcelInetAddress(Parcel parcel, InetAddress address, int flags) {
- byte[] addressArray = (address != null) ? address.getAddress() : null;
- parcel.writeByteArray(addressArray);
- }
-
- /**
- * Reads an InetAddress from a parcel. Returns null if the address that was written was null
- * or if the data is invalid.
- */
- protected static InetAddress unparcelInetAddress(Parcel in) {
- byte[] addressArray = in.createByteArray();
- if (addressArray == null) {
- return null;
- }
- try {
- return InetAddress.getByAddress(addressArray);
- } catch (UnknownHostException e) {
- return null;
- }
- }
-
-
- /**
* Masks a raw IP address byte array with the specified prefix length.
*/
public static void maskRawAddress(byte[] array, int prefixLength) {
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 25bae3c..99cf3a9 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -19,6 +19,7 @@
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
+import android.net.shared.InetAddressUtils;
import android.os.Parcel;
import android.os.Parcelable;
@@ -232,10 +233,10 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeParcelable(ipAddress, flags);
- NetworkUtils.parcelInetAddress(dest, gateway, flags);
+ InetAddressUtils.parcelInetAddress(dest, gateway, flags);
dest.writeInt(dnsServers.size());
for (InetAddress dnsServer : dnsServers) {
- NetworkUtils.parcelInetAddress(dest, dnsServer, flags);
+ InetAddressUtils.parcelInetAddress(dest, dnsServer, flags);
}
dest.writeString(domains);
}
@@ -244,11 +245,11 @@
public static StaticIpConfiguration readFromParcel(Parcel in) {
final StaticIpConfiguration s = new StaticIpConfiguration();
s.ipAddress = in.readParcelable(null);
- s.gateway = NetworkUtils.unparcelInetAddress(in);
+ s.gateway = InetAddressUtils.unparcelInetAddress(in);
s.dnsServers.clear();
int size = in.readInt();
for (int i = 0; i < size; i++) {
- s.dnsServers.add(NetworkUtils.unparcelInetAddress(in));
+ s.dnsServers.add(InetAddressUtils.unparcelInetAddress(in));
}
s.domains = in.readString();
return s;
diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java
index 2a942ee..3008115 100644
--- a/core/java/android/net/metrics/DhcpClientEvent.java
+++ b/core/java/android/net/metrics/DhcpClientEvent.java
@@ -31,10 +31,6 @@
public final class DhcpClientEvent implements IpConnectivityLog.Event {
// Names for recording DhcpClient pseudo-state transitions.
- /** {@hide} Represents transitions from DhcpInitState to DhcpBoundState */
- public static final String INITIAL_BOUND = "InitialBoundState";
- /** {@hide} Represents transitions from and to DhcpBoundState via DhcpRenewingState */
- public static final String RENEWING_BOUND = "RenewingBoundState";
/** @hide */
public final String msg;
diff --git a/core/java/android/net/shared/FdEventsReader.java b/core/java/android/net/shared/FdEventsReader.java
index 5ccc560..bffbfb1 100644
--- a/core/java/android/net/shared/FdEventsReader.java
+++ b/core/java/android/net/shared/FdEventsReader.java
@@ -21,15 +21,15 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.net.util.SocketUtils;
import android.os.Handler;
import android.os.Looper;
import android.os.MessageQueue;
import android.system.ErrnoException;
import android.system.OsConstants;
-import libcore.io.IoUtils;
-
import java.io.FileDescriptor;
+import java.io.IOException;
/**
@@ -81,7 +81,10 @@
private long mPacketsReceived;
protected static void closeFd(FileDescriptor fd) {
- IoUtils.closeQuietly(fd);
+ try {
+ SocketUtils.closeSocket(fd);
+ } catch (IOException ignored) {
+ }
}
protected FdEventsReader(@NonNull Handler h, @NonNull BufferType buffer) {
@@ -136,8 +139,8 @@
}
/**
- * Subclasses MUST create the listening socket here, including setting
- * all desired socket options, interface or address/port binding, etc.
+ * Subclasses MUST create the listening socket here, including setting all desired socket
+ * options, interface or address/port binding, etc. The socket MUST be created nonblocking.
*/
@Nullable
protected abstract FileDescriptor createFd();
@@ -181,10 +184,6 @@
try {
mFd = createFd();
- if (mFd != null) {
- // Force the socket to be non-blocking.
- IoUtils.setBlocking(mFd, false);
- }
} catch (Exception e) {
logError("Failed to create socket: ", e);
closeFd(mFd);
diff --git a/core/java/android/net/shared/InetAddressUtils.java b/core/java/android/net/shared/InetAddressUtils.java
new file mode 100644
index 0000000..c9ee3a7
--- /dev/null
+++ b/core/java/android/net/shared/InetAddressUtils.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.shared;
+
+import android.os.Parcel;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Collection of utilities to interact with {@link InetAddress}
+ * @hide
+ */
+public class InetAddressUtils {
+
+ /**
+ * Writes an InetAddress to a parcel. The address may be null. This is likely faster than
+ * calling writeSerializable.
+ * @hide
+ */
+ public static void parcelInetAddress(Parcel parcel, InetAddress address, int flags) {
+ byte[] addressArray = (address != null) ? address.getAddress() : null;
+ parcel.writeByteArray(addressArray);
+ }
+
+ /**
+ * Reads an InetAddress from a parcel. Returns null if the address that was written was null
+ * or if the data is invalid.
+ * @hide
+ */
+ public static InetAddress unparcelInetAddress(Parcel in) {
+ byte[] addressArray = in.createByteArray();
+ if (addressArray == null) {
+ return null;
+ }
+ try {
+ return InetAddress.getByAddress(addressArray);
+ } catch (UnknownHostException e) {
+ return null;
+ }
+ }
+
+ private InetAddressUtils() {}
+}
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java
index 93360a5..ddec688 100644
--- a/core/java/android/os/GraphicsEnvironment.java
+++ b/core/java/android/os/GraphicsEnvironment.java
@@ -34,14 +34,11 @@
import dalvik.system.VMRuntime;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -63,7 +60,6 @@
private static final boolean DEBUG = false;
private static final String TAG = "GraphicsEnvironment";
private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0";
- private static final String GAME_DRIVER_WHITELIST_FILENAME = "whitelist.txt";
private static final String ANGLE_RULES_FILE = "a4a_rules.json";
private static final String ANGLE_TEMP_RULES = "debug.angle.rules";
private static final String ACTION_ANGLE_FOR_ANDROID = "android.app.action.ANGLE_FOR_ANDROID";
@@ -553,8 +549,9 @@
boolean isOptIn =
getGlobalSettingsString(coreSettings, Settings.Global.GAME_DRIVER_OPT_IN_APPS)
.contains(ai.packageName);
-
- if (!isOptIn && !onWhitelist(context, driverPackageName, ai.packageName)) {
+ if (!isOptIn
+ && !getGlobalSettingsString(coreSettings, Settings.Global.GAME_DRIVER_WHITELIST)
+ .contains(ai.packageName)) {
if (DEBUG) {
Log.w(TAG, ai.packageName + " is not on the whitelist.");
}
@@ -647,31 +644,6 @@
return null;
}
- private static boolean onWhitelist(Context context, String driverPackageName,
- String applicationPackageName) {
- try {
- Context driverContext = context.createPackageContext(driverPackageName,
- Context.CONTEXT_RESTRICTED);
- AssetManager assets = driverContext.getAssets();
- InputStream stream = assets.open(GAME_DRIVER_WHITELIST_FILENAME);
- BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
- for (String packageName; (packageName = reader.readLine()) != null; ) {
- if (packageName.equals(applicationPackageName)) {
- return true;
- }
- }
- } catch (PackageManager.NameNotFoundException e) {
- if (DEBUG) {
- Log.w(TAG, "driver package '" + driverPackageName + "' not installed");
- }
- } catch (IOException e) {
- if (DEBUG) {
- Log.w(TAG, "Failed to load whitelist driver package, abort.");
- }
- }
- return false;
- }
-
private static native int getCanLoadSystemLibraries();
private static native void setLayerPaths(ClassLoader classLoader, String layerPaths);
private static native void setDebugLayers(String layers);
diff --git a/core/java/android/os/IncidentManager.java b/core/java/android/os/IncidentManager.java
index 88a578a..a1c7b08 100644
--- a/core/java/android/os/IncidentManager.java
+++ b/core/java/android/os/IncidentManager.java
@@ -16,7 +16,9 @@
package android.os;
+import android.annotation.IntDef;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.SystemService;
@@ -25,6 +27,11 @@
import android.net.Uri;
import android.util.Slog;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
@@ -95,6 +102,33 @@
*/
public static final int FLAG_CONFIRMATION_DIALOG = 0x1;
+ /**
+ * Flag marking fields and incident reports than can be taken
+ * off the device only via adb.
+ */
+ public static final int PRIVACY_POLICY_LOCAL = 0;
+
+ /**
+ * Flag marking fields and incident reports than can be taken
+ * off the device with contemporary consent.
+ */
+ public static final int PRIVACY_POLICY_EXPLICIT = 100;
+
+ /**
+ * Flag marking fields and incident reports than can be taken
+ * off the device with prior consent.
+ */
+ public static final int PRIVACY_POLICY_AUTO = 200;
+
+ /** @hide */
+ @IntDef(flag = false, prefix = { "PRIVACY_POLICY_" }, value = {
+ PRIVACY_POLICY_AUTO,
+ PRIVACY_POLICY_EXPLICIT,
+ PRIVACY_POLICY_LOCAL,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface PrivacyPolicy {}
+
private final Context mContext;
private Object mLock = new Object();
@@ -203,6 +237,110 @@
}
/**
+ * Record of an incident report that has previously been taken.
+ * @hide
+ */
+ @SystemApi
+ @TestApi
+ public static class IncidentReport implements Parcelable, Closeable {
+ private final long mTimestampMs;
+ private final int mPrivacyPolicy;
+ private ParcelFileDescriptor mFileDescriptor;
+
+ public IncidentReport(Parcel in) {
+ mTimestampMs = in.readLong();
+ mPrivacyPolicy = in.readInt();
+ if (in.readInt() != 0) {
+ mFileDescriptor = ParcelFileDescriptor.CREATOR.createFromParcel(in);
+ } else {
+ mFileDescriptor = null;
+ }
+ }
+
+ /**
+ * Close the input stream associated with this entry.
+ */
+ public void close() {
+ try {
+ if (mFileDescriptor != null) {
+ mFileDescriptor.close();
+ mFileDescriptor = null;
+ }
+ } catch (IOException e) {
+ }
+ }
+
+ /**
+ * Get the time at which this incident report was taken, in wall clock time
+ * ({@link System#uptimeMillis System.uptimeMillis()} time base).
+ */
+ public long getTimestamp() {
+ return mTimestampMs;
+ }
+
+ /**
+ * Get the privacy level to which this report has been filtered.
+ *
+ * @see #PRIVACY_POLICY_AUTO
+ * @see #PRIVACY_POLICY_EXPLICIT
+ * @see #PRIVACY_POLICY_LOCAL
+ */
+ public long getPrivacyPolicy() {
+ return mPrivacyPolicy;
+ }
+
+ /**
+ * Get the contents of this incident report.
+ */
+ public InputStream getInputStream() throws IOException {
+ if (mFileDescriptor == null) {
+ return null;
+ }
+ return new ParcelFileDescriptor.AutoCloseInputStream(mFileDescriptor);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public int describeContents() {
+ return mFileDescriptor != null ? Parcelable.CONTENTS_FILE_DESCRIPTOR : 0;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeLong(mTimestampMs);
+ out.writeInt(mPrivacyPolicy);
+ if (mFileDescriptor != null) {
+ out.writeInt(1);
+ mFileDescriptor.writeToParcel(out, flags);
+ } else {
+ out.writeInt(0);
+ }
+ }
+
+ /**
+ * {@link Parcelable.Creator Creator} for {@link IncidentReport}.
+ */
+ public static final Parcelable.Creator<IncidentReport> CREATOR = new Parcelable.Creator() {
+ /**
+ * @inheritDoc
+ */
+ public IncidentReport[] newArray(int size) {
+ return new IncidentReport[size];
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public IncidentReport createFromParcel(Parcel in) {
+ return new IncidentReport(in);
+ }
+ };
+ }
+
+ /**
* Listener for the status of an incident report being authroized or denied.
*
* @see #requestAuthorization
@@ -242,7 +380,7 @@
}
/**
- * Take an incident report and put it in dropbox.
+ * Take an incident report.
*/
@RequiresPermission(allOf = {
android.Manifest.permission.DUMP,
@@ -325,6 +463,52 @@
}
}
+ /**
+ * Get the incident reports that are available for upload for the supplied
+ * broadcast recevier.
+ *
+ * @param receiverClass Class name of broadcast receiver in this package that
+ * was registered to retrieve reports.
+ *
+ * @return A list of {@link Uri Uris} that are awaiting upload.
+ */
+ @RequiresPermission(allOf = {
+ android.Manifest.permission.DUMP,
+ android.Manifest.permission.PACKAGE_USAGE_STATS
+ })
+ public @NonNull List<Uri> getIncidentReportList(String receiverClass) {
+ throw new RuntimeException("implement me");
+ }
+
+ /**
+ * Get the incident report with the given URI id.
+ *
+ * @param uri Identifier of the incident report.
+ *
+ * @return an IncidentReport object, or null if the incident report has been
+ * expired from disk.
+ */
+ @RequiresPermission(allOf = {
+ android.Manifest.permission.DUMP,
+ android.Manifest.permission.PACKAGE_USAGE_STATS
+ })
+ public @Nullable IncidentReport getIncidentReport(Uri uri) {
+ throw new RuntimeException("implement me");
+ }
+
+ /**
+ * Delete the incident report with the given URI id.
+ *
+ * @param uri Identifier of the incident report.
+ */
+ @RequiresPermission(allOf = {
+ android.Manifest.permission.DUMP,
+ android.Manifest.permission.PACKAGE_USAGE_STATS
+ })
+ public void deleteIncidentReports(Uri uri) {
+ throw new RuntimeException("implement me");
+ }
+
private void reportIncidentInternal(IncidentReportArgs args) {
try {
final IIncidentManager service = getIIncidentManagerLocked();
diff --git a/core/java/android/os/IncidentReportArgs.java b/core/java/android/os/IncidentReportArgs.java
index 3ca7f77..8d44727 100644
--- a/core/java/android/os/IncidentReportArgs.java
+++ b/core/java/android/os/IncidentReportArgs.java
@@ -32,19 +32,16 @@
@TestApi
public final class IncidentReportArgs implements Parcelable {
- private static final int DEST_EXPLICIT = 100;
- private static final int DEST_AUTO = 200;
-
private final IntArray mSections = new IntArray();
private final ArrayList<byte[]> mHeaders = new ArrayList<byte[]>();
private boolean mAll;
- private int mDest;
+ private int mPrivacyPolicy;
/**
* Construct an incident report args with no fields.
*/
public IncidentReportArgs() {
- mDest = DEST_AUTO;
+ mPrivacyPolicy = IncidentManager.PRIVACY_POLICY_AUTO;
}
/**
@@ -75,7 +72,7 @@
out.writeByteArray(mHeaders.get(i));
}
- out.writeInt(mDest);
+ out.writeInt(mPrivacyPolicy);
}
public void readFromParcel(Parcel in) {
@@ -93,7 +90,7 @@
mHeaders.add(in.createByteArray());
}
- mDest = in.readInt();
+ mPrivacyPolicy = in.readInt();
}
public static final Parcelable.Creator<IncidentReportArgs> CREATOR
@@ -128,7 +125,7 @@
sb.append(", ");
sb.append(mHeaders.size());
sb.append(" headers), ");
- sb.append("Dest enum value: ").append(mDest);
+ sb.append("privacy: ").append(mPrivacyPolicy);
return sb.toString();
}
@@ -145,14 +142,15 @@
/**
* Set this incident report privacy policy spec.
*/
- public void setPrivacyPolicy(int dest) {
- switch (dest) {
- case DEST_EXPLICIT:
- case DEST_AUTO:
- mDest = dest;
+ public void setPrivacyPolicy(int privacyPolicy) {
+ switch (privacyPolicy) {
+ case IncidentManager.PRIVACY_POLICY_LOCAL:
+ case IncidentManager.PRIVACY_POLICY_EXPLICIT:
+ case IncidentManager.PRIVACY_POLICY_AUTO:
+ mPrivacyPolicy = privacyPolicy;
break;
default:
- mDest = DEST_AUTO;
+ mPrivacyPolicy = IncidentManager.PRIVACY_POLICY_AUTO;
}
}
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 8a52f1f..3e5bd4b 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -138,8 +138,8 @@
* Action used to help apps show calendar events in the managed profile.
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
- public static final String ACTION_VIEW_WORK_CALENDAR_EVENT =
- "android.provider.calendar.action.VIEW_WORK_CALENDAR_EVENT";
+ public static final String ACTION_VIEW_MANAGED_PROFILE_CALENDAR_EVENT =
+ "android.provider.calendar.action.VIEW_MANAGED_PROFILE_CALENDAR_EVENT";
/**
* Intent Extras key: {@link EventsColumns#CUSTOM_APP_URI} for the event in
@@ -166,7 +166,7 @@
public static final String EXTRA_EVENT_ALL_DAY = "allDay";
/**
- * Intent Extras key: The id of an event.
+ * Intent Extras key: An extra of type {@code long} holding the id of an event.
*/
public static final String EXTRA_EVENT_ID = "id";
@@ -218,7 +218,7 @@
* When this API is called, the system will attempt to start an activity
* in the managed profile with an intent targeting the same caller package.
* The intent will have its action set to
- * {@link CalendarContract#ACTION_VIEW_WORK_CALENDAR_EVENT} and contain extras
+ * {@link CalendarContract#ACTION_VIEW_MANAGED_PROFILE_CALENDAR_EVENT} and contain extras
* corresponding to the API's arguments. A calendar app intending to support
* cross-profile events viewing should handle this intent, parse the arguments
* and show the appropriate UI.
@@ -226,10 +226,10 @@
* @param context the context.
* @param eventId the id of the event to be viewed. Will be put into {@link #EXTRA_EVENT_ID}
* field of the intent.
- * @param start the start time of the event. Will be put into {@link #EXTRA_EVENT_BEGIN_TIME}
- * field of the intent.
- * @param end the end time of the event. Will be put into {@link #EXTRA_EVENT_END_TIME} field
- * of the intent.
+ * @param startMs the start time of the event in milliseconds since epoch.
+ * Will be put into {@link #EXTRA_EVENT_BEGIN_TIME} field of the intent.
+ * @param endMs the end time of the event in milliseconds since epoch.
+ * Will be put into {@link #EXTRA_EVENT_END_TIME} field of the intent.
* @param allDay if the event is an all-day event. Will be put into
* {@link #EXTRA_EVENT_ALL_DAY} field of the intent.
* @param flags flags to be set on the intent via {@link Intent#setFlags}
@@ -241,12 +241,12 @@
* @see #EXTRA_EVENT_ALL_DAY
*/
public static boolean startViewCalendarEventInManagedProfile(@NonNull Context context,
- long eventId, long start, long end, boolean allDay, int flags) {
+ long eventId, long startMs, long endMs, boolean allDay, int flags) {
Preconditions.checkNotNull(context, "Context is null");
final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
Context.DEVICE_POLICY_SERVICE);
- return dpm.startViewCalendarEventInManagedProfile(eventId, start,
- end, allDay, flags);
+ return dpm.startViewCalendarEventInManagedProfile(eventId, startMs,
+ endMs, allDay, flags);
}
/**
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 0b23fe3e..30c0731 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -160,6 +160,18 @@
}
/**
+ * Namespace for all activity manager related features that are used at the native level.
+ * These features are applied at reboot.
+ *
+ * @hide
+ */
+ @SystemApi
+ public interface ActivityManagerNativeBoot {
+ String NAMESPACE = "activity_manager_native_boot";
+ String OFFLOAD_QUEUE_ENABLED = "offload_queue_enabled";
+ }
+
+ /**
* Namespace for attention-based features provided by on-device machine intelligence.
*
* @hide
@@ -218,16 +230,15 @@
}
/**
- * Namespace for Full Stack Integrity to run privileged apps only in JIT mode. The flag applies
- * at process start, so reboot is a way to bring the device to a clean state.
+ * Namespace for how dex runs. The feature may requires reboot to a clean state.
*
* @hide
*/
@SystemApi
- public interface FsiBoot {
- String NAMESPACE = "fsi_boot";
- String OOB_ENABLED = "oob_enabled";
- String OOB_WHITELIST = "oob_whitelist";
+ public interface DexBoot {
+ String NAMESPACE = "dex_boot";
+ String PRIV_APPS_OOB_ENABLED = "priv_apps_oob_enabled";
+ String PRIV_APPS_OOB_WHITELIST = "priv_apps_oob_whitelist";
}
/**
diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java
index 63bbb9c..89d1c44 100644
--- a/core/java/android/provider/Downloads.java
+++ b/core/java/android/provider/Downloads.java
@@ -419,12 +419,20 @@
/**
* The column that is used to remember whether the media scanner was invoked.
- * It can take the values: null or 0(not scanned), 1(scanned), 2 (not scannable).
+ * It can take the values: {@link #MEDIA_NOT_SCANNED}, {@link #MEDIA_SCANNED} or
+ * {@link #MEDIA_NOT_SCANNABLE} or {@code null}. If it's value is {@code null}, it will be
+ * treated as {@link #MEDIA_NOT_SCANNED}.
+ *
* <P>Type: TEXT</P>
*/
@UnsupportedAppUsage
public static final String COLUMN_MEDIA_SCANNED = "scanned";
+ /** Possible values for column {@link #COLUMN_MEDIA_SCANNED} */
+ public static final int MEDIA_NOT_SCANNED = 0;
+ public static final int MEDIA_SCANNED = 1;
+ public static final int MEDIA_NOT_SCANNABLE = 2;
+
/**
* The column with errorMsg for a failed downloaded.
* Used only for debugging purposes.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 794c2f1..ea00698 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10521,8 +10521,10 @@
/**
* Setting to enable connected MAC randomization in Wi-Fi; disabled by default, and
* setting to 1 will enable it. In the future, additional values may be supported.
+ * @deprecated MAC randomization is now a per-network setting
* @hide
*/
+ @Deprecated
public static final String WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED =
"wifi_connected_mac_randomization_enabled";
@@ -10598,6 +10600,18 @@
private static final Validator WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR =
BOOLEAN_VALIDATOR;
+ /**
+ * Setting to enable the Wi-Fi link probing.
+ * Disabled by default, and setting it to 1 will enable it.
+ * The value is boolean (0 or 1).
+ * @hide
+ */
+ public static final String WIFI_LINK_PROBING_ENABLED =
+ "wifi_link_probing_enabled";
+
+ private static final Validator WIFI_LINK_PROBING_ENABLED_VALIDATOR =
+ BOOLEAN_VALIDATOR;
+
/**
* The maximum number of times we will retry a connection to an access
* point for which we have failed in acquiring an IP address from DHCP.
@@ -13391,6 +13405,7 @@
WIFI_PNO_FREQUENCY_CULLING_ENABLED_VALIDATOR);
VALIDATORS.put(WIFI_PNO_RECENCY_SORTING_ENABLED,
WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR);
+ VALIDATORS.put(WIFI_LINK_PROBING_ENABLED, WIFI_LINK_PROBING_ENABLED_VALIDATOR);
}
/**
diff --git a/core/java/android/service/appprediction/AppPredictionService.java b/core/java/android/service/appprediction/AppPredictionService.java
index b77405a..d012851 100644
--- a/core/java/android/service/appprediction/AppPredictionService.java
+++ b/core/java/android/service/appprediction/AppPredictionService.java
@@ -21,6 +21,7 @@
import android.annotation.MainThread;
import android.annotation.NonNull;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.app.Service;
import android.app.prediction.AppPredictionContext;
import android.app.prediction.AppPredictionSessionId;
@@ -49,6 +50,7 @@
* @hide
*/
@SystemApi
+@TestApi
public abstract class AppPredictionService extends Service {
private static final String TAG = "AppPredictionService";
@@ -140,6 +142,7 @@
@Override
public final IBinder onBind(Intent intent) {
+ // TODO(b/111701043): Verify that the action is valid
return mInterface.asBinder();
}
@@ -228,6 +231,7 @@
public void onStopPredictionUpdates() {}
private void doRequestPredictionUpdate(@NonNull AppPredictionSessionId sessionId) {
+ // Just an optimization, if there are no callbacks, then don't bother notifying the service
final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);
if (callbacks != null && !callbacks.isEmpty()) {
onRequestPredictionUpdate(sessionId);
diff --git a/core/java/android/service/dreams/OWNERS b/core/java/android/service/dreams/OWNERS
index 3c9bbf8..426f002 100644
--- a/core/java/android/service/dreams/OWNERS
+++ b/core/java/android/service/dreams/OWNERS
@@ -1,3 +1,3 @@
-dsandler@google.com
+dsandler@android.com
michaelwr@google.com
roosa@google.com
diff --git a/core/java/android/service/notification/INotificationListener.aidl b/core/java/android/service/notification/INotificationListener.aidl
index 1ddc099e..22104b5 100644
--- a/core/java/android/service/notification/INotificationListener.aidl
+++ b/core/java/android/service/notification/INotificationListener.aidl
@@ -33,6 +33,7 @@
void onListenerConnected(in NotificationRankingUpdate update);
void onNotificationPosted(in IStatusBarNotificationHolder notificationHolder,
in NotificationRankingUpdate update);
+ void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons);
// stats only for assistant
void onNotificationRemoved(in IStatusBarNotificationHolder notificationHolder,
in NotificationRankingUpdate update, in NotificationStats stats, int reason);
diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index c734b63..d4e8879 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -469,6 +469,17 @@
}
/**
+ * Implement this method to be notified when the behavior of silent notifications in the status
+ * bar changes. See {@link NotificationManager#shouldHideSilentStatusBarIcons()}.
+ *
+ * @param hideSilentStatusIcons whether or not status bar icons should be hidden for silent
+ * notifications
+ */
+ public void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) {
+ // optional
+ }
+
+ /**
* Implement this method to learn about notification channel modifications.
*
* <p>The caller must have {@link CompanionDeviceManager#getAssociations() an associated
@@ -1411,6 +1422,12 @@
mHandler.obtainMessage(
MyHandler.MSG_ON_NOTIFICATION_CHANNEL_GROUP_MODIFIED, args).sendToTarget();
}
+
+ @Override
+ public void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) {
+ mHandler.obtainMessage(MyHandler.MSG_ON_STATUS_BAR_ICON_BEHAVIOR_CHANGED,
+ hideSilentStatusIcons).sendToTarget();
+ }
}
/**
@@ -2142,6 +2159,7 @@
public static final int MSG_ON_INTERRUPTION_FILTER_CHANGED = 6;
public static final int MSG_ON_NOTIFICATION_CHANNEL_MODIFIED = 7;
public static final int MSG_ON_NOTIFICATION_CHANNEL_GROUP_MODIFIED = 8;
+ public static final int MSG_ON_STATUS_BAR_ICON_BEHAVIOR_CHANGED = 9;
public MyHandler(Looper looper) {
super(looper, null, false);
@@ -2207,6 +2225,10 @@
int modificationType = (int) args.arg4;
onNotificationChannelGroupModified(pkgName, user, group, modificationType);
} break;
+
+ case MSG_ON_STATUS_BAR_ICON_BEHAVIOR_CHANGED: {
+ onStatusBarIconsBehaviorChanged((Boolean) msg.obj);
+ } break;
}
}
}
diff --git a/core/java/android/text/BoringLayout.java b/core/java/android/text/BoringLayout.java
index 2b33fae..cf6987c 100644
--- a/core/java/android/text/BoringLayout.java
+++ b/core/java/android/text/BoringLayout.java
@@ -272,16 +272,27 @@
}
/**
- * Returns null if not boring; the width, ascent, and descent if boring.
+ * Determine and compute metrics if given text can be handled by BoringLayout.
+ *
+ * @param text a text
+ * @param paint a paint
+ * @return layout metric for the given text. null if given text is unable to be handled by
+ * BoringLayout.
*/
public static Metrics isBoring(CharSequence text, TextPaint paint) {
return isBoring(text, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR, null);
}
/**
- * Returns null if not boring; the width, ascent, and descent in the
- * provided Metrics object (or a new one if the provided one was null)
- * if boring.
+ * Determine and compute metrics if given text can be handled by BoringLayout.
+ *
+ * @param text a text
+ * @param paint a paint
+ * @param metrics a metrics object to be recycled. If null is passed, this function creat new
+ * object.
+ * @return layout metric for the given text. If metrics is not null, this method fills values
+ * to given metrics object instead of allocating new metrics object. null if given text
+ * is unable to be handled by BoringLayout.
*/
public static Metrics isBoring(CharSequence text, TextPaint paint, Metrics metrics) {
return isBoring(text, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR, metrics);
diff --git a/core/java/android/util/proto/EncodedBuffer.java b/core/java/android/util/proto/EncodedBuffer.java
index ed38e6f..56a0bfa 100644
--- a/core/java/android/util/proto/EncodedBuffer.java
+++ b/core/java/android/util/proto/EncodedBuffer.java
@@ -147,6 +147,14 @@
return mReadableSize;
}
+ /**
+ * Returns the buffer size
+ * @return the buffer size
+ */
+ public int getSize() {
+ return ((mBufferCount - 1) * mChunkSize) + mWriteIndex;
+ }
+
//
// Reading from the read position.
//
diff --git a/core/java/android/util/proto/ProtoOutputStream.java b/core/java/android/util/proto/ProtoOutputStream.java
index a1ee61c..6efcfbf 100644
--- a/core/java/android/util/proto/ProtoOutputStream.java
+++ b/core/java/android/util/proto/ProtoOutputStream.java
@@ -188,6 +188,18 @@
}
/**
+ * Returns the uncompressed buffer size
+ * @return the uncompressed buffer size
+ */
+ public int getRawSize() {
+ if (mCompacted) {
+ return getBytes().length;
+ } else {
+ return mBuffer.getSize();
+ }
+ }
+
+ /**
* Write a value for the given fieldId.
*
* Will automatically convert for the following field types, and
diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java
index eb41e07..59e562f 100644
--- a/core/java/android/view/AccessibilityInteractionController.java
+++ b/core/java/android/view/AccessibilityInteractionController.java
@@ -41,12 +41,14 @@
import android.view.accessibility.AccessibilityInteractionClient;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.view.accessibility.AccessibilityNodeProvider;
import android.view.accessibility.AccessibilityRequestPreparer;
import android.view.accessibility.IAccessibilityInteractionConnectionCallback;
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.SomeArgs;
import java.util.ArrayList;
@@ -64,8 +66,11 @@
* called from the interaction connection ViewAncestor gives the system to
* talk to it and a corresponding *UiThread method that is executed on the
* UI thread.
+ *
+ * @hide
*/
-final class AccessibilityInteractionController {
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+public final class AccessibilityInteractionController {
private static final String LOG_TAG = "AccessibilityInteractionController";
@@ -85,7 +90,7 @@
private final Object mLock = new Object();
- private final Handler mHandler;
+ private final PrivateHandler mHandler;
private final ViewRootImpl mViewRootImpl;
@@ -131,11 +136,19 @@
// thread in this process, set the message as a static reference so
// after this call completes the same thread but in the interrogating
// client can handle the message to generate the result.
- if (interrogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) {
+ if (interrogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId
+ && mHandler.hasAccessibilityCallback(message)) {
AccessibilityInteractionClient.getInstanceForThread(
interrogatingTid).setSameThreadMessage(message);
} else {
- mHandler.sendMessage(message);
+ // For messages without callback of interrogating client, just handle the
+ // message immediately if this is UI thread.
+ if (!mHandler.hasAccessibilityCallback(message)
+ && Thread.currentThread().getId() == mMyLooperThreadId) {
+ mHandler.handleMessage(message);
+ } else {
+ mHandler.sendMessage(message);
+ }
}
}
}
@@ -731,6 +744,52 @@
}
}
+ /**
+ * Finds the accessibility focused node in the root, and clears the accessibility focus.
+ */
+ public void clearAccessibilityFocusClientThread() {
+ final Message message = mHandler.obtainMessage();
+ message.what = PrivateHandler.MSG_CLEAR_ACCESSIBILITY_FOCUS;
+
+ // Don't care about pid and tid because there's no interrogating client for this message.
+ scheduleMessage(message, 0, 0, CONSIDER_REQUEST_PREPARERS);
+ }
+
+ private void clearAccessibilityFocusUiThread() {
+ if (mViewRootImpl.mView == null || mViewRootImpl.mAttachInfo == null) {
+ return;
+ }
+ try {
+ mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags =
+ AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
+ final View root = mViewRootImpl.mView;
+ if (root != null && isShown(root)) {
+ final View host = mViewRootImpl.mAccessibilityFocusedHost;
+ // If there is no accessibility focus host or it is not a descendant
+ // of the root from which to start the search, then the search failed.
+ if (host == null || !ViewRootImpl.isViewDescendantOf(host, root)) {
+ return;
+ }
+ final AccessibilityNodeProvider provider = host.getAccessibilityNodeProvider();
+ final AccessibilityNodeInfo focusNode =
+ mViewRootImpl.mAccessibilityFocusedVirtualView;
+ if (provider != null && focusNode != null) {
+ final int virtualNodeId = AccessibilityNodeInfo.getVirtualDescendantId(
+ focusNode.getSourceNodeId());
+ provider.performAction(virtualNodeId,
+ AccessibilityAction.ACTION_CLEAR_ACCESSIBILITY_FOCUS.getId(),
+ null);
+ } else {
+ host.performAccessibilityAction(
+ AccessibilityAction.ACTION_CLEAR_ACCESSIBILITY_FOCUS.getId(),
+ null);
+ }
+ }
+ } finally {
+ mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;
+ }
+ }
+
private View findViewByAccessibilityId(int accessibilityId) {
View root = mViewRootImpl.mView;
if (root == null) {
@@ -1294,6 +1353,12 @@
private static final int MSG_APP_PREPARATION_FINISHED = 8;
private static final int MSG_APP_PREPARATION_TIMEOUT = 9;
+ // Uses FIRST_NO_ACCESSIBILITY_CALLBACK_MSG for messages that don't need to call back
+ // results to interrogating client.
+ private static final int FIRST_NO_ACCESSIBILITY_CALLBACK_MSG = 100;
+ private static final int MSG_CLEAR_ACCESSIBILITY_FOCUS =
+ FIRST_NO_ACCESSIBILITY_CALLBACK_MSG + 1;
+
public PrivateHandler(Looper looper) {
super(looper);
}
@@ -1320,6 +1385,8 @@
return "MSG_APP_PREPARATION_FINISHED";
case MSG_APP_PREPARATION_TIMEOUT:
return "MSG_APP_PREPARATION_TIMEOUT";
+ case MSG_CLEAR_ACCESSIBILITY_FOCUS:
+ return "MSG_CLEAR_ACCESSIBILITY_FOCUS";
default:
throw new IllegalArgumentException("Unknown message type: " + type);
}
@@ -1356,10 +1423,17 @@
case MSG_APP_PREPARATION_TIMEOUT: {
requestPreparerTimeoutUiThread();
} break;
+ case MSG_CLEAR_ACCESSIBILITY_FOCUS: {
+ clearAccessibilityFocusUiThread();
+ } break;
default:
throw new IllegalArgumentException("Unknown message type: " + type);
}
}
+
+ boolean hasAccessibilityCallback(Message message) {
+ return message.what < FIRST_NO_ACCESSIBILITY_CALLBACK_MSG ? true : false;
+ }
}
private final class AddNodeInfosForViewId implements Predicate<View> {
diff --git a/core/java/android/view/InputWindowHandle.java b/core/java/android/view/InputWindowHandle.java
index 92e0009..ec79eea 100644
--- a/core/java/android/view/InputWindowHandle.java
+++ b/core/java/android/view/InputWindowHandle.java
@@ -16,10 +16,10 @@
package android.view;
+import static android.view.Display.INVALID_DISPLAY;
+
import android.graphics.Region;
import android.os.IBinder;
-import android.view.IWindow;
-import android.view.InputChannel;
/**
* Functions as a handle for a window that can receive input.
@@ -94,6 +94,10 @@
// Display this input is on.
public int displayId;
+ // If this value is set to a valid display ID, it indicates this window is a portal which
+ // transports the touch of this window to the display indicated by portalToDisplayId.
+ public int portalToDisplayId = INVALID_DISPLAY;
+
private native void nativeDispose();
public InputWindowHandle(InputApplicationHandle inputApplicationHandle,
diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java
index dc7c343..6061cb2 100644
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -20,6 +20,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemService;
+import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -399,10 +400,15 @@
}
private void initPrecompiledViews() {
- // Check if precompiled layouts are enabled by a system property.
- mUseCompiledView =
- SystemProperties.getBoolean(USE_PRECOMPILED_LAYOUT_SYSTEM_PROPERTY, false);
+ initPrecompiledViews(
+ SystemProperties.getBoolean(USE_PRECOMPILED_LAYOUT_SYSTEM_PROPERTY, false));
+ }
+
+ private void initPrecompiledViews(boolean enablePrecompiledViews) {
+ mUseCompiledView = enablePrecompiledViews;
+
if (!mUseCompiledView) {
+ mPrecompiledClassLoader = null;
return;
}
@@ -431,6 +437,17 @@
}
mUseCompiledView = false;
}
+ if (!mUseCompiledView) {
+ mPrecompiledClassLoader = null;
+ }
+ }
+
+ /**
+ * @hide for use by CTS tests
+ */
+ @TestApi
+ public void setPrecompiledLayoutsEnabledForTesting(boolean enablePrecompiledLayouts) {
+ initPrecompiledViews(enablePrecompiledLayouts);
}
/**
diff --git a/core/java/android/view/RemoteAnimationTarget.java b/core/java/android/view/RemoteAnimationTarget.java
index 1d2cf4b..9b3efe1 100644
--- a/core/java/android/view/RemoteAnimationTarget.java
+++ b/core/java/android/view/RemoteAnimationTarget.java
@@ -246,8 +246,12 @@
position.writeToProto(proto, POSITION);
sourceContainerBounds.writeToProto(proto, SOURCE_CONTAINER_BOUNDS);
windowConfiguration.writeToProto(proto, WINDOW_CONFIGURATION);
- startLeash.writeToProto(proto, START_LEASH);
- startBounds.writeToProto(proto, START_BOUNDS);
+ if (startLeash != null) {
+ startLeash.writeToProto(proto, START_LEASH);
+ }
+ if (startBounds != null) {
+ startBounds.writeToProto(proto, START_BOUNDS);
+ }
proto.end(token);
}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a17a188..519181d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8210,7 +8210,7 @@
* changed by calling
* {@link ContentCaptureSession#notifyViewAppeared(ViewStructure)},
* {@link ContentCaptureSession#notifyViewDisappeared(AutofillId)}, and
- * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence, int)}
+ * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence)}
* respectively. The structure for the a child must be created using
* {@link ContentCaptureSession#newVirtualViewStructure(AutofillId, long)}, and the
* {@code autofillId} for a child can be obtained either through
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index f47eb10..9213f32 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -8718,6 +8718,15 @@
}
}
}
+
+ @Override
+ public void clearAccessibilityFocus() {
+ ViewRootImpl viewRootImpl = mViewRootImpl.get();
+ if (viewRootImpl != null && viewRootImpl.mView != null) {
+ viewRootImpl.getAccessibilityInteractionController()
+ .clearAccessibilityFocusClientThread();
+ }
+ }
}
private class SendWindowContentChangedAccessibilityEvent implements Runnable {
diff --git a/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl b/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl
index 4c0fdfd..947ff05 100644
--- a/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl
+++ b/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl
@@ -55,4 +55,6 @@
void performAccessibilityAction(long accessibilityNodeId, int action, in Bundle arguments,
int interactionId, IAccessibilityInteractionConnectionCallback callback, int flags,
int interrogatingPid, long interrogatingTid);
+
+ void clearAccessibilityFocus();
}
diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java
index e6ee6ed..68a3e8a 100644
--- a/core/java/android/view/contentcapture/ContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/ContentCaptureSession.java
@@ -54,7 +54,7 @@
* @hide
*/
// NOTE: not prefixed by STATE_ so it's not printed on getStateAsString()
- public static final int UNKNWON_STATE = 0x0;
+ public static final int UNKNOWN_STATE = 0x0;
/**
* Service's startSession() was called, but server didn't confirm it was created yet.
@@ -160,7 +160,7 @@
@Nullable
protected final String mId;
- private int mState = UNKNWON_STATE;
+ private int mState = UNKNOWN_STATE;
// Lazily created on demand.
private ContentCaptureSessionId mContentCaptureSessionId;
@@ -350,10 +350,8 @@
*
* @param id of the node.
* @param text new text.
- * @param flags currently ignored.
*/
- public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text,
- int flags) {
+ public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text) {
Preconditions.checkNotNull(id);
if (!isContentCaptureEnabled()) return;
@@ -439,7 +437,7 @@
/** @hide */
@NonNull
protected static String getStateAsString(int state) {
- return state + " (" + (state == UNKNWON_STATE ? "UNKNOWN"
+ return state + " (" + (state == UNKNOWN_STATE ? "UNKNOWN"
: DebugUtils.flagsToString(ContentCaptureSession.class, "STATE_", state)) + ")";
}
diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java
index 72aefb2..2eca51f 100644
--- a/core/java/android/view/contentcapture/MainContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java
@@ -115,7 +115,7 @@
@Nullable
private DeathRecipient mDirectServiceVulture;
- private int mState = UNKNWON_STATE;
+ private int mState = UNKNOWN_STATE;
@Nullable
private IBinder mApplicationToken;
@@ -367,7 +367,7 @@
}
private boolean handleHasStarted() {
- return mState != UNKNWON_STATE;
+ return mState != UNKNOWN_STATE;
}
private void handleScheduleFlush(@FlushReason int reason, boolean checkExisting) {
diff --git a/core/java/android/view/contentcapture/UserDataRemovalRequest.java b/core/java/android/view/contentcapture/UserDataRemovalRequest.java
index 8ee63ef..8fedcd5 100644
--- a/core/java/android/view/contentcapture/UserDataRemovalRequest.java
+++ b/core/java/android/view/contentcapture/UserDataRemovalRequest.java
@@ -16,7 +16,6 @@
package android.view.contentcapture;
import android.annotation.NonNull;
-import android.annotation.SystemApi;
import android.app.ActivityThread;
import android.net.Uri;
import android.os.Parcel;
@@ -67,9 +66,7 @@
/**
* Gets the name of the app that's making the request.
- * @hide
*/
- @SystemApi
@NonNull
public String getPackageName() {
return mPackageName;
@@ -77,20 +74,14 @@
/**
* Checks if app is requesting to remove all user data associated with its package.
- *
- * @hide
*/
- @SystemApi
public boolean isForEverything() {
return mForEverything;
}
/**
* Gets the list of {@code Uri}s the apps is requesting to remove.
- *
- * @hide
*/
- @SystemApi
@NonNull
public List<UriRequest> getUriRequests() {
return mUriRequests;
@@ -203,9 +194,7 @@
/**
* Representation of a request to remove data associated with an {@link Uri}.
- * @hide
*/
- @SystemApi
public final class UriRequest {
private final @NonNull Uri mUri;
private final boolean mRecursive;
diff --git a/core/java/android/view/textclassifier/TextClassifier.java b/core/java/android/view/textclassifier/TextClassifier.java
index 5a56136..8a688d8 100644
--- a/core/java/android/view/textclassifier/TextClassifier.java
+++ b/core/java/android/view/textclassifier/TextClassifier.java
@@ -164,9 +164,10 @@
TextClassifier NO_OP = new TextClassifier() {};
/**
- * Used as a boolean value to indicate the intent is generated by TextClassifier.
+ * Extra that is included on activity intents coming from a TextClassifier when
+ * it suggests actions to its caller.
* <p>
- * All {@link TextClassifier} implementations should set this boolean extra to be true in their
+ * All {@link TextClassifier} implementations should make sure this extra exists in their
* generated intents.
*/
String EXTRA_FROM_TEXT_CLASSIFIER = "android.view.textclassifier.extra.FROM_TEXT_CLASSIFIER";
diff --git a/core/java/android/webkit/WebViewZygote.java b/core/java/android/webkit/WebViewZygote.java
index de1f3df..09aa066 100644
--- a/core/java/android/webkit/WebViewZygote.java
+++ b/core/java/android/webkit/WebViewZygote.java
@@ -163,7 +163,7 @@
TextUtils.join(",", Build.SUPPORTED_ABIS),
null, // instructionSet
Process.FIRST_ISOLATED_UID,
- Process.LAST_ISOLATED_UID);
+ Integer.MAX_VALUE); // TODO(b/123615476) deal with user-id ranges properly
ZygoteProcess.waitForConnectionToZygote(sZygote.getPrimarySocketAddress());
if (sPackageOriginalAppInfo.sourceDir.equals(sPackage.applicationInfo.sourceDir)) {
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 780fe8d..2b45c06 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10275,7 +10275,7 @@
final ContentCaptureSession session = getContentCaptureSession();
if (session != null) {
// TODO(b/111276913): pass flags when edited by user / add CTS test
- session.notifyViewTextChanged(getAutofillId(), getText(), /* flags= */ 0);
+ session.notifyViewTextChanged(getAutofillId(), getText());
}
}
}
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 299801a..46f42f7 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -24,6 +24,7 @@
import android.app.prediction.AppTarget;
import android.app.prediction.AppTargetEvent;
import android.app.prediction.AppTargetId;
+import android.content.ClipData;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -41,9 +42,13 @@
import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.database.DataSetObserver;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
import android.graphics.Color;
+import android.graphics.Path;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
+import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
@@ -62,7 +67,9 @@
import android.service.chooser.IChooserTargetResult;
import android.service.chooser.IChooserTargetService;
import android.text.TextUtils;
+import android.util.AttributeSet;
import android.util.Log;
+import android.util.Size;
import android.util.Slog;
import android.view.LayoutInflater;
import android.view.View;
@@ -73,9 +80,11 @@
import android.view.ViewGroup.LayoutParams;
import android.widget.AbsListView;
import android.widget.BaseAdapter;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.Space;
+import android.widget.TextView;
import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
@@ -85,6 +94,7 @@
import com.google.android.collect.Lists;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -262,16 +272,31 @@
}
mReplacementExtras = intent.getBundleExtra(Intent.EXTRA_REPLACEMENT_EXTRAS);
- CharSequence title = intent.getCharSequenceExtra(Intent.EXTRA_TITLE);
+
+ // Do not allow the title to be changed when sharing content
+ CharSequence title = null;
+ if (target != null) {
+ String targetAction = target.getAction();
+ if (!(Intent.ACTION_SEND.equals(targetAction) || Intent.ACTION_SEND_MULTIPLE.equals(
+ targetAction))) {
+ title = intent.getCharSequenceExtra(Intent.EXTRA_TITLE);
+ } else {
+ Log.w(TAG, "Ignoring intent's EXTRA_TITLE, deprecated in P. You may wish to set a"
+ + " preview title by using EXTRA_TITLE property of the wrapped"
+ + " EXTRA_INTENT.");
+ }
+ }
+
int defaultTitleRes = 0;
if (title == null) {
defaultTitleRes = com.android.internal.R.string.chooseActivity;
}
+
Parcelable[] pa = intent.getParcelableArrayExtra(Intent.EXTRA_INITIAL_INTENTS);
Intent[] initialIntents = null;
if (pa != null) {
initialIntents = new Intent[pa.length];
- for (int i=0; i<pa.length; i++) {
+ for (int i = 0; i < pa.length; i++) {
if (!(pa[i] instanceof Intent)) {
Log.w(TAG, "Initial intent #" + i + " not an Intent: " + pa[i]);
finish();
@@ -364,6 +389,68 @@
}
}
+ /**
+ * Override method to add content preview area, specific to the chooser activity.
+ */
+ @Override
+ public void setHeader() {
+ super.setHeader();
+
+ Intent targetIntent = getTargetIntent();
+ if (targetIntent == null) {
+ return;
+ }
+
+ ViewGroup contentPreviewLayout = findViewById(R.id.content_preview);
+ String action = targetIntent.getAction();
+ if (!(Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action))) {
+ contentPreviewLayout.setVisibility(View.GONE);
+ return;
+ }
+
+ showDefaultContentPreview(contentPreviewLayout, targetIntent);
+ }
+
+ private void showDefaultContentPreview(final ViewGroup parentLayout,
+ final Intent targetIntent) {
+ CharSequence sharingText = targetIntent.getCharSequenceExtra(Intent.EXTRA_TEXT);
+ TextView previewTextView = findViewById(R.id.content_preview_text);
+ if (sharingText == null) {
+ previewTextView.setVisibility(View.GONE);
+ } else {
+ previewTextView.setText(sharingText);
+ }
+
+ String previewTitle = targetIntent.getStringExtra(Intent.EXTRA_TITLE);
+ TextView previewTitleView = findViewById(R.id.content_preview_title);
+ if (previewTitle == null) {
+ previewTitleView.setVisibility(View.GONE);
+ } else {
+ previewTitleView.setText(previewTitle);
+ }
+
+ ClipData previewData = targetIntent.getClipData();
+ Uri previewThumbnail = null;
+ if (previewData != null) {
+ if (previewData.getItemCount() > 0) {
+ ClipData.Item previewDataItem = previewData.getItemAt(0);
+ previewThumbnail = previewDataItem.getUri();
+ }
+ }
+
+ ImageView previewThumbnailView = findViewById(R.id.content_preview_thumbnail);
+ if (previewThumbnail == null) {
+ previewThumbnailView.setVisibility(View.GONE);
+ } else {
+ Bitmap bmp = loadThumbnail(previewThumbnail, new Size(200, 200));
+ if (bmp == null) {
+ previewThumbnailView.setVisibility(View.GONE);
+ } else {
+ previewThumbnailView.setImageBitmap(bmp);
+ }
+ }
+ }
+
static SharedPreferences getPinnedSharedPrefs(Context context) {
// The code below is because in the android:ui process, no one can hear you scream.
// The package info in the context isn't initialized in the way it is for normal apps,
@@ -630,15 +717,19 @@
}
}
if (targetsToQuery >= QUERY_TARGET_SERVICE_LIMIT) {
- if (DEBUG) Log.d(TAG, "queryTargets hit query target limit "
- + QUERY_TARGET_SERVICE_LIMIT);
+ if (DEBUG) {
+ Log.d(TAG, "queryTargets hit query target limit "
+ + QUERY_TARGET_SERVICE_LIMIT);
+ }
break;
}
}
if (!mServiceConnections.isEmpty()) {
- if (DEBUG) Log.d(TAG, "queryTargets setting watchdog timer for "
- + WATCHDOG_TIMEOUT_MILLIS + "ms");
+ if (DEBUG) {
+ Log.d(TAG, "queryTargets setting watchdog timer for "
+ + WATCHDOG_TIMEOUT_MILLIS + "ms");
+ }
mChooserHandler.sendEmptyMessageDelayed(CHOOSER_TARGET_SERVICE_WATCHDOG_TIMEOUT,
WATCHDOG_TIMEOUT_MILLIS);
} else {
@@ -969,6 +1060,20 @@
mLaunchedFromUid);
}
+ @VisibleForTesting
+ protected Bitmap loadThumbnail(Uri uri, Size size) {
+ if (uri == null || size == null) {
+ return null;
+ }
+
+ try {
+ return getContentResolver().loadThumbnail(uri, size, null);
+ } catch (IOException | NullPointerException ex) {
+ Log.w(TAG, "Error loading preview thumbnail for uri: " + uri.toString(), ex);
+ }
+ return null;
+ }
+
final class ChooserTargetInfo implements TargetInfo {
private final DisplayResolveInfo mSourceInfo;
private final ResolveInfo mBackupResolveInfo;
@@ -1247,7 +1352,7 @@
UserManager userManager =
(UserManager) getSystemService(Context.USER_SERVICE);
if (ii instanceof LabeledIntent) {
- LabeledIntent li = (LabeledIntent)ii;
+ LabeledIntent li = (LabeledIntent) ii;
ri.resolvePackageName = li.getSourcePackage();
ri.labelRes = li.getLabelResource();
ri.nonLocalizedLabel = li.getNonLocalizedLabel();
@@ -1391,8 +1496,10 @@
}
public void addServiceResults(DisplayResolveInfo origTarget, List<ChooserTarget> targets) {
- if (DEBUG) Log.d(TAG, "addServiceResults " + origTarget + ", " + targets.size()
- + " targets");
+ if (DEBUG) {
+ Log.d(TAG, "addServiceResults " + origTarget + ", " + targets.size()
+ + " targets");
+ }
if (mTargetsNeedPruning && targets.size() > 0) {
// First proper update since we got an onListRebuilt() with (transient) 0 items.
@@ -1492,8 +1599,9 @@
public int getCount() {
return (int) (
getCallerTargetRowCount()
- + getServiceTargetRowCount()
- + Math.ceil((float) mChooserListAdapter.getStandardTargetCount() / mColumnCount)
+ + getServiceTargetRowCount()
+ + Math.ceil(
+ (float) mChooserListAdapter.getStandardTargetCount() / mColumnCount)
);
}
@@ -1860,7 +1968,7 @@
final int chooserTargetRows = mChooserRowAdapter.getServiceTargetRowCount();
int offset = 0;
- for (int i = 0; i < chooserTargetRows; i++) {
+ for (int i = 0; i < chooserTargetRows; i++) {
final int pos = mChooserRowAdapter.getCallerTargetRowCount() + i;
final int vt = mChooserRowAdapter.getItemViewType(pos);
if (vt != mCachedViewType) {
@@ -1882,4 +1990,65 @@
mResolverDrawerLayout.setCollapsibleHeightReserved(offset);
}
}
+
+
+ /**
+ * Used internally to round image corners while obeying view padding.
+ */
+ public static class RoundedRectImageView extends ImageView {
+ private int mRadius = 0;
+ private Path mPath = new Path();
+
+ public RoundedRectImageView(Context context) {
+ super(context);
+ }
+
+ public RoundedRectImageView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public RoundedRectImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public RoundedRectImageView(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ mRadius = context.getResources().getDimensionPixelSize(R.dimen.chooser_corner_radius);
+ }
+
+ private void updatePath(int width, int height) {
+ mPath.reset();
+
+ int imageWidth = width - getPaddingLeft() - getPaddingRight();
+ int imageHeight = height - getPaddingTop() - getPaddingBottom();
+ mPath.addRoundRect(getPaddingLeft(), getPaddingTop(), imageWidth, imageHeight, mRadius,
+ mRadius, Path.Direction.CW);
+ }
+
+ /**
+ * Sets the corner radius on all corners
+ *
+ * param radius 0 for no radius, > 0 for a visible corner radius
+ */
+ public void setRadius(int radius) {
+ mRadius = radius;
+ updatePath(getWidth(), getHeight());
+ }
+
+ @Override
+ protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+ super.onSizeChanged(width, height, oldWidth, oldHeight);
+ updatePath(width, height);
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ if (mRadius != 0) {
+ canvas.clipPath(mPath);
+ }
+
+ super.onDraw(canvas);
+ }
+ }
}
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index a50c736..0919911 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1044,7 +1044,10 @@
}
}
- public void setTitleAndIcon() {
+ /**
+ * Configure the area above the app selection list (title, content preview, etc).
+ */
+ public void setHeader() {
if (mAdapter.getCount() == 0 && mAdapter.mPlaceholderCount == 0) {
final TextView titleView = findViewById(R.id.title);
if (titleView != null) {
@@ -1062,23 +1065,6 @@
titleView.setText(title);
}
setTitle(title);
-
- // Try to initialize the title icon if we have a view for it and a title to match
- final ImageView titleIcon = findViewById(R.id.title_icon);
- if (titleIcon != null) {
- ApplicationInfo ai = null;
- try {
- if (!TextUtils.isEmpty(mReferrerPackage)) {
- ai = mPm.getApplicationInfo(mReferrerPackage, 0);
- }
- } catch (NameNotFoundException e) {
- Log.e(TAG, "Could not find referrer package " + mReferrerPackage);
- }
-
- if (ai != null) {
- titleIcon.setImageDrawable(ai.loadIcon(mPm));
- }
- }
}
final ImageView iconView = findViewById(R.id.icon);
@@ -1692,7 +1678,7 @@
mPostListReadyRunnable = new Runnable() {
@Override
public void run() {
- setTitleAndIcon();
+ setHeader();
resetButtonBar();
onListRebuilt();
mPostListReadyRunnable = null;
diff --git a/core/java/com/android/internal/os/AppZygoteInit.java b/core/java/com/android/internal/os/AppZygoteInit.java
index afe6dad..6ba584d 100644
--- a/core/java/com/android/internal/os/AppZygoteInit.java
+++ b/core/java/com/android/internal/os/AppZygoteInit.java
@@ -73,6 +73,9 @@
Log.i(TAG, "Beginning application preload for " + appInfo.packageName);
LoadedApk loadedApk = new LoadedApk(null, appInfo, null, null, false, true, false);
ClassLoader loader = loadedApk.getClassLoader();
+
+ Zygote.allowAppFilesAcrossFork(appInfo);
+
Class<?> cl;
Method m;
try {
diff --git a/core/java/com/android/internal/os/ChildZygoteInit.java b/core/java/com/android/internal/os/ChildZygoteInit.java
index a052a3b..cc74863 100644
--- a/core/java/com/android/internal/os/ChildZygoteInit.java
+++ b/core/java/com/android/internal/os/ChildZygoteInit.java
@@ -98,9 +98,11 @@
throw new RuntimeException("Passed in UID range is invalid, min > max.");
}
- // Verify the UIDs are in the isolated UID range, as that's the only thing that we should
- // be forking right now
- if (!Process.isIsolated(uidGidMin) || !Process.isIsolated(uidGidMax)) {
+ // Verify the UIDs at least do not include system UIDs; we can't easily verify there
+ // are just isolated UIDs in the range, because for the webview zygote, there is no
+ // single range that captures all possible isolated UIDs.
+ // TODO(b/123615476) narrow this down
+ if (uidGidMin < Process.FIRST_ISOLATED_UID) {
throw new RuntimeException("Passed in UID range does not map to isolated processes.");
}
diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
index b529bbe..f4902d4 100644
--- a/core/java/com/android/internal/os/RoSystemProperties.java
+++ b/core/java/com/android/internal/os/RoSystemProperties.java
@@ -17,6 +17,7 @@
package com.android.internal.os;
import android.os.SystemProperties;
+import android.sysprop.CryptoProperties;
/**
* This is a cache of various ro.* properties so that they can be read just once
@@ -61,7 +62,7 @@
// ------ ro.crypto.* -------- //
public static final String CRYPTO_STATE = SystemProperties.get("ro.crypto.state");
- public static final String CRYPTO_TYPE = SystemProperties.get("ro.crypto.type");
+ public static final String CRYPTO_TYPE = CryptoProperties.type().orElse("");
// These are pseudo-properties
public static final boolean CRYPTO_ENCRYPTABLE =
!CRYPTO_STATE.isEmpty() && !"unsupported".equals(CRYPTO_STATE);
diff --git a/core/java/com/android/internal/os/WebViewZygoteInit.java b/core/java/com/android/internal/os/WebViewZygoteInit.java
index c8d30b2..9ed7384 100644
--- a/core/java/com/android/internal/os/WebViewZygoteInit.java
+++ b/core/java/com/android/internal/os/WebViewZygoteInit.java
@@ -78,18 +78,7 @@
ClassLoader loader = loadedApk.getClassLoader();
doPreload(loader, WebViewFactory.getWebViewLibrary(appInfo));
- // Add the APK to the Zygote's list of allowed files for children.
- Zygote.nativeAllowFileAcrossFork(appInfo.sourceDir);
- if (appInfo.splitSourceDirs != null) {
- for (String path : appInfo.splitSourceDirs) {
- Zygote.nativeAllowFileAcrossFork(path);
- }
- }
- if (appInfo.sharedLibraryFiles != null) {
- for (String path : appInfo.sharedLibraryFiles) {
- Zygote.nativeAllowFileAcrossFork(path);
- }
- }
+ Zygote.allowAppFilesAcrossFork(appInfo);
Log.i(TAG, "Application preload done");
}
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java
index bc7cf87..474d4d7 100644
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -20,6 +20,7 @@
import static com.android.internal.os.ZygoteConnectionConstants.MAX_ZYGOTE_ARGC;
+import android.content.pm.ApplicationInfo;
import android.net.Credentials;
import android.net.LocalServerSocket;
import android.net.LocalSocket;
@@ -370,6 +371,27 @@
protected static native void nativeAllowFileAcrossFork(String path);
/**
+ * Lets children of the zygote inherit open file descriptors that belong to the
+ * ApplicationInfo that is passed in.
+ *
+ * @param appInfo ApplicationInfo of the application
+ */
+ protected static void allowAppFilesAcrossFork(ApplicationInfo appInfo) {
+ Zygote.nativeAllowFileAcrossFork(appInfo.sourceDir);
+ if (appInfo.splitSourceDirs != null) {
+ for (String path : appInfo.splitSourceDirs) {
+ Zygote.nativeAllowFileAcrossFork(path);
+ }
+ }
+ // As well as its shared libs
+ if (appInfo.sharedLibraryFiles != null) {
+ for (String path : appInfo.sharedLibraryFiles) {
+ Zygote.nativeAllowFileAcrossFork(path);
+ }
+ }
+ }
+
+ /**
* Installs a seccomp filter that limits setresuid()/setresgid() to the passed-in range
* @param uidGidMin The smallest allowed uid/gid
* @param uidGidMax The largest allowed uid/gid
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index d8ee643..69efb2b 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -41,7 +41,6 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
-import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.graphics.Color;
@@ -1885,7 +1884,8 @@
// If we have a session send it the volume command, otherwise
// use the suggested stream.
if (mMediaController != null) {
- mMediaController.dispatchVolumeButtonEventAsSystemService(event);
+ getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(
+ mMediaController.getSessionToken(), event);
} else {
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(event,
mVolumeControlStreamType);
@@ -1906,7 +1906,8 @@
case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
if (mMediaController != null) {
- if (mMediaController.dispatchMediaButtonEventAsSystemService(event)) {
+ if (getMediaSessionManager().dispatchMediaKeyEventAsSystemService(
+ mMediaController.getSessionToken(), event)) {
return true;
}
}
@@ -1977,7 +1978,8 @@
// If we have a session send it the volume command, otherwise
// use the suggested stream.
if (mMediaController != null) {
- mMediaController.dispatchVolumeButtonEventAsSystemService(event);
+ getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(
+ mMediaController.getSessionToken(), event);
} else {
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(
event, mVolumeControlStreamType);
@@ -2007,7 +2009,8 @@
case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
if (mMediaController != null) {
- if (mMediaController.dispatchMediaButtonEventAsSystemService(event)) {
+ if (getMediaSessionManager().dispatchMediaKeyEventAsSystemService(
+ mMediaController.getSessionToken(), event)) {
return true;
}
}
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 9afd5d0..51a3b48 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -301,6 +301,7 @@
"libhwui",
"libdl",
"libstatslog",
+ "server_configurable_flags",
],
generated_sources: ["android_util_StatsLog.cpp"],
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index c90071a..49598bb 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -31,6 +31,7 @@
#include <binder/Parcel.h>
#include <utils/threads.h>
#include <cutils/properties.h>
+#include <server_configurable_flags/get_flags.h>
#include <SkGraphics.h>
@@ -774,7 +775,17 @@
addOption("-XX:LowMemoryMode");
}
- parseRuntimeOption("dalvik.vm.gctype", gctypeOptsBuf, "-Xgc:");
+ std::string gc_type_override =
+ server_configurable_flags::GetServerConfigurableFlag("runtime_native", "gctype", "");
+ std::string gc_type_override_temp;
+ if (gc_type_override.empty()) {
+ parseRuntimeOption("dalvik.vm.gctype", gctypeOptsBuf, "-Xgc:");
+ } else {
+ // Copy the string so it doesn't go out of scope since addOption does not make a copy.
+ gc_type_override_temp = "-Xgc:" + gc_type_override;
+ addOption(gc_type_override_temp.c_str());
+ }
+
parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");
/*
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index c74797b..d215f96 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -986,6 +986,19 @@
return static_cast<jint>(dst);
}
+static jlong Bitmap_getColor(JNIEnv* env, jobject, jlong bitmapHandle,
+ jint x, jint y) {
+ SkBitmap bitmap;
+ reinterpret_cast<BitmapWrapper*>(bitmapHandle)->getSkBitmap(&bitmap);
+
+ SkImageInfo dstInfo = SkImageInfo::Make(
+ 1, 1, kRGBA_F16_SkColorType, kUnpremul_SkAlphaType, bitmap.refColorSpace());
+
+ uint64_t dst;
+ bitmap.readPixels(dstInfo, &dst, dstInfo.minRowBytes(), x, y);
+ return static_cast<jlong>(dst);
+}
+
static void Bitmap_getPixels(JNIEnv* env, jobject, jlong bitmapHandle,
jintArray pixelArray, jint offset, jint stride,
jint x, jint y, jint width, jint height) {
@@ -1231,6 +1244,7 @@
(void*)Bitmap_extractAlpha },
{ "nativeGenerationId", "(J)I", (void*)Bitmap_getGenerationId },
{ "nativeGetPixel", "(JII)I", (void*)Bitmap_getPixel },
+ { "nativeGetColor", "(JII)J", (void*)Bitmap_getColor },
{ "nativeGetPixels", "(J[IIIIIII)V", (void*)Bitmap_getPixels },
{ "nativeSetPixel", "(JIII)V", (void*)Bitmap_setPixel },
{ "nativeSetPixels", "(J[IIIIIII)V", (void*)Bitmap_setPixels },
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index fc9ea76..9c48c33 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -222,6 +222,18 @@
get_canvas(canvasHandle)->drawColor(color, mode);
}
+static void drawColorLong(JNIEnv* env, jobject, jlong canvasHandle, jlong colorSpaceHandle,
+ jlong colorLong, jint modeHandle) {
+ SkColor4f color = GraphicsJNI::convertColorLong(colorLong);
+ sk_sp<SkColorSpace> cs = GraphicsJNI::getNativeColorSpace(colorSpaceHandle);
+ SkPaint p;
+ p.setColor4f(color, cs.get());
+
+ SkBlendMode mode = static_cast<SkBlendMode>(modeHandle);
+ p.setBlendMode(mode);
+ get_canvas(canvasHandle)->drawPaint(p);
+}
+
static void drawPaint(JNIEnv* env, jobject, jlong canvasHandle, jlong paintHandle) {
Paint* paint = reinterpret_cast<Paint*>(paintHandle);
get_canvas(canvasHandle)->drawPaint(*paint);
@@ -677,6 +689,7 @@
// If called from DisplayListCanvas they are @FastNative
static const JNINativeMethod gDrawMethods[] = {
{"nDrawColor","(JII)V", (void*) CanvasJNI::drawColor},
+ {"nDrawColor","(JJJI)V", (void*) CanvasJNI::drawColorLong},
{"nDrawPaint","(JJ)V", (void*) CanvasJNI::drawPaint},
{"nDrawPoint", "(JFFJ)V", (void*) CanvasJNI::drawPoint},
{"nDrawPoints", "(J[FIIJ)V", (void*) CanvasJNI::drawPoints},
diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp
index c0e45b1..67a7441 100644
--- a/core/jni/android_hardware_input_InputWindowHandle.cpp
+++ b/core/jni/android_hardware_input_InputWindowHandle.cpp
@@ -55,6 +55,7 @@
jfieldID ownerUid;
jfieldID inputFeatures;
jfieldID displayId;
+ jfieldID portalToDisplayId;
} gInputWindowHandleClassInfo;
static Mutex gHandleMutex;
@@ -154,6 +155,8 @@
gInputWindowHandleClassInfo.inputFeatures);
mInfo.displayId = env->GetIntField(obj,
gInputWindowHandleClassInfo.displayId);
+ mInfo.portalToDisplayId = env->GetIntField(obj,
+ gInputWindowHandleClassInfo.portalToDisplayId);
jobject inputApplicationHandleObj = env->GetObjectField(obj,
gInputWindowHandleClassInfo.inputApplicationHandle);
@@ -307,6 +310,9 @@
GET_FIELD_ID(gInputWindowHandleClassInfo.displayId, clazz,
"displayId", "I");
+
+ GET_FIELD_ID(gInputWindowHandleClassInfo.portalToDisplayId, clazz,
+ "portalToDisplayId", "I");
return 0;
}
diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp
index e64d2af..ee11b61 100644
--- a/core/jni/android_os_VintfObject.cpp
+++ b/core/jni/android_os_VintfObject.cpp
@@ -96,7 +96,7 @@
return toJavaStringArray(env, cStrings);
}
-static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::CheckFlags::Type checks) {
+static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) {
std::vector<std::string> cPackageInfo;
if (packageInfo) {
size_t count = env->GetArrayLength(packageInfo);
@@ -109,18 +109,19 @@
}
}
std::string error;
- int32_t status = VintfObject::CheckCompatibility(cPackageInfo, &error, checks);
+ int32_t status = VintfObject::CheckCompatibility(cPackageInfo, &error);
if (status)
LOG(WARNING) << "VintfObject.verify() returns " << status << ": " << error;
return status;
}
-static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) {
- return verify(env, packageInfo, ::android::vintf::CheckFlags::ENABLE_ALL_CHECKS);
-}
-
static jint android_os_VintfObject_verifyWithoutAvb(JNIEnv* env, jclass) {
- return verify(env, nullptr, ::android::vintf::CheckFlags::DISABLE_AVB_CHECK);
+ std::string error;
+ int32_t status = VintfObject::CheckCompatibility({}, &error,
+ ::android::vintf::CheckFlags::DISABLE_AVB_CHECK);
+ if (status)
+ LOG(WARNING) << "VintfObject.verifyWithoutAvb() returns " << status << ": " << error;
+ return status;
}
static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) {
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
index 94a6734..f2f7304 100644
--- a/core/proto/android/app/settings_enums.proto
+++ b/core/proto/android/app/settings_enums.proto
@@ -2189,4 +2189,9 @@
// OPEN: Settings > System > Aware > Disable > Dialog
DIALOG_AWARE_DISABLE = 1633;
+
+ // OPEN: Settings > Settings > Network & internet > Click Mobile network to land on page with
+ // details for a SIM/eSIM mobile network > Click edit icon to bring up a rename dialog.
+ // OS: Q
+ MOBILE_NETWORK_RENAME_DIALOG = 1642;
}
diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto
index e0eaf14..a160451 100644
--- a/core/proto/android/providers/settings/global.proto
+++ b/core/proto/android/providers/settings/global.proto
@@ -230,8 +230,6 @@
}
optional Connectivity connectivity = 32;
- reserved 145; // Used to be ContentCapture, which moved to DeviceConfig
-
optional SettingProto contact_metadata_sync_enabled = 33 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto contacts_database_wal_enabled = 34 [ (android.privacy).dest = DEST_AUTOMATIC ];
@@ -999,7 +997,7 @@
optional SettingProto watchdog_poor_network_test_enabled = 22 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto suspend_optimizations_enabled = 23 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto verbose_logging_enabled = 24 [ (android.privacy).dest = DEST_AUTOMATIC ];
- optional SettingProto connected_mac_randomization_enabled = 25 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ reserved 25; // connected_mac_randomization_enabled
optional SettingProto max_dhcp_retry_count = 26 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto mobile_data_transition_wakelock_timeout_ms = 27 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Controls whether WiFi configurations created by a Device Owner app should
@@ -1039,5 +1037,5 @@
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
- // Next tag = 149;
+ // Next tag = 145 then 149; // (145 was removed)
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1a402c0..7a261a9 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -4751,7 +4751,7 @@
<receiver android:name="com.android.server.updates.ConversationActionsInstallReceiver"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
- <action android:name="android.intent.action.ACTION_UPDATE_CONVERSATION_ACTIONS" />
+ <action android:name="android.intent.action.UPDATE_CONVERSATION_ACTIONS" />
<data android:scheme="content" android:host="*" android:mimeType="*/*" />
</intent-filter>
</receiver>
diff --git a/core/res/res/drawable/ic_bt_cellphone.xml b/core/res/res/drawable/ic_phone.xml
similarity index 100%
rename from core/res/res/drawable/ic_bt_cellphone.xml
rename to core/res/res/drawable/ic_phone.xml
diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml
index ded2b35..c42f43a 100644
--- a/core/res/res/layout/chooser_grid.xml
+++ b/core/res/res/layout/chooser_grid.xml
@@ -29,8 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alwaysShow="true"
- android:elevation="8dp"
- android:paddingStart="16dp"
android:background="?attr/colorBackgroundFloating" >
<TextView android:id="@+id/profile_button"
android:layout_width="wrap_content"
@@ -46,25 +44,66 @@
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:singleLine="true"/>
- <ImageView android:id="@+id/title_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_marginEnd="16dp"
- android:visibility="gone"
- android:scaleType="fitCenter"
- android:layout_below="@id/profile_button"
- android:layout_alignParentLeft="true"/>
+
<TextView android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textAppearance="?attr/textAppearanceMedium"
- android:textSize="14sp"
- android:gravity="start|center_vertical"
+ android:textSize="20sp"
+ android:gravity="center"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="12dp"
- android:paddingBottom="12dp"
+ android:paddingBottom="6dp"
android:layout_below="@id/profile_button"
- android:layout_toRightOf="@id/title_icon"/>
+ android:layout_centerHorizontal="true"/>
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/content_preview"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?attr/colorBackgroundFloating">
+
+ <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView"
+ android:id="@+id/content_preview_thumbnail"
+ android:layout_alignParentTop="true"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:gravity="center"
+ android:adjustViewBounds="true"
+ android:maxWidth="90dp"
+ android:maxHeight="90dp"
+ android:scaleType="fitCenter"
+ android:padding="5dp"/>
+
+ <TextView
+ android:id="@+id/content_preview_title"
+ android:layout_alignParentTop="true"
+ android:layout_toEndOf="@id/content_preview_thumbnail"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="start|top"
+ android:textAppearance="?attr/textAppearanceMedium"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:paddingStart="15dp"
+ android:paddingEnd="15dp"
+ android:paddingTop="10dp" />
+
+ <TextView
+ android:id="@+id/content_preview_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/content_preview_title"
+ android:layout_toEndOf="@id/content_preview_thumbnail"
+ android:gravity="start|top"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:paddingStart="15dp"
+ android:paddingEnd="15dp"
+ android:paddingTop="10dp"
+ android:paddingBottom="5dp"/>
</RelativeLayout>
<ListView
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 67b0652..eb214ba 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -712,6 +712,9 @@
<!-- Indicates that connected MAC randomization is supported on this device -->
<bool translatable="false" name="config_wifi_connected_mac_randomization_supported">false</bool>
+ <!-- Indicates that wifi link probing is supported on this device -->
+ <bool translatable="false" name="config_wifi_link_probing_supported">false</bool>
+
<!-- Flag indicating whether we should enable the automatic brightness.
Software implementation will be used if config_hardware_auto_brightness_available is not set -->
<bool name="config_automatic_brightness_available">false</bool>
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index c870683..ef3834c 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -714,4 +714,7 @@
<dimen name="harmful_app_message_padding_bottom">24dp</dimen>
<!-- Line spacing modifier for the message field of the harmful app dialog -->
<item name="harmful_app_message_line_spacing_modifier" type="dimen">1.22</item>
+
+ <!-- chooser corner radius -->
+ <dimen name="chooser_corner_radius">4dp</dimen>
</resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index a761baf..6adb4a7 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3082,7 +3082,7 @@
<!-- Label for a link to a intent resolver dialog when selecting an editor application -->
<string name="whichEditApplicationLabel">Edit</string>
<!-- Title of intent resolver dialog when selecting a sharing application to run. -->
- <string name="whichSendApplication">Share with</string>
+ <string name="whichSendApplication">Share</string>
<!-- Title of intent resolver dialog when selecting a sharing application to run
and a previously used application is known. -->
<string name="whichSendApplicationNamed">Share with %1$s</string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 09d6c26..5400d94 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -50,6 +50,10 @@
<java-symbol type="id" name="characterPicker" />
<java-symbol type="id" name="clearDefaultHint" />
<java-symbol type="id" name="contentPanel" />
+ <java-symbol type="id" name="content_preview" />
+ <java-symbol type="id" name="content_preview_thumbnail" />
+ <java-symbol type="id" name="content_preview_text" />
+ <java-symbol type="id" name="content_preview_title" />
<java-symbol type="id" name="current_scene" />
<java-symbol type="id" name="scene_layoutid_cache" />
<java-symbol type="id" name="customPanel" />
@@ -1424,7 +1428,7 @@
<java-symbol type="drawable" name="ic_signal_cellular_alt_24px" />
<java-symbol type="drawable" name="btn_borderless_rect" />
- <java-symbol type="drawable" name="ic_bt_cellphone" />
+ <java-symbol type="drawable" name="ic_phone" />
<java-symbol type="drawable" name="ic_bt_headphones_a2dp" />
<java-symbol type="drawable" name="ic_bt_headset_hfp" />
<java-symbol type="drawable" name="ic_bt_hearing_aid" />
@@ -1906,6 +1910,7 @@
<java-symbol type="bool" name="config_wifi_convert_apband_5ghz_to_any" />
<java-symbol type="bool" name="config_wifi_local_only_hotspot_5ghz" />
<java-symbol type="bool" name="config_wifi_connected_mac_randomization_supported" />
+ <java-symbol type="bool" name="config_wifi_link_probing_supported" />
<java-symbol type="bool" name="config_wifi_fast_bss_transition_enabled" />
<java-symbol type="bool" name="config_wimaxEnabled" />
<java-symbol type="bool" name="show_ongoing_ime_switcher" />
@@ -2703,9 +2708,9 @@
<java-symbol type="layout" name="date_picker_month_item_material" />
<java-symbol type="id" name="month_view" />
<java-symbol type="integer" name="config_zen_repeat_callers_threshold" />
+ <java-symbol type="dimen" name="chooser_corner_radius" />
<java-symbol type="layout" name="chooser_grid" />
<java-symbol type="layout" name="resolve_grid_item" />
- <java-symbol type="id" name="title_icon" />
<java-symbol type="id" name="day_picker_view_pager" />
<java-symbol type="layout" name="day_picker_content_material" />
<java-symbol type="drawable" name="scroll_indicator_material" />
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk
index 9d04e63..6a81050 100644
--- a/core/tests/coretests/Android.mk
+++ b/core/tests/coretests/Android.mk
@@ -37,7 +37,9 @@
mockwebserver \
guava \
androidx.test.runner \
+ androidx.test.ext.junit \
androidx.test.rules \
+ androidx.test.espresso.core \
mockito-target-minus-junit4 \
espresso-core \
ub-uiautomator \
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index 86818c6..268bb81 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -62,6 +62,7 @@
<uses-permission android:name="android.permission.READ_LOGS"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -1144,6 +1145,14 @@
</intent-filter>
</activity>
+ <activity android:name="android.view.accessibility.AccessibilityTestActivity"
+ android:label="AccessibilityTestActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
<!-- Activity-level metadata -->
<meta-data android:name="com.android.frameworks.coretests.isApp" android:value="true" />
<meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />
diff --git a/core/tests/coretests/res/layout/accessibility_test.xml b/core/tests/coretests/res/layout/accessibility_test.xml
new file mode 100644
index 0000000..1bdd21b
--- /dev/null
+++ b/core/tests/coretests/res/layout/accessibility_test.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <Button android:id="@+id/appNameBtn"
+ android:text="@string/app_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="60dp"
+ android:bufferType="normal">
+ </Button>
+</LinearLayout>
diff --git a/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java b/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java
index 365e97d..c8150b1 100644
--- a/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java
+++ b/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java
@@ -16,6 +16,7 @@
package android.content.pm;
+import android.content.Intent;
import android.content.res.Resources;
import android.os.FileUtils;
import android.os.Parcel;
@@ -189,6 +190,36 @@
assertEquals(0, cache.getPersistentServicesSize(u1));
}
+ /**
+ * Check that an optimization to skip a call to PackageManager handles an invalidated cache.
+ *
+ * We added an optimization in generateServicesMap to only query PackageManager for packages
+ * that have been changed, because if a package is unchanged, we have already cached the
+ * services info for it, so we can save a query to PackageManager (and save some memory).
+ * However, if invalidateCache was called, we cannot optimize, and must do a full query.
+ * The initial optimization was buggy because it failed to check for an invalidated cache, and
+ * only scanned the changed packages, given in the ACTION_PACKAGE_CHANGED intent (b/122912184).
+ */
+ public void testParseServiceInfoOptimizationHandlesInvalidatedCache() {
+ TestServicesCache cache = new TestServicesCache();
+ cache.addServiceForQuerying(U0, r1, newServiceInfo(t1, UID1));
+ cache.addServiceForQuerying(U0, r2, newServiceInfo(t2, UID2));
+ assertEquals(2, cache.getAllServicesSize(U0));
+
+ // simulate the client of the cache invalidating it
+ cache.invalidateCache(U0);
+
+ // there should be 0 services (userServices.services == null ) at this point, but we don't
+ // call getAllServicesSize since that would force a full scan of packages,
+ // instead we trigger a package change in a package that is in the list of services
+ Intent intent = new Intent(Intent.ACTION_PACKAGE_CHANGED);
+ intent.putExtra(Intent.EXTRA_UID, UID1);
+ cache.handlePackageEvent(intent, U0);
+
+ // check that the optimization does a full query and caches both services
+ assertEquals(2, cache.getAllServicesSize(U0));
+ }
+
private static RegisteredServicesCache.ServiceInfo<TestServiceType> newServiceInfo(
TestServiceType type, int uid) {
final ComponentInfo info = new ComponentInfo();
@@ -266,6 +297,11 @@
map = new HashMap<>();
mServices.put(userId, map);
}
+ // in actual cases, resolveInfo should always have a serviceInfo, since we specifically
+ // query for intent services
+ resolveInfo.serviceInfo = new android.content.pm.ServiceInfo();
+ resolveInfo.serviceInfo.applicationInfo =
+ new ApplicationInfo(serviceInfo.componentInfo.applicationInfo);
map.put(resolveInfo, serviceInfo);
}
@@ -304,6 +340,11 @@
public void onUserRemoved(int userId) {
super.onUserRemoved(userId);
}
+
+ @Override
+ public void handlePackageEvent(Intent intent, int userId) {
+ super.handlePackageEvent(intent, userId);
+ }
}
static class TestSerializer implements XmlSerializerAndParser<TestServiceType> {
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 0b5bde7..f38abd7 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -509,7 +509,6 @@
Settings.Global.WIFI_ALWAYS_REQUESTED,
Settings.Global.WIFI_BADGING_THRESHOLDS,
Settings.Global.WIFI_BOUNCE_DELAY_OVERRIDE_MS,
- Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED,
Settings.Global.WIFI_COUNTRY_CODE,
Settings.Global.WIFI_DATA_STALL_MIN_TX_BAD,
Settings.Global.WIFI_DATA_STALL_MIN_TX_SUCCESS_WITHOUT_RX,
@@ -526,6 +525,7 @@
Settings.Global.WIFI_LINK_SPEED_METRICS_ENABLED,
Settings.Global.WIFI_PNO_FREQUENCY_CULLING_ENABLED,
Settings.Global.WIFI_PNO_RECENCY_SORTING_ENABLED,
+ Settings.Global.WIFI_LINK_PROBING_ENABLED,
Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT,
Settings.Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS,
Settings.Global.WIFI_NETWORK_SHOW_RSSI,
diff --git a/core/tests/coretests/src/android/view/AccessibilityInteractionControllerTest.java b/core/tests/coretests/src/android/view/AccessibilityInteractionControllerTest.java
new file mode 100644
index 0000000..d0719cb
--- /dev/null
+++ b/core/tests/coretests/src/android/view/AccessibilityInteractionControllerTest.java
@@ -0,0 +1,220 @@
+/*
+ * 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.view;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.app.Service;
+import android.app.UiAutomation;
+import android.graphics.Rect;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityTestActivity;
+import android.view.accessibility.AccessibilityWindowInfo;
+
+import com.android.compatibility.common.util.TestUtils;
+import com.android.frameworks.coretests.R;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityInteractionControllerTest {
+ static final long TIMEOUT_DEFAULT = 10000; // 10 seconds
+
+ private static Instrumentation sInstrumentation;
+ private static UiAutomation sUiAutomation;
+
+ @Rule
+ public ActivityTestRule<AccessibilityTestActivity> mActivityRule = new ActivityTestRule<>(
+ AccessibilityTestActivity.class, false, false);
+
+ private AccessibilityInteractionController mAccessibilityInteractionController;
+ private ViewRootImpl mViewRootImpl;
+ private View mButton;
+
+ @BeforeClass
+ public static void oneTimeSetup() {
+ sInstrumentation = InstrumentationRegistry.getInstrumentation();
+ sUiAutomation = sInstrumentation.getUiAutomation();
+ }
+
+ @AfterClass
+ public static void postTestTearDown() {
+ sUiAutomation.destroy();
+ }
+
+ @Before
+ public void setUp() throws Throwable {
+ launchActivity();
+ enableTouchExploration(true);
+ mActivityRule.runOnUiThread(() -> {
+ mViewRootImpl = mActivityRule.getActivity().getWindow().getDecorView()
+ .getViewRootImpl();
+ mButton = mActivityRule.getActivity().findViewById(R.id.appNameBtn);
+ });
+ mAccessibilityInteractionController =
+ mViewRootImpl.getAccessibilityInteractionController();
+ }
+
+ @After
+ public void tearDown() {
+ enableTouchExploration(false);
+ }
+
+ @Test
+ public void clearAccessibilityFocus_shouldClearFocus() throws Exception {
+ performAccessibilityFocus("com.android.frameworks.coretests:id/appNameBtn");
+ assertTrue("Button should have a11y focus",
+ mButton.isAccessibilityFocused());
+ mAccessibilityInteractionController.clearAccessibilityFocusClientThread();
+ sInstrumentation.waitForIdleSync();
+ assertFalse("Button should not have a11y focus",
+ mButton.isAccessibilityFocused());
+ }
+
+ @Test
+ public void clearAccessibilityFocus_uiThread_shouldClearFocus() throws Exception {
+ performAccessibilityFocus("com.android.frameworks.coretests:id/appNameBtn");
+ assertTrue("Button should have a11y focus",
+ mButton.isAccessibilityFocused());
+ sInstrumentation.runOnMainSync(() -> {
+ mAccessibilityInteractionController.clearAccessibilityFocusClientThread();
+ });
+ assertFalse("Button should not have a11y focus",
+ mButton.isAccessibilityFocused());
+ }
+
+ private void launchActivity() {
+ final Object waitObject = new Object();
+ final int[] location = new int[2];
+ final StringBuilder activityPackage = new StringBuilder();
+ final Rect bounds = new Rect();
+ final StringBuilder activityTitle = new StringBuilder();
+ try {
+ final long executionStartTimeMillis = SystemClock.uptimeMillis();
+ sUiAutomation.setOnAccessibilityEventListener((event) -> {
+ if (event.getEventTime() < executionStartTimeMillis) {
+ return;
+ }
+ synchronized (waitObject) {
+ waitObject.notifyAll();
+ }
+ });
+ enableRetrieveAccessibilityWindows();
+
+ final Activity activity = mActivityRule.launchActivity(null);
+ sInstrumentation.runOnMainSync(() -> {
+ activity.getWindow().getDecorView().getLocationOnScreen(location);
+ activityPackage.append(activity.getPackageName());
+ activityTitle.append(activity.getTitle());
+ });
+ sInstrumentation.waitForIdleSync();
+
+ TestUtils.waitOn(waitObject, () -> {
+ final AccessibilityWindowInfo window = findWindowByTitle(activityTitle);
+ if (window == null) return false;
+ window.getBoundsInScreen(bounds);
+ activity.getWindow().getDecorView().getLocationOnScreen(location);
+ if (bounds.isEmpty()) {
+ return false;
+ }
+ return (!bounds.isEmpty())
+ && (bounds.left == location[0]) && (bounds.top == location[1]);
+ }, TIMEOUT_DEFAULT, "Launch Activity");
+ } finally {
+ sUiAutomation.setOnAccessibilityEventListener(null);
+ }
+ }
+
+ private void enableRetrieveAccessibilityWindows() {
+ AccessibilityServiceInfo info = sUiAutomation.getServiceInfo();
+ info.flags |= AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS;
+ sUiAutomation.setServiceInfo(info);
+ }
+
+ private void enableTouchExploration(boolean enabled) {
+ final Object waitObject = new Object();
+ final AccessibilityManager accessibilityManager =
+ (AccessibilityManager) sInstrumentation.getContext().getSystemService(
+ Service.ACCESSIBILITY_SERVICE);
+ final AccessibilityManager.TouchExplorationStateChangeListener listener = status -> {
+ synchronized (waitObject) {
+ waitObject.notifyAll();
+ }
+ };
+ try {
+ accessibilityManager.addTouchExplorationStateChangeListener(listener);
+ final AccessibilityServiceInfo info = sUiAutomation.getServiceInfo();
+ if (enabled) {
+ info.flags |= AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE;
+ } else {
+ info.flags &= ~AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE;
+ }
+ sUiAutomation.setServiceInfo(info);
+ TestUtils.waitOn(waitObject,
+ () -> accessibilityManager.isTouchExplorationEnabled() == enabled,
+ TIMEOUT_DEFAULT,
+ (enabled ? "Enable" : "Disable") + "touch exploration");
+ } finally {
+ accessibilityManager.removeTouchExplorationStateChangeListener(listener);
+ }
+ }
+
+ private void performAccessibilityFocus(String viewId) throws TimeoutException {
+ final AccessibilityNodeInfo node = sUiAutomation.getRootInActiveWindow()
+ .findAccessibilityNodeInfosByViewId(viewId).get(0);
+ // Perform an action and wait for an event
+ sUiAutomation.executeAndWaitForEvent(
+ () -> node.performAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS),
+ event -> event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ TIMEOUT_DEFAULT);
+ node.refresh();
+ }
+
+ private AccessibilityWindowInfo findWindowByTitle(CharSequence title) {
+ final List<AccessibilityWindowInfo> windows = sUiAutomation.getWindows();
+ AccessibilityWindowInfo returnValue = null;
+ for (int i = 0; i < windows.size(); i++) {
+ final AccessibilityWindowInfo window = windows.get(i);
+ if (TextUtils.equals(title, window.getTitle())) {
+ returnValue = window;
+ } else {
+ window.recycle();
+ }
+ }
+ return returnValue;
+ }
+}
diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityTestActivity.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityTestActivity.java
new file mode 100644
index 0000000..a17fa73
--- /dev/null
+++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityTestActivity.java
@@ -0,0 +1,45 @@
+/*
+ * 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.view.accessibility;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.frameworks.coretests.R;
+
+/**
+ * An activity for accessibility test.
+ */
+public class AccessibilityTestActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ turnOnScreen();
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.accessibility_test);
+ }
+
+ private void turnOnScreen() {
+ setTurnScreenOn(true);
+ setShowWhenLocked(true);
+ KeyguardManager keyguardManager = (KeyguardManager) getSystemService(
+ Context.KEYGUARD_SERVICE);
+ keyguardManager.requestDismissKeyguard(this, null);
+ }
+}
diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
index bfa6e06..71612e6 100644
--- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
+++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
@@ -78,7 +78,7 @@
assertThrows(NullPointerException.class, () -> mSession1.notifyViewAppeared(null));
assertThrows(NullPointerException.class, () -> mSession1.notifyViewDisappeared(null));
assertThrows(NullPointerException.class,
- () -> mSession1.notifyViewTextChanged(null, "whatever", 0));
+ () -> mSession1.notifyViewTextChanged(null, "whatever"));
}
@Test
diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
index aaa624e..21fcae7 100644
--- a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
+++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
@@ -16,12 +16,12 @@
package com.android.internal.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static com.android.internal.app.ChooserWrapperActivity.sOverrides;
@@ -33,12 +33,18 @@
import static org.mockito.Mockito.when;
import android.app.usage.UsageStatsManager;
+import android.content.ClipData;
import android.content.Intent;
import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.net.Uri;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
import com.android.internal.R;
import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;
@@ -69,7 +75,21 @@
@Test
public void customTitle() throws InterruptedException {
- Intent sendIntent = createSendImageIntent();
+ Intent viewIntent = createViewTextIntent();
+ List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
+
+ when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
+ Mockito.anyBoolean(),
+ Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
+ mActivityRule.launchActivity(Intent.createChooser(viewIntent, "chooser test"));
+
+ waitForIdle();
+ onView(withId(R.id.title)).check(matches(withText("chooser test")));
+ }
+
+ @Test
+ public void customTitleIgnoredForSendIntents() throws InterruptedException {
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
@@ -77,12 +97,12 @@
Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
mActivityRule.launchActivity(Intent.createChooser(sendIntent, "chooser test"));
waitForIdle();
- onView(withId(R.id.title)).check(matches(withText("chooser test")));
+ onView(withId(R.id.title)).check(matches(withText(R.string.whichSendApplication)));
}
@Test
public void emptyTitle() throws InterruptedException {
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
@@ -95,8 +115,72 @@
}
@Test
+ public void emptyPreviewTitleAndThumbnail() throws InterruptedException {
+ Intent sendIntent = createSendTextIntentWithPreview(null, null);
+ List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
+
+ when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
+ Mockito.anyBoolean(),
+ Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
+ mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
+ waitForIdle();
+ onView(withId(R.id.content_preview_title)).check(matches(not(isDisplayed())));
+ onView(withId(R.id.content_preview_thumbnail)).check(matches(not(isDisplayed())));
+ }
+
+ @Test
+ public void visiblePreviewTitleWithoutThumbnail() throws InterruptedException {
+ String previewTitle = "My Content Preview Title";
+ Intent sendIntent = createSendTextIntentWithPreview(previewTitle, null);
+ List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
+
+ when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
+ Mockito.anyBoolean(),
+ Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
+ mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
+ waitForIdle();
+ onView(withId(R.id.content_preview_title)).check(matches(isDisplayed()));
+ onView(withId(R.id.content_preview_title)).check(matches(withText(previewTitle)));
+ onView(withId(R.id.content_preview_thumbnail)).check(matches(not(isDisplayed())));
+ }
+
+ @Test
+ public void visiblePreviewTitleWithInvalidThumbnail() throws InterruptedException {
+ String previewTitle = "My Content Preview Title";
+ Intent sendIntent = createSendTextIntentWithPreview(previewTitle,
+ Uri.parse("tel:(+49)12345789"));
+ List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
+
+ when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
+ Mockito.anyBoolean(),
+ Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
+ mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
+ waitForIdle();
+ onView(withId(R.id.content_preview_title)).check(matches(isDisplayed()));
+ onView(withId(R.id.content_preview_thumbnail)).check(matches(not(isDisplayed())));
+ }
+
+ @Test
+ public void visiblePreviewTitleAndThumbnail() throws InterruptedException {
+ String previewTitle = "My Content Preview Title";
+ Intent sendIntent = createSendTextIntentWithPreview(previewTitle,
+ Uri.parse("android.resource://com.android.frameworks.coretests/"
+ + com.android.frameworks.coretests.R.drawable.test320x240));
+ sOverrides.previewThumbnail = createBitmap();
+ List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
+
+ when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
+ Mockito.anyBoolean(),
+ Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
+ mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
+ waitForIdle();
+ onView(withId(R.id.content_preview_title)).check(matches(isDisplayed()));
+ onView(withId(R.id.content_preview_thumbnail)).check(matches(isDisplayed()));
+ }
+
+ @Test
public void twoOptionsAndUserSelectsOne() throws InterruptedException {
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
@@ -125,7 +209,7 @@
@Test
public void updateChooserCountsAndModelAfterUserSelection() throws InterruptedException {
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
@@ -158,7 +242,7 @@
when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
Mockito.anyBoolean(),
Mockito.isA(List.class))).thenReturn(null);
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
final ChooserWrapperActivity activity = mActivityRule
.launchActivity(Intent.createChooser(sendIntent, null));
waitForIdle();
@@ -186,7 +270,7 @@
Mockito.anyBoolean(),
Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
final ChooserWrapperActivity activity = mActivityRule
.launchActivity(Intent.createChooser(sendIntent, null));
waitForIdle();
@@ -197,7 +281,7 @@
@Test
public void hasOtherProfileOneOption() throws Exception {
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos =
createResolvedComponentsForTestWithOtherProfile(2);
ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);
@@ -234,7 +318,7 @@
@Test
public void hasOtherProfileTwoOptionsAndUserSelectsOne() throws Exception {
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos =
createResolvedComponentsForTestWithOtherProfile(3);
ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);
@@ -273,7 +357,7 @@
@Test
public void hasLastChosenActivityAndOtherProfile() throws Exception {
- Intent sendIntent = createSendImageIntent();
+ Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos =
createResolvedComponentsForTestWithOtherProfile(3);
ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);
@@ -308,14 +392,33 @@
assertThat(chosen[0], is(toChoose));
}
- private Intent createSendImageIntent() {
+ private Intent createSendTextIntent() {
Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, "testing intent sending");
- sendIntent.setType("image/jpeg");
return sendIntent;
}
+ private Intent createSendTextIntentWithPreview(String title, Uri imageThumbnail) {
+ Intent sendIntent = new Intent();
+ sendIntent.setAction(Intent.ACTION_SEND);
+ sendIntent.putExtra(Intent.EXTRA_TEXT, "testing intent sending");
+ sendIntent.putExtra(Intent.EXTRA_TITLE, title);
+ if (imageThumbnail != null) {
+ ClipData.Item clipItem = new ClipData.Item(imageThumbnail);
+ sendIntent.setClipData(new ClipData("Clip Label", new String[]{"image/png"}, clipItem));
+ }
+
+ return sendIntent;
+ }
+
+ private Intent createViewTextIntent() {
+ Intent viewIntent = new Intent();
+ viewIntent.setAction(Intent.ACTION_VIEW);
+ viewIntent.putExtra(Intent.EXTRA_TEXT, "testing intent viewing");
+ return viewIntent;
+ }
+
private List<ResolvedComponentInfo> createResolvedComponentsForTest(int numberOfResults) {
List<ResolvedComponentInfo> infoList = new ArrayList<>(numberOfResults);
for (int i = 0; i < numberOfResults; i++) {
@@ -340,4 +443,24 @@
private void waitForIdle() {
InstrumentationRegistry.getInstrumentation().waitForIdleSync();
}
-}
\ No newline at end of file
+
+ private Bitmap createBitmap() {
+ int width = 200;
+ int height = 200;
+ Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(bitmap);
+
+ Paint paint = new Paint();
+ paint.setColor(Color.RED);
+ paint.setStyle(Paint.Style.FILL);
+ canvas.drawPaint(paint);
+
+ paint.setColor(Color.WHITE);
+ paint.setAntiAlias(true);
+ paint.setTextSize(14.f);
+ paint.setTextAlign(Paint.Align.CENTER);
+ canvas.drawText("Hi!", (width / 2.f), (height / 2.f), paint);
+
+ return bitmap;
+ }
+}
diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
index 60529f6..637d2ea 100644
--- a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
+++ b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
@@ -21,6 +21,9 @@
import android.app.usage.UsageStatsManager;
import android.content.Context;
import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.util.Size;
import java.util.function.Function;
@@ -74,6 +77,14 @@
return super.getPackageManager();
}
+ @Override
+ protected Bitmap loadThumbnail(Uri uri, Size size) {
+ if (sOverrides.previewThumbnail != null) {
+ return sOverrides.previewThumbnail;
+ }
+ return super.loadThumbnail(uri, size);
+ }
+
/**
* We cannot directly mock the activity created since instrumentation creates it.
* <p>
@@ -85,11 +96,13 @@
public Function<TargetInfo, Boolean> onSafelyStartCallback;
public ResolverListController resolverListController;
public Boolean isVoiceInteraction;
+ public Bitmap previewThumbnail;
public void reset() {
onSafelyStartCallback = null;
isVoiceInteraction = null;
createPackageManager = null;
+ previewThumbnail = null;
resolverListController = mock(ResolverListController.class);
}
}
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index a47ab87..bcac5fd 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -329,6 +329,7 @@
<permission name="android.permission.USE_RESERVED_DISK"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <permission name="android.permission.STATUS_BAR_SERVICE"/>
<permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>
</privapp-permissions>
diff --git a/graphics/java/android/graphics/BaseCanvas.java b/graphics/java/android/graphics/BaseCanvas.java
index 65aaba1..aaf40b4 100644
--- a/graphics/java/android/graphics/BaseCanvas.java
+++ b/graphics/java/android/graphics/BaseCanvas.java
@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.ColorInt;
+import android.annotation.ColorLong;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
@@ -258,6 +259,16 @@
nDrawColor(mNativeCanvasWrapper, color, mode.getXfermode().porterDuffMode);
}
+ /**
+ * Make lint happy.
+ * See {@link Canvas#drawColor(long, BlendMode)}
+ */
+ public void drawColor(@ColorLong long color, @NonNull BlendMode mode) {
+ ColorSpace cs = Color.colorSpace(color);
+ nDrawColor(mNativeCanvasWrapper, cs.getNativeInstance(), color,
+ mode.getXfermode().porterDuffMode);
+ }
+
public void drawLine(float startX, float startY, float stopX, float stopY,
@NonNull Paint paint) {
throwIfHasHwBitmapInSwMode(paint);
@@ -669,6 +680,9 @@
private static native void nDrawColor(long nativeCanvas, int color, int mode);
+ private static native void nDrawColor(long nativeCanvas, long nativeColorSpace,
+ @ColorLong long color, int mode);
+
private static native void nDrawPaint(long nativeCanvas, long nativePaint);
private static native void nDrawPoint(long canvasHandle, float x, float y, long paintHandle);
diff --git a/graphics/java/android/graphics/BaseRecordingCanvas.java b/graphics/java/android/graphics/BaseRecordingCanvas.java
index 4f60935..3e11741 100644
--- a/graphics/java/android/graphics/BaseRecordingCanvas.java
+++ b/graphics/java/android/graphics/BaseRecordingCanvas.java
@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.ColorInt;
+import android.annotation.ColorLong;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
@@ -217,6 +218,13 @@
}
@Override
+ public final void drawColor(@ColorLong long color, @NonNull BlendMode mode) {
+ ColorSpace cs = Color.colorSpace(color);
+ nDrawColor(mNativeCanvasWrapper, cs.getNativeInstance(), color,
+ mode.getXfermode().porterDuffMode);
+ }
+
+ @Override
public final void drawLine(float startX, float startY, float stopX, float stopY,
@NonNull Paint paint) {
nDrawLine(mNativeCanvasWrapper, startX, startY, stopX, stopY, paint.getNativeInstance());
@@ -590,6 +598,10 @@
private static native void nDrawColor(long nativeCanvas, int color, int mode);
@FastNative
+ private static native void nDrawColor(long nativeCanvas, long nativeColorSpace,
+ @ColorLong long color, int mode);
+
+ @FastNative
private static native void nDrawPaint(long nativeCanvas, long nativePaint);
@FastNative
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index f0e2361..f9e7dd1 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -21,7 +21,6 @@
import android.annotation.ColorLong;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.annotation.WorkerThread;
import android.content.res.ResourcesImpl;
@@ -31,6 +30,7 @@
import android.os.StrictMode;
import android.os.Trace;
import android.util.DisplayMetrics;
+import android.util.Half;
import android.util.Log;
import android.view.ThreadedRenderer;
@@ -1761,9 +1761,7 @@
* previously assigned color space.
*
* @param colorSpace to assign to the bitmap
- * @hide
*/
- @TestApi
public void setColorSpace(@NonNull ColorSpace colorSpace) {
checkRecycled("setColorSpace called on a recycled bitmap");
if (colorSpace == null) {
@@ -1814,9 +1812,7 @@
* @throws IllegalArgumentException if the color space encoded in the long
* is invalid or unknown.
*
- * @hide pending API approval
*/
- @TestApi
public void eraseColor(@ColorLong long c) {
checkRecycled("Can't erase a recycled bitmap");
if (!isMutable()) {
@@ -1848,6 +1844,45 @@
return nativeGetPixel(mNativePtr, x, y);
}
+ private static float clamp(float value, @NonNull ColorSpace cs, int index) {
+ return Math.max(Math.min(value, cs.getMaxValue(index)), cs.getMinValue(index));
+ }
+
+ /**
+ * Returns the {@link Color} at the specified location. Throws an exception
+ * if x or y are out of bounds (negative or >= to the width or height
+ * respectively).
+ *
+ * @param x The x coordinate (0...width-1) of the pixel to return
+ * @param y The y coordinate (0...height-1) of the pixel to return
+ * @return The {@link Color} at the specified coordinate
+ * @throws IllegalArgumentException if x, y exceed the bitmap's bounds
+ * @throws IllegalStateException if the bitmap's config is {@link Config#HARDWARE}
+ *
+ */
+ public Color getColor(int x, int y) {
+ checkRecycled("Can't call getColor() on a recycled bitmap");
+ checkHardware("unable to getColor(), "
+ + "pixel access is not supported on Config#HARDWARE bitmaps");
+ checkPixelAccess(x, y);
+
+ final ColorSpace cs = getColorSpace();
+ if (cs.equals(ColorSpace.get(ColorSpace.Named.SRGB))) {
+ return Color.valueOf(nativeGetPixel(mNativePtr, x, y));
+ }
+ // The returned value is in kRGBA_F16_SkColorType, which is packed as
+ // four half-floats, r,g,b,a.
+ long rgba = nativeGetColor(mNativePtr, x, y);
+ float r = Half.toFloat((short) ((rgba >> 0) & 0xffff));
+ float g = Half.toFloat((short) ((rgba >> 16) & 0xffff));
+ float b = Half.toFloat((short) ((rgba >> 32) & 0xffff));
+ float a = Half.toFloat((short) ((rgba >> 48) & 0xffff));
+
+ // Skia may draw outside of the numerical range of the colorSpace.
+ // Clamp to get an expected value.
+ return Color.valueOf(clamp(r, cs, 0), clamp(g, cs, 1), clamp(b, cs, 2), a, cs);
+ }
+
/**
* Returns in pixels[] a copy of the data in the bitmap. Each value is
* a packed int representing a {@link Color}. The stride parameter allows
@@ -2176,6 +2211,7 @@
private static native boolean nativeIsConfigF16(long nativeBitmap);
private static native int nativeGetPixel(long nativeBitmap, int x, int y);
+ private static native long nativeGetColor(long nativeBitmap, int x, int y);
private static native void nativeGetPixels(long nativeBitmap, int[] pixels,
int offset, int stride, int x, int y,
int width, int height);
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 8c1bae2..034dff0 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.ColorInt;
+import android.annotation.ColorLong;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -1682,6 +1683,18 @@
}
/**
+ * Fill the entire canvas' bitmap (restricted to the current clip) with the specified color,
+ * using srcover porterduff mode.
+ *
+ * @param color the color to draw onto the canvas
+ * @throws IllegalArgumentException if the color space encoded in the long
+ * is invalid or unknown.
+ */
+ public void drawColor(@ColorLong long color) {
+ super.drawColor(color, BlendMode.SRC_OVER);
+ }
+
+ /**
* Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
* porter-duff xfermode.
*
@@ -1707,6 +1720,19 @@
}
/**
+ * Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
+ * blendmode.
+ *
+ * @param color the color to draw with
+ * @param mode the blendmode to apply to the color
+ * @throws IllegalArgumentException if the color space encoded in the long
+ * is invalid or unknown.
+ */
+ public void drawColor(@ColorLong long color, @NonNull BlendMode mode) {
+ super.drawColor(color, mode);
+ }
+
+ /**
* Draw a line segment with the specified start and stop x,y coordinates, using the specified
* paint.
* <p>
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 7eee6f4..73442db 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -24,7 +24,6 @@
import android.annotation.Nullable;
import android.annotation.Px;
import android.annotation.Size;
-import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.graphics.fonts.FontVariationAxis;
import android.os.Build;
@@ -974,10 +973,7 @@
* @see Color for APIs that help manipulate a color long.
*
* @return the paint's color (and alpha).
- *
- * @hide pending API approval
*/
- @TestApi
@ColorLong
public long getColorLong() {
return mColor;
@@ -1006,10 +1002,7 @@
* to set in the paint.
* @throws IllegalArgumentException if the color space encoded in the long
* is invalid or unknown.
- *
- * @hide pending API approval
*/
- @TestApi
public void setColor(@ColorLong long color) {
ColorSpace cs = Color.colorSpace(color);
float r = Color.red(color);
@@ -1445,10 +1438,7 @@
*
* @throws IllegalArgumentException if the color space encoded in the long
* is invalid or unknown.
- *
- * @hide pending API approval
*/
- @TestApi
public void setShadowLayer(float radius, float dx, float dy, @ColorLong long shadowColor) {
ColorSpace cs = Color.colorSpace(shadowColor);
float r = Color.red(shadowColor);
@@ -1517,9 +1507,7 @@
* Returns the color of the shadow layer.
* @see #setShadowLayer(float,float,float,int)
* @see #setShadowLayer(float,float,float,long)
- * @hide pending API approval
*/
- @TestApi
public @ColorLong long getShadowLayerColorLong() {
return mShadowLayerColor;
}
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index 6dc9d34..8594766 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -759,6 +759,8 @@
void RecordingCanvas::reset(DisplayListData* dl, const SkIRect& bounds) {
this->resetCanvas(bounds.right(), bounds.bottom());
fDL = dl;
+ mClipMayBeComplex = false;
+ mSaveCount = mComplexSaveCount = 0;
}
sk_sp<SkSurface> RecordingCanvas::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {
@@ -770,6 +772,7 @@
}
void RecordingCanvas::willSave() {
+ mSaveCount++;
fDL->save();
}
SkCanvas::SaveLayerStrategy RecordingCanvas::getSaveLayerStrategy(const SaveLayerRec& rec) {
@@ -778,6 +781,11 @@
return SkCanvas::kNoLayer_SaveLayerStrategy;
}
void RecordingCanvas::willRestore() {
+ mSaveCount--;
+ if (mSaveCount < mComplexSaveCount) {
+ mClipMayBeComplex = false;
+ mComplexSaveCount = 0;
+ }
fDL->restore();
}
@@ -798,17 +806,27 @@
void RecordingCanvas::onClipRect(const SkRect& rect, SkClipOp op, ClipEdgeStyle style) {
fDL->clipRect(rect, op, style == kSoft_ClipEdgeStyle);
+ if (!getTotalMatrix().isScaleTranslate()) {
+ setClipMayBeComplex();
+ }
this->INHERITED::onClipRect(rect, op, style);
}
void RecordingCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle style) {
+ if (rrect.getType() > SkRRect::kRect_Type || !getTotalMatrix().isScaleTranslate()) {
+ setClipMayBeComplex();
+ }
fDL->clipRRect(rrect, op, style == kSoft_ClipEdgeStyle);
this->INHERITED::onClipRRect(rrect, op, style);
}
void RecordingCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle style) {
+ setClipMayBeComplex();
fDL->clipPath(path, op, style == kSoft_ClipEdgeStyle);
this->INHERITED::onClipPath(path, op, style);
}
void RecordingCanvas::onClipRegion(const SkRegion& region, SkClipOp op) {
+ if (region.isComplex() || !getTotalMatrix().isScaleTranslate()) {
+ setClipMayBeComplex();
+ }
fDL->clipRegion(region, op);
this->INHERITED::onClipRegion(region, op);
}
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h
index caaef67..3a76ca1 100644
--- a/libs/hwui/RecordingCanvas.h
+++ b/libs/hwui/RecordingCanvas.h
@@ -203,10 +203,41 @@
void drawVectorDrawable(VectorDrawableRoot* tree);
+ /**
+ * If "isClipMayBeComplex" returns false, it is guaranteed the current clip is a rectangle.
+ * If the return value is true, then clip may or may not be complex (there is no guarantee).
+ */
+ inline bool isClipMayBeComplex() { return mClipMayBeComplex; }
+
private:
typedef SkCanvasVirtualEnforcer<SkNoDrawCanvas> INHERITED;
+ inline void setClipMayBeComplex() {
+ if (!mClipMayBeComplex) {
+ mComplexSaveCount = mSaveCount;
+ mClipMayBeComplex = true;
+ }
+ }
+
DisplayListData* fDL;
+
+ /**
+ * mClipMayBeComplex tracks if the current clip is a rectangle. This flag is used to promote
+ * FunctorDrawable to a layer, if it is clipped by a non-rect.
+ */
+ bool mClipMayBeComplex = false;
+
+ /**
+ * mSaveCount is the current level of our save tree.
+ */
+ int mSaveCount = 0;
+
+ /**
+ * mComplexSaveCount is the first save level, which has a complex clip. Every level below
+ * mComplexSaveCount is assumed to have a complex clip and every level above mComplexSaveCount
+ * is guaranteed to not be complex.
+ */
+ int mComplexSaveCount = 0;
};
} // namespace uirenderer
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h
index ddb7e4e..e6710cc 100644
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -151,6 +151,7 @@
// parent may have already dictated that a descendant layer is needed
bool functorsNeedLayer =
ancestorDictatesFunctorsNeedLayer
+ || CC_UNLIKELY(isClipMayBeComplex())
// Round rect clipping forces layer for functors
|| CC_UNLIKELY(getOutline().willRoundRectClip()) ||
@@ -193,6 +194,12 @@
bool isProjectionReceiver() const { return mPrimitiveFields.mProjectionReceiver; }
+ bool setClipMayBeComplex(bool isClipMayBeComplex) {
+ return RP_SET(mPrimitiveFields.mClipMayBeComplex, isClipMayBeComplex);
+ }
+
+ bool isClipMayBeComplex() const { return mPrimitiveFields.mClipMayBeComplex; }
+
bool setStaticMatrix(const SkMatrix* matrix) {
delete mStaticMatrix;
if (matrix) {
@@ -563,6 +570,7 @@
bool mProjectBackwards = false;
bool mProjectionReceiver = false;
bool mAllowForceDark = true;
+ bool mClipMayBeComplex = false;
Rect mClipBounds;
Outline mOutline;
RevealClip mRevealClip;
diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
index 230065c..29d5ef2 100644
--- a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
+++ b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
@@ -73,7 +73,6 @@
RenderNode* childNode = child.getRenderNode();
Matrix4 mat4(child.getRecordedMatrix());
info.damageAccumulator->pushTransform(&mat4);
- // TODO: a layer is needed if the canvas is rotated or has a non-rect clip
info.hasBackwardProjectedNodes = false;
childFn(childNode, observer, info, functorsNeedLayer);
hasBackwardProjectedNodesSubtree |= info.hasBackwardProjectedNodes;
diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
index d54275f..b67aea2 100644
--- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
+++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
@@ -113,6 +113,10 @@
// Record the child node. Drawable dtor will be invoked when mChildNodes deque is cleared.
mDisplayList->mChildNodes.emplace_back(renderNode, asSkCanvas(), true, mCurrentBarrier);
auto& renderNodeDrawable = mDisplayList->mChildNodes.back();
+ if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaVulkan) {
+ // Put Vulkan WebViews with non-rectangular clips in a HW layer
+ renderNode->mutateStagingProperties().setClipMayBeComplex(mRecorder.isClipMayBeComplex());
+ }
drawDrawable(&renderNodeDrawable);
// use staging property, since recording on UI thread
diff --git a/libs/hwui/private/hwui/DrawVkInfo.h b/libs/hwui/private/hwui/DrawVkInfo.h
index abc4dbf..fb55f5c 100644
--- a/libs/hwui/private/hwui/DrawVkInfo.h
+++ b/libs/hwui/private/hwui/DrawVkInfo.h
@@ -29,7 +29,7 @@
VkDevice device;
VkQueue queue;
uint32_t graphics_queue_index;
- uint32_t instance_version;
+ uint32_t api_version;
const char* const* enabled_instance_extension_names;
uint32_t enabled_instance_extension_names_length;
const char* const* enabled_device_extension_names;
diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp
index 1e75202..582d51e 100644
--- a/libs/hwui/renderthread/VulkanManager.cpp
+++ b/libs/hwui/renderthread/VulkanManager.cpp
@@ -83,7 +83,6 @@
mDevice = VK_NULL_HANDLE;
mPhysicalDevice = VK_NULL_HANDLE;
mInstance = VK_NULL_HANDLE;
- mInstanceVersion = 0u;
mInstanceExtensions.clear();
mDeviceExtensions.clear();
free_features_extensions_structs(mPhysicalDeviceFeatures2);
@@ -100,7 +99,7 @@
0, // applicationVersion
"android framework", // pEngineName
0, // engineVerison
- VK_MAKE_VERSION(1, 1, 0), // apiVersion
+ mAPIVersion, // apiVersion
};
{
@@ -377,8 +376,9 @@
}
GET_PROC(EnumerateInstanceVersion);
- LOG_ALWAYS_FATAL_IF(mEnumerateInstanceVersion(&mInstanceVersion));
- LOG_ALWAYS_FATAL_IF(mInstanceVersion < VK_MAKE_VERSION(1, 1, 0));
+ uint32_t instanceVersion;
+ LOG_ALWAYS_FATAL_IF(mEnumerateInstanceVersion(&instanceVersion));
+ LOG_ALWAYS_FATAL_IF(instanceVersion < VK_MAKE_VERSION(1, 1, 0));
GrVkExtensions extensions;
LOG_ALWAYS_FATAL_IF(!this->setupDevice(extensions, mPhysicalDeviceFeatures2));
@@ -398,7 +398,7 @@
backendContext.fDevice = mDevice;
backendContext.fQueue = mGraphicsQueue;
backendContext.fGraphicsQueueIndex = mGraphicsQueueIndex;
- backendContext.fInstanceVersion = mInstanceVersion;
+ backendContext.fMaxAPIVersion = mAPIVersion;
backendContext.fVkExtensions = &extensions;
backendContext.fDeviceFeatures2 = &mPhysicalDeviceFeatures2;
backendContext.fGetProc = std::move(getProc);
@@ -446,7 +446,7 @@
.device = mDevice,
.queue = mGraphicsQueue,
.graphics_queue_index = mGraphicsQueueIndex,
- .instance_version = mInstanceVersion,
+ .api_version = mAPIVersion,
.enabled_instance_extension_names = mInstanceExtensions.data(),
.enabled_instance_extension_names_length =
static_cast<uint32_t>(mInstanceExtensions.size()),
diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h
index abe78ef..6426fe2 100644
--- a/libs/hwui/renderthread/VulkanManager.h
+++ b/libs/hwui/renderthread/VulkanManager.h
@@ -246,7 +246,7 @@
VkCommandBuffer mDummyCB = VK_NULL_HANDLE;
// Variables saved to populate VkFunctorInitParams.
- uint32_t mInstanceVersion = 0u;
+ static const uint32_t mAPIVersion = VK_MAKE_VERSION(1, 1, 0);
std::vector<const char*> mInstanceExtensions;
std::vector<const char*> mDeviceExtensions;
VkPhysicalDeviceFeatures2 mPhysicalDeviceFeatures2{};
diff --git a/location/java/android/location/GnssMeasurementCorrections.java b/location/java/android/location/GnssMeasurementCorrections.java
index b81bf90..3ce48b4 100644
--- a/location/java/android/location/GnssMeasurementCorrections.java
+++ b/location/java/android/location/GnssMeasurementCorrections.java
@@ -43,13 +43,27 @@
* are computed.
*/
private double mAltitudeMeters;
+ /**
+ * Represents the horizontal uncertainty (68% confidence) in meters on the device position at
+ * which the corrections are provided.
+ *
+ * <p> This value is useful for example to judge how accurate the provided corrections are.
+ */
+ private double mHorizontalPositionUncertaintyMeters;
+ /**
+ * Represents the vertical uncertainty (68% confidence) in meters on the device position at
+ * which the corrections are provided.
+ *
+ * <p> This value is useful for example to judge how accurate the provided corrections are.
+ */
+ private double mVerticalPositionUncertaintyMeters;
- /** Time Of Applicability, GPS time of week */
+ /** Time Of Applicability, GPS time of week in nanoseconds. */
private long mToaGpsNanosecondsOfWeek;
/**
* A set of {@link GnssSingleSatCorrection} each containing measurement corrections for a
- * satellite in view
+ * satellite in view.
*/
private @Nullable List<GnssSingleSatCorrection> mSingleSatCorrectionList;
@@ -57,6 +71,8 @@
mLatitudeDegrees = builder.mLatitudeDegrees;
mLongitudeDegrees = builder.mLongitudeDegrees;
mAltitudeMeters = builder.mAltitudeMeters;
+ mHorizontalPositionUncertaintyMeters = builder.mHorizontalPositionUncertaintyMeters;
+ mVerticalPositionUncertaintyMeters = builder.mVerticalPositionUncertaintyMeters;
mToaGpsNanosecondsOfWeek = builder.mToaGpsNanosecondsOfWeek;
mSingleSatCorrectionList =
builder.mSingleSatCorrectionList == null
@@ -83,6 +99,22 @@
return mAltitudeMeters;
}
+ /**
+ * Gets the horizontal uncertainty (68% confidence) in meters on the device position at
+ * which the corrections are provided.
+ */
+ public double getHorizontalPositionUncertaintyMeters() {
+ return mHorizontalPositionUncertaintyMeters;
+ }
+
+ /**
+ * Gets the vertical uncertainty (68% confidence) in meters on the device position at
+ * which the corrections are provided.
+ */
+ public double getVerticalPositionUncertaintyMeters() {
+ return mVerticalPositionUncertaintyMeters;
+ }
+
/** Gets the time of applicability, GPS time of week in nanoseconds. */
public long getToaGpsNanosecondsOfWeek() {
return mToaGpsNanosecondsOfWeek;
@@ -110,6 +142,8 @@
.setLatitudeDegrees(parcel.readDouble())
.setLongitudeDegrees(parcel.readDouble())
.setAltitudeMeters(parcel.readDouble())
+ .setHorizontalPositionUncertaintyMeters(parcel.readDouble())
+ .setVerticalPositionUncertaintyMeters(parcel.readDouble())
.setToaGpsNanosecondsOfWeek(parcel.readLong());
List<GnssSingleSatCorrection> singleSatCorrectionList = new ArrayList<>();
parcel.readTypedList(singleSatCorrectionList, GnssSingleSatCorrection.CREATOR);
@@ -131,6 +165,10 @@
builder.append(String.format(format, "LatitudeDegrees = ", mLatitudeDegrees));
builder.append(String.format(format, "LongitudeDegrees = ", mLongitudeDegrees));
builder.append(String.format(format, "AltitudeMeters = ", mAltitudeMeters));
+ builder.append(String.format(format, "HorizontalPositionUncertaintyMeters = ",
+ mHorizontalPositionUncertaintyMeters));
+ builder.append(String.format(format, "VerticalPositionUncertaintyMeters = ",
+ mVerticalPositionUncertaintyMeters));
builder.append(
String.format(format, "ToaGpsNanosecondsOfWeek = ", mToaGpsNanosecondsOfWeek));
builder.append(
@@ -143,6 +181,8 @@
parcel.writeDouble(mLatitudeDegrees);
parcel.writeDouble(mLongitudeDegrees);
parcel.writeDouble(mAltitudeMeters);
+ parcel.writeDouble(mHorizontalPositionUncertaintyMeters);
+ parcel.writeDouble(mVerticalPositionUncertaintyMeters);
parcel.writeLong(mToaGpsNanosecondsOfWeek);
parcel.writeTypedList(mSingleSatCorrectionList);
}
@@ -154,9 +194,10 @@
* GnssMeasurementCorrections}.
*/
private double mLatitudeDegrees;
-
private double mLongitudeDegrees;
private double mAltitudeMeters;
+ private double mHorizontalPositionUncertaintyMeters;
+ private double mVerticalPositionUncertaintyMeters;
private long mToaGpsNanosecondsOfWeek;
private List<GnssSingleSatCorrection> mSingleSatCorrectionList;
@@ -181,6 +222,27 @@
return this;
}
+
+ /**
+ * Sets the horizontal uncertainty (68% confidence) in meters on the device position at
+ * which the corrections are provided.
+ */
+ public Builder setHorizontalPositionUncertaintyMeters(
+ double horizontalPositionUncertaintyMeters) {
+ mHorizontalPositionUncertaintyMeters = horizontalPositionUncertaintyMeters;
+ return this;
+ }
+
+ /**
+ * Sets the vertical uncertainty (68% confidence) in meters on the device position at which
+ * the corrections are provided.
+ */
+ public Builder setVerticalPositionUncertaintyMeters(
+ double verticalPositionUncertaintyMeters) {
+ mVerticalPositionUncertaintyMeters = verticalPositionUncertaintyMeters;
+ return this;
+ }
+
/** Sets the time of applicability, GPS time of week in nanoseconds. */
public Builder setToaGpsNanosecondsOfWeek(long toaGpsNanosecondsOfWeek) {
mToaGpsNanosecondsOfWeek = toaGpsNanosecondsOfWeek;
diff --git a/location/java/android/location/GnssSingleSatCorrection.java b/location/java/android/location/GnssSingleSatCorrection.java
index 3922d2f..4d5303f 100644
--- a/location/java/android/location/GnssSingleSatCorrection.java
+++ b/location/java/android/location/GnssSingleSatCorrection.java
@@ -317,8 +317,8 @@
* between 0 and 1.
*/
public Builder setProbSatIsLos(@FloatRange(from = 0f, to = 1f) float probSatIsLos) {
- Preconditions.checkArgumentInRange(probSatIsLos, 0, 1,
- "probSatIsLos should be between 0 and 1.");
+ Preconditions.checkArgumentInRange(
+ probSatIsLos, 0, 1, "probSatIsLos should be between 0 and 1.");
mProbSatIsLos = probSatIsLos;
mSingleSatCorrectionFlags =
(byte) (mSingleSatCorrectionFlags | HAS_PROB_SAT_IS_LOS_MASK);
diff --git a/location/tests/locationtests/src/android/location/GnssMeasurementCorrectionsTest.java b/location/tests/locationtests/src/android/location/GnssMeasurementCorrectionsTest.java
index d6227bb..8f46e84 100644
--- a/location/tests/locationtests/src/android/location/GnssMeasurementCorrectionsTest.java
+++ b/location/tests/locationtests/src/android/location/GnssMeasurementCorrectionsTest.java
@@ -48,6 +48,8 @@
assertEquals(37.386051, measurementCorrections.getLatitudeDegrees());
assertEquals(-122.083855, measurementCorrections.getLongitudeDegrees());
assertEquals(32.0, measurementCorrections.getAltitudeMeters());
+ assertEquals(9.25, measurementCorrections.getHorizontalPositionUncertaintyMeters());
+ assertEquals(2.3, measurementCorrections.getVerticalPositionUncertaintyMeters());
assertEquals(604000000000000L, measurementCorrections.getToaGpsNanosecondsOfWeek());
GnssSingleSatCorrection singleSatCorrection =
@@ -74,6 +76,8 @@
.setLatitudeDegrees(37.386051)
.setLongitudeDegrees(-122.083855)
.setAltitudeMeters(32)
+ .setHorizontalPositionUncertaintyMeters(9.25)
+ .setVerticalPositionUncertaintyMeters(2.3)
.setToaGpsNanosecondsOfWeek(604000000000000L);
List<GnssSingleSatCorrection> singleSatCorrectionList = new ArrayList<>();
singleSatCorrectionList.add(GnssSingleSatCorrectionsTest.generateTestSingleSatCorrection());
diff --git a/media/Android.bp b/media/Android.bp
index 3181a29..e7d5faf 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -66,7 +66,9 @@
filegroup {
name: "media1-srcs",
srcs: [
+ "apex/java/android/media/MediaDescription.java",
"apex/java/android/media/MediaParceledListSlice.java",
+ "apex/java/android/media/Rating.java",
"apex/java/android/media/VolumeProvider.java",
"apex/java/android/media/browse/MediaBrowser.java",
"apex/java/android/media/browse/MediaBrowserUtils.java",
diff --git a/media/java/android/media/MediaDescription.aidl b/media/apex/java/android/media/MediaDescription.aidl
similarity index 100%
rename from media/java/android/media/MediaDescription.aidl
rename to media/apex/java/android/media/MediaDescription.aidl
diff --git a/media/java/android/media/MediaDescription.java b/media/apex/java/android/media/MediaDescription.java
similarity index 93%
rename from media/java/android/media/MediaDescription.java
rename to media/apex/java/android/media/MediaDescription.java
index 31079e5..39eeb3e 100644
--- a/media/java/android/media/MediaDescription.java
+++ b/media/apex/java/android/media/MediaDescription.java
@@ -1,3 +1,19 @@
+/*
+ * 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.media;
import android.annotation.Nullable;
@@ -226,7 +242,7 @@
return false;
}
- if (!(o instanceof MediaDescription)){
+ if (!(o instanceof MediaDescription)) {
return false;
}
@@ -375,6 +391,11 @@
return this;
}
+ /**
+ * Build {@link MediaDescription}.
+ *
+ * @return a new media description.
+ */
public MediaDescription build() {
return new MediaDescription(mMediaId, mTitle, mSubtitle, mDescription, mIcon, mIconUri,
mExtras, mMediaUri);
diff --git a/media/apex/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java
index 1a1f6fb..87ce4c3 100644
--- a/media/apex/java/android/media/MediaPlayer2.java
+++ b/media/apex/java/android/media/MediaPlayer2.java
@@ -21,6 +21,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.StringDef;
+import android.annotation.TestApi;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
@@ -3758,6 +3759,7 @@
* @throws IllegalStateException if called before being prepared
* @hide
*/
+ @TestApi
public DrmInfo getDrmInfo(@NonNull DataSourceDesc dsd) {
final SourceInfo sourceInfo = getSourceInfo(dsd);
if (sourceInfo != null) {
@@ -3814,6 +3816,7 @@
* @hide
*/
// This is an asynchronous call.
+ @TestApi
public Object prepareDrm(@NonNull DataSourceDesc dsd, @NonNull UUID uuid) {
return addTask(newPrepareDrmTask(dsd, uuid));
}
@@ -3905,6 +3908,7 @@
* @hide
*/
// This is a synchronous call.
+ @TestApi
public void releaseDrm(@NonNull DataSourceDesc dsd)
throws NoDrmSchemeException {
final SourceInfo sourceInfo = getSourceInfo(dsd);
@@ -3955,6 +3959,7 @@
* @throws NoDrmSchemeException if there is no active DRM session
* @hide
*/
+ @TestApi
public MediaDrm.KeyRequest getDrmKeyRequest(
@NonNull DataSourceDesc dsd,
@Nullable byte[] keySetId, @Nullable byte[] initData,
@@ -3997,6 +4002,7 @@
* @hide
*/
// This is a synchronous call.
+ @TestApi
public byte[] provideDrmKeyResponse(
@NonNull DataSourceDesc dsd,
@Nullable byte[] keySetId, @NonNull byte[] response)
@@ -4023,6 +4029,7 @@
* @hide
*/
// This is a synchronous call.
+ @TestApi
public void restoreDrmKeys(
@NonNull DataSourceDesc dsd,
@NonNull byte[] keySetId)
@@ -4050,6 +4057,7 @@
* @throws NoDrmSchemeException if there is no active DRM session
* @hide
*/
+ @TestApi
public String getDrmPropertyString(
@NonNull DataSourceDesc dsd,
@NonNull @MediaDrmStringProperty String propertyName)
@@ -4078,6 +4086,7 @@
* @hide
*/
// This is a synchronous call.
+ @TestApi
public void setDrmPropertyString(
@NonNull DataSourceDesc dsd,
@NonNull @MediaDrmStringProperty String propertyName, @NonNull String value)
diff --git a/media/java/android/media/Rating.aidl b/media/apex/java/android/media/Rating.aidl
similarity index 100%
rename from media/java/android/media/Rating.aidl
rename to media/apex/java/android/media/Rating.aidl
diff --git a/media/java/android/media/Rating.java b/media/apex/java/android/media/Rating.java
similarity index 93%
rename from media/java/android/media/Rating.java
rename to media/apex/java/android/media/Rating.java
index 04d5364f..ffe7e48 100644
--- a/media/java/android/media/Rating.java
+++ b/media/apex/java/android/media/Rating.java
@@ -33,7 +33,7 @@
* through one of the factory methods.
*/
public final class Rating implements Parcelable {
- private final static String TAG = "Rating";
+ private static final String TAG = "Rating";
/**
* @hide
@@ -55,40 +55,40 @@
* type, but can be used by other classes to indicate they do not support
* Rating.
*/
- public final static int RATING_NONE = 0;
+ public static final int RATING_NONE = 0;
/**
* A rating style with a single degree of rating, "heart" vs "no heart". Can be used to
* indicate the content referred to is a favorite (or not).
*/
- public final static int RATING_HEART = 1;
+ public static final int RATING_HEART = 1;
/**
* A rating style for "thumb up" vs "thumb down".
*/
- public final static int RATING_THUMB_UP_DOWN = 2;
+ public static final int RATING_THUMB_UP_DOWN = 2;
/**
* A rating style with 0 to 3 stars.
*/
- public final static int RATING_3_STARS = 3;
+ public static final int RATING_3_STARS = 3;
/**
* A rating style with 0 to 4 stars.
*/
- public final static int RATING_4_STARS = 4;
+ public static final int RATING_4_STARS = 4;
/**
* A rating style with 0 to 5 stars.
*/
- public final static int RATING_5_STARS = 5;
+ public static final int RATING_5_STARS = 5;
/**
* A rating style expressed as a percentage.
*/
- public final static int RATING_PERCENTAGE = 6;
+ public static final int RATING_PERCENTAGE = 6;
- private final static float RATING_NOT_RATED = -1.0f;
+ private static final float RATING_NOT_RATED = -1.0f;
private final int mRatingStyle;
@@ -116,8 +116,7 @@
dest.writeFloat(mRatingValue);
}
- public static final Parcelable.Creator<Rating> CREATOR
- = new Parcelable.Creator<Rating>() {
+ public static final Parcelable.Creator<Rating> CREATOR = new Parcelable.Creator<Rating>() {
/**
* Rebuilds a Rating previously stored with writeToParcel().
* @param p Parcel object to read the Rating from
@@ -205,7 +204,7 @@
break;
default:
Log.e(TAG, "Invalid rating style (" + starRatingStyle + ") for a star rating");
- return null;
+ return null;
}
if ((starRating < 0.0f) || (starRating > maxRating)) {
Log.e(TAG, "Trying to set out of range star-based rating");
@@ -281,16 +280,16 @@
* not star-based, or if it is unrated.
*/
public float getStarRating() {
+ float ratingValue = -1.0f;
switch (mRatingStyle) {
case RATING_3_STARS:
case RATING_4_STARS:
case RATING_5_STARS:
if (isRated()) {
- return mRatingValue;
+ ratingValue = mRatingValue;
}
- default:
- return -1.0f;
}
+ return ratingValue;
}
/**
diff --git a/media/apex/java/android/media/session/ControllerLink.java b/media/apex/java/android/media/session/ControllerLink.java
index 937df20..f60ec00 100644
--- a/media/apex/java/android/media/session/ControllerLink.java
+++ b/media/apex/java/android/media/session/ControllerLink.java
@@ -34,6 +34,7 @@
import android.view.KeyEvent;
import java.util.List;
+import java.util.Objects;
/**
* Handles incoming commands from {@link MediaController}.
@@ -96,15 +97,12 @@
*
* @param packageName the package name of the controller
* @param caller the {@link ControllerCallbackLink} of the controller
- * @param asSystemService whether this event should be considered as from system service
* @param mediaButton the media button key event
*/
boolean sendMediaButton(@NonNull String packageName,
- @NonNull ControllerCallbackLink caller, boolean asSystemService,
- @NonNull KeyEvent mediaButton) {
+ @NonNull ControllerCallbackLink caller, @NonNull KeyEvent mediaButton) {
try {
- return mISessionController.sendMediaButton(packageName, caller, asSystemService,
- mediaButton);
+ return mISessionController.sendMediaButton(packageName, caller, mediaButton);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
@@ -202,16 +200,14 @@
* @param packageName the package name of the controller
* @param opPackageName the op package name of this request
* @param caller the {@link ControllerCallbackLink} of the controller
- * @param asSystemService whether this event should be considered as from system service
* @param direction the direction to adjust the volume in
* @param flags the flags with this volume change request
*/
void adjustVolume(@NonNull String packageName, @NonNull String opPackageName,
- @NonNull ControllerCallbackLink caller, boolean asSystemService, int direction,
+ @NonNull ControllerCallbackLink caller, int direction,
int flags) {
try {
- mISessionController.adjustVolume(packageName, opPackageName, caller, asSystemService,
- direction, flags);
+ mISessionController.adjustVolume(packageName, opPackageName, caller, direction, flags);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
@@ -603,6 +599,23 @@
dest.writeStrongBinder(mISessionController.asBinder());
}
+ @Override
+ public int hashCode() {
+ return mISessionController.asBinder().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof ControllerLink)) {
+ return false;
+ }
+ ControllerLink other = (ControllerLink) obj;
+ return Objects.equals(getBinder(), other.getBinder());
+ }
+
/**
* Class for Stub implementation
*/
@@ -614,8 +627,7 @@
/** Stub method for ISessionController.sendMediaButton */
public boolean sendMediaButton(@NonNull String packageName,
- @NonNull ControllerCallbackLink caller, boolean asSystemService,
- @NonNull KeyEvent mediaButton) {
+ @NonNull ControllerCallbackLink caller, @NonNull KeyEvent mediaButton) {
return false;
}
@@ -659,8 +671,7 @@
/** Stub method for ISessionController.adjustVolume */
public void adjustVolume(@NonNull String packageName, @NonNull String opPackageName,
- @NonNull ControllerCallbackLink caller, boolean asSystemService, int direction,
- int flags) {
+ @NonNull ControllerCallbackLink caller, int direction, int flags) {
}
/** Stub method for ISessionController.setVolumeTo */
@@ -801,9 +812,8 @@
@Override
public boolean sendMediaButton(String packageName, ControllerCallbackLink caller,
- boolean asSystemService, KeyEvent mediaButton) {
- return mControllerStub.sendMediaButton(packageName, caller, asSystemService,
- mediaButton);
+ KeyEvent mediaButton) {
+ return mControllerStub.sendMediaButton(packageName, caller, mediaButton);
}
@Override
@@ -843,10 +853,8 @@
@Override
public void adjustVolume(String packageName, String opPackageName,
- ControllerCallbackLink caller, boolean asSystemService, int direction,
- int flags) {
- mControllerStub.adjustVolume(packageName, opPackageName, caller, asSystemService,
- direction, flags);
+ ControllerCallbackLink caller, int direction, int flags) {
+ mControllerStub.adjustVolume(packageName, opPackageName, caller, direction, flags);
}
@Override
diff --git a/media/apex/java/android/media/session/ISessionController.aidl b/media/apex/java/android/media/session/ISessionController.aidl
index a3439a1..e697c65 100644
--- a/media/apex/java/android/media/session/ISessionController.aidl
+++ b/media/apex/java/android/media/session/ISessionController.aidl
@@ -39,7 +39,7 @@
void sendCommand(String packageName, in ControllerCallbackLink caller,
String command, in Bundle args, in ResultReceiver cb);
boolean sendMediaButton(String packageName, in ControllerCallbackLink caller,
- boolean asSystemService, in KeyEvent mediaButton);
+ in KeyEvent mediaButton);
void registerCallback(String packageName, in ControllerCallbackLink cb);
void unregisterCallback(in ControllerCallbackLink cb);
String getPackageName();
@@ -48,8 +48,7 @@
long getFlags();
MediaController.PlaybackInfo getVolumeAttributes();
void adjustVolume(String packageName, String opPackageName,
- in ControllerCallbackLink caller, boolean asSystemService, int direction,
- int flags);
+ in ControllerCallbackLink caller, int direction, int flags);
void setVolumeTo(String packageName, String opPackageName, in ControllerCallbackLink caller,
int value, int flags);
diff --git a/media/apex/java/android/media/session/MediaController.java b/media/apex/java/android/media/session/MediaController.java
index 79389a8..1333ab0 100644
--- a/media/apex/java/android/media/session/MediaController.java
+++ b/media/apex/java/android/media/session/MediaController.java
@@ -123,25 +123,6 @@
* @return true if the event was sent to the session, false otherwise.
*/
public boolean dispatchMediaButtonEvent(@NonNull KeyEvent keyEvent) {
- return dispatchMediaButtonEventInternal(false, keyEvent);
- }
-
- /**
- * Dispatches the media button event as system service to the session.
- * <p>
- * Should be only called by the {@link com.android.internal.policy.PhoneWindow} when the
- * foreground activity didn't consume the key from the hardware devices.
- *
- * @param keyEvent media key event
- * @return {@code true} if the event was sent to the session, {@code false} otherwise
- * @hide
- */
- public boolean dispatchMediaButtonEventAsSystemService(@NonNull KeyEvent keyEvent) {
- return dispatchMediaButtonEventInternal(true, keyEvent);
- }
-
- private boolean dispatchMediaButtonEventInternal(boolean asSystemService,
- @NonNull KeyEvent keyEvent) {
if (keyEvent == null) {
throw new IllegalArgumentException("KeyEvent may not be null");
}
@@ -149,8 +130,7 @@
return false;
}
try {
- return mSessionBinder.sendMediaButton(mContext.getPackageName(), mCbStub,
- asSystemService, keyEvent);
+ return mSessionBinder.sendMediaButton(mContext.getPackageName(), mCbStub, keyEvent);
} catch (RuntimeException e) {
// System is dead. =(
}
@@ -158,59 +138,6 @@
}
/**
- * Dispatches the volume button event as system service to the session.
- * <p>
- * Should be only called by the {@link com.android.internal.policy.PhoneWindow} when the
- * foreground activity didn't consume the key from the hardware devices.
- *
- * @param keyEvent volume key event
- * @hide
- */
- public void dispatchVolumeButtonEventAsSystemService(@NonNull KeyEvent keyEvent) {
- switch (keyEvent.getAction()) {
- case KeyEvent.ACTION_DOWN: {
- int direction = 0;
- switch (keyEvent.getKeyCode()) {
- case KeyEvent.KEYCODE_VOLUME_UP:
- direction = AudioManager.ADJUST_RAISE;
- break;
- case KeyEvent.KEYCODE_VOLUME_DOWN:
- direction = AudioManager.ADJUST_LOWER;
- break;
- case KeyEvent.KEYCODE_VOLUME_MUTE:
- direction = AudioManager.ADJUST_TOGGLE_MUTE;
- break;
- }
- try {
- // Note: Need both package name and OP package name. Package name is used for
- // RemoteUserInfo, and OP package name is used for AudioService's internal
- // AppOpsManager usages.
- mSessionBinder.adjustVolume(mContext.getPackageName(),
- mContext.getOpPackageName(), mCbStub, true, direction,
- AudioManager.FLAG_SHOW_UI);
- } catch (RuntimeException e) {
- Log.wtf(TAG, "Error calling adjustVolumeBy", e);
- }
- break;
- }
-
- case KeyEvent.ACTION_UP: {
- final int flags = AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_VIBRATE
- | AudioManager.FLAG_FROM_KEY;
- try {
- // Note: Need both package name and OP package name. Package name is used for
- // RemoteUserInfo, and OP package name is used for AudioService's internal
- // AppOpsManager usages.
- mSessionBinder.adjustVolume(mContext.getPackageName(),
- mContext.getOpPackageName(), mCbStub, true, 0, flags);
- } catch (RuntimeException e) {
- Log.wtf(TAG, "Error calling adjustVolumeBy", e);
- }
- }
- }
- }
-
- /**
* Get the current playback state for this session.
*
* @return The current PlaybackState or null
@@ -394,7 +321,7 @@
// RemoteUserInfo, and OP package name is used for AudioService's internal
// AppOpsManager usages.
mSessionBinder.adjustVolume(mContext.getPackageName(), mContext.getOpPackageName(),
- mCbStub, false, direction, flags);
+ mCbStub, direction, flags);
} catch (RuntimeException e) {
Log.wtf(TAG, "Error calling adjustVolumeBy.", e);
}
diff --git a/media/java/android/media/session/ISessionManager.aidl b/media/java/android/media/session/ISessionManager.aidl
index e360808..edaa55d 100644
--- a/media/java/android/media/session/ISessionManager.aidl
+++ b/media/java/android/media/session/ISessionManager.aidl
@@ -42,8 +42,12 @@
List<Session2Token> getSession2Tokens(int userId);
void dispatchMediaKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent,
boolean needWakeLock);
+ boolean dispatchMediaKeyEventToSessionAsSystemService(String packageName,
+ in MediaSession.Token sessionToken, in KeyEvent keyEvent);
void dispatchVolumeKeyEvent(String packageName, String opPackageName, boolean asSystemService,
in KeyEvent keyEvent, int stream, boolean musicOnly);
+ void dispatchVolumeKeyEventToSessionAsSystemService(String packageName, String opPackageName,
+ in MediaSession.Token sessionToken, in KeyEvent keyEvent);
void dispatchAdjustVolume(String packageName, String opPackageName, int suggestedStream,
int delta, int flags);
void addSessionsListener(in IActiveSessionsListener listener, in ComponentName compName,
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 8f4a3ad..ca3346c 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -36,6 +36,7 @@
import android.os.Handler;
import android.os.Parcel;
import android.os.Parcelable;
+import android.os.Process;
import android.os.ResultReceiver;
import android.service.media.MediaBrowserService;
import android.text.TextUtils;
@@ -43,6 +44,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
+import java.util.Objects;
/**
* Allows interaction with media controllers, volume keys, media buttons, and
@@ -423,15 +425,22 @@
*/
public static final class Token implements Parcelable {
- private ControllerLink mControllerLink;
+ private final int mUid;
+ private final ControllerLink mControllerLink;
/**
* @hide
*/
public Token(ControllerLink controllerLink) {
+ mUid = Process.myUid();
mControllerLink = controllerLink;
}
+ Token(Parcel in) {
+ mUid = in.readInt();
+ mControllerLink = in.readParcelable(null);
+ }
+
@Override
public int describeContents() {
return 0;
@@ -439,13 +448,14 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(mUid);
dest.writeParcelable(mControllerLink, flags);
}
@Override
public int hashCode() {
final int prime = 31;
- int result = 1;
+ int result = mUid;
result = prime * result + ((mControllerLink == null)
? 0 : mControllerLink.getBinder().hashCode());
return result;
@@ -460,14 +470,18 @@
if (getClass() != obj.getClass())
return false;
Token other = (Token) obj;
- if (mControllerLink == null) {
- if (other.mControllerLink != null) {
- return false;
- }
- } else if (!mControllerLink.getBinder().equals(other.mControllerLink.getBinder())) {
+ if (mUid != other.mUid) {
return false;
}
- return true;
+ return Objects.equals(mControllerLink, other.mControllerLink);
+ }
+
+ /**
+ * Gets the UID of this token.
+ * @hide
+ */
+ public int getUid() {
+ return mUid;
}
/**
@@ -483,8 +497,7 @@
new Parcelable.Creator<Token>() {
@Override
public Token createFromParcel(Parcel in) {
- ControllerLink link = in.readParcelable(null);
- return new Token(link);
+ return new Token(in);
}
@Override
diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index 7563867..bd8eadd 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -508,6 +508,37 @@
}
/**
+ * Dispatches the media button event as system service to the session.
+ * <p>
+ * Should be only called by the {@link com.android.internal.policy.PhoneWindow} when the
+ * foreground activity didn't consume the key from the hardware devices.
+ *
+ * @param sessionToken session token
+ * @param keyEvent media key event
+ * @return {@code true} if the event was sent to the session, {@code false} otherwise
+ * @hide
+ */
+ public boolean dispatchMediaKeyEventAsSystemService(@NonNull MediaSession.Token sessionToken,
+ @NonNull KeyEvent keyEvent) {
+ if (sessionToken == null) {
+ throw new IllegalArgumentException("sessionToken shouldn't be null");
+ }
+ if (keyEvent == null) {
+ throw new IllegalArgumentException("keyEvent shouldn't be null");
+ }
+ if (!KeyEvent.isMediaSessionKey(keyEvent.getKeyCode())) {
+ return false;
+ }
+ try {
+ return mService.dispatchMediaKeyEventToSessionAsSystemService(mContext.getPackageName(),
+ sessionToken, keyEvent);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to send key event.", e);
+ }
+ return false;
+ }
+
+ /**
* Send a volume key event. The receiver will be selected automatically.
*
* @param keyEvent The volume KeyEvent to send.
@@ -544,6 +575,32 @@
}
/**
+ * Dispatches the volume key event as system service to the session.
+ * <p>
+ * Should be only called by the {@link com.android.internal.policy.PhoneWindow} when the
+ * foreground activity didn't consume the key from the hardware devices.
+ *
+ * @param sessionToken sessionToken
+ * @param keyEvent volume key event
+ * @hide
+ */
+ public void dispatchVolumeKeyEventAsSystemService(@NonNull MediaSession.Token sessionToken,
+ @NonNull KeyEvent keyEvent) {
+ if (sessionToken == null) {
+ throw new IllegalArgumentException("sessionToken shouldn't be null");
+ }
+ if (keyEvent == null) {
+ throw new IllegalArgumentException("keyEvent shouldn't be null");
+ }
+ try {
+ mService.dispatchVolumeKeyEventToSessionAsSystemService(mContext.getPackageName(),
+ mContext.getOpPackageName(), sessionToken, keyEvent);
+ } catch (RemoteException e) {
+ Log.wtf(TAG, "Error calling dispatchVolumeKeyEventAsSystemService", e);
+ }
+ }
+
+ /**
* Dispatch an adjust volume request to the system. It will be sent to the
* most relevant audio stream or media session. The direction must be one of
* {@link AudioManager#ADJUST_LOWER}, {@link AudioManager#ADJUST_RAISE},
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 81fce8a..866325c 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -426,6 +426,9 @@
if (err == BAD_VALUE || err == ERROR_DRM_CANNOT_HANDLE) {
jniThrowException(env, "java/lang/IllegalArgumentException", msg);
return true;
+ } else if (err == ERROR_UNSUPPORTED) {
+ jniThrowException(env, "java/lang/UnsupportedOperationException", msg);
+ return true;
} else if (err == ERROR_DRM_NOT_PROVISIONED) {
jniThrowException(env, "android/media/NotProvisionedException", msg);
return true;
@@ -542,15 +545,15 @@
// static
-bool JDrm::IsCryptoSchemeSupported(const uint8_t uuid[16], const String8 &mimeType,
- DrmPlugin::SecurityLevel securityLevel) {
+status_t JDrm::IsCryptoSchemeSupported(const uint8_t uuid[16], const String8 &mimeType,
+ DrmPlugin::SecurityLevel securityLevel, bool *isSupported) {
sp<IDrm> drm = MakeDrm();
if (drm == NULL) {
- return false;
+ return BAD_VALUE;
}
- return drm->isCryptoSchemeSupported(uuid, mimeType, securityLevel);
+ return drm->isCryptoSchemeSupported(uuid, mimeType, securityLevel, isSupported);
}
status_t JDrm::initCheck() const {
@@ -977,7 +980,14 @@
}
DrmPlugin::SecurityLevel securityLevel = jintToSecurityLevel(jSecurityLevel);
- return JDrm::IsCryptoSchemeSupported(uuid.array(), mimeType, securityLevel);
+ bool isSupported;
+ status_t err = JDrm::IsCryptoSchemeSupported(uuid.array(), mimeType,
+ securityLevel, &isSupported);
+
+ if (throwExceptionAsNecessary(env, err, "Failed to query crypto scheme support")) {
+ return false;
+ }
+ return isSupported;
}
static jbyteArray android_media_MediaDrm_openSession(
diff --git a/media/jni/android_media_MediaDrm.h b/media/jni/android_media_MediaDrm.h
index 9338861..5ebac1d 100644
--- a/media/jni/android_media_MediaDrm.h
+++ b/media/jni/android_media_MediaDrm.h
@@ -37,9 +37,10 @@
};
struct JDrm : public BnDrmClient {
- static bool IsCryptoSchemeSupported(const uint8_t uuid[16],
- const String8 &mimeType,
- DrmPlugin::SecurityLevel level);
+ static status_t IsCryptoSchemeSupported(const uint8_t uuid[16],
+ const String8 &mimeType,
+ DrmPlugin::SecurityLevel level,
+ bool *isSupported);
JDrm(JNIEnv *env, jobject thiz, const uint8_t uuid[16], const String8 &appPackageName);
diff --git a/native/webview/plat_support/draw_fn.h b/native/webview/plat_support/draw_fn.h
index e31ce19..5b3e496 100644
--- a/native/webview/plat_support/draw_fn.h
+++ b/native/webview/plat_support/draw_fn.h
@@ -84,7 +84,7 @@
VkDevice device;
VkQueue queue;
uint32_t graphics_queue_index;
- uint32_t instance_version;
+ uint32_t api_version;
const char* const* enabled_instance_extension_names;
uint32_t enabled_instance_extension_names_length;
const char* const* enabled_device_extension_names;
diff --git a/native/webview/plat_support/draw_functor.cpp b/native/webview/plat_support/draw_functor.cpp
index afe103a..6deb47f 100644
--- a/native/webview/plat_support/draw_functor.cpp
+++ b/native/webview/plat_support/draw_functor.cpp
@@ -102,7 +102,7 @@
.device = init_vk_params.device,
.queue = init_vk_params.queue,
.graphics_queue_index = init_vk_params.graphics_queue_index,
- .instance_version = init_vk_params.instance_version,
+ .api_version = init_vk_params.api_version,
.enabled_instance_extension_names =
init_vk_params.enabled_instance_extension_names,
.enabled_instance_extension_names_length =
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 7eaf04b..0a571c5 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -60,7 +60,6 @@
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import java.io.IOException;
@@ -107,11 +106,11 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL);
logMetricsEvent(MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_ACTIVITY);
mCm = ConnectivityManager.from(this);
mNetwork = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
- mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL);
mUserAgent =
getIntent().getStringExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_USER_AGENT);
mUrl = getUrl();
@@ -637,7 +636,7 @@
}
private void logMetricsEvent(int event) {
- MetricsLogger.action(this, event, getPackageName());
+ mCaptivePortal.logEvent(event, getPackageName());
}
private static final SparseArray<String> SSL_ERRORS = new SparseArray<>();
diff --git a/packages/ExtServices/Android.bp b/packages/ExtServices/Android.bp
new file mode 100644
index 0000000..77972fe
--- /dev/null
+++ b/packages/ExtServices/Android.bp
@@ -0,0 +1,11 @@
+android_library {
+ name: "ExtServices-core",
+ srcs: [
+ "src/**/*.java",
+ ],
+ resource_dirs: [
+ "res",
+ ],
+
+ manifest: "AndroidManifest.xml",
+}
\ No newline at end of file
diff --git a/packages/ExtServices/AndroidManifest.xml b/packages/ExtServices/AndroidManifest.xml
index 010a810..7fb51b9 100644
--- a/packages/ExtServices/AndroidManifest.xml
+++ b/packages/ExtServices/AndroidManifest.xml
@@ -22,6 +22,7 @@
coreApp="true">
<uses-permission android:name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
+ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<application android:label="@string/app_name"
android:defaultToDeviceProtectedStorage="true"
diff --git a/packages/ExtServices/tests/Android.bp b/packages/ExtServices/tests/Android.bp
new file mode 100644
index 0000000..5de4548
--- /dev/null
+++ b/packages/ExtServices/tests/Android.bp
@@ -0,0 +1,26 @@
+android_test {
+ name: "ExtServicesUnitTests",
+
+ // Include all test java files.
+ srcs: ["src/**/*.java"],
+
+ // We only want this apk build for tests.
+ certificate: "platform",
+
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ ],
+
+ static_libs: [
+ "ExtServices-core",
+ "android-support-test",
+ "mockito-target-minus-junit4",
+ "espresso-core",
+ "truth-prebuilt",
+ "testables",
+ "testng",
+ ],
+
+ platform_apis: true,
+}
\ No newline at end of file
diff --git a/packages/ExtServices/tests/Android.mk b/packages/ExtServices/tests/Android.mk
deleted file mode 100644
index a57fa94..0000000
--- a/packages/ExtServices/tests/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test \
- mockito-target-minus-junit4 \
- espresso-core \
- truth-prebuilt \
- testables \
- testng
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ExtServicesUnitTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := ExtServices
-
-include $(BUILD_PACKAGE)
diff --git a/packages/ExtServices/tests/AndroidManifest.xml b/packages/ExtServices/tests/AndroidManifest.xml
index ddf725b..3cf1527 100644
--- a/packages/ExtServices/tests/AndroidManifest.xml
+++ b/packages/ExtServices/tests/AndroidManifest.xml
@@ -24,7 +24,7 @@
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.ext.services"
+ android:targetPackage="android.ext.services.tests.unit"
android:label="ExtServices Test Cases">
</instrumentation>
diff --git a/packages/ExtServices/tests/src/android/ext/services/notification/NotificationCategorizerTest.java b/packages/ExtServices/tests/src/android/ext/services/notification/NotificationCategorizerTest.java
index 12908e6..c59885e 100644
--- a/packages/ExtServices/tests/src/android/ext/services/notification/NotificationCategorizerTest.java
+++ b/packages/ExtServices/tests/src/android/ext/services/notification/NotificationCategorizerTest.java
@@ -180,7 +180,7 @@
assertFalse(nc.shouldSilence(NotificationCategorizer.CATEGORY_SYSTEM));
when(mSbn.getUid()).thenReturn(FIRST_APPLICATION_UID);
- assertEquals(NotificationCategorizer.CATEGORY_EVERYTHING_ELSE, nc.getCategory(mEntry));
+ assertEquals(NotificationCategorizer.CATEGORY_HIGH, nc.getCategory(mEntry));
}
@Test
diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp
index 9b0d896..b0522f2 100644
--- a/packages/NetworkStack/Android.bp
+++ b/packages/NetworkStack/Android.bp
@@ -18,6 +18,7 @@
// system server on devices that run the stack there
java_library {
name: "NetworkStackLib",
+ sdk_version: "system_current",
installable: true,
srcs: [
"src/**/*.java",
@@ -25,14 +26,15 @@
":services-networkstack-shared-srcs",
],
static_libs: [
- "services-netlink-lib",
+ "netd_aidl_interface-java",
+ "networkstack-aidl-interfaces-java",
]
}
// Updatable network stack packaged as an application
android_app {
name: "NetworkStack",
- platform_apis: true,
+ sdk_version: "system_current",
certificate: "platform",
privileged: true,
static_libs: [
diff --git a/packages/NetworkStack/src/android/net/apf/ApfFilter.java b/packages/NetworkStack/src/android/net/apf/ApfFilter.java
index 08452bb..4fa7d64 100644
--- a/packages/NetworkStack/src/android/net/apf/ApfFilter.java
+++ b/packages/NetworkStack/src/android/net/apf/ApfFilter.java
@@ -38,7 +38,6 @@
import android.content.IntentFilter;
import android.net.LinkAddress;
import android.net.LinkProperties;
-import android.net.NetworkUtils;
import android.net.apf.ApfGenerator.IllegalInstructionException;
import android.net.apf.ApfGenerator.Register;
import android.net.ip.IpClient.IpClientCallbacksWrapper;
@@ -47,6 +46,8 @@
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.RaEvent;
import android.net.util.InterfaceParams;
+import android.net.util.NetworkStackUtils;
+import android.net.util.SocketUtils;
import android.os.PowerManager;
import android.os.SystemClock;
import android.system.ErrnoException;
@@ -60,8 +61,6 @@
import com.android.internal.util.HexDump;
import com.android.internal.util.IndentingPrintWriter;
-import libcore.io.IoBridge;
-
import java.io.FileDescriptor;
import java.io.IOException;
import java.net.Inet4Address;
@@ -200,10 +199,8 @@
public void halt() {
mStopped = true;
- try {
- // Interrupts the read() call the thread is blocked in.
- IoBridge.closeAndSignalBlockedThreads(mSocket);
- } catch (IOException ignored) {}
+ // Interrupts the read() call the thread is blocked in.
+ NetworkStackUtils.closeSocketQuietly(mSocket);
}
@Override
@@ -470,8 +467,8 @@
socket = Os.socket(AF_PACKET, SOCK_RAW, ETH_P_IPV6);
SocketAddress addr = makePacketSocketAddress(
(short) ETH_P_IPV6, mInterfaceParams.index);
- Os.bind(socket, addr);
- NetworkUtils.attachRaFilter(socket, mApfCapabilities.apfPacketFormat);
+ SocketUtils.bindSocket(socket, addr);
+ SocketUtils.attachRaFilter(socket, mApfCapabilities.apfPacketFormat);
} catch(SocketException|ErrnoException e) {
Log.e(TAG, "Error starting filter", e);
return;
diff --git a/packages/NetworkStack/src/android/net/dhcp/DhcpClient.java b/packages/NetworkStack/src/android/net/dhcp/DhcpClient.java
index 12eecc0..b0e8da9 100644
--- a/packages/NetworkStack/src/android/net/dhcp/DhcpClient.java
+++ b/packages/NetworkStack/src/android/net/dhcp/DhcpClient.java
@@ -28,6 +28,7 @@
import static android.net.dhcp.DhcpPacket.DHCP_VENDOR_INFO;
import static android.net.dhcp.DhcpPacket.INADDR_ANY;
import static android.net.dhcp.DhcpPacket.INADDR_BROADCAST;
+import static android.net.util.NetworkStackUtils.closeSocketQuietly;
import static android.net.util.SocketUtils.makePacketSocketAddress;
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_PACKET;
@@ -44,7 +45,6 @@
import android.content.Context;
import android.net.DhcpResults;
-import android.net.NetworkUtils;
import android.net.TrafficStats;
import android.net.ip.IpClient;
import android.net.metrics.DhcpClientEvent;
@@ -66,8 +66,6 @@
import com.android.internal.util.StateMachine;
import com.android.internal.util.WakeupMessage;
-import libcore.io.IoBridge;
-
import java.io.FileDescriptor;
import java.io.IOException;
import java.net.Inet4Address;
@@ -108,6 +106,12 @@
private static final boolean MSG_DBG = false;
private static final boolean PACKET_DBG = false;
+ // Metrics events: must be kept in sync with server-side aggregation code.
+ /** Represents transitions from DhcpInitState to DhcpBoundState */
+ private static final String EVENT_INITIAL_BOUND = "InitialBoundState";
+ /** Represents transitions from and to DhcpBoundState via DhcpRenewingState */
+ private static final String EVENT_RENEWING_BOUND = "RenewingBoundState";
+
// Timers and timeouts.
private static final int SECONDS = 1000;
private static final int FIRST_TIMEOUT_MS = 2 * SECONDS;
@@ -313,8 +317,8 @@
try {
mPacketSock = Os.socket(AF_PACKET, SOCK_RAW, ETH_P_IP);
SocketAddress addr = makePacketSocketAddress((short) ETH_P_IP, mIface.index);
- Os.bind(mPacketSock, addr);
- NetworkUtils.attachDhcpFilter(mPacketSock);
+ SocketUtils.bindSocket(mPacketSock, addr);
+ SocketUtils.attachDhcpFilter(mPacketSock);
} catch(SocketException|ErrnoException e) {
Log.e(TAG, "Error creating packet socket", e);
return false;
@@ -350,15 +354,9 @@
}
}
- private static void closeQuietly(FileDescriptor fd) {
- try {
- IoBridge.closeAndSignalBlockedThreads(fd);
- } catch (IOException ignored) {}
- }
-
private void closeSockets() {
- closeQuietly(mUdpSock);
- closeQuietly(mPacketSock);
+ closeSocketQuietly(mUdpSock);
+ closeSocketQuietly(mPacketSock);
}
class ReceiveThread extends Thread {
@@ -414,7 +412,8 @@
try {
if (encap == DhcpPacket.ENCAP_L2) {
if (DBG) Log.d(TAG, "Broadcasting " + description);
- Os.sendto(mPacketSock, buf.array(), 0, buf.limit(), 0, mInterfaceBroadcastAddr);
+ SocketUtils.sendTo(
+ mPacketSock, buf.array(), 0, buf.limit(), 0, mInterfaceBroadcastAddr);
} else if (encap == DhcpPacket.ENCAP_BOOTP && to.equals(INADDR_BROADCAST)) {
if (DBG) Log.d(TAG, "Broadcasting " + description);
// We only send L3-encapped broadcasts in DhcpRebindingState,
@@ -928,9 +927,9 @@
private void logTimeToBoundState() {
long now = SystemClock.elapsedRealtime();
if (mLastBoundExitTime > mLastInitEnterTime) {
- logState(DhcpClientEvent.RENEWING_BOUND, (int)(now - mLastBoundExitTime));
+ logState(EVENT_RENEWING_BOUND, (int) (now - mLastBoundExitTime));
} else {
- logState(DhcpClientEvent.INITIAL_BOUND, (int)(now - mLastInitEnterTime));
+ logState(EVENT_INITIAL_BOUND, (int) (now - mLastInitEnterTime));
}
}
}
@@ -1021,7 +1020,7 @@
// We need to broadcast and possibly reconnect the socket to a
// completely different server.
- closeQuietly(mUdpSock);
+ closeSocketQuietly(mUdpSock);
if (!initUdpSocket()) {
Log.e(TAG, "Failed to recreate UDP socket");
transitionTo(mDhcpInitState);
diff --git a/packages/NetworkStack/src/android/net/dhcp/DhcpPacketListener.java b/packages/NetworkStack/src/android/net/dhcp/DhcpPacketListener.java
index eac8d2a..96d1a28 100644
--- a/packages/NetworkStack/src/android/net/dhcp/DhcpPacketListener.java
+++ b/packages/NetworkStack/src/android/net/dhcp/DhcpPacketListener.java
@@ -64,7 +64,7 @@
@Override
protected int readPacket(@NonNull FileDescriptor fd, @NonNull Payload packetBuffer)
throws Exception {
- final InetSocketAddress addr = new InetSocketAddress();
+ final InetSocketAddress addr = new InetSocketAddress(0);
final int read = Os.recvfrom(
fd, packetBuffer.mBytes, 0, packetBuffer.mBytes.length, 0 /* flags */, addr);
diff --git a/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java b/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java
index beabd3e..cd993e9 100644
--- a/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java
+++ b/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java
@@ -28,6 +28,7 @@
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.IPPROTO_UDP;
import static android.system.OsConstants.SOCK_DGRAM;
+import static android.system.OsConstants.SOCK_NONBLOCK;
import static android.system.OsConstants.SOL_SOCKET;
import static android.system.OsConstants.SO_BROADCAST;
import static android.system.OsConstants.SO_REUSEADDR;
@@ -43,7 +44,6 @@
import android.annotation.Nullable;
import android.net.INetworkStackStatusCallback;
import android.net.MacAddress;
-import android.net.NetworkUtils;
import android.net.TrafficStats;
import android.net.util.SharedLog;
import android.net.util.SocketUtils;
@@ -207,7 +207,7 @@
@Override
public void addArpEntry(@NonNull Inet4Address ipv4Addr, @NonNull MacAddress ethAddr,
@NonNull String ifname, @NonNull FileDescriptor fd) throws IOException {
- NetworkUtils.addArpEntry(ipv4Addr, ethAddr, ifname, fd);
+ SocketUtils.addArpEntry(ipv4Addr, ethAddr, ifname, fd);
}
@Override
@@ -630,7 +630,7 @@
// TODO: have and use an API to set a socket tag without going through the thread tag
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TAG_SYSTEM_DHCP_SERVER);
try {
- mSocket = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ mSocket = Os.socket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
SocketUtils.bindSocketToInterface(mSocket, mIfName);
Os.setsockoptInt(mSocket, SOL_SOCKET, SO_REUSEADDR, 1);
Os.setsockoptInt(mSocket, SOL_SOCKET, SO_BROADCAST, 1);
diff --git a/packages/NetworkStack/src/android/net/dhcp/DhcpServingParams.java b/packages/NetworkStack/src/android/net/dhcp/DhcpServingParams.java
index 31ce95b..3cd2aa4 100644
--- a/packages/NetworkStack/src/android/net/dhcp/DhcpServingParams.java
+++ b/packages/NetworkStack/src/android/net/dhcp/DhcpServingParams.java
@@ -209,7 +209,7 @@
* but it must always be set explicitly before building the {@link DhcpServingParams}.
*/
public Builder setDefaultRouters(@NonNull Inet4Address... defaultRouters) {
- return setDefaultRouters(new ArraySet<>(Arrays.asList(defaultRouters)));
+ return setDefaultRouters(makeArraySet(defaultRouters));
}
/**
@@ -239,7 +239,7 @@
* building the {@link DhcpServingParams}.
*/
public Builder setDnsServers(@NonNull Inet4Address... dnsServers) {
- return setDnsServers(new ArraySet<>(Arrays.asList(dnsServers)));
+ return setDnsServers(makeArraySet(dnsServers));
}
/**
@@ -269,7 +269,7 @@
* and do not need to be set here.
*/
public Builder setExcludedAddrs(@NonNull Inet4Address... excludedAddrs) {
- return setExcludedAddrs(new ArraySet<>(Arrays.asList(excludedAddrs)));
+ return setExcludedAddrs(makeArraySet(excludedAddrs));
}
/**
@@ -368,4 +368,10 @@
static IpPrefix makeIpPrefix(@NonNull LinkAddress addr) {
return new IpPrefix(addr.getAddress(), addr.getPrefixLength());
}
+
+ private static <T> ArraySet<T> makeArraySet(T[] elements) {
+ final ArraySet<T> set = new ArraySet<>(elements.length);
+ set.addAll(Arrays.asList(elements));
+ return set;
+ }
}
diff --git a/packages/NetworkStack/src/android/net/ip/ConnectivityPacketTracker.java b/packages/NetworkStack/src/android/net/ip/ConnectivityPacketTracker.java
index 385dd52..649257a 100644
--- a/packages/NetworkStack/src/android/net/ip/ConnectivityPacketTracker.java
+++ b/packages/NetworkStack/src/android/net/ip/ConnectivityPacketTracker.java
@@ -20,12 +20,13 @@
import static android.system.OsConstants.AF_PACKET;
import static android.system.OsConstants.ARPHRD_ETHER;
import static android.system.OsConstants.ETH_P_ALL;
+import static android.system.OsConstants.SOCK_NONBLOCK;
import static android.system.OsConstants.SOCK_RAW;
-import android.net.NetworkUtils;
import android.net.util.ConnectivityPacketSummary;
import android.net.util.InterfaceParams;
import android.net.util.PacketReader;
+import android.net.util.SocketUtils;
import android.os.Handler;
import android.system.ErrnoException;
import android.system.Os;
@@ -33,7 +34,7 @@
import android.util.LocalLog;
import android.util.Log;
-import libcore.util.HexEncoding;
+import com.android.internal.util.HexDump;
import java.io.FileDescriptor;
import java.io.IOException;
@@ -101,9 +102,10 @@
protected FileDescriptor createFd() {
FileDescriptor s = null;
try {
- s = Os.socket(AF_PACKET, SOCK_RAW, 0);
- NetworkUtils.attachControlPacketFilter(s, ARPHRD_ETHER);
- Os.bind(s, makePacketSocketAddress((short) ETH_P_ALL, mInterface.index));
+ s = Os.socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, 0);
+ SocketUtils.attachControlPacketFilter(s, ARPHRD_ETHER);
+ SocketUtils.bindSocket(
+ s, makePacketSocketAddress((short) ETH_P_ALL, mInterface.index));
} catch (ErrnoException | IOException e) {
logError("Failed to create packet tracking socket: ", e);
closeFd(s);
@@ -119,8 +121,7 @@
if (summary == null) return;
if (DBG) Log.d(mTag, summary);
- addLogEntry(summary +
- "\n[" + new String(HexEncoding.encode(recvbuf, 0, length)) + "]");
+ addLogEntry(summary + "\n[" + HexDump.toHexString(recvbuf, 0, length) + "]");
}
@Override
diff --git a/packages/NetworkStack/src/android/net/ip/IpClient.java b/packages/NetworkStack/src/android/net/ip/IpClient.java
index 4315d34..12fe8c5 100644
--- a/packages/NetworkStack/src/android/net/ip/IpClient.java
+++ b/packages/NetworkStack/src/android/net/ip/IpClient.java
@@ -16,6 +16,7 @@
package android.net.ip;
+import static android.net.RouteInfo.RTN_UNICAST;
import static android.net.shared.IpConfigurationParcelableUtil.toStableParcelable;
import static android.net.shared.LinkPropertiesParcelableUtil.fromStableParcelable;
import static android.net.shared.LinkPropertiesParcelableUtil.toStableParcelable;
@@ -36,7 +37,6 @@
import android.net.apf.ApfCapabilities;
import android.net.apf.ApfFilter;
import android.net.dhcp.DhcpClient;
-import android.net.ip.IIpClientCallbacks;
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.IpManagerEvent;
import android.net.shared.InitialConfiguration;
@@ -52,7 +52,6 @@
import android.util.Log;
import android.util.SparseArray;
-import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IState;
import com.android.internal.util.IndentingPrintWriter;
@@ -992,7 +991,7 @@
// specified in the InitialConfiguration have been observed with Netlink.
if (config.isProvisionedBy(newLp.getLinkAddresses(), null)) {
for (IpPrefix prefix : config.directlyConnectedRoutes) {
- newLp.addRoute(new RouteInfo(prefix, null, mInterfaceName));
+ newLp.addRoute(new RouteInfo(prefix, null, mInterfaceName, RTN_UNICAST));
}
}
addAllReachableDnsServers(newLp, config.dnsServers);
@@ -1093,7 +1092,7 @@
// If we have a StaticIpConfiguration attempt to apply it and
// handle the result accordingly.
if (mConfiguration.mStaticIpConfig != null) {
- if (mInterfaceCtrl.setIPv4Address(mConfiguration.mStaticIpConfig.ipAddress)) {
+ if (mInterfaceCtrl.setIPv4Address(mConfiguration.mStaticIpConfig.getIpAddress())) {
handleIPv4Success(new DhcpResults(mConfiguration.mStaticIpConfig));
} else {
return false;
@@ -1348,10 +1347,8 @@
apfConfig.apfCapabilities = mConfiguration.mApfCapabilities;
apfConfig.multicastFilter = mMulticastFiltering;
// Get the Configuration for ApfFilter from Context
- apfConfig.ieee802_3Filter =
- mContext.getResources().getBoolean(R.bool.config_apfDrop802_3Frames);
- apfConfig.ethTypeBlackList =
- mContext.getResources().getIntArray(R.array.config_apfEthTypeBlackList);
+ apfConfig.ieee802_3Filter = ApfCapabilities.getApfDrop8023Frames(mContext);
+ apfConfig.ethTypeBlackList = ApfCapabilities.getApfEthTypeBlackList(mContext);
mApfFilter = ApfFilter.maybeCreate(mContext, apfConfig, mInterfaceParams, mCallback);
// TODO: investigate the effects of any multicast filtering racing/interfering with the
// rest of this IP configuration startup.
diff --git a/packages/NetworkStack/src/android/net/ip/IpNeighborMonitor.java b/packages/NetworkStack/src/android/net/ip/IpNeighborMonitor.java
index 2e6ff24..b29d617 100644
--- a/packages/NetworkStack/src/android/net/ip/IpNeighborMonitor.java
+++ b/packages/NetworkStack/src/android/net/ip/IpNeighborMonitor.java
@@ -20,6 +20,10 @@
import static android.net.netlink.NetlinkConstants.hexify;
import static android.net.netlink.NetlinkConstants.stringForNlMsgType;
import static android.net.util.SocketUtils.makeNetlinkSocketAddress;
+import static android.system.OsConstants.AF_NETLINK;
+import static android.system.OsConstants.NETLINK_ROUTE;
+import static android.system.OsConstants.SOCK_DGRAM;
+import static android.system.OsConstants.SOCK_NONBLOCK;
import android.net.MacAddress;
import android.net.netlink.NetlinkErrorMessage;
@@ -27,8 +31,10 @@
import android.net.netlink.NetlinkSocket;
import android.net.netlink.RtNetlinkNeighborMessage;
import android.net.netlink.StructNdMsg;
+import android.net.util.NetworkStackUtils;
import android.net.util.PacketReader;
import android.net.util.SharedLog;
+import android.net.util.SocketUtils;
import android.os.Handler;
import android.os.SystemClock;
import android.system.ErrnoException;
@@ -36,8 +42,6 @@
import android.system.OsConstants;
import android.util.Log;
-import libcore.io.IoUtils;
-
import java.io.FileDescriptor;
import java.net.InetAddress;
import java.net.SocketAddress;
@@ -77,7 +81,7 @@
1, ip, StructNdMsg.NUD_PROBE, ifIndex, null);
try {
- NetlinkSocket.sendOneShotKernelMessage(OsConstants.NETLINK_ROUTE, msg);
+ NetlinkSocket.sendOneShotKernelMessage(NETLINK_ROUTE, msg);
} catch (ErrnoException e) {
Log.e(TAG, "Error " + msgSnippet + ": " + e);
return -e.errno;
@@ -145,8 +149,8 @@
FileDescriptor fd = null;
try {
- fd = NetlinkSocket.forProto(OsConstants.NETLINK_ROUTE);
- Os.bind(fd, makeNetlinkSocketAddress(0, OsConstants.RTMGRP_NEIGH));
+ fd = Os.socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK, NETLINK_ROUTE);
+ SocketUtils.bindSocket(fd, makeNetlinkSocketAddress(0, OsConstants.RTMGRP_NEIGH));
NetlinkSocket.connectToKernel(fd);
if (VDBG) {
@@ -155,7 +159,7 @@
}
} catch (ErrnoException|SocketException e) {
logError("Failed to create rtnetlink socket", e);
- IoUtils.closeQuietly(fd);
+ NetworkStackUtils.closeSocketQuietly(fd);
return null;
}
diff --git a/packages/NetworkStack/src/android/net/util/NetworkStackUtils.java b/packages/NetworkStack/src/android/net/util/NetworkStackUtils.java
index 6dcf0c0..98123a5 100644
--- a/packages/NetworkStack/src/android/net/util/NetworkStackUtils.java
+++ b/packages/NetworkStack/src/android/net/util/NetworkStackUtils.java
@@ -16,6 +16,9 @@
package android.net.util;
+import java.io.FileDescriptor;
+import java.io.IOException;
+
/**
* Collection of utilities for the network stack.
*/
@@ -27,4 +30,14 @@
public static <T> boolean isEmpty(T[] array) {
return array == null || array.length == 0;
}
+
+ /**
+ * Close a socket, ignoring any exception while closing.
+ */
+ public static void closeSocketQuietly(FileDescriptor fd) {
+ try {
+ SocketUtils.closeSocket(fd);
+ } catch (IOException ignored) {
+ }
+ }
}
diff --git a/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java b/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
index 4f55779..6fb4b0d 100644
--- a/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
+++ b/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
@@ -15,6 +15,8 @@
*/
package com.android.server;
+import static android.net.RouteInfo.RTN_UNICAST;
+
import android.annotation.NonNull;
import android.net.INetd;
import android.net.INetdUnsolicitedEventListener;
@@ -169,7 +171,7 @@
public void onRouteChanged(boolean updated, String route, String gateway, String ifName) {
final RouteInfo processRoute = new RouteInfo(new IpPrefix(route),
("".equals(gateway)) ? null : InetAddresses.parseNumericAddress(gateway),
- ifName);
+ ifName, RTN_UNICAST);
if (updated) {
invokeForAllObservers(o -> o.onRouteUpdated(processRoute));
} else {
diff --git a/packages/NetworkStack/src/com/android/server/NetworkStackService.java b/packages/NetworkStack/src/com/android/server/NetworkStackService.java
index 7405c47..cedcb84 100644
--- a/packages/NetworkStack/src/com/android/server/NetworkStackService.java
+++ b/packages/NetworkStack/src/com/android/server/NetworkStackService.java
@@ -19,6 +19,7 @@
import static android.net.dhcp.IDhcpServer.STATUS_INVALID_ARGUMENT;
import static android.net.dhcp.IDhcpServer.STATUS_SUCCESS;
import static android.net.dhcp.IDhcpServer.STATUS_UNKNOWN_ERROR;
+import static android.net.shared.NetworkParcelableUtil.fromStableParcelable;
import static com.android.server.util.PermissionUtil.checkDumpPermission;
import static com.android.server.util.PermissionUtil.checkNetworkStackCallingPermission;
@@ -34,7 +35,7 @@
import android.net.INetworkMonitorCallbacks;
import android.net.INetworkStackConnector;
import android.net.Network;
-import android.net.NetworkRequest;
+import android.net.NetworkParcelable;
import android.net.PrivateDnsConfigParcel;
import android.net.dhcp.DhcpServer;
import android.net.dhcp.DhcpServingParams;
@@ -150,13 +151,12 @@
}
@Override
- public void makeNetworkMonitor(int netId, String name, INetworkMonitorCallbacks cb)
+ public void makeNetworkMonitor(
+ NetworkParcelable network, String name, INetworkMonitorCallbacks cb)
throws RemoteException {
- final Network network = new Network(netId, false /* privateDnsBypass */);
- final NetworkRequest defaultRequest = mCm.getDefaultRequest();
- final SharedLog log = addValidationLogs(network, name);
- final NetworkMonitor nm = new NetworkMonitor(
- mContext, cb, network, defaultRequest, log);
+ final Network parsedNetwork = fromStableParcelable(network);
+ final SharedLog log = addValidationLogs(parsedNetwork, name);
+ final NetworkMonitor nm = new NetworkMonitor(mContext, cb, parsedNetwork, log);
cb.onNetworkMonitorCreated(new NetworkMonitorImpl(nm));
}
diff --git a/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java b/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
index 96eaa50..b34efc4 100644
--- a/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
@@ -47,7 +47,6 @@
import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
import android.net.ProxyInfo;
import android.net.TrafficStats;
import android.net.Uri;
@@ -310,14 +309,14 @@
private long mLastProbeTime;
public NetworkMonitor(Context context, INetworkMonitorCallbacks cb, Network network,
- NetworkRequest defaultRequest, SharedLog validationLog) {
- this(context, cb, network, defaultRequest, new IpConnectivityLog(), validationLog,
+ SharedLog validationLog) {
+ this(context, cb, network, new IpConnectivityLog(), validationLog,
Dependencies.DEFAULT);
}
@VisibleForTesting
protected NetworkMonitor(Context context, INetworkMonitorCallbacks cb, Network network,
- NetworkRequest defaultRequest, IpConnectivityLog logger, SharedLog validationLogs,
+ IpConnectivityLog logger, SharedLog validationLogs,
Dependencies deps) {
// Add suffix indicating which NetworkMonitor we're talking about.
super(TAG + "/" + network.toString());
@@ -369,8 +368,7 @@
// we can ever fetch them.
// TODO: Delete ASAP.
mLinkProperties = new LinkProperties();
- mNetworkCapabilities = new NetworkCapabilities();
- mNetworkCapabilities.clearAll();
+ mNetworkCapabilities = new NetworkCapabilities(null);
}
/**
@@ -689,6 +687,15 @@
}
sendMessage(CMD_CAPTIVE_PORTAL_APP_FINISHED, response);
}
+
+ @Override
+ public void logEvent(int eventId, String packageName)
+ throws RemoteException {
+ mContext.enforceCallingPermission(
+ android.Manifest.permission.CONNECTIVITY_INTERNAL,
+ "CaptivePortal");
+ mCallback.logCaptivePortalLoginEvent(eventId, packageName);
+ }
}));
final CaptivePortalProbeResult probeRes = mLastPortalProbeResult;
intent.putExtra(EXTRA_CAPTIVE_PORTAL_URL, probeRes.detectUrl);
diff --git a/packages/NetworkStack/tests/src/android/net/util/PacketReaderTest.java b/packages/NetworkStack/tests/src/android/net/util/PacketReaderTest.java
index dced743..6e11c40 100644
--- a/packages/NetworkStack/tests/src/android/net/util/PacketReaderTest.java
+++ b/packages/NetworkStack/tests/src/android/net/util/PacketReaderTest.java
@@ -17,7 +17,13 @@
package android.net.util;
import static android.net.util.PacketReader.DEFAULT_RECV_BUF_SIZE;
-import static android.system.OsConstants.*;
+import static android.system.OsConstants.AF_INET6;
+import static android.system.OsConstants.IPPROTO_UDP;
+import static android.system.OsConstants.SOCK_DGRAM;
+import static android.system.OsConstants.SOCK_NONBLOCK;
+import static android.system.OsConstants.SOL_SOCKET;
+import static android.system.OsConstants.SO_SNDTIMEO;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -31,10 +37,12 @@
import android.system.Os;
import android.system.StructTimeval;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.UncheckedIOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.Inet6Address;
@@ -45,13 +53,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.junit.runner.RunWith;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import libcore.io.IoBridge;
-
/**
* Tests for PacketReader.
*
@@ -80,7 +81,7 @@
protected FileDescriptor createFd() {
FileDescriptor s = null;
try {
- s = Os.socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+ s = Os.socket(AF_INET6, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
Os.bind(s, LOOPBACK6, 0);
mLocalSockName = (InetSocketAddress) Os.getsockname(s);
Os.setsockoptTimeval(s, SOL_SOCKET, SO_SNDTIMEO, TIMEO);
diff --git a/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java b/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
index d31fa77..d11bb64 100644
--- a/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -21,7 +21,6 @@
import static android.net.INetworkMonitor.NETWORK_TEST_RESULT_INVALID;
import static android.net.INetworkMonitor.NETWORK_TEST_RESULT_VALID;
import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
@@ -51,7 +50,6 @@
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
-import android.net.NetworkRequest;
import android.net.captiveportal.CaptivePortalProbeResult;
import android.net.metrics.IpConnectivityLog;
import android.net.util.SharedLog;
@@ -103,7 +101,6 @@
private @Mock NetworkMonitor.Dependencies mDependencies;
private @Mock INetworkMonitorCallbacks mCallbacks;
private @Spy Network mNetwork = new Network(TEST_NETID);
- private NetworkRequest mRequest;
private static final int TEST_NETID = 4242;
@@ -178,10 +175,6 @@
InetAddresses.parseNumericAddress("192.168.0.0")
}).when(mNetwork).getAllByName(any());
- mRequest = new NetworkRequest.Builder()
- .addCapability(NET_CAPABILITY_INTERNET)
- .addCapability(NET_CAPABILITY_NOT_RESTRICTED)
- .build();
// Default values. Individual tests can override these.
when(mCm.getLinkProperties(any())).thenReturn(TEST_LINKPROPERTIES);
when(mCm.getNetworkCapabilities(any())).thenReturn(METERED_CAPABILITIES);
@@ -195,9 +188,9 @@
private class WrappedNetworkMonitor extends NetworkMonitor {
private long mProbeTime = 0;
- WrappedNetworkMonitor(Context context, Network network, NetworkRequest defaultRequest,
- IpConnectivityLog logger, Dependencies deps) {
- super(context, mCallbacks, network, defaultRequest, logger,
+ WrappedNetworkMonitor(Context context, Network network, IpConnectivityLog logger,
+ Dependencies deps) {
+ super(context, mCallbacks, network, logger,
new SharedLog("test_nm"), deps);
}
@@ -213,7 +206,7 @@
private WrappedNetworkMonitor makeMeteredWrappedNetworkMonitor() {
final WrappedNetworkMonitor nm = new WrappedNetworkMonitor(
- mContext, mNetwork, mRequest, mLogger, mDependencies);
+ mContext, mNetwork, mLogger, mDependencies);
when(mCm.getNetworkCapabilities(any())).thenReturn(METERED_CAPABILITIES);
nm.start();
waitForIdle(nm.getHandler());
@@ -222,7 +215,7 @@
private WrappedNetworkMonitor makeNotMeteredWrappedNetworkMonitor() {
final WrappedNetworkMonitor nm = new WrappedNetworkMonitor(
- mContext, mNetwork, mRequest, mLogger, mDependencies);
+ mContext, mNetwork, mLogger, mDependencies);
when(mCm.getNetworkCapabilities(any())).thenReturn(NOT_METERED_CAPABILITIES);
nm.start();
waitForIdle(nm.getHandler());
@@ -231,7 +224,7 @@
private NetworkMonitor makeMonitor() {
final NetworkMonitor nm = new NetworkMonitor(
- mContext, mCallbacks, mNetwork, mRequest, mLogger, mValidationLogger,
+ mContext, mCallbacks, mNetwork, mLogger, mValidationLogger,
mDependencies);
nm.start();
waitForIdle(nm.getHandler());
diff --git a/packages/SettingsLib/ActionBarShadow/Android.bp b/packages/SettingsLib/ActionBarShadow/Android.bp
new file mode 100644
index 0000000..d284856
--- /dev/null
+++ b/packages/SettingsLib/ActionBarShadow/Android.bp
@@ -0,0 +1,14 @@
+android_library {
+ name: "SettingsLibActionBarShadow",
+
+ srcs: ["src/**/*.java"],
+
+ static_libs: [
+ "androidx.annotation_annotation",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.recyclerview_recyclerview",
+ ],
+
+ sdk_version: "system_current",
+ min_sdk_version: "21",
+}
diff --git a/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml b/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml
new file mode 100644
index 0000000..4b9f1ab
--- /dev/null
+++ b/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settingslib.widget">
+
+ <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
diff --git a/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java b/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java
new file mode 100644
index 0000000..68ba5fb
--- /dev/null
+++ b/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java
@@ -0,0 +1,133 @@
+/*
+ * 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.settingslib.widget;
+
+import static androidx.lifecycle.Lifecycle.Event.ON_START;
+import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.view.View;
+
+import androidx.annotation.VisibleForTesting;
+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.
+ */
+public class ActionBarShadowController implements LifecycleObserver {
+
+ @VisibleForTesting
+ static final float ELEVATION_HIGH = 8;
+ @VisibleForTesting
+ static final float ELEVATION_LOW = 0;
+
+ @VisibleForTesting
+ ScrollChangeWatcher mScrollChangeWatcher;
+ private RecyclerView mRecyclerView;
+ 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);
+ }
+
+ /**
+ * 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);
+ }
+
+ private ActionBarShadowController(Activity activity, Lifecycle lifecycle,
+ RecyclerView recyclerView) {
+ mScrollChangeWatcher =
+ new ActionBarShadowController.ScrollChangeWatcher(activity);
+ mRecyclerView = recyclerView;
+ attachScrollWatcher();
+ lifecycle.addObserver(this);
+ }
+
+ private ActionBarShadowController(View anchorView, Lifecycle lifecycle,
+ RecyclerView recyclerView) {
+ mScrollChangeWatcher =
+ new ActionBarShadowController.ScrollChangeWatcher(anchorView);
+ mRecyclerView = recyclerView;
+ attachScrollWatcher();
+ lifecycle.addObserver(this);
+ }
+
+ @OnLifecycleEvent(ON_START)
+ private void attachScrollWatcher() {
+ if (!mIsScrollWatcherAttached) {
+ mIsScrollWatcherAttached = true;
+ mRecyclerView.addOnScrollListener(mScrollChangeWatcher);
+ mScrollChangeWatcher.updateDropShadow(mRecyclerView);
+ }
+ }
+
+ @OnLifecycleEvent(ON_STOP)
+ private void detachScrollWatcher() {
+ mRecyclerView.removeOnScrollListener(mScrollChangeWatcher);
+ mIsScrollWatcherAttached = false;
+ }
+
+ /**
+ * Update the drop shadow as the scrollable entity is scrolled.
+ */
+ final class ScrollChangeWatcher extends RecyclerView.OnScrollListener {
+
+ private final Activity mActivity;
+ private final View mAnchorView;
+
+ ScrollChangeWatcher(Activity activity) {
+ mActivity = activity;
+ mAnchorView = null;
+ }
+
+ ScrollChangeWatcher(View anchorView) {
+ mAnchorView = anchorView;
+ mActivity = null;
+ }
+
+ // RecyclerView scrolled.
+ @Override
+ public void onScrolled(RecyclerView view, int dx, int dy) {
+ updateDropShadow(view);
+ }
+
+ public void updateDropShadow(View view) {
+ final boolean shouldShowShadow = view.canScrollVertically(-1);
+ if (mAnchorView != null) {
+ mAnchorView.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
+ } else if (mActivity != null) { // activity can become null when running monkey
+ final ActionBar actionBar = mActivity.getActionBar();
+ if (actionBar != null) {
+ actionBar.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
+ }
+ }
+ }
+ }
+}
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index 2321790..5a81f8b 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -13,6 +13,7 @@
"SettingsLibHelpUtils",
"SettingsLibRestrictedLockUtils",
+ "SettingsLibActionBarShadow",
"SettingsLibAppPreference",
"SettingsLibSearchWidget",
"SettingsLibSettingsSpinner",
diff --git a/packages/SettingsLib/OWNERS b/packages/SettingsLib/OWNERS
index d188c65..d879087 100644
--- a/packages/SettingsLib/OWNERS
+++ b/packages/SettingsLib/OWNERS
@@ -4,7 +4,7 @@
dehboxturtle@google.com
dhnishi@google.com
dling@google.com
-dsandler@google.com
+dsandler@android.com
evanlaird@google.com
jackqdyulei@google.com
jmonk@google.com
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index c8f8d73..191bd8f 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -99,12 +99,14 @@
<string name="connected_via_network_scorer_default">Automatically connected via network rating provider</string>
<!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
<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] -->
- <string name="tap_to_set_up">Tap to set up</string>
+ <string name="tap_to_sign_up">Tap to sign up</string>
<!-- Package name for Settings app-->
<string name="settings_package" translatable="false">com.android.settings</string>
<!-- Package name for Certinstaller app-->
@@ -127,78 +129,16 @@
<!-- Status message of Wi-Fi when an available network is a carrier network. [CHAR LIMIT=NONE] -->
<string name="available_via_carrier">Available via %1$s</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_AP_CONNECTION. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_ap_connection">Connection failed</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_SERVER_URL_INVALID. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_server_url_invalid">Invalid OSU server URL</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_SERVER_CONNECTION. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_server_connection">OSU server connection failed</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_SERVER_VALIDATION. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_server_validation">OSU server validation failed</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_SERVICE_PROVIDER_VERIFICATION. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_service_provider_verification">Invalid OSU server certificate</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_PROVISIONING_ABORTED. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_provisioning_aborted">Provisioning aborted</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_PROVISIONING_NOT_AVAILABLE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_provisioning_not_available">Provisioning not available</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_INVALID_SERVER_URL. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_invalid_server_url">Invalid OSU server URL</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_UNEXPECTED_COMMAND_TYPE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_unexpected_command_type">Unexpected command type</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_UNEXPECTED_SOAP_MESSAGE_TYPE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_unexpected_soap_message_type">Unexpected SOAP message type</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_SOAP_MESSAGE_EXCHANGE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_soap_message_exchange">SOAP message exchange failed</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_START_REDIRECT_LISTENER. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_start_redirect_listener">Redirect listener failed to start</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_TIMED_OUT_REDIRECT_LISTENER. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_timed_out_redirect_listener">Timed out waiting for redirect</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_NO_OSU_ACTIVITY_FOUND. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_no_osu_activity_found">No OSU activity found</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_UNEXPECTED_SOAP_MESSAGE_STATUS. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_unexpected_soap_message_status">Unexpected SOAP message status</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_NO_PPS_MO. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_no_pps_mo">Failed to find PPS-MO</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_NO_AAA_SERVER_TRUST_ROOT_NODE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_no_aaa_server_trust_root_node">Failed to find trust root node for AAA server</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_NO_REMEDIATION_SERVER_TRUST_ROOT_NODE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_no_remediation_server_trust_root_node">Failed to find trust root node for remediation server</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_NO_POLICY_SERVER_TRUST_ROOT_NODE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_no_policy_server_trust_root_node">Failed to find trust root node for policy server</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_RETRIEVE_TRUST_ROOT_CERTIFICATES. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_retrieve_trust_root_certificates">Failed to retrieve trust root certificates</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_NO_AAA_TRUST_ROOT_CERTIFICATE. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_no_aaa_trust_root_certificate">Failed to find trust root certificate for AAA server</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_ADD_PASSPOINT_CONFIGURATION. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_add_passpoint_configuration">Failed to add PassPoint configuration</string>
- <!-- Status message of OSU Provider on receiving OSU_FAILURE_OSU_PROVIDER_NOT_FOUND. [CHAR LIMIT=NONE] -->
- <string name="osu_failure_osu_provider_not_found">Failed to find an OSU provider</string>
-
- <!-- Status message of OSU Provider on receiving OSU_STATUS_AP_CONNECTING. [CHAR LIMIT=NONE] -->
- <string name="osu_status_ap_connecting">Connecting</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_AP_CONNECTED. [CHAR LIMIT=NONE] -->
- <string name="osu_status_ap_connected">Connected</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_SERVER_CONNECTING. [CHAR LIMIT=NONE] -->
- <string name="osu_status_server_connecting">Connecting to OSU server</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_SERVER_VALIDATED. [CHAR LIMIT=NONE] -->
- <string name="osu_status_server_validated">OSU server validated</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_SERVER_CONNECTED. [CHAR LIMIT=NONE] -->
- <string name="osu_status_server_connected">Connected to OSU server</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_INIT_SOAP_EXCHANGE. [CHAR LIMIT=NONE] -->
- <string name="osu_status_init_soap_exchange">Initial SOAP exchange</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_WAITING_FOR_REDIRECT_RESPONSE. [CHAR LIMIT=NONE] -->
- <string name="osu_status_waiting_for_redirect_response">Waiting for redirect response</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_REDIRECT_RESPONSE_RECEIVED. [CHAR LIMIT=NONE] -->
- <string name="osu_status_redirect_response_received">Received redirect response</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_SECOND_SOAP_EXCHANGE. [CHAR LIMIT=NONE] -->
- <string name="osu_status_second_soap_exchange">Second SOAP exchange</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_THIRD_SOAP_EXCHANGE. [CHAR LIMIT=NONE] -->
- <string name="osu_status_third_soap_exchange">Third SOAP exchange</string>
- <!-- Status message of OSU Provider on receiving OSU_STATUS_RETRIEVING_TRUST_ROOT_CERTS. [CHAR LIMIT=NONE] -->
- <string name="osu_status_retrieving_trust_root_certs">Retrieving trust root certificates</string>
-
+ <!-- Status message of OSU Provider upon initiating provisioning flow [CHAR LIMIT=NONE] -->
+ <string name="osu_opening_provider">Opening <xliff:g id="passpointProvider" example="Passpoint Provider">%1$s</xliff:g></string>
+ <!-- Status message of OSU Provider when connection fails [CHAR LIMIT=NONE] -->
+ <string name="osu_connect_failed">Couldn\u2019t connect</string>
+ <!-- Status message of OSU Provider after user completes provisioning flow [CHAR LIMIT=NONE] -->
+ <string name="osu_completing_sign_up">Completing sign-up\u2026</string>
+ <!-- Status message of OSU Provider when sign up could not be completed [CHAR LIMIT=NONE] -->
+ <string name="osu_sign_up_failed">Couldn\u2019t complete sign-up. Tap to try again.</string>
<!-- Status message of OSU Provider on completing provisioning. [CHAR LIMIT=NONE] -->
- <string name="osu_provisioning_complete">Provisioning complete</string>
+ <string name="osu_sign_up_complete">Sign-up complete. Connecting\u2026</string>
<!-- Speed label for very slow network speed -->
<string name="speed_label_very_slow">Very Slow</string>
@@ -616,8 +556,6 @@
<string name="wifi_display_certification">Wireless display certification</string>
<!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
<string name="wifi_verbose_logging">Enable Wi\u2011Fi Verbose Logging</string>
- <!-- Setting Checkbox title whether to enable connected MAC randomization -->
- <string name="wifi_connected_mac_randomization">Connected MAC Randomization</string>
<!-- Setting Checkbox title whether to always keep mobile data active. [CHAR LIMIT=80] -->
<string name="mobile_data_always_on">Mobile data always active</string>
<!-- Setting Checkbox title whether to enable hardware acceleration for tethering. [CHAR LIMIT=80] -->
@@ -673,8 +611,6 @@
<string name="wifi_display_certification_summary">Show options for wireless display certification</string>
<!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
<string name="wifi_verbose_logging_summary">Increase Wi\u2011Fi logging level, show per SSID RSSI in Wi\u2011Fi Picker</string>
- <!-- Setting Checkbox title whether to enable connected MAC randomization -->
- <string name="wifi_connected_mac_randomization_summary">Randomize MAC address when connecting to Wi\u2011Fi networks</string>
<!-- Label indicating network has been manually marked as metered -->
<string name="wifi_metered_label">Metered</string>
<!-- Label indicating network has been manually marked as unmetered -->
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
index a8a0b6d..081f8a0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
@@ -68,7 +68,7 @@
case BluetoothClass.Device.Major.PHONE:
return new Pair<>(
getBluetoothDrawable(context,
- com.android.internal.R.drawable.ic_bt_cellphone, level,
+ com.android.internal.R.drawable.ic_phone, level,
iconScale),
context.getString(R.string.bluetooth_talkback_phone));
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
index 0afc878..d4dda32 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
@@ -200,7 +200,7 @@
}
public int getDrawableResource(BluetoothClass btClass) {
- return com.android.internal.R.drawable.ic_bt_cellphone;
+ return com.android.internal.R.drawable.ic_phone;
}
protected void finalize() {
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java
index bea944c..b2a9a6a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java
@@ -196,7 +196,7 @@
}
public int getDrawableResource(BluetoothClass btClass) {
- return com.android.internal.R.drawable.ic_bt_cellphone;
+ return com.android.internal.R.drawable.ic_phone;
}
protected void finalize() {
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
index 4a27715..a2da4fb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
@@ -192,7 +192,7 @@
}
public int getDrawableResource(BluetoothClass btClass) {
- return com.android.internal.R.drawable.ic_bt_cellphone;
+ return com.android.internal.R.drawable.ic_phone;
}
protected void finalize() {
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java
index 165af2c..17104e4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java
@@ -135,7 +135,7 @@
}
public int getDrawableResource(BluetoothClass btClass) {
- return com.android.internal.R.drawable.ic_bt_cellphone;
+ return com.android.internal.R.drawable.ic_phone;
}
protected void finalize() {
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java
index 9e9c5b9..9b733f2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java
@@ -196,7 +196,7 @@
}
public int getDrawableResource(BluetoothClass btClass) {
- return com.android.internal.R.drawable.ic_bt_cellphone;
+ return com.android.internal.R.drawable.ic_phone;
}
protected void finalize() {
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
index 01003aa..8ec2a7f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
@@ -52,7 +52,7 @@
@Override
public int getIcon() {
//TODO(b/117129183): This is not final icon for phone device, just for demo.
- return com.android.internal.R.drawable.ic_bt_cellphone;
+ return com.android.internal.R.drawable.ic_phone;
}
@Override
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 9b12a31..ed8b487 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -888,19 +888,19 @@
if (isOsuProvider()) {
if (mOsuProvisioningComplete) {
- summary.append(mContext.getString(R.string.osu_provisioning_complete));
+ summary.append(mContext.getString(R.string.osu_sign_up_complete));
} else if (mOsuFailure != null) {
summary.append(mOsuFailure);
} else if (mOsuStatus != null) {
summary.append(mOsuStatus);
} else {
- summary.append(mContext.getString(R.string.tap_to_set_up));
+ summary.append(mContext.getString(R.string.tap_to_sign_up));
}
} else if (isActive()) {
if (isPasspoint()) {
// This is the active connection on passpoint
summary.append(getSummary(mContext, ssid, getDetailedState(),
- false, mConfig.providerFriendlyName));
+ false, null, mConfig.providerFriendlyName));
} else if (mConfig != null && getDetailedState() == DetailedState.CONNECTED
&& mIsCarrierAp) {
// This is the active connection on a carrier AP
@@ -909,7 +909,8 @@
} else {
// This is the active connection on non-passpoint network
summary.append(getSummary(mContext, getDetailedState(),
- mInfo != null && mInfo.isEphemeral()));
+ mInfo != null && mInfo.isEphemeral(),
+ mInfo != null ? mInfo.getNetworkSuggestionOrSpecifierPackageName() : null));
}
} else { // not active
if (mConfig != null && mConfig.hasNoInternetAccess()) {
@@ -1322,13 +1323,34 @@
return mRssi != UNREACHABLE_RSSI;
}
+ private static CharSequence getAppLabel(String packageName, PackageManager packageManager) {
+ CharSequence appLabel = "";
+ ApplicationInfo appInfo = null;
+ try {
+ int userId = UserHandle.getUserId(UserHandle.USER_CURRENT);
+ appInfo = packageManager.getApplicationInfoAsUser(packageName, 0 /* flags */, userId);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Failed to get app info", e);
+ return appLabel;
+ }
+ if (appInfo != null) {
+ appLabel = appInfo.loadLabel(packageManager);
+ }
+ return appLabel;
+ }
+
public static String getSummary(Context context, String ssid, DetailedState state,
- boolean isEphemeral, String passpointProvider) {
+ boolean isEphemeral, String suggestionOrSpecifierPackageName,
+ String passpointProvider) {
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)) {
+ CharSequence appLabel =
+ getAppLabel(suggestionOrSpecifierPackageName, context.getPackageManager());
+ return context.getString(R.string.connected_via_app, appLabel);
} else if (isEphemeral) {
// Special case for connected + ephemeral networks.
final NetworkScoreManager networkScoreManager = context.getSystemService(
@@ -1379,13 +1401,17 @@
return String.format(formats[index], ssid);
}
- public static String getSummary(Context context, DetailedState state, boolean isEphemeral) {
- return getSummary(context, null, state, isEphemeral, null);
+ 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 passpointProvider) {
- return getSummary(context, null, state, isEphemeral, passpointProvider);
+ String suggestionOrSpecifierPackageName,
+ String passpointProvider) {
+ return getSummary(context, null, state, false, suggestionOrSpecifierPackageName,
+ passpointProvider);
}
public static String convertToQuotedString(String string) {
@@ -1528,91 +1554,12 @@
* All methods are invoked on the Main Thread
*/
private class AccessPointProvisioningCallback extends ProvisioningCallback {
- // TODO: Remove logs and implement summary changing logic for these provisioning callbacks.
@Override
@MainThread public void onProvisioningFailure(int status) {
- switch (status) {
- case OSU_FAILURE_AP_CONNECTION:
- mOsuFailure = mContext.getString(R.string.osu_failure_ap_connection);
- break;
- case OSU_FAILURE_SERVER_URL_INVALID:
- mOsuFailure = mContext.getString(R.string.osu_failure_server_url_invalid);
- break;
- case OSU_FAILURE_SERVER_CONNECTION:
- mOsuFailure = mContext.getString(R.string.osu_failure_server_connection);
- break;
- case OSU_FAILURE_SERVER_VALIDATION:
- mOsuFailure = mContext.getString(R.string.osu_failure_server_validation);
- break;
- case OSU_FAILURE_SERVICE_PROVIDER_VERIFICATION:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_service_provider_verification);
- break;
- case OSU_FAILURE_PROVISIONING_ABORTED:
- mOsuFailure = mContext.getString(R.string.osu_failure_provisioning_aborted);
- break;
- case OSU_FAILURE_PROVISIONING_NOT_AVAILABLE:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_provisioning_not_available);
- break;
- case OSU_FAILURE_INVALID_URL_FORMAT_FOR_OSU:
- mOsuFailure = mContext.getString(R.string.osu_failure_invalid_server_url);
- break;
- case OSU_FAILURE_UNEXPECTED_COMMAND_TYPE:
- mOsuFailure = mContext.getString(R.string.osu_failure_unexpected_command_type);
- break;
- case OSU_FAILURE_UNEXPECTED_SOAP_MESSAGE_TYPE:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_unexpected_soap_message_type);
- break;
- case OSU_FAILURE_SOAP_MESSAGE_EXCHANGE:
- mOsuFailure = mContext.getString(R.string.osu_failure_soap_message_exchange);
- break;
- case OSU_FAILURE_START_REDIRECT_LISTENER:
- mOsuFailure = mContext.getString(R.string.osu_failure_start_redirect_listener);
- break;
- case OSU_FAILURE_TIMED_OUT_REDIRECT_LISTENER:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_timed_out_redirect_listener);
- break;
- case OSU_FAILURE_NO_OSU_ACTIVITY_FOUND:
- mOsuFailure = mContext.getString(R.string.osu_failure_no_osu_activity_found);
- break;
- case OSU_FAILURE_UNEXPECTED_SOAP_MESSAGE_STATUS:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_unexpected_soap_message_status);
- break;
- case OSU_FAILURE_NO_PPS_MO:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_no_pps_mo);
- break;
- case OSU_FAILURE_NO_AAA_SERVER_TRUST_ROOT_NODE:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_no_aaa_server_trust_root_node);
- break;
- case OSU_FAILURE_NO_REMEDIATION_SERVER_TRUST_ROOT_NODE:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_no_remediation_server_trust_root_node);
- break;
- case OSU_FAILURE_NO_POLICY_SERVER_TRUST_ROOT_NODE:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_no_policy_server_trust_root_node);
- break;
- case OSU_FAILURE_RETRIEVE_TRUST_ROOT_CERTIFICATES:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_retrieve_trust_root_certificates);
- break;
- case OSU_FAILURE_NO_AAA_TRUST_ROOT_CERTIFICATE:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_no_aaa_trust_root_certificate);
- break;
- case OSU_FAILURE_ADD_PASSPOINT_CONFIGURATION:
- mOsuFailure = mContext.getString(
- R.string.osu_failure_add_passpoint_configuration);
- break;
- case OSU_FAILURE_OSU_PROVIDER_NOT_FOUND:
- mOsuFailure = mContext.getString(R.string.osu_failure_osu_provider_not_found);
- break;
+ if (TextUtils.equals(mOsuStatus, mContext.getString(R.string.osu_completing_sign_up))) {
+ mOsuFailure = mContext.getString(R.string.osu_sign_up_failed);
+ } else {
+ mOsuFailure = mContext.getString(R.string.osu_connect_failed);
}
mOsuStatus = null;
mOsuProvisioningComplete = false;
@@ -1625,50 +1572,37 @@
@Override
@MainThread public void onProvisioningStatus(int status) {
+ String newStatus = null;
switch (status) {
case OSU_STATUS_AP_CONNECTING:
- mOsuStatus = mContext.getString(R.string.osu_status_ap_connecting);
- break;
case OSU_STATUS_AP_CONNECTED:
- mOsuStatus = mContext.getString(R.string.osu_status_ap_connected);
- break;
case OSU_STATUS_SERVER_CONNECTING:
- mOsuStatus = mContext.getString(R.string.osu_status_server_connecting);
- break;
case OSU_STATUS_SERVER_VALIDATED:
- mOsuStatus = mContext.getString(R.string.osu_status_server_validated);
- break;
case OSU_STATUS_SERVER_CONNECTED:
- mOsuStatus = mContext.getString(R.string.osu_status_server_connected);
- break;
case OSU_STATUS_INIT_SOAP_EXCHANGE:
- mOsuStatus = mContext.getString(R.string.osu_status_init_soap_exchange);
- break;
case OSU_STATUS_WAITING_FOR_REDIRECT_RESPONSE:
- mOsuStatus = mContext.getString(
- R.string.osu_status_waiting_for_redirect_response);
+ newStatus = String.format(mContext.getString(R.string.osu_opening_provider),
+ mOsuProvider.getFriendlyName());
break;
case OSU_STATUS_REDIRECT_RESPONSE_RECEIVED:
- mOsuStatus = mContext.getString(R.string.osu_status_redirect_response_received);
- break;
case OSU_STATUS_SECOND_SOAP_EXCHANGE:
- mOsuStatus = mContext.getString(R.string.osu_status_second_soap_exchange);
- break;
case OSU_STATUS_THIRD_SOAP_EXCHANGE:
- mOsuStatus = mContext.getString(R.string.osu_status_third_soap_exchange);
- break;
case OSU_STATUS_RETRIEVING_TRUST_ROOT_CERTS:
- mOsuStatus = mContext.getString(
- R.string.osu_status_retrieving_trust_root_certs);
+ newStatus = mContext.getString(
+ R.string.osu_completing_sign_up);
break;
}
+ boolean updated = !TextUtils.equals(mOsuStatus, newStatus);
+ mOsuStatus = newStatus;
mOsuFailure = null;
mOsuProvisioningComplete = false;
- ThreadUtils.postOnMainThread(() -> {
- if (mAccessPointListener != null) {
- mAccessPointListener.onAccessPointChanged(AccessPoint.this);
- }
- });
+ if (updated) {
+ ThreadUtils.postOnMainThread(() -> {
+ if (mAccessPointListener != null) {
+ mAccessPointListener.onAccessPointChanged(AccessPoint.this);
+ }
+ });
+ }
}
@Override
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java
index afea5d2..17a73ac 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java
@@ -72,9 +72,13 @@
public AccessPoint build() {
Bundle bundle = new Bundle();
- WifiConfiguration wifiConfig = new WifiConfiguration();
- wifiConfig.networkId = mNetworkId;
- wifiConfig.BSSID = mBssid;
+ WifiConfiguration wifiConfig = null;
+ // ephemeral networks don't have a WifiConfiguration object in AccessPoint representation.
+ if (mNetworkId != WifiConfiguration.INVALID_NETWORK_ID) {
+ wifiConfig = new WifiConfiguration();
+ wifiConfig.networkId = mNetworkId;
+ wifiConfig.BSSID = mBssid;
+ }
bundle.putString(AccessPoint.KEY_SSID, ssid);
bundle.putParcelable(AccessPoint.KEY_CONFIG, wifiConfig);
diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
index fc3034e..5e3472b 100644
--- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
+++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
@@ -19,6 +19,7 @@
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
@@ -26,6 +27,9 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.NetworkKey;
@@ -483,6 +487,45 @@
}
@Test
+ public void testSummaryString_showsConnectedViaSuggestionOrSpecifierApp() throws Exception {
+ final int rssi = -55;
+ final String appPackageName = "com.test.app";
+ final CharSequence appLabel = "Test App";
+ final String connectedViaAppResourceString = "Connected via ";
+
+ WifiInfo wifiInfo = new WifiInfo();
+ wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_SSID));
+ wifiInfo.setEphemeral(true);
+ wifiInfo.setNetworkSuggestionOrSpecifierPackageName(appPackageName);
+ wifiInfo.setRssi(rssi);
+
+ Context context = mock(Context.class);
+ Resources resources = mock(Resources.class);
+ PackageManager packageManager = mock(PackageManager.class);
+ ApplicationInfo applicationInfo = mock(ApplicationInfo.class);
+ when(context.getPackageManager()).thenReturn(packageManager);
+ when(context.getResources()).thenReturn(resources);
+ when(resources.getString(R.string.connected_via_app, appLabel))
+ .thenReturn(connectedViaAppResourceString + appLabel.toString());
+ when(packageManager.getApplicationInfoAsUser(eq(appPackageName), anyInt(), anyInt()))
+ .thenReturn(applicationInfo);
+ when(applicationInfo.loadLabel(packageManager)).thenReturn(appLabel);
+
+ NetworkInfo networkInfo =
+ new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
+ networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
+
+ AccessPoint ap = new TestAccessPointBuilder(context)
+ .setSsid(TEST_SSID)
+ .setNetworkInfo(networkInfo)
+ .setRssi(rssi)
+ .setSecurity(AccessPoint.SECURITY_NONE)
+ .setWifiInfo(wifiInfo)
+ .build();
+ assertThat(ap.getSummary()).isEqualTo("Connected via Test App");
+ }
+
+ @Test
public void testSetScanResultWithCarrierInfo() {
String ssid = "ssid";
AccessPoint ap = new TestAccessPointBuilder(mContext).setSsid(ssid).build();
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java
index b379b54..c892711 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java
@@ -253,7 +253,7 @@
resolveInfo.activityInfo.metaData = new Bundle(oldMetadata);
resolveInfo.activityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON,
- com.android.internal.R.drawable.ic_bt_cellphone);
+ com.android.internal.R.drawable.ic_phone);
outTiles.clear();
TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
null /* defaultCategory */, outTiles, false /* usePriority */);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java
index c6c2a44..2113d47 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java
@@ -31,7 +31,7 @@
@RunWith(RobolectricTestRunner.class)
public class BluetoothDeviceLayerDrawableTest {
- private static final int RES_ID = com.android.internal.R.drawable.ic_bt_cellphone;
+ private static final int RES_ID = com.android.internal.R.drawable.ic_phone;
private static final int BATTERY_LEVEL = 15;
private static final float BATTERY_ICON_SCALE = 0.75f;
private static final int BATTERY_ICON_PADDING_TOP = 6;
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
new file mode 100644
index 0000000..a25b512
--- /dev/null
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionBarShadowControllerTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.settingslib.widget;
+
+import static androidx.lifecycle.Lifecycle.Event.ON_START;
+import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.view.View;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class ActionBarShadowControllerTest {
+
+ @Mock
+ private RecyclerView mRecyclerView;
+ @Mock
+ private Activity mActivity;
+ @Mock
+ private ActionBar mActionBar;
+ private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
+ private View mView;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mActivity.getActionBar()).thenReturn(mActionBar);
+ mView = new View(RuntimeEnvironment.application);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+ }
+
+ @Test
+ public void attachToRecyclerView_shouldAddScrollWatcherAndUpdateActionBar() {
+ when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
+
+ ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+
+ verify(mActionBar).setElevation(ActionBarShadowController.ELEVATION_LOW);
+ }
+
+ @Test
+ public void attachToRecyclerView_customViewAsActionBar_shouldUpdateElevationOnScroll() {
+ // Setup
+ mView.setElevation(50);
+ when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
+ final ActionBarShadowController controller =
+ ActionBarShadowController.attachToRecyclerView(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 */);
+ assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_HIGH);
+ }
+
+ @Test
+ public void attachToRecyclerView_lifecycleChange_shouldAttachDetach() {
+ ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+
+ verify(mRecyclerView).addOnScrollListener(any());
+
+ mLifecycle.handleLifecycleEvent(ON_START);
+ mLifecycle.handleLifecycleEvent(ON_STOP);
+ verify(mRecyclerView).removeOnScrollListener(any());
+
+ mLifecycle.handleLifecycleEvent(ON_START);
+ verify(mRecyclerView, times(2)).addOnScrollListener(any());
+ }
+
+ @Test
+ public void onScrolled_nullAnchorViewAndActivity_shouldNotCrash() {
+ final Activity activity = null;
+ final ActionBarShadowController controller =
+ ActionBarShadowController.attachToRecyclerView(activity, mLifecycle, mRecyclerView);
+
+ // Scroll
+ controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
+ // no crash
+ }
+}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 3877c90..6ca8261 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -1511,9 +1511,6 @@
Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED,
GlobalSettingsProto.Wifi.VERBOSE_LOGGING_ENABLED);
dumpSetting(s, p,
- Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED,
- GlobalSettingsProto.Wifi.CONNECTED_MAC_RANDOMIZATION_ENABLED);
- dumpSetting(s, p,
Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT,
GlobalSettingsProto.Wifi.MAX_DHCP_RETRY_COUNT);
dumpSetting(s, p,
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index c3c3f25..c032683 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -145,6 +145,7 @@
<uses-permission android:name="android.permission.SET_TIME_ZONE" />
<uses-permission android:name="android.permission.DISABLE_HIDDEN_API_CHECKS" />
<uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" />
+ <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
<!-- Permission needed to rename bugreport notifications (so they're not shown as Shell) -->
<uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
<!-- Permission needed to hold a wakelock in dumpstate.cpp (drop_root_user()) -->
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 3453e79..815ae9a 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -22,6 +22,11 @@
android:sharedUserId="android.uid.systemui"
coreApp="true">
+ <!-- Using OpenGL ES 2.0 -->
+ <uses-feature
+ android:glEsVersion="0x00020000"
+ android:required="true" />
+
<!-- SysUI must be the one to define this permission; its name is
referenced by the core OS. -->
<permission android:name="android.permission.systemui.IDENTITY"
@@ -593,11 +598,6 @@
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
android:process=":ui"
android:visibleToInstantApps="true">
- <intent-filter>
- <action android:name="android.intent.action.CHOOSER_UI" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
- </intent-filter>
</activity>
<!-- Doze with notifications, run in main sysui process for every user -->
diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS
index 2f6e32b..e7e2c1a 100644
--- a/packages/SystemUI/OWNERS
+++ b/packages/SystemUI/OWNERS
@@ -1,6 +1,6 @@
set noparent
-dsandler@google.com
+dsandler@android.com
adamcohen@google.com
asc@google.com
diff --git a/packages/SystemUI/res-keyguard/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml
index 4e2937a..55c822b 100644
--- a/packages/SystemUI/res-keyguard/values-af/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-af/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml
index b64e0cf..2632db4 100644
--- a/packages/SystemUI/res-keyguard/values-am/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-am/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml
index af958e5..9149d7e 100644
--- a/packages/SystemUI/res-keyguard/values-ar/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml
@@ -182,4 +182,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-as/strings.xml b/packages/SystemUI/res-keyguard/values-as/strings.xml
index 258219a..0a6b896 100644
--- a/packages/SystemUI/res-keyguard/values-as/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-as/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml
index 1867186..8e6df65 100644
--- a/packages/SystemUI/res-keyguard/values-az/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-az/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</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 ef0e1ce..ca32751a 100644
--- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
@@ -158,4 +158,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml
index 873a87b..2048869 100644
--- a/packages/SystemUI/res-keyguard/values-be/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-be/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml
index 3725a5e..362fc51 100644
--- a/packages/SystemUI/res-keyguard/values-bg/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-bg/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml
index ff925f8..e3f0f65 100644
--- a/packages/SystemUI/res-keyguard/values-bn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-bn/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml
index 1106807..042c11e 100644
--- a/packages/SystemUI/res-keyguard/values-bs/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml
@@ -158,4 +158,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml
index 3a734b1..f6ca03c 100644
--- a/packages/SystemUI/res-keyguard/values-ca/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ca/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml
index 1bfc294..f313423 100644
--- a/packages/SystemUI/res-keyguard/values-cs/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-cs/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml
index f4a3794..acc91b6 100644
--- a/packages/SystemUI/res-keyguard/values-da/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-da/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml
index 83d7da5c..b925ac6 100644
--- a/packages/SystemUI/res-keyguard/values-de/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-de/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml
index 89b05ec..91afac6 100644
--- a/packages/SystemUI/res-keyguard/values-el/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-el/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
index 415e3de..12fae43 100644
--- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
index 56a4bcc..fb587c3 100644
--- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
index 415e3de..12fae43 100644
--- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
index 415e3de..12fae43 100644
--- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
index f3b398d..da98ea9 100644
--- a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
@@ -150,4 +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 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-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-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
index e56fa6b..72fc16a 100644
--- a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml
index 8a755b4..232c79b 100644
--- a/packages/SystemUI/res-keyguard/values-es/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-es/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml
index a19cc23..4eeebe3 100644
--- a/packages/SystemUI/res-keyguard/values-et/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-et/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml
index b063107..bb913d1 100644
--- a/packages/SystemUI/res-keyguard/values-eu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-eu/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml
index db7923d..5568d94 100644
--- a/packages/SystemUI/res-keyguard/values-fa/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml
index 2bd8314..4f3304d 100644
--- a/packages/SystemUI/res-keyguard/values-fi/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fi/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
index 9b0e269..348a3ff 100644
--- a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml
index f0c7e92..e986cee 100644
--- a/packages/SystemUI/res-keyguard/values-fr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fr/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml
index 756fc27..631ab6a 100644
--- a/packages/SystemUI/res-keyguard/values-gl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-gl/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml
index fb3a14b..520f098 100644
--- a/packages/SystemUI/res-keyguard/values-gu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-gu/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml
index 7bfc635..9f189e8 100644
--- a/packages/SystemUI/res-keyguard/values-hi/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml
index 089c6c4..5c84ecc 100644
--- a/packages/SystemUI/res-keyguard/values-hr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hr/strings.xml
@@ -158,4 +158,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml
index 49d8401..e4e9fa6 100644
--- a/packages/SystemUI/res-keyguard/values-hu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hu/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml
index 5198da6..c237828 100644
--- a/packages/SystemUI/res-keyguard/values-hy/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hy/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml
index 161287c..ed41222 100644
--- a/packages/SystemUI/res-keyguard/values-in/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-in/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml
index 9ed1188..afaf6bb 100644
--- a/packages/SystemUI/res-keyguard/values-is/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-is/strings.xml
@@ -150,4 +150,78 @@
<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) -->
+ <!-- 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 b5f85f6..28a53a4 100644
--- a/packages/SystemUI/res-keyguard/values-it/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-it/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml
index 09b3cfa..dc9c7ed 100644
--- a/packages/SystemUI/res-keyguard/values-iw/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml
index 08d4b9b..23e6d15 100644
--- a/packages/SystemUI/res-keyguard/values-ja/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml
index f966c33..788c772 100644
--- a/packages/SystemUI/res-keyguard/values-ka/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ka/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml
index 530418f..66c4e1ee 100644
--- a/packages/SystemUI/res-keyguard/values-kk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-kk/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml
index 7ab347d..dcd6ce7 100644
--- a/packages/SystemUI/res-keyguard/values-km/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-km/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml
index ef92951..39fdf55 100644
--- a/packages/SystemUI/res-keyguard/values-kn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-kn/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml
index 8a65c95..c20a9dd 100644
--- a/packages/SystemUI/res-keyguard/values-ko/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ko/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml
index a7d5d45..9416843 100644
--- a/packages/SystemUI/res-keyguard/values-ky/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ky/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml
index 9f3de8b0..c00f2f0 100644
--- a/packages/SystemUI/res-keyguard/values-lo/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-lo/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml
index bdebf67..71e04f2 100644
--- a/packages/SystemUI/res-keyguard/values-lt/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-lt/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml
index c68761d..4bdaa66 100644
--- a/packages/SystemUI/res-keyguard/values-lv/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-lv/strings.xml
@@ -158,4 +158,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml
index 0ace83f..b963d32 100644
--- a/packages/SystemUI/res-keyguard/values-mk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-mk/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml
index 779a532..0af354f 100644
--- a/packages/SystemUI/res-keyguard/values-ml/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ml/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml
index 189d407..9e16c6d 100644
--- a/packages/SystemUI/res-keyguard/values-mn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-mn/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml
index d412252..b27b299 100644
--- a/packages/SystemUI/res-keyguard/values-mr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml
index 9e10298..c16f433 100644
--- a/packages/SystemUI/res-keyguard/values-ms/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ms/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml
index 87fca07..0d011af 100644
--- a/packages/SystemUI/res-keyguard/values-my/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-my/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml
index 977784c..dc54489 100644
--- a/packages/SystemUI/res-keyguard/values-nb/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml
index c21faea..be39c32 100644
--- a/packages/SystemUI/res-keyguard/values-ne/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ne/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml
index f80749f..5c911be 100644
--- a/packages/SystemUI/res-keyguard/values-nl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-nl/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml
index eff493b..58242e6 100644
--- a/packages/SystemUI/res-keyguard/values-or/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-or/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml
index 08245dc..a435c79 100644
--- a/packages/SystemUI/res-keyguard/values-pa/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pa/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml
index 49792e2..51c7ac8 100644
--- a/packages/SystemUI/res-keyguard/values-pl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pl/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
index 90f46ce..6698bf9 100644
--- a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
index 321b898..118f05f 100644
--- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml
index 90f46ce..6698bf9 100644
--- a/packages/SystemUI/res-keyguard/values-pt/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pt/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml
index 083adbd..915a47b 100644
--- a/packages/SystemUI/res-keyguard/values-ro/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ro/strings.xml
@@ -158,4 +158,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml
index e5b1d0e..d036e0d 100644
--- a/packages/SystemUI/res-keyguard/values-ru/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ru/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml
index 1955edd..7073526 100644
--- a/packages/SystemUI/res-keyguard/values-si/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-si/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml
index f9f39e5..9f0501c 100644
--- a/packages/SystemUI/res-keyguard/values-sk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sk/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml
index 2a4417c..afc6ee1b 100644
--- a/packages/SystemUI/res-keyguard/values-sl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sl/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml
index 4057e03..d8e68d7 100644
--- a/packages/SystemUI/res-keyguard/values-sq/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml
index 16c1bde..c576493 100644
--- a/packages/SystemUI/res-keyguard/values-sr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sr/strings.xml
@@ -158,4 +158,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml
index 8e75aa2..dfa570b 100644
--- a/packages/SystemUI/res-keyguard/values-sv/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml
index e5277b2..00334be 100644
--- a/packages/SystemUI/res-keyguard/values-sw/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sw/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml
index f5fb357..d978643 100644
--- a/packages/SystemUI/res-keyguard/values-ta/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml
index 1e08177..8a8df34 100644
--- a/packages/SystemUI/res-keyguard/values-te/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-te/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml
index bde50f3..a8577a7 100644
--- a/packages/SystemUI/res-keyguard/values-th/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-th/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml
index 71a7537..b3609d1 100644
--- a/packages/SystemUI/res-keyguard/values-tl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-tl/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml
index fbbf63e..018e271 100644
--- a/packages/SystemUI/res-keyguard/values-tr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-tr/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml
index feab22f..92ca57b 100644
--- a/packages/SystemUI/res-keyguard/values-uk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-uk/strings.xml
@@ -166,4 +166,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml
index 928fcbdb..ace9f79 100644
--- a/packages/SystemUI/res-keyguard/values-ur/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ur/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml
index faa7d50..1766d11 100644
--- a/packages/SystemUI/res-keyguard/values-uz/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-uz/strings.xml
@@ -152,4 +152,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml
index 6b06513..eb6e536 100644
--- a/packages/SystemUI/res-keyguard/values-vi/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-vi/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
index 44f06a6..5fafe2f 100644
--- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
index 364f126..0181ed3 100644
--- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
index f687397..126304f 100644
--- a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml
index 66904eb..6a62d52 100644
--- a/packages/SystemUI/res-keyguard/values-zu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zu/strings.xml
@@ -150,4 +150,78 @@
<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) -->
</resources>
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-hdpi/ic_phone_24dp.png
deleted file mode 100644
index a6a6448..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_phone_24dp.png
+++ /dev/null
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-mdpi/ic_phone_24dp.png
deleted file mode 100644
index 2286bb4..0000000
--- a/packages/SystemUI/res/drawable-mdpi/ic_phone_24dp.png
+++ /dev/null
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-xhdpi/ic_phone_24dp.png
deleted file mode 100644
index cd9ff60..0000000
--- a/packages/SystemUI/res/drawable-xhdpi/ic_phone_24dp.png
+++ /dev/null
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-xxhdpi/ic_phone_24dp.png
deleted file mode 100644
index 3c546e5..0000000
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_phone_24dp.png
+++ /dev/null
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_phone_24dp.png
deleted file mode 100644
index 4f7da0a..0000000
--- a/packages/SystemUI/res/drawable-xxxhdpi/ic_phone_24dp.png
+++ /dev/null
Binary files differ
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 96a1bab..098c975 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -78,7 +78,7 @@
android:layout_height="@dimen/keyguard_affordance_height"
android:layout_width="@dimen/keyguard_affordance_width"
android:layout_gravity="bottom|start"
- android:src="@drawable/ic_phone_24dp"
+ android:src="@*android:drawable/ic_phone"
android:scaleType="center"
android:contentDescription="@string/accessibility_phone_button"
android:tint="?attr/wallpaperTextColor" />
diff --git a/packages/SystemUI/res/raw/image_wallpaper_fragment_shader.glsl b/packages/SystemUI/res/raw/image_wallpaper_fragment_shader.glsl
new file mode 100644
index 0000000..11d73a9
--- /dev/null
+++ b/packages/SystemUI/res/raw/image_wallpaper_fragment_shader.glsl
@@ -0,0 +1,33 @@
+precision mediump float;
+
+uniform sampler2D uTexture;
+uniform float uCenterReveal;
+uniform float uReveal;
+uniform float uAod2Opacity;
+uniform int uAodMode;
+varying vec2 vTextureCoordinates;
+
+vec3 luminosity(vec3 color) {
+ float lum = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;
+ return vec3(lum);
+}
+
+vec4 transform(vec3 diffuse) {
+ // TODO: Add well comments here, tracking on b/123615467.
+ vec3 lum = luminosity(diffuse);
+ diffuse = mix(diffuse, lum, smoothstep(0., uCenterReveal, uReveal));
+ float val = mix(uReveal, uCenterReveal, step(uCenterReveal, uReveal));
+ diffuse = smoothstep(val, 1.0, diffuse);
+ diffuse *= uAod2Opacity * (1. - smoothstep(uCenterReveal, 1., uReveal));
+ return vec4(diffuse.r, diffuse.g, diffuse.b, 1.);
+}
+
+void main() {
+ vec4 fragColor = texture2D(uTexture, vTextureCoordinates);
+ // TODO: Remove the branch logic here, tracking on b/123615467.
+ if (uAodMode != 0) {
+ gl_FragColor = transform(fragColor.rgb);
+ } else {
+ gl_FragColor = fragColor;
+ }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/res/raw/image_wallpaper_vertex_shader.glsl b/packages/SystemUI/res/raw/image_wallpaper_vertex_shader.glsl
new file mode 100644
index 0000000..4393e2b
--- /dev/null
+++ b/packages/SystemUI/res/raw/image_wallpaper_vertex_shader.glsl
@@ -0,0 +1,8 @@
+attribute vec4 aPosition;
+attribute vec2 aTextureCoordinates;
+varying vec2 vTextureCoordinates;
+
+void main() {
+ vTextureCoordinates = aTextureCoordinates;
+ gl_Position = aPosition;
+}
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index de2a950..31e450b 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Kanselleer"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Hulpboodskapgebied"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Bevestig"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Probeer weer"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Raak die vingerafdruksensor"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Vingerafdrukikoon"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Soek tans vir jou …"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Oudio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Kopstuk"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Invoer"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Gehoortoestelle"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Skakel tans aan …"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Helderheid"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Outo-draai"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Jy maak hierdie kennisgewings gewoonlik toe. \nMoet ons aanhou om hulle te wys?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Hou aan om hierdie kennisgewings te wys?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Stop kennisgewings"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokkeer"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Hou aan wys"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimeer"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Wys sonder klank"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Bly stil"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Waarsku my"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Hou aan waarsku"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Hou aan om kennisgewings van hierdie program af te wys?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Hierdie kennisgewings kan nie afgeskakel word nie"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Instellings"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Het dit"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Stort SysUI-hoop"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> programme</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> program</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> gebruik tans jou <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Programme gebruik tans jou <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Kanselleer"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 4154643..731acce 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ማያ እንዲሞላ አጉላ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ማያ ለመሙለት ሳብ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ቅጽበታዊ ገጽ እይታ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ይቅር"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"የእገዛ መልዕክት አካባቢ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"አረጋግጥ"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"እንደገና ይሞክሩ"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"የጣት አሻራ ዳሳሹን ይንኩ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"የጣት አሻራ አዶ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"እርስዎን በመፈለግ ላይ…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ኦዲዮ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ማዳመጫ"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ግቤት"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"አጋዥ መስሚያዎች"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"በማብራት ላይ..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ብሩህነት"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"በራስ ሰር አሽከርክር"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"አብዛኛውን ጊዜ እነዚህን ማሳወቂያዎች ያሰናብቷቸዋል። \nመታየታቸው ይቀጥል??"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"እነዚህን ማሳወቂያዎች ማሳየት ይቀጥሉ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"ማሳወቂያዎችን አስቁም"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"አግድ"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ማሳየትን ቀጥል"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"አሳንስ"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"በፀጥታ አሳይ"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ጸጥ እንዳለ ቆይ"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"አሳውቀኝ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ማንቃቱን ቀጥል"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ከዚህ መተግበሪያ ማሳወቂያዎችን ማሳየት ይቀጥል?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"እነዚህ ማሳወቂያዎች ሊጠፉ አይችሉም"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"በ<xliff:g id="APP_NAME">%1$s</xliff:g> በኩል"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ቅንብሮች"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ገባኝ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI Heap አራግፍ"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> መተግበሪያዎች</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> መተግበሪያዎች</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን <xliff:g id="TYPES_LIST">%2$s</xliff:g> እየተጠቀመ ነው።"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"መተግበሪያዎች የእርስዎን <xliff:g id="TYPES_LIST">%s</xliff:g> እየተጠቀሙ ነው።"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ይቅር"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index 579964d..3306388 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"تكبير/تصغير لملء الشاشة"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"توسيع بملء الشاشة"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"لقطة شاشة"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"إلغاء"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"منطقة رسالة المساعدة"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"تأكيد"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"إعادة المحاولة"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"المس جهاز استشعار بصمات الإصبع"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"رمز بصمة الإصبع"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"جارٍ البحث عن وجهك…"</string>
@@ -300,8 +305,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"صوت"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"سماعة الرأس"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"الإدخال"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"سماعات الأذن الطبية"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"جارٍ التفعيل…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"السطوع"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"دوران تلقائي"</string>
@@ -623,17 +627,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"أنت تتجاهل عادةً هذه الإشعارات. \nهل تريد الاستمرار في عرضها؟"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"هل تريد الاستمرار في تلقي هذه الإشعارات؟"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"إيقاف الإشعارات"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"حظر"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"الاستمرار في تلقّي الإشعارات"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"تصغير"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"عرض بدون تنبيه صوتي"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"متابعة عرض الإشعارات بدون صوت"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"إرسال تنبيه إليّ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"متابعة إرسال التنبيهات"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"هل تريد الاستمرار في تلقي إشعارات من هذا التطبيق؟"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"يتعذَّر إيقاف هذه الإشعارات."</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"عبر <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -755,7 +755,7 @@
</string-array>
<string name="menu_ime" msgid="4998010205321292416">"مفتاح تبديل لوحة المفاتيح"</string>
<string name="save" msgid="2311877285724540644">"حفظ"</string>
- <string name="reset" msgid="2448168080964209908">"إعادة تعيين"</string>
+ <string name="reset" msgid="2448168080964209908">"إعادة الضبط"</string>
<string name="adjust_button_width" msgid="6138616087197632947">"ضبط عرض الزر"</string>
<string name="clipboard" msgid="1313879395099896312">"الحافظة"</string>
<string name="accessibility_key" msgid="5701989859305675896">"زر التنقل المخصص"</string>
@@ -891,11 +891,26 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"الإعدادات"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"حسنًا"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"تفريغ ذاكرة SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="zero"><xliff:g id="NUM_APPS_2">%d</xliff:g> تطبيق</item>
+ <item quantity="two">تطبيقان (<xliff:g id="NUM_APPS_2">%d</xliff:g>)</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> تطبيقات</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> تطبيقًا</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> تطبيق</item>
+ <item quantity="one">تطبيق واحد (<xliff:g id="NUM_APPS_0">%d</xliff:g>)</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"التطبيق <xliff:g id="APP">%1$s</xliff:g> يستخدم <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"تستخدم التطبيقات <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"إلغاء"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="zero">هناك <xliff:g id="NUM_APPS_4">%1$d</xliff:g> تطبيق يستخدِم <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <item quantity="two">هناك تطبيقان (<xliff:g id="NUM_APPS_4">%1$d</xliff:g>) يستخدِمان <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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="many">هناك <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>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml
index 8113504..4a09194 100644
--- a/packages/SystemUI/res/values-as/strings.xml
+++ b/packages/SystemUI/res/values-as/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"স্ক্ৰীণ পূর্ণ কৰিবলৈ জুম কৰক"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"স্ক্ৰীণ পূর্ণ কৰিবলৈ প্ৰসাৰিত কৰক"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"স্ক্ৰীণশ্বট"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"বাতিল কৰক"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"সহায় বাৰ্তাৰ ক্ষেত্ৰ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"নিশ্চিত কৰক"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"আকৌ চেষ্টা কৰক"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটো স্পৰ্শ কৰক"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ফিংগাৰপ্ৰিণ্ট আইকন"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"আপোনাৰ মুখমণ্ডল বিচাৰি আছে…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"অডিঅ’"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"হেডছেট"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ইনপুট"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"শ্ৰৱণ যন্ত্ৰ"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"অন কৰি থকা হৈছে…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"উজ্জ্বলতা"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"স্বয়ং-ঘূৰ্ণন"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"আপুনি সাধাৰণতে এই জাননীসমূহ অগ্ৰাহ্য কৰে। \nসেইবোৰ দেখুওৱাই থাকিব লাগিবনে?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"এই জাননীসমূহ দেখুওৱাই থাকিব লাগিবনে?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"জাননী বন্ধ কৰক"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"অৱৰোধ কৰক"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"দেখুওৱাই থাকক"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"সৰু কৰক"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"নিৰৱে দেখুৱাওক"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"নীৰৱ হৈ থাকক"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"মোক সতৰ্ক কৰি দিব"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"সতৰ্ক কৰি থাকক"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"এই এপটোৰ জাননী দেখুওৱাই থাকিব লাগিবনে?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"এই জাননীসমূহ বন্ধ কৰিব নোৱাৰি"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ জৰিয়তে"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ছেটিংবোৰ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"বুজি পালোঁ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI হীপ ডাম্প কৰক"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g>টা এপ্</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g>টা এপ্</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g>এ আপোনাৰ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ব্যৱহাৰ কৰি আছে।"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"এপ্লিকেশ্বনসমূহে আপোনাৰ <xliff:g id="TYPES_LIST">%s</xliff:g> ব্যৱহাৰ কৰি আছে।"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"বাতিল কৰক"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml
index 907e19d..b8bace9 100644
--- a/packages/SystemUI/res/values-az/strings.xml
+++ b/packages/SystemUI/res/values-az/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Ləğv et"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Yardım mesajı bölməsi"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Təsdiq"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Yenidən cəhd edin"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Barmaq izi sensoruna klikləyin"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Barmaq izi ikonası"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Siz axtarılırsınız…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Qulaqlıq"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Giriş"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Eşitmə Aparatı"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Aktiv edilir..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Parlaqlıq"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Avtodönüş"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Adətən bu bildirişləri rədd edirsiniz. \nBildirişlər göstərilsin?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Bu bildirişlər göstərilməyə davam edilsin?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Bildirişləri dayandırın"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blok edin"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Göstərməyə davam edin"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Kiçildin"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Səssiz göstərin"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Səssiz göstərilsin"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Məni xəbərdar edin"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Xəbərdarlıq göndərməyə davam edin"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Bu tətbiqin bildirişləri göstərilməyə davam edilsin?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Bu bildirişlər deaktiv edilə bilməz"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> vasitəsilə"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Ayarlar"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Anladım"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> tətbiq</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> tətbiq</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="TYPES_LIST">%2$s</xliff:g> tətbiqlərindən istifadə edir."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Tətbiqlər <xliff:g id="TYPES_LIST">%s</xliff:g> istifadə edir."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Ləğv edin"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
index 8668c6b..eed9ce6 100644
--- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Otkaži"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Oblast poruke za pomoć"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potvrdi"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Probaj ponovo"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dodirnite senzor za otisak prsta"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona otiska prsta"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Tražimo vas…"</string>
@@ -297,8 +302,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Slušalice"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Unos"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Slušni aparati"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Uključuje se..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Osvetljenost"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatska rotacija"</string>
@@ -614,17 +618,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Obično odbacujete ova obaveštenja. \nŽelite li da se i dalje prikazuju?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Želite li da se ova obaveštenja i dalje prikazuju?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Prestani da prikazuješ obaveštenja"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokiraj"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Nastavi da prikazuješ"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Umanji"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Prikaži bez zvuka"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Ne uključuj zvuk"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Obavesti me"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Nastavi sa obaveštenjima"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Želite li da se obaveštenja iz ove aplikacije i dalje prikazuju?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ne možete da isključite ova obaveštenja"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"preko aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -876,11 +876,20 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Podešavanja"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Važi"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Izdvoji SysUI mem."</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikacije</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> koristi <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikacije koriste <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Otkaži"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija koristi dozvolu <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml
index 6a27dbb..8bc87cd 100644
--- a/packages/SystemUI/res/values-be/strings.xml
+++ b/packages/SystemUI/res/values-be/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Павял. на ўвесь экран"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Расцягн. на ўвесь экран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Здымак экрана"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Скасаваць"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Поле даведачнага паведамлення"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Пацвердзіць"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Паўтарыць спробу"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Дакраніцеся да сканера адбіткаў пальцаў"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Значок адбіткаў пальцаў"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ідзе пошук вашага твару…"</string>
@@ -300,8 +305,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Гук"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Гарнітура"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Увод"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Слыхавыя апараты"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Уключэнне…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яркасць"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Аўтапаварот"</string>
@@ -619,17 +623,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Звычайна вы адхіляеце гэтыя апавяшчэнні. \nПаказваць іх?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Працягваць паказваць гэтыя апавяшчэнні?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Спыніць апавяшчэнні"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Заблакіраваць"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Працягваць паказваць"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Згарнуць"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Паказваць бязгучна"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Не ўключаць гук"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Апавясціць мяне"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Апавяшчаць далей"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Працягваць паказваць апавяшчэнні гэтай праграмы?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Немагчыма адключыць гэтыя апавяшчэнні"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"праз праграму \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
@@ -883,11 +883,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Налады"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Зразумела"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Дамп кучы SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> праграма</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> праграмы</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> праграм</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> праграмы</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Праграма \"<xliff:g id="APP">%1$s</xliff:g>\" выкарыстоўвае: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Праграмы выкарыстоўваюць: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Скасаваць"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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="few">Функцыю \"<xliff:g id="TYPE_3">%2$s</xliff:g>\" выкарыстоўваюць <xliff:g id="NUM_APPS_2">%1$d</xliff:g> праграмы.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index e9effcf..63111276 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Мащаб – запълва екрана"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Разпъване – запълва екрана"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Екранна снимка"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Отказ"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Област за помощно съобщение"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Потвърждаване"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Нов опит"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Докоснете сензора за отпечатъци"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Икона за отпечатък"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Търсим ви…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудио"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Слушалки"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Вход"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Слухови апарати"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Включва се..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яркост"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоматична ориентация"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Обикновено отхвърляте тези известия. \nИскате ли да продължат да се показват?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Тези известия да продължат ли да се показват?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Спиране на известията"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Блокиране"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Да продължат да се показват"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Намаляване"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Показване без звук"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Показване на известията без звук"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Сигнализиране"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Продължаване на сигнализирането"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Да продължат ли да се показват известията от това приложение?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Тези известия не могат да бъдат изключени"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"чрез <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Настройки"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Разбрах"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> прилож.</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> прилож.</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> използва <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Някои приложения използват <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Отказ"</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> приложения използват <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml
index 0724e37..58678ba 100644
--- a/packages/SystemUI/res/values-bn/strings.xml
+++ b/packages/SystemUI/res/values-bn/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"স্ক্রীণ পূরণ করতে জুম করুন"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ফুল স্ক্রিন করুন"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"স্ক্রিনশট নিন"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"বাতিল করুন"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"সহায়তার মেসেজ দেখানোর জায়গা"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"কনফার্ম করুন"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"আবার চেষ্টা করুন"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"আঙ্গুলের ছাপের সেন্সর স্পর্শ করুন"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"আঙ্গুলের ছাপের আইকন"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"আপনার জন্য খোঁজা হচ্ছে…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"অডিও"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"হেডসেট"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ইনপুট"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"হিয়ারিং এড"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"চালু করা হচ্ছে…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"উজ্জ্বলতা"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"স্বতঃ ঘূর্ণায়মান"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"এই বিজ্ঞপ্তিগুলিকে আপনি সাধারণত বাতিল করেন। \nসেগুলি দেখতে চান?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"এই বিজ্ঞপ্তিগুলি পরেও দেখে যেতে চান?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"বিজ্ঞপ্তি বন্ধ করুন"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ব্লক করুন"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"দেখতে থাকুন"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ছোট করে দিন"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"নিঃশব্দে দেখুন"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"বিজ্ঞপ্তি মিউট করুন"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"আমাকে জানানো হোক"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"বিজ্ঞপ্তি পান"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"এই অ্যাপের বিজ্ঞপ্তি পরেও দেখে যেতে চান?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"এই বিজ্ঞপ্তিগুলি বন্ধ করা যাবে না"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর মাধ্যমে"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"সেটিংস"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"বুঝেছি"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g>টি অ্যাপ</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g>টি অ্যাপ</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> আপনার <xliff:g id="TYPES_LIST">%2$s</xliff:g> ব্যবহার করছে।"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"অ্যাপ্লিকেশনগুলি আপনার <xliff:g id="TYPES_LIST">%s</xliff:g> ব্যবহার করছে।"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"বাতিল করুন"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml
index 77429a0d..b2b2ee7 100644
--- a/packages/SystemUI/res/values-bs/strings.xml
+++ b/packages/SystemUI/res/values-bs/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Otkaži"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Prostor za poruku za pomoć"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potvrdite"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Pokušaj ponovo"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dodirnite senzor za otisak prsta"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona za otisak prsta"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Tražimo vas…"</string>
@@ -297,8 +302,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Zvuk"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Slušalice"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Ulaz"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Slušni aparat"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Uključivanje…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Osvjetljenje"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatsko rotiranje"</string>
@@ -616,17 +620,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Obično odbacujete ova obavještenja. \nNastaviti ih prikazivati?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Nastaviti prikazivanje ovih obavještenja?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Zaustavi obavještenja"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokiraj"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Nastavi prikazivanje"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimiziraj"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Prikaži bez zvuka"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Ostani u nečujnom načinu rada"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Upozori me"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Nastavi upozoravati"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Nastaviti prikazivanje obavještenja iz ove aplikacije?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ova obavještenja nije moguće isključiti"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"preko aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -878,11 +878,20 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Postavke"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Razumijem"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Izdvoji SysUI mem."</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikacije</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> koristi <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikacije koriste <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Otkaži"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija koristi <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 4e8e833..45ad570 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancel·la"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Àrea de missatge d\'ajuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirma"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Torna-ho a provar"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca el sensor d\'empremtes digitals"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona d\'empremta digital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"S\'està cercant la teva cara…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Àudio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Auriculars"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Audiòfons"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"S\'està activant…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brillantor"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Gira automàticament"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Normalment ignores aquestes notificacions. \nVols que es continuïn mostrant?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Vols continuar rebent aquestes notificacions?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Deixa d\'enviar notificacions"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloqueja"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continua rebent"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimitza"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostra de manera silenciosa"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Continua silenciant"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Avisa\'m"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continua avisant-me"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Vols continuar rebent notificacions d\'aquesta aplicació?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Aquestes notificacions no es poden desactivar"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"mitjançant <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Configuració"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"D\'acord"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Aboca espai de SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplicacions</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplicació</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> està fent servir el següent: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Algunes aplicacions estan fent servir el següent: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancel·la"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 30bf1de..3b3dc00 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Zrušit"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Oblast pro zprávu nápovědy"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potvrdit"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Zkusit znovu"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotkněte se snímače otisků prstů"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona otisku prstu"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Hledáme vás…"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Zvuk"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Sluchátka"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Vstup"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Naslouchátka"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Zapínání…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Jas"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatické otáčení"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Tato oznámení obvykle odmítáte. \nChcete je nadále zobrazovat?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Mají se tato oznámení nadále zobrazovat?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Přestat zobrazovat oznámení"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokovat"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Nadále zobrazovat"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimalizovat"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Zobrazovat tiše"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Nadále bez zvuku"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Upozornit"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Dál upozorňovat"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Mají se oznámení z této aplikace nadále zobrazovat?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Tato oznámení nelze deaktivovat"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"prostřednictvím aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Nastavení"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Rozumím"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Výpis haldy SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikace</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikace</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikací</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplikace</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Aplikace <xliff:g id="APP">%1$s</xliff:g> využívá tato oprávnění: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikace využívají tato oprávnění: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Zrušit"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikace využívají tato oprávnění: <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikace využívá tato oprávnění: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index ad4afcf..118204e 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Annuller"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Område med hjælpemeddelelse"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Bekræft"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Prøv igen"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sæt fingeren på fingeraftrykslæseren"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon for fingeraftryk"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Forsøger at finde dig…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Lyd"</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>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Høreapparater"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Aktiverer…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Lysstyrke"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Roter automatisk"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Du afviser som regel disse notifikationer. \nVil du blive ved med at se dem?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Vil du fortsætte med at se disse notifikationer?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Stop notifikationer"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloker"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Fortsæt med at vise notifikationer"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimer"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Vis lydløst"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Fortsæt med lydløse notifikationer"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Underret mig"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Fortsæt med at underrette"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Vil du fortsætte med at se notifikationer fra denne app?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Disse notifikationer kan ikke deaktiveres"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Indstillinger"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Gem SysUI-heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> app</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apps</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> anvender enhedens <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Apps anvender enhedens <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Luk"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 0be730a..d91e678 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Abbrechen"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Bereich für die Hilfemeldung"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Bestätigen"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Noch einmal versuchen"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Berühre den Fingerabdrucksensor"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerabdruck-Symbol"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Wir suchen nach dir…"</string>
@@ -300,8 +305,7 @@
<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">"Eingabe"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Hörhilfen"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Wird aktiviert…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Helligkeit"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatisch drehen"</string>
@@ -615,17 +619,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Normalerweise schließt du diese Benachrichtigungen. \nSollen sie trotzdem weiter angezeigt werden?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Diese Benachrichtigungen weiterhin anzeigen?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Benachrichtigungen nicht mehr anzeigen"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blockieren"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Weiterhin anzeigen"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimieren"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Ohne Ton anzeigen"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Weiter lautlos bleiben"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Benachrichtigung an mich"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Weiterhin Benachrichtigungen senden"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Benachrichtigungen dieser App weiterhin anzeigen?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Diese Benachrichtigungen können nicht deaktiviert werden"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"über <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -875,11 +875,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Einstellungen"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> verwendet gerade Folgendes: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Apps verwenden gerade Folgendes: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Abbrechen"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 7468b3a..52bcfce 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Ζουμ σε πλήρη οθόνη"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Προβoλή σε πλήρη οθ."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Στιγμιότυπο οθόνης"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Ακύρωση"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Περιοχή μηνυμάτων βοήθειας"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Επιβεβαίωση"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Δοκιμάστε ξανά"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Εικονίδιο δακτυλικών αποτυπωμάτων"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Αναζήτηση για εσάς…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Ήχος"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Ακουστικά"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Είσοδος"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Βοηθήματα ακρόασης"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Ενεργοποίηση…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Φωτεινότητα"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Αυτόματη περιστροφή"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Συνήθως απορρίπτετε αυτές τις ειδοποιήσεις. \nΝα εξακολουθήσουν να εμφανίζονται;"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Να συνεχίσουν να εμφανίζονται αυτές οι ειδοποιήσεις;"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Διακοπή ειδοποιήσεων"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Αποκλεισμός"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Συνέχιση εμφάνισης"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Ελαχιστοποίηση"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Εμφάνιση σιωπηλά"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Διατήρηση σε σίγαση"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Να ειδοποιούμαι"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Να συνεχιστούν οι ειδοποιήσεις"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Να συνεχίσουν να εμφανίζονται ειδοποιήσεις από αυτήν την εφαρμογή;"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Αδύνατη η απενεργοποίηση αυτών των ειδοποιήσεων"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"μέσω <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Ρυθμίσεις"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Το κατάλαβα"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Στιγμ. μνήμης SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> εφαρμογές</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> εφαρμογή</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> χρησιμοποιεί τις λειτουργίες <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Οι εφαρμογές χρησιμοποιούν τις λειτουργίες <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Ακύρωση"</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> εφαρμογές χρησιμοποιούν το <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index 703bc40..70208fb 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<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>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <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>
@@ -296,8 +301,7 @@
<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>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <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>
@@ -611,17 +615,13 @@
<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>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <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">"Minimise"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Show silently"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <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>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Settings"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </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>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancel"</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>
+ </plurals>
+ <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <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>
diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml
index 31fd04a..3084403 100644
--- a/packages/SystemUI/res/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res/values-en-rCA/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<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>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <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>
@@ -296,8 +301,7 @@
<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>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <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>
@@ -611,17 +615,13 @@
<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>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <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">"Minimise"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Show silently"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <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>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Settings"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </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>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancel"</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>
+ </plurals>
+ <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <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>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index 703bc40..70208fb 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<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>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <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>
@@ -296,8 +301,7 @@
<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>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <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>
@@ -611,17 +615,13 @@
<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>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <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">"Minimise"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Show silently"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <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>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Settings"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </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>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancel"</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>
+ </plurals>
+ <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <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>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index 703bc40..70208fb 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<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>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <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>
@@ -296,8 +301,7 @@
<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>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <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>
@@ -611,17 +615,13 @@
<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>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <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">"Minimise"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Show silently"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <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>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Settings"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </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>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancel"</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>
+ </plurals>
+ <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <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>
diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml
index d53d61b..0154c82 100644
--- a/packages/SystemUI/res/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC/strings.xml
@@ -57,8 +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>
+ <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>
@@ -875,7 +878,7 @@
<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_cancel" msgid="5479124524931216790">"Cancel"</string>
+ <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>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 761acf6..4ee4006 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancelar"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Área de mensajes de ayuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmar"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Volver a intentarlo"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca el sensor de huellas digitales"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícono de huella digital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Autenticando tu rostro…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Auriculares"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Audífonos"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Activando…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brillo"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotación automática"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Sueles descartar estas notificaciones. \n¿Quieres seguir recibiéndolas?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"¿Quieres seguir viendo estas notificaciones?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Detener notificaciones"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquear"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Seguir viendo"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizar"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostrar sin emitir sonido"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Silenciar notificaciones"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Avisarme"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Seguir recibiendo alertas"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"¿Quieres seguir viendo las notificaciones de esta app?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"No se pueden desactivar estas notificaciones"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"por medio de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Configuración"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Entendido"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Volcar pila de SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> está usando tu <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Hay aplicaciones que están usando tu <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancelar"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index 0b3ba5d..446b6ac 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancelar"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Área de mensaje de ayuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmar"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Reintentar"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca el sensor de huellas digitales"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icono de huella digital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Buscando tu cara…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Auriculares"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Audífonos"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Activando…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brillo"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Girar automáticamente"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Normalmente ignoras estas notificaciones. \n¿Quieres seguir viéndolas?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"¿Quieres seguir viendo estas notificaciones?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Detener las notificaciones"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquear"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Seguir mostrando"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizar"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostrar en silencio"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Silenciar notificaciones"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Quiero recibir alertas"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Quiero seguir recibiendo alertas"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"¿Quieres seguir viendo las notificaciones de esta aplicación?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Estas notificaciones no se pueden desactivar"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"mediante <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Ajustes"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Entendido"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Volcar pila de SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> está usando tu <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Hay aplicaciones que usan tu <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancelar"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml
index e318291..080f206 100644
--- a/packages/SystemUI/res/values-et/strings.xml
+++ b/packages/SystemUI/res/values-et/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Tühista"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Abisõnumi ala"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Kinnita"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Proovi uuesti"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Puudutage sõrmejäljeandurit"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Sõrmejälje ikoon"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Otsitakse teid …"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Heli"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Peakomplekt"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Sisend"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Kuuldeaparaadid"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Sisselülitamine …"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Heledus"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automaatne pööramine"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Tavaliselt loobute nendest märguannetest. \nKas soovite neid jätkuvalt näidata?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Kas soovite nende märguannete kuvamist jätkata?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Peata märguanded"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokeeri"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Jätka kuvamist"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimeeri"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Kuva vaikselt"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Kuva helita"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Teavita mind"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Teavita ka edaspidi"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Kas jätkata selle rakenduse märguannete kuvamist?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Neid märguandeid ei saa välja lülitada"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> kaudu"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Seaded"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Selge"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> rakendust</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> rakendus</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> kasutab järgmisi: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Rakendused kasutavad järgmisi: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Tühista"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml
index 5b9f0cf..8d62bcf 100644
--- a/packages/SystemUI/res/values-eu/strings.xml
+++ b/packages/SystemUI/res/values-eu/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Utzi"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Laguntza-mezuaren eremua"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Berretsi"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Saiatu berriro"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sakatu hatz-marken sentsorea"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Hatz-markaren ikonoa"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Zure bila…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audioa"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Entzungailua"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Sarrera"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Audiofonoak"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Aktibatzen…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Distira"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Biratze automatikoa"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Baztertu egin ohi dituzu jakinarazpen hauek. \nHaiek erakusten jarraitzea nahi duzu?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Jakinarazpenak erakusten jarraitzea nahi duzu?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Blokeatu jakinarazpenak"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokeatu"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Jarraitu erakusten"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizatu"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Erakutsi soinurik egin gabepen"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Jarraitu isilik"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Bidali jakinarazpenak"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Jarraitu jakinarazpenak bidaltzen"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Aplikazio honen jakinarazpenak erakusten jarraitzea nahi duzu?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Jakinarazpen hauek ezin dira desaktibatu"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren bidez"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Ezarpenak"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Ados"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikazio</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplikazio</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="TYPES_LIST">%2$s</xliff:g> erabiltzen ari da."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikazio batzuk <xliff:g id="TYPES_LIST">%s</xliff:g> erabiltzen ari dira."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Utzi"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index e89f906..035c6f3 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"بزرگنمایی برای پر کردن صفحه"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"گسترده کردن برای پر کردن صفحه"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"عکس صفحهنمایش"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"لغو"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"بخش پیام راهنما"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"تأیید"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"امتحان مجدد"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"حسگر اثر انگشت را لمس کنید"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"نماد اثر انگشت"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"درحال جستجوی شما…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"صوت"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"هدست"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ورودی"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"سمعک"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"روشن کردن…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"روشنایی"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"چرخش خودکار"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"معمولاً این اعلانها را رد میکنید. \nهمچنان نشان داده شود؟"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"نمایش این اعلانها ادامه یابد؟"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"توقف اعلانها"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"مسدود کردن"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"همچنان نشان داده شود"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"کوچک کردن"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"نمایش بهصورت بیصدا"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"بیصدا بماند"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"به من اطلاع داده شود"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"همچنان اطلاع داده شود"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"نمایش اعلان از این برنامه ادامه یابد؟"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"نمیتوان این اعلانها را خاموش کرد"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"ازطریق <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"تنظیمات"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"متوجه شدم"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> برنامه</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> برنامه</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> از <xliff:g id="TYPES_LIST">%2$s</xliff:g> شما استفاده میکند."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"برنامهها از <xliff:g id="TYPES_LIST">%s</xliff:g> شما استفاده میکنند."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"لغو"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index 931def7..c2ccd99 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Peruuta"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Ohjeviestialue"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Vahvista"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Yritä uudelleen"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Kosketa sormenjälkitunnistinta"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Sormenjälkikuvake"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Etsitään kasvoja…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Ääni"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Headset"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Syöttölaite"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Kuulolaitteet"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Otetaan käyttöön…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Kirkkaus"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automaattinen kääntö"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Hylkäät yleensä nämä ilmoitukset. \nHaluatko, että niitä näytetään myös jatkossa?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Jatketaanko näiden ilmoitusten näyttämistä?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Lopeta ilmoitukset"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Estä"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Jatka näyttämistä"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Pienennä"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Näytä ilman ääntä"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Jatka äänettömyyttä"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Hälytä"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Jatka ilmoituksista hälyttämistä"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Jatketaanko ilmoitusten näyttämistä tästä sovelluksesta?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Näitä ilmoituksia ei voi poistaa käytöstä"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Asetukset"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Selvä"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Luo SysUI-keon vedos"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> sovellusta</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> sovellus</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> käyttää ominaisuuksia (<xliff:g id="TYPES_LIST">%2$s</xliff:g>)."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"<xliff:g id="TYPES_LIST">%s</xliff:g> ovat sovellusten käytössä."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Peruuta"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index d1412aa..98e6489 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Annuler"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Zone de message d\'aide"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmer"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Réessayer"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touchez le capteur d\'empreintes digitales"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icône d\'empreinte digitale"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Recherche de votre visage…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Écouteurs"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrée"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Prothèses auditives"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Activation en cours…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Luminosité"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotation automatique"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Vous ignorez habituellement ces notifications. \nSouhaitez-vous continuer à les afficher?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Continuer à afficher ces notifications?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Arrêter les notifications"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquer"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuer à afficher"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Réduire"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Afficher en silence"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Continuer d\'util. mode silencieux"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"M\'alerter"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continuer d\'envoyer des alertes"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Continuer à afficher les notifications de cette application?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ces notifications ne peuvent pas être désactivées"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Paramètres"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Capturer mémoire SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> application</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> applications</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> utilise votre <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Des applications utilisent votre <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Annuler"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index 8ba575b..1233bbe 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Annuler"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Zone de message d\'aide"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmer"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Réessayer"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Appuyez sur le lecteur d\'empreinte digitale"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icône d\'empreinte digitale"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Recherche de votre visage…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Casque"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrée"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Appareils auditifs"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Activation…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Luminosité"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotation automatique"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Vous ignorez généralement ces notifications. \nSouhaitez-vous continuer de les recevoir ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Continuer d\'afficher ces notifications ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Arrêter les notifications"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquer"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuer d\'afficher les notifications"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Réduire"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Affichage silencieux"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Notifications silencieuses"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"M\'avertir"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continuer de m\'avertir"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Continuer d\'afficher les notifications de cette application ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ces notifications ne peuvent pas être désactivées"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Paramètres"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Copier mémoire SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> application</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> applications</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> utilise votre <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Des applications utilisent votre <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Annuler"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml
index 2784567..38554d1 100644
--- a/packages/SystemUI/res/values-gl/strings.xml
+++ b/packages/SystemUI/res/values-gl/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancelar"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Área de mensaxes de axuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmar"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Tentar de novo"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca o sensor de impresión dixital"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona de impresión dixital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Buscándote…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Auriculares"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Audiófonos"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Activando…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brillo"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Xirar automaticamente"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Ignoras estas notificacións a miúdo. \nQueres seguir recibíndoas?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Queres seguir mostrando estas notificacións?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Deter notificacións"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquear"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuar mostrando notificacións"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizar"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostrar en silencio"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Notificacións silenciosas"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Recibir notificacións"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continuar recibindo notificacións"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Queres seguir mostrando as notificacións desta aplicación?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Non se poden desactivar estas notificacións"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"mediante <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Configuración"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"De acordo"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Baleirar mont. SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplicacións</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplicación</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> está utilizando <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Hai aplicacións que están utilizando <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancelar"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml
index f17a7f6..878d0b9 100644
--- a/packages/SystemUI/res/values-gu/strings.xml
+++ b/packages/SystemUI/res/values-gu/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"સ્ક્રીન ભરવા માટે ઝૂમ કરો"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"સ્ક્રીન ભરવા માટે ખેંચો"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"સ્ક્રીનશૉટ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"રદ કરો"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"સહાય સંદેશનું ક્ષેત્ર"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"કન્ફર્મ કરો"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ફરી પ્રયાસ કરો"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ફિંગરપ્રિન્ટના સેન્સરને સ્પર્શ કરો"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ફિંગરપ્રિન્ટનું આઇકન"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"તમારા માટે શોધી રહ્યાં છે..."</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ઑડિઓ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"હૅડસેટ"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ઇનપુટ"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"શ્રવણ યંત્રો"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ચાલુ કરી રહ્યાં છીએ…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"તેજ"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"આપમેળે ફેરવો"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"તમે સામાન્ય રીતે આ નોટીફિકેશનને છોડી દો છો. \nતેમને બતાવવાનું ચાલુ રાખીએ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"આ નોટિફિકેશન બતાવવાનું ચાલુ રાખીએ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"નોટિફિકેશન બંધ કરો"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"બ્લૉક કરો"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"બતાવવાનું ચાલુ રાખો"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"નાનું કરો"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"સાઇલન્ટલી બતાવો"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"સાઇલન્ટ મોડ ચાલુ રાખો"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"મને અલર્ટ બતાવો"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"અલર્ટ કરવાનું ચાલુ રાખો"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"આ ઍપમાંથી નોટિફિકેશન બતાવવાનું ચાલુ રાખીએ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"આ નોટિફિકેશન બંધ કરી શકશો નહીં"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> મારફતે"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"સેટિંગ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"સમજાઈ ગયું"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> ઍપ</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ઍપ</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ઍપ તમારા <xliff:g id="TYPES_LIST">%2$s</xliff:g>નો ઉપયોગ કરી રહી છે."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ઍપ્લિકેશન તમારા <xliff:g id="TYPES_LIST">%s</xliff:g>નો ઉપયોગ કરી રહી છે."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"રદ કરો"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 1c69910..96c6f6e 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"स्क्रीन भरने के लिए ज़ूम करें"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"स्क्रीन भरने के लिए खींचें"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"स्क्रीनशॉट"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"रद्द करें"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"सहायता का मैसेज दिखाने की जगह"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"पुष्टि करें"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"फिर से कोशिश करें"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"फ़िंगरप्रिंट सेंसर को छुएं"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"फ़िंगरप्रिंट आइकॉन"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"आपको पहचान रहा है…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ऑडियो"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"हेडसेट"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"इनपुट"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"सुनने में मददगार डिवाइस"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ब्लूटूथ चालू हो रहा है…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"स्क्रीन की रोशनी"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"स्वत: घुमाएं"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"अाप अक्सर इन सूचनाओं को खारिज कर देते हैं. \nआगे भी इन्हें देखना जारी रखना चाहते हैं?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ये सूचनाएं दिखाना जारी रखें?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"सूचनाएं दिखाना बंद करें"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ब्लॉक करें"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"दिखाना जारी रखें"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"सूचनाएं छोटी करें"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"बिना आवाज़ के दिखाएं"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"साइलेंट मोड में सूचनाएं पाएं"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"मुझे सूचना दें"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"सूचना देना जारी रखें"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"इस ऐप्लिकेशन से जुड़ी सूचनाएं दिखाना जारी रखें?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ये सूचनाएं दिखाया जाना बंद नहीं किया जा सकता"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> के ज़रिए"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"सेटिंग"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ठीक है"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> ऐप्लिकेशन</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ऐप्लिकेशन</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> आपकी <xliff:g id="TYPES_LIST">%2$s</xliff:g> का इस्तेमाल कर रहा है."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ऐप्लिकेशन आपकी <xliff:g id="TYPES_LIST">%s</xliff:g> का इस्तेमाल कर रहे हैं."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"रद्द करें"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index 8f3a11b..17e1cc3 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Odustani"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Područje poruke za pomoć"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potvrdi"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Pokušaj ponovo"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dodirnite senzor otiska prsta"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona otiska prsta"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Tražimo vas…"</string>
@@ -297,8 +302,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Slušalice"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Unos"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Slušni aparati"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Uključivanje…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Svjetlina"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatsko izmjenjivanje"</string>
@@ -614,17 +618,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Obično odbacujete te obavijesti. \nŽelite li da se nastave prikazivati?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Želite li da se obavijesti nastave prikazivati?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Zaustavi obavijesti"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokiraj"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Nastavi prikazivati"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimiziraj"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Prikaži tiho"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Nastavi tiho"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Obavijesti me"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Nastavi obavještavati"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Želite li da se obavijesti te aplikacije nastave prikazivati?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Te se obavijesti ne mogu isključiti"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"putem aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -876,11 +876,20 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Postavke"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Shvaćam"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Izdvoji mem. SysUI-a"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikacije</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> upotrebljava <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikacije upotrebljavaju <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Odustani"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija upotrebljava <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index 49d923a..6e14200 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Mégse"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Súgószöveg területe"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Megerősítés"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Újrapróbálkozás"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Érintse meg az ujjlenyomat-érzékelőt"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ujjlenyomat ikonja"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Keresem az Ön arcát…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Hang"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Headset"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Bevitel"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Hallókészülékek"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Bekapcsolás…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Fényerő"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatikus elforgatás"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Általában elveti ezeket az értesítéseket.\nSzeretné, hogy továbbra is megjelenjenek?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Továbbra is megjelenjenek ezek az értesítések?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Értesítések letiltása"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Tiltás"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Megjelenítés továbbra is"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Kis méret"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Megjelenítés hang nélkül"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Néma megjelenítés"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Értesítsen"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Értesítések folytatása"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Továbbra is megjelenjenek az alkalmazás értesítései?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ezeket az értesítéseket nem lehet kikapcsolni"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazás használatával"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Beállítások"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Értem"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI-memória-kiírás"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> alkalmazás</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> alkalmazás</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"A(z) <xliff:g id="APP">%1$s</xliff:g> használja a következőket: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Több alkalmazás használja a következőket: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Mégse"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml
index dc592c5..37512e6 100644
--- a/packages/SystemUI/res/values-hy/strings.xml
+++ b/packages/SystemUI/res/values-hy/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Խոշորացնել` էկրանը լցնելու համար"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ձգել` էկրանը լցնելու համար"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Սքրինշոթ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Չեղարկել"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Օգնության հաղորդագրության դաշտ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Հաստատել"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Նորից փորձել"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Հպեք մատնահետքերի սկաներին"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Մատնահետքի պատկերակ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Դեմքի ճանաչում…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Աուդիո"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Ականջակալ"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Մուտքագրում"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Լսողական ապարատ"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Միացում…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Պայծառություն"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Ինքնապտտում"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Դուք սովորաբար փակում եք այս ծանուցումները: \nՇարունակե՞լ ցուցադրել դրանք:"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Ցուցադրե՞լ այս ծանուցումները։"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Չցուցադրել ծանուցումներ"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Արգելափակել"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Ցուցադրել"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Ծալել"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Ցույց տալ անձայն"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Չմիացնել ձայնը"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Ծանուցել ինձ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Ծանուցել"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Ցուցադրե՞լ ծանուցումներ այս հավելվածից։"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Այս ծանուցումները հնարավոր չէ անջատել"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի միջոցով"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Կարգավորումներ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Եղավ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> հավելված</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> հավելված</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> հավելվածն օգտագործում է ձեր <xliff:g id="TYPES_LIST">%2$s</xliff:g>:"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Հավելվածներն օգտագործում են ձեր <xliff:g id="TYPES_LIST">%s</xliff:g>:"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Չեղարկել"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 1b43e65..9d49bdc 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Batal"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Area pesan bantuan"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Konfirmasi"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Coba lagi"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sentuh sensor sidik jari"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon sidik jari"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Mencari wajah Anda…"</string>
@@ -296,8 +301,7 @@
<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">"Masukan"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Alat Bantu Dengar"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Mengaktifkan…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Kecerahan"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotasi otomatis"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Anda biasanya menutup notifikasi ini. \nTerus tampilkan?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Terus tampilkan notifikasi ini?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Hentikan notifikasi"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokir"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Terus tampilkan"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Perkecil"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Tampilkan tanpa suara"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Tetap nonaktif"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Beri tahu saya"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Terus beri tahu"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Terus tampilkan notifikasi dari aplikasi ini?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Notifikasi ini tidak dapat dinonaktifkan"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"melalui <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Setelan"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Hapus Heap SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikasi</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplikasi</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> menggunakan <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikasi menggunakan <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Batal"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml
index 36b557d..0cc367b 100644
--- a/packages/SystemUI/res/values-is/strings.xml
+++ b/packages/SystemUI/res/values-is/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Hætta við"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Svæði hjálparskilaboða"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Staðfesta"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Reyna aftur"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Snertu fingrafaralesarann"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingrafaratákn"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Leitar að þér ..."</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Hljóð"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Höfuðtól"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Inntak"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Heyrnartæki"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Kveikir…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Birtustig"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Sjálfvirkur snúningur"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Þú hunsar yfirleitt þessar tilkynningar. \nViltu halda áfram að fá þær?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Sýna áfram þessar tilkynningar?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Stöðva tilkynningar"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Loka á"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Sýna áfram"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minnka"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Sýna án hljóðs"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Áfram hljóðlaust"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Láta mig vita"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Halda áfram að gera viðvart"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Sýna áfram tilkynningar frá þessu forriti?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ekki er hægt að slökkva á þessum tilkynningum"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"með <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Stillingar"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Ég skil"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Vista SysUI-gögn"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> forrit</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> forrit</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> er að nota <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Forrit eru að nota <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Hætta við"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index 21c259a..27998bf 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Annulla"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Area dei messaggi di assistenza"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confermo"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Riprova"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Tocca il sensore di impronte digitali"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona dell\'impronta digitale"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"In attesa del volto…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Auricolare"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Ingresso"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Apparecchi acustici"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Attivazione…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Luminosità"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotazione automatica"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"In genere ignori queste notifiche. \nVuoi continuare a riceverle?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Continuare a ricevere queste notifiche?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Interrompi la ricezione di notifiche"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blocca"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continua a mostrare"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Riduci a icona"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostra silenziosamente"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Continua con notifiche silenziose"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Avvisami"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continua ad avvisare"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Continuare a ricevere notifiche da questa app?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Queste notifiche non possono essere disattivate"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"tramite <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Impostazioni"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Esegui dump heap SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> app</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">"L\'app <xliff:g id="APP">%1$s</xliff:g> sta usando <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Le app stanno usando <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Annulla"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index d43551d..71cf575 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"הגדל תצוגה כדי למלא את המסך"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"מתח כדי למלא את המסך"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"צילום מסך"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ביטול"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"אזור הודעת עזרה"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"אישור"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ניסיון נוסף"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"יש לגעת בחיישן טביעות האצבע"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"סמל טביעת אצבע"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"מחפש אותך…"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"אודיו"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"אוזניות"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"קלט"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"מכשירי שמיעה"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ההפעלה מתבצעת…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"בהירות"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"סיבוב אוטומטי"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"הודעות אלה בדרך כלל נדחות על ידיך. \nלהמשיך להציג אותן?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"שנמשיך להציג לך את ההודעות האלה?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"לא, אל תמשיכו"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"חסימה"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"כן, המשיכו"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"מזעור"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"הצגה ללא צליל"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"בשקט"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"אבקש התראה"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"המשך שליחת התראות"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"שנמשיך להציג לך הודעות מהאפליקציה הזאת?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"לא ניתן לכבות את ההודעות האלה"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"באמצעות <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"הגדרות"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"הבנתי"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"ערימת Dump SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="two"><xliff:g id="NUM_APPS_2">%d</xliff:g> אפליקציות</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> אפליקציות</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> אפליקציות</item>
+ <item quantity="one">אפליקציה אחת (<xliff:g id="NUM_APPS_0">%d</xliff:g>)</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> משתמשת ב<xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"אפליקציות משתמשות ב<xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ביטול"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="two"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> אפליקציות משתמשות ב<xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <item quantity="many"><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>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index ff88a0d..2430500 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"画面サイズに合わせて拡大"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"画面サイズに合わせて拡大"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"スクリーンショット"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"キャンセル"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"ヘルプ メッセージ領域"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"確認"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"再試行"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"指紋認証センサーをタップしてください"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指紋アイコン"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"顔を認証しています…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"オーディオ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ヘッドセット"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"入力"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"補聴器"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ON にしています…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"画面の明るさ"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"自動回転"</string>
@@ -595,7 +599,7 @@
<string name="enable_bluetooth_title" msgid="5027037706500635269">"BluetoothをONにしますか?"</string>
<string name="enable_bluetooth_message" msgid="9106595990708985385">"タブレットでキーボードに接続するには、最初にBluetoothをONにする必要があります。"</string>
<string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"ONにする"</string>
- <string name="show_silently" msgid="6841966539811264192">"通知をマナーモードで表示する"</string>
+ <string name="show_silently" msgid="6841966539811264192">"通知をポップアップで知らせる"</string>
<string name="block" msgid="2734508760962682611">"通知をすべてブロックする"</string>
<string name="do_not_silence" msgid="6878060322594892441">"音声で知らせる"</string>
<string name="do_not_silence_block" msgid="4070647971382232311">"音声で知らせる / ブロックしない"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"通常、この通知はスワイプして非表示にしています。\n今後も表示しますか?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"この通知を今後も表示しますか?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"通知を表示しない"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ブロック"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"今後も表示する"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"最小化"</string>
- <string name="inline_silent_button_silent" msgid="4411510650503783646">"サイレント モードで表示"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_silent" msgid="4411510650503783646">"ポップアップで知らせる"</string>
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"音なしで通知"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"アラートを設定"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"今後もアラートを受け取る"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"このアプリからの通知を今後も表示しますか?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"この通知を OFF にすることはできません"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> 経由"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"設定"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI ヒープのダンプ"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g>個のアプリ</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g>個のアプリ</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g>は<xliff:g id="TYPES_LIST">%2$s</xliff:g>を使用しています。"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"アプリは<xliff:g id="TYPES_LIST">%s</xliff:g>を使用しています。"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"キャンセル"</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> 個のアプリが <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml
index e1ee20e..40f13039f 100644
--- a/packages/SystemUI/res/values-ka/strings.xml
+++ b/packages/SystemUI/res/values-ka/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"მასშტაბი შეცვალეთ ეკრანის შესავსებად."</string>
<string name="compat_mode_off" msgid="4434467572461327898">"გაწიეთ ეკრანის შესავსებად."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ეკრანის ანაბეჭდი"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"გაუქმება"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"დამხმარე შეტყობინების არე"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"დადასტურება"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ხელახლა ცდა"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"შეეხეთ თითის ანაბეჭდის სენსორს"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"თითის ანაბეჭდის ხატულა"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"მიმდინარეობს თქვენი ძიება…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"აუდიო"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ყურსაცვამი"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"შეყვანა"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"სმენის მოწყობილობები"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ირთვება…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"სიკაშკაშე"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ავტოროტაცია"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"როგორც წესი, თქვენ ასეთ შეტყობინებებს ხურავთ. \nგსურთ მათი ჩვენების გაგრძელება?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"გაგრძელდეს ამ შეტყობინებათა ჩვენება?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"შეტყობინებების შეწყვეტა"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"დაბლოკვა"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ჩვენების გაგრძელება"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ჩაკეცვა"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"უხმოდ ჩვენება"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"კვლავ ჩუმად ჩვენება"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"გაფრთხილების მიღება"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"გაფრთხილების გაგრძელება"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"გაგრძელდეს შეტყობინებათა ჩვენება ამ აპიდან?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ამ შეტყობინებათა გამორთვა ვერ მოხერხდება"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g>-დან"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"პარამეტრები"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"გასაგებია"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI გროვის გამოტანა"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> აპი</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> აპი</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g>-ის მიერ გამოიყენება თქვენი <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"აპლიკაციების მიერ გამოიყენება თქვენი <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"გაუქმება"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml
index 41ef3e2..b00c560 100644
--- a/packages/SystemUI/res/values-kk/strings.xml
+++ b/packages/SystemUI/res/values-kk/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Экранды толтыру үшін ұлғайту"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Экранды толтыру үшін созу"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Скриншот"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Бас тарту"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Анықтама хабары аумағы"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Растау"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Қайталап көріңіз"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Саусақ ізін оқу сканерін түртіңіз"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Саусақ ізі белгішесі"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Бет ізделуде…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Aудио"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Гарнитура"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Кіріс"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Есту аппараттары"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Қосылуда…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Жарықтығы"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоматты түрде бұру"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Әдетте хабарландыруларды көрмейсіз. \nОлар көрсетілсін бе?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Хабарландырулар көрсетілсін бе?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Хабарландыруларға тыйым салу"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Бөгеу"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Көрсету"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Жасыру"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Дыбыссыз көрсету"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Хабарландырулар алғым келмейді"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Хабарландырулар алғым келеді"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Хабарландырулар келе берсін"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Осы қолданбаның хабарландырулары көрсетілсін бе?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Хабарландыруларды өшіру мүмкін емес"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> арқылы"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Параметрлер"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Түсінікті"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> қолданба</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> қолданба</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> қолданбасында <xliff:g id="TYPES_LIST">%2$s</xliff:g> пайдалануда."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Қолданбаларда <xliff:g id="TYPES_LIST">%s</xliff:g> пайдаланылуда."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Бас тарту"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml
index 5520cb0..a3c37a6 100644
--- a/packages/SystemUI/res/values-km/strings.xml
+++ b/packages/SystemUI/res/values-km/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ពង្រីកដើម្បីឲ្យពេញអេក្រង់"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ទាញដើម្បីឲ្យពេញអេក្រង់"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"រូបថតអេក្រង់"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"បោះបង់"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"តំបន់សារជំនួយ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"បញ្ជាក់"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ព្យាយាមម្ដងទៀត"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"រូបតំណាងស្នាមម្រាមដៃ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"កំពុងស្វែងរកអ្នក…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"សំឡេង"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"កាស"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"បញ្ចូល"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ឧបករណ៍ជំនួយការស្ដាប់"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"កំពុងបើក..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ពន្លឺ"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"បង្វិលស្វ័យប្រវត្តិ"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"ជាធម្មតាអ្នកច្រានចោលការជូនដំណឹងទាំងនេះ។ \nបន្តបង្ហាញពួកវាទៀតដែរទេ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"បន្តបង្ហាញការជូនដំណឹងទាំងនេះ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"បញ្ឈប់ការជូនដំណឹង"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ទប់ស្កាត់"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"បន្តបង្ហាញ"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"បង្រួម"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"បង្ហាញស្ងាត់ៗ"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"បន្តបិទសំឡេង"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"ជូនដំណឹងដល់ខ្ញុំ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"បន្តជូនដំណឹង"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"បន្តបង្ហាញការជូនដំណឹងពីកម្មវិធីនេះ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"មិនអាចបិទការជូនដំណឹងទាំងនេះបានទេ"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"តាមរយៈ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ការកំណត់"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"យល់ហើយ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"ចម្លង SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other">កម្មវិធី <xliff:g id="NUM_APPS_2">%d</xliff:g></item>
+ <item quantity="one">កម្មវិធី <xliff:g id="NUM_APPS_0">%d</xliff:g></item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> កំពុងប្រើ <xliff:g id="TYPES_LIST">%2$s</xliff:g> របស់អ្នក។"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"កម្មវិធីកំពុងប្រើ <xliff:g id="TYPES_LIST">%s</xliff:g> របស់អ្នក។"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"បោះបង់"</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> កំពុងប្រើប្រាស់ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml
index f829c12..8c553f5 100644
--- a/packages/SystemUI/res/values-kn/strings.xml
+++ b/packages/SystemUI/res/values-kn/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ಪರದೆ ತುಂಬಿಸಲು ಝೂಮ್ ಮಾಡು"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ಪರದೆ ತುಂಬಿಸಲು ವಿಸ್ತಾರಗೊಳಿಸು"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ರದ್ದುಮಾಡಿ"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"ಸಹಾಯ ಸಂದೇಶ ಪ್ರದೇಶ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"ದೃಢೀಕರಿಸಿ"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಐಕಾನ್"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ನಿಮಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ಆಡಿಯೋ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ಹೆಡ್ಸೆಟ್"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ಇನ್ಪುಟ್"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ಶ್ರವಣ ಸಾಧನಗಳು"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ಪ್ರಕಾಶಮಾನ"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ಸ್ವಯಂ-ತಿರುಗುವಿಕೆ"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"ನೀವು ಸಾಮಾನ್ಯವಾಗಿ ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾಗೊಳಿಸಿದ್ದೀರಿ. \nಅವುಗಳನ್ನು ತೋರಿಸುತ್ತಲೇ ಇರಬೇಕೆ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸುತ್ತಲೇ ಇರಬೇಕೆ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಲ್ಲಿಸಿ"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ನಿರ್ಬಂಧಿಸಿ"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ತೋರಿಸುತ್ತಲಿರಿ"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ಕಿರಿದುಗೊಳಿಸಿ"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"ಮೌನವಾಗಿ ತೋರಿಸಿ"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ಮೌನವಾಗಿರಿ"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"ನನ್ನನ್ನು ಎಚ್ಚರಿಸಿ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ಎಚ್ಚರಿಸುತ್ತಿರಿ"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ಈ ಅಪ್ಲಿಕೇಶನ್ನಿಂದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸುತ್ತಲೇ ಇರಬೇಕೆ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಮೂಲಕ"</string>
@@ -734,7 +734,7 @@
<item msgid="586019486955594690">"ಬಲ-ಬಾಗುವಿಕೆ"</item>
</string-array>
<string name="menu_ime" msgid="4998010205321292416">"ಕೀಬೋರ್ಡ್ ಬದಲಾಯಿಸುವಿಕೆ"</string>
- <string name="save" msgid="2311877285724540644">"ಉಳಿಸು"</string>
+ <string name="save" msgid="2311877285724540644">"ಉಳಿಸಿ"</string>
<string name="reset" msgid="2448168080964209908">"ಮರುಹೊಂದಿಸು"</string>
<string name="adjust_button_width" msgid="6138616087197632947">"ಬಟನ್ ಅಳತೆ ಹೊಂದಿಸು"</string>
<string name="clipboard" msgid="1313879395099896312">"ಕ್ಲಿಪ್ಬೋರ್ಡ್"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ಅರ್ಥವಾಯಿತು"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI ಹೀಪ್ ಡಂಪ್ ಮಾಡಿ"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> ಆ್ಯಪ್ಗಳು</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ಆ್ಯಪ್ಗಳು</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"ನಿಮ್ಮ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ಅನ್ನು <xliff:g id="APP">%1$s</xliff:g> ಬಳಸುತ್ತಿದೆ."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ನಿಮ್ಮ <xliff:g id="TYPES_LIST">%s</xliff:g> ಅನ್ನು ಆ್ಯಪ್ಗಳು ಬಳಸುತ್ತಿವೆ."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ರದ್ದುಮಾಡಿ"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index f5168fb..559357f 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"전체화면 모드로 확대"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"전체화면 모드로 확대"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"스크린샷"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"취소"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"도움말 메시지 영역"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"확인"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"다시 시도하세요."</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"지문 센서를 터치하세요."</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"지문 아이콘"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"찾는 중..."</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"오디오"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"헤드셋"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"입력"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"보청기"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"켜는 중..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"밝기"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"자동 회전"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"보통 이 알림을 닫았습니다. \n알림을 계속 표시하시겠습니까?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"이 알림을 계속 표시하시겠습니까?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"알림 중지"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"차단"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"계속 표시하기"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"최소화"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"소리 없이 표시"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"계속 무음으로 알림"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"내게 알림"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"계속 알림"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"이 앱의 알림을 계속 표시하시겠습니까?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"이 알림은 끌 수 없습니다"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"제공: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"설정"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"확인"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other">앱 <xliff:g id="NUM_APPS_2">%d</xliff:g>개</item>
+ <item quantity="one">앱 <xliff:g id="NUM_APPS_0">%d</xliff:g>개</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g>이(가) <xliff:g id="TYPES_LIST">%2$s</xliff:g>을(를) 사용 중입니다."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"애플리케이션이 <xliff:g id="TYPES_LIST">%s</xliff:g>을(를) 사용 중입니다."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"취소"</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>개가 <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml
index 9558c3a..5725d16 100644
--- a/packages/SystemUI/res/values-ky/strings.xml
+++ b/packages/SystemUI/res/values-ky/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Экрнд тлтр ү. чен өлч өзг"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Экранды толтуруу ү-н чоюу"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Скриншот"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Жокко чыгаруу"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Жардам билдирүүсү"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Ырастоо"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Кайталоо"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Манжа изинин сенсорун басыңыз"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Манжа изинин сүрөтчөсү"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Жүзүңүз изделүүдө…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудио"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Гарнитура"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Киргизүү"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Угуу аппараттары"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Күйгүзүлүүдө…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Жарыктыгы"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоматтык бурулуу"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Адатта мындай эскертмелерди өткөрүп жибересиз. \nАлар көрсөтүлө берсинби?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Бул эскертмелер көрсөтүлө берсинби?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Эскертмелерди токтотуу"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Бөгөттөө"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Көрсөтүлө берсин"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Кичирейтүү"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Үнсүз көрсөтүү"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Үнү чыкпасын"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Мага кабар берилсин"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Кабар бериле берсин"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Бул колдонмонун эскертмелери көрсөтүлө берсинби?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Бул эскертмелерди өчүрүүгө болбойт"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> аркылуу"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Жөндөөлөр"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Түшүндүм"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> колдонмо</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> колдонмо</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> төмөнкүлөрдү колдонуп жатат: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Колдонмолор төмөнкүлөрдү пайдаланып жатышат: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Жок"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml
index a4ffffb..4472fc5 100644
--- a/packages/SystemUI/res/values-lo/strings.xml
+++ b/packages/SystemUI/res/values-lo/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ຊູມໃຫ້ເຕັມໜ້າຈໍ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ປັບໃຫ້ເຕັມໜ້າຈໍ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ພາບໜ້າຈໍ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ຍົກເລີກ"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"ຊ່ວຍພື້ນທີ່ຂໍ້ຄວາມ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"ຢືນຢັນ"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ລອງໃໝ່"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ໄອຄອນລາຍນິ້ວມື"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ກຳລັງຊອກຫາທ່ານ…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ສຽງ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ຊຸດຫູຟັງ"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ການປ້ອນຂໍ້ມູນ"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ເຄື່ອງຊ່ວຍຟັງ"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ກຳລັງເປີດ..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ຄວາມສະຫວ່າງ"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ໝຸນອັດຕະໂນມັດ"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"ໂດຍປົກກະຕິທ່ານປິດການແຈ້ງເຕືອນເຫຼົ່ານີ້ໄວ້. \nສືບຕໍ່ສະແດງພວກມັນບໍ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ສະແດງການແຈ້ງເຕືອນເຫຼົ່ານີ້ຕໍ່ໄປບໍ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"ຢຸດການແຈ້ງເຕືອນ"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ບລັອກ"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ສະແດງຕໍ່ໄປ"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ຫຍໍ້"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"ສະແດງແບບງຽບໆ"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ສືບຕໍ່ມິດງຽບ"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"ແຈ້ງເຕືອນຂ້ອຍ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ສືບຕໍ່ແຈ້ງເຕືອນ"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ສະແດງການແຈ້ງເຕືອນຈາກແອັບນີ້ຕໍ່ໄປບໍ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ບໍ່ສາມາດປິດການແຈ້ງເຕືອນເຫຼົ່ານີ້ໄດ້"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"ຜ່ານ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ການຕັ້ງຄ່າ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ເຂົ້າໃຈແລ້ວ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ແອັບ</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ແອັບ</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ກຳລັງໃຊ້ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ຂອງທ່ານ."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ແອັບພລິເຄຊັນກຳລັງໃຊ້ <xliff:g id="TYPES_LIST">%s</xliff:g> ຂອງທ່ານ."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ຍົກເລີກ"</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> ແອັບພລິເຄຊັນກຳລັງໃຊ້ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index 5786fb0..a99df69 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Atšaukti"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Pagalbos pranešimo sritis"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Patvirtinkite"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Bandyti dar kartą"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Palieskite piršto antspaudo jutiklį"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Piršto antspaudo piktograma"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ieškoma jūsų…"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Garsas"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Virtualiosios realybės įrenginys"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Įvestis"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Klausos aparatai"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Įjungiama…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Šviesumas"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatinis pasukimas"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Paprastai šių pranešimų atsisakote. \nToliau juos rodyti?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Toliau rodyti šiuos pranešimus?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Sustabdyti pranešimus"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokuoti"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Toliau rodyti"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Sumažinti"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Rodyti tyliai"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Neskambėti"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Įspėti mane"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Toliau įspėti"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Toliau rodyti iš šios programos gautus pranešimus?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Šių pranešimų negalima išjungti"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"naudojant „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Nustatymai"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Supratau"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Pat. „SysUI“ krūvą"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> programa</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> programos</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> programos</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> programų</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Programa „<xliff:g id="APP">%1$s</xliff:g>“ naudoja: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Programos naudoja: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Atšaukti"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> programa naudoja jūsų <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> programos naudoja jūsų <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index cebd91c..250920d 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Atcelt"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Palīdzības ziņojuma apgabals"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Apstiprināt"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Mēģināt vēlreiz"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Pieskarieties pirksta nospieduma sensoram"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Pirksta nospieduma ikona"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Notiek jūsu sejas meklēšana…"</string>
@@ -297,8 +302,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Austiņas"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Ievade"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Dzirdes aparāti"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Notiek ieslēgšana…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Spilgtums"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automātiska pagriešana"</string>
@@ -614,17 +618,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Parasti jūs noraidāt šādus paziņojumus. \nVai turpināt tos rādīt?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Vai turpināt rādīt šos paziņojumus?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Apturēt paziņojumu rādīšanu"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloķēt"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Turpināt rādīt"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizēt"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Rādīt bez skaņas signāla"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Neslēgt skaļumu"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Brīdināt mani"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Turpināt paziņošanu"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Vai turpināt rādīt paziņojumus no šīs lietotnes?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Šos paziņojumus nevar izslēgt."</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -876,11 +876,20 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Iestatījumi"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Labi"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="zero"><xliff:g id="NUM_APPS_2">%d</xliff:g> lietotņu</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> lietotne</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> lietotnes</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Lietotne <xliff:g id="APP">%1$s</xliff:g> izmanto funkcijas <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Lietojumprogrammas izmanto šādas funkcijas: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Atcelt"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="zero"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> lietojumprogrammās tiek izmantots: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml
index df1bdbb..49a7655 100644
--- a/packages/SystemUI/res/values-mk/strings.xml
+++ b/packages/SystemUI/res/values-mk/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Зумирај да се исполни екранот"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Растегни да се исполни екранот"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Слика од екранот"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Откажи"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Област за пораки за помош"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Потврди"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Обиди се повторно"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Допрете го сензорот за отпечатоци"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Икона за отпечатоци"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ве бараме вас…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудио"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Слушалки"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Влез"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Слушни помагала"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Се вклучува…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Осветленост"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоматско ротирање"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Обично ги отфрлате известувањава. \nДа продолжат да се прикажуваат?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Дали да продолжат да се прикажуваат известувањава?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Запри ги известувањата"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Блокирај"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Продолжи да ги прикажуваш"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Минимизирај"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Прикажи тивко"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Продолжи со безгласно прикажување"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Предупреди ме"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Продолжи да ме предупредуваш"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Дали да продолжат да се прикажуваат известувања од апликацијава?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Известувањава не може да се исклучат"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"преку <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Поставки"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Сфатив"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Извади SysUI-слика"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> апликација</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> апликации</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> користи <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Апликациите користат <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Откажи"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml
index 5800e0e..ba93974 100644
--- a/packages/SystemUI/res/values-ml/strings.xml
+++ b/packages/SystemUI/res/values-ml/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"സ്ക്രീനിൽ ഉൾക്കൊള്ളിക്കാൻ സൂം ചെയ്യുക"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"സ്ക്രീനിൽ ഉൾക്കൊള്ളിക്കാൻ വലിച്ചുനീട്ടുക"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"സ്ക്രീൻഷോട്ട്"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"റദ്ദാക്കുക"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"സഹായ സന്ദേശ ഏരിയ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"സ്ഥിരീകരിക്കുക"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"വീണ്ടും ശ്രമിക്കുക"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"വിരലടയാള സെൻസർ സ്പർശിക്കുക"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"വിരലടയാള ഐക്കൺ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"നിങ്ങൾക്കായി തിരയുന്നു…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ഓഡിയോ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ഹെഡ്സെറ്റ്"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ഇൻപുട്ട്"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ശ്രവണ സഹായികൾ"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ഓണാക്കുന്നു…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"തെളിച്ചം"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"സ്ക്രീൻ സ്വമേധയാ തിരിയുക"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"സാധാരണയായി നിങ്ങൾ ഈ അറിയിപ്പുകൾ നിരാകരിക്കുന്നു. \nഅവ തുടർന്നും കാണിക്കണോ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ഈ അറിയിപ്പുകൾ തുടർന്നും കാണിക്കണോ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"അറിയിപ്പുകൾ നിർത്തുക"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ബ്ലോക്ക് ചെയ്യുക"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"തുടർന്നും കാണിക്കുക"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ചെറുതാക്കുക"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"നിശബ്ദമായി കാണിക്കുക"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"നിശബ്ദമായ നിലയിൽ തുടരുക"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"എനിക്ക് അലേർട്ട് നൽകുക"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"മുന്നറിയിപ്പ് നൽകുന്നത് തുടരുക"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ഈ ആപ്പിൽ നിന്നുള്ള അറിയിപ്പുകൾ തുടർന്നും കാണിക്കണോ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ഈ അറിയിപ്പുകൾ ഓഫാക്കാനാവില്ല"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> വഴി"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ക്രമീകരണം"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"മനസ്സിലായി"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI ഹീപ്പ് ഡമ്പ് ചെയ്യുക"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ആപ്പുകൾ</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ആപ്പ്</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> നിങ്ങളുടെ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ഉപയോഗിക്കുന്നു."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ആപ്പുകൾ നിങ്ങളുടെ <xliff:g id="TYPES_LIST">%s</xliff:g> ഉപയോഗിക്കുന്നു."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"റദ്ദാക്കുക"</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> ആപ്പുകൾ നിങ്ങളുടെ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml
index e96865e..e19cb2b 100644
--- a/packages/SystemUI/res/values-mn/strings.xml
+++ b/packages/SystemUI/res/values-mn/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Дэлгэц дүүргэх бол өсгөнө үү"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Дэлгэц дүүргэх бол татна уу"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Дэлгэцийн зураг дарах"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Цуцлах"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Тусламжийн зурвасын хэсэг"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Баталгаажуулах"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Дахин оролдох"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Хурууны хээ мэдрэгчид хүрэх"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Хурууны хээний дүрс тэмдэг"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Таныг хайж байна…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудио"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Чихэвч"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Оролт"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Сонсголын төхөөрөмж"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Асааж байна…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Тодрол"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоматаар эргэх"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Та эдгээр мэдэгдлийг ихэвчлэн хаадаг. \nЭдгээрийг харуулсан хэвээр байх уу?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Эдгээр мэдэгдлийг харуулсан хэвээр байх уу?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Мэдэгдлийг зогсоох"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Блоклох"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Харуулсан хэвээр байх"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Багасгах"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Дуугүй харуулах"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Чимээгүй хэвээр харуулах"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Надад сануулах"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Үргэлжлүүлэн сануулах"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Энэ аппаас мэдэгдэл харуулсан хэвээр байх уу?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Эдгээр мэдэгдлийг унтраах боломжгүй"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g>-р"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Тохиргоо"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Ойлголоо"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> апп</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> апп</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> таны <xliff:g id="TYPES_LIST">%2$s</xliff:g>-г ашиглаж байна."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Аппууд таны <xliff:g id="TYPES_LIST">%s</xliff:g>-г ашиглаж байна."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Болих"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml
index 6022a9c..71e0e3c 100644
--- a/packages/SystemUI/res/values-mr/strings.xml
+++ b/packages/SystemUI/res/values-mr/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"स्क्रीन भरण्यासाठी झूम करा"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"स्क्रीन भरण्यासाठी ताणा"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"स्क्रीनशॉट"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"रद्द करा"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"मदत मेसेज परिसर"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"खात्री करा"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"पुन्हा प्रयत्न करा"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"फिंगरप्रिंट सेन्सरला स्पर्श करा"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"फिंगरप्रिंट आयकन"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"तुमच्यासाठी शोधत आहे…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ऑडिओ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"हेडसेट"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"इनपुट"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"श्रवण यंत्रे"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"सुरू करत आहे…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"चमक"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ऑटो-रोटेट"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"तुम्ही या सूचना सामान्यतः डिसमिस करता. \nते दाखवत राहायचे?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"या सूचना दाखवणे सुरू ठेवायचे?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"सूचना थांबवा"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ब्लॉक करा"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"दाखवणे सुरू ठेवा"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"लहान करा"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"शांतपणे दर्शवा"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"सायलंट रहा"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"मला अॅलर्ट करा"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"सूचना देत रहा"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"या अॅपकडील सूचना दाखवणे सुरू ठेवायचे?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"या सूचना बंद करता येत नाहीत"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> मार्गे"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"सेटिंग्ज"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"समजले"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI हीप डंप करा"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> अॅप</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> अॅप्स</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> तुमचे <xliff:g id="TYPES_LIST">%2$s</xliff:g> वापरत आहे."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"अॅप्लिकेशन्स तुमचे <xliff:g id="TYPES_LIST">%s</xliff:g> वापरत आहे."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"रद्द करा"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml
index 1a9eb1c..1b7cc7c 100644
--- a/packages/SystemUI/res/values-ms/strings.xml
+++ b/packages/SystemUI/res/values-ms/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Batal"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Bahagian mesej bantuan"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Sahkan"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Cuba lagi"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sentuh penderia cap jari"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon cap jari"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Mencari anda…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Set Kepala"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Input"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Alat Bantu Dengar"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Menghidupkan…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Kecerahan"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Autoputar"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Biasanya anda mengetepikan pemberitahuan ini. \nTerus tunjukkan pemberitahuan?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Terus tunjukkan pemberitahuan ini?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Hentikan pemberitahuan"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Sekat"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Terus tunjukkan"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimumkan"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Tunjukkan secara senyap"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Kekal senyap"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Maklumi saya"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Teruskan memberikan makluman"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Terus tunjukkan pemberitahuan daripada apl ini?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Pemberitahuan ini tidak boleh dimatikan"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"melalui <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Tetapan"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Longgok Tmbunn SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apl</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> apl</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> sedang menggunakan <xliff:g id="TYPES_LIST">%2$s</xliff:g> anda."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikasi sedang menggunakan <xliff:g id="TYPES_LIST">%s</xliff:g> anda."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Batal"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml
index dbfa01e..b5cd82e 100644
--- a/packages/SystemUI/res/values-my/strings.xml
+++ b/packages/SystemUI/res/values-my/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ဇူးမ်အပြည့်ဆွဲခြင်း"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ဖန်သားပြင်အပြည့်ဆန့်ခြင်း"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"မလုပ်တော့"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"အကူအညီမက်ဆေ့ဂျ် နေရာ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"အတည်ပြုပါ"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ထပ်စမ်းကြည့်ရန်"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"လက်ဗွေအာရုံခံကိရိယာကို တို့ပါ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"လက်ဗွေ သင်္ကေတ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"သင့်ကို ရှာဖွေနေသည်…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"အသံ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"မိုက်ခွက်ပါနားကြပ်"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"အဝင်"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"နားကြားကိရိယာ"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ဖွင့်နေသည်…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"အလင်းတောက်ပမှု"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"အော်တို-လည်"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"သင်သည် အများအားဖြင့် ဤအကြောင်းကြားချက်များကို ပယ်လေ့ရှိပါသည်။ \n၎င်းတို့ကို ဆက်လက်ပြသလိုပါသလား။"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ဤအကြောင်းကြားချက်များကို ဆက်ပြလိုပါသလား။"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"အကြောင်းကြားချက်များကို ရပ်ရန်"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ပိတ်ထားရန်"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ဆက်ပြရန်"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ချုံ့ရန်"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"တိတ်တဆိတ် ပြရန်"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ဆက်လက် အသံတိတ်ရန်"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"ကျွန်ုပ်ကို သတိပေးရန်"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ဆက်လက် သတိပေးရန်"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ဤအက်ပ်ထံမှ အကြောင်းကြားချက်များကို ဆက်ပြလိုပါသလား။"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ဤအကြောင်းကြားချက်များကို ပိတ်၍မရပါ"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> မှတစ်ဆင့်"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ဆက်တင်များ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ရပါပြီ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other">အက်ပ် <xliff:g id="NUM_APPS_2">%d</xliff:g> ခု</item>
+ <item quantity="one">အက်ပ် <xliff:g id="NUM_APPS_0">%d</xliff:g> ခု</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ကို အသုံးပြုနေသည်။"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"အပလီကေးရှင်းများက သင်၏ <xliff:g id="TYPES_LIST">%s</xliff:g> ကို အသုံးပြုနေသည်။"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"မလုပ်တော့"</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> ခုက သင်၏ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index e790684..83a1ad9 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Avbryt"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Område for hjelpemelding"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Bekreft"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Prøv på nytt"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Trykk på fingeravtrykkssensoren"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon for fingeravtrykk"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ser etter deg …"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Lyd"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Hodetelefoner"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Innenhet"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Høreapparater"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Slår på …"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Lysstyrke"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotér automatisk"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Du avviser vanligvis disse varslene. \nVil du fortsette å vise dem?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Vil du fortsette å vise disse varslene?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Stopp varsler"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokkér"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Fortsett å vise"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimer"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Vis uten lyd"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Forbli lydløs"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Varsle meg"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Fortsett å varsle"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Vil du fortsette å vise varsler fra denne appen?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Du kan ikke slå av disse varslene"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Innstillinger"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Greit"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI-heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apper</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> bruker <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Apper bruker <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Avbryt"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml
index 9b4441f..8ebb22e 100644
--- a/packages/SystemUI/res/values-ne/strings.xml
+++ b/packages/SystemUI/res/values-ne/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"स्क्रिन भर्न जुम गर्नुहोस्"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"स्क्रिन भर्न तन्काउनुहोस्"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"स्क्रिनसट"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"रद्द गर्नुहोस्"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"मद्दतसम्बन्धी सन्देशको क्षेत्र"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"पुष्टि गर्नुहोस्"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"फेरि प्रयास गर्नुहोस्"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"फिंगरप्रिन्ट सेन्सरमा छुनुहोस्"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"फिंगरप्रिन्ट जनाउने आइकन"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"तपाईंलाई खोज्दै…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"अडियो"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"हेडसेट"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"इनपुट"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"श्रवण यन्त्रहरू"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"सक्रिय गर्दै…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"चमक"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"स्वतःघुम्ने"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"तपाईं सामान्यतया यी सूचनाहरूलाई खारेज गर्ने गर्नुहुन्छ। \nतिनलाई देखाइरहने हो?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"यी सूचनाहरू देखाउने क्रम जारी राख्ने हो?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"सूचनाहरू देखाउन छाड्नुहोस्"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"रोक लगाउनुहोस्"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"देखाउने क्रम जारी राख्नुहोस्"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"सानो बनाउनुहोस्"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"मौन रूपमा देखाउने"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"मौन रहनुहोस्"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"मलाई सतर्क गराउनुहोस्"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"सर्तक गराइरहनुहोस्"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"यो अनुप्रयोगका सूचनाहरू देखाउने क्रम जारी राख्ने हो?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"यी सूचनाहरूलाई निष्क्रिय पार्न सकिँदैन"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> मार्फत"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"सेटिङहरू"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"बुझेँ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> अनुप्रयोगहरू</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> अनुप्रयोग</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको <xliff:g id="TYPES_LIST">%2$s</xliff:g> प्रयोग गर्दै छ।"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"अनुप्रयोगहरूले तपाईंको <xliff:g id="TYPES_LIST">%s</xliff:g> प्रयोग गर्दै छन्।"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"रद्द गर्नु…"</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> अनुप्रयोगहरूले तपाईंको <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index e570789..f28e206 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Annuleren"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Gebied voor Help-berichten"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Bevestigen"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Opnieuw proberen"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Raak de vingerafdruksensor aan"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Vingerafdrukpictogram"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Jouw gezicht zoeken…"</string>
@@ -296,8 +301,7 @@
<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">"Invoer"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Gehoorapparaten"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Inschakelen..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Helderheid"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatisch draaien"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Meestal sluit je deze meldingen. \nWil je ze blijven weergeven?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Deze meldingen blijven weergeven?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Meldingen stoppen"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokkeren"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Blijven weergeven"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimaliseren"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Zonder geluid weergeven"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Stil blijven"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Mij waarschuwen"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Blijven waarschuwen"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Meldingen van deze app blijven weergeven?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Deze meldingen kunnen niet worden uitgeschakeld"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Instellingen"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <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>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> gebruikt je <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Apps gebruiken je <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Annuleren"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml
index dd260b1..07cd18f 100644
--- a/packages/SystemUI/res/values-or/strings.xml
+++ b/packages/SystemUI/res/values-or/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ସ୍କ୍ରୀନ ଭରିବା ପାଇଁ ଜୁମ୍ କରନ୍ତୁ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ସ୍କ୍ରୀନ୍କୁ ଭରିବା ପାଇଁ ଟାଣନ୍ତୁ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ସ୍କ୍ରୀନଶଟ୍"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"କ୍ୟାନ୍ସଲ୍ କରନ୍ତୁ"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"ସାହାଯ୍ୟ ମେସେଜ୍ କ୍ଷେତ୍ର"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ସେନସର୍କୁ ଛୁଅଁନ୍ତୁ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ଆଇକନ୍"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରୁଛି…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ଅଡିଓ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ହେଡସେଟ୍"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ଇନପୁଟ୍"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ଶ୍ରବଣ ଯନ୍ତ୍ର"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ଅନ୍ ହେଉଛି…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ଉଜ୍ଜ୍ୱଳତା"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ସ୍ୱତଃ-ଘୂର୍ଣ୍ଣନ"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"ସାଧାରଣତଃ ଆପଣ ଏହି ବିଜ୍ଞପ୍ତିକୁ ଖାରଜ କରିଦିଅନ୍ତି। \n ସେଗୁଡ଼ିକୁ ଦେଖାଇବା ଜାରି ରଖିବେ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାଇବା ଜାରି ରଖିବେ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"ବିଜ୍ଞପ୍ତିକୁ ଦେଖାଇବା ବନ୍ଦ କରନ୍ତୁ"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ବ୍ଲକ୍ କରନ୍ତୁ"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ଦେଖାଇବା ଜାରି ରଖନ୍ତୁ"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ଛୋଟ କରନ୍ତୁ"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"ନିରବରେ ଦେଖାନ୍ତୁ"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ନୀରବ ରହନ୍ତୁ"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"ମୋତେ ଆଲର୍ଟ କରନ୍ତୁ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ଆଲର୍ଟ କରିବା ଜାରି ରଖନ୍ତୁ"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ଏହି ଆପ୍ରୁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାଇବା ଜାରି ରଖିବେ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ବନ୍ଦ କରିହେବ ନାହିଁ"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> ମାଧ୍ୟମରେ"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ସେଟିଙ୍ଗ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ବୁଝିଲି"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI ହିପ୍ ଡମ୍ପ୍ କରନ୍ତୁ"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g>ଟି ଆପ୍ସ</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ଆପ୍</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ଆପଣଙ୍କ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ବ୍ୟବହାର କରୁଛନ୍ତି।"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ଆପ୍ଲିକେସନ୍ଗୁଡିକ ଆପଣଙ୍କ <xliff:g id="TYPES_LIST">%s</xliff:g> ବ୍ୟବହାର କରୁଛନ୍ତି।"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ବାତିଲ୍"</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>ଟି ଆପ୍ଲିକେସନ୍ ଆପଣଙ୍କର <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml
index e36fea2..2b2a124 100644
--- a/packages/SystemUI/res/values-pa/strings.xml
+++ b/packages/SystemUI/res/values-pa/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ਸਕ੍ਰੀਨ ਭਰਨ ਲਈ ਜ਼ੂਮ ਕਰੋ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ਸਕ੍ਰੀਨ ਭਰਨ ਲਈ ਸਟ੍ਰੈਚ ਕਰੋ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ਰੱਦ ਕਰੋ"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"ਮਦਦ ਸੁਨੇਹਾ ਖੇਤਰ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"ਪੁਸ਼ਟੀ ਕਰੋ"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਪ੍ਰਤੀਕ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ਤੁਹਾਡੀ ਪਛਾਣ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ਆਡੀਓ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ਹੈੱਡਸੈੱਟ"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ਇਨਪੁੱਟ"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ਸੁਣਨ ਦੇ ਸਾਧਨ"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ਚਮਕ"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ਆਟੋ-ਰੋਟੇਟ"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"ਤੁਸੀਂ ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਮ ਤੌਰ \'ਤੇ ਖਾਰਜ ਕਰਦੇ ਹੋ। \nਕੀ ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਦਿਖਾਉਣਾ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ਕੀ ਇਨ੍ਹਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਦਿਖਾਉਣਾ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰੋ"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"ਬਲਾਕ ਕਰੋ"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"ਦਿਖਾਉਣਾ ਜਾਰੀ ਰੱਖੋ"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ਛੋਟਾ ਕਰੋ"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"ਚੁੱਪ-ਚਪੀਤੇ ਦਿਖਾਓ"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ਚੁੱਪ ਰਹੋ"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"ਮੈਨੂੰ ਸੁਚੇਤ ਕਰੋ"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ਸੁਚੇਤ ਰਖੋ"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ਕੀ ਇਸ ਐਪ ਤੋਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਦਿਖਾਉਣਾ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ਇਨ੍ਹਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਰਾਹੀਂ"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ਸੈਟਿੰਗਾਂ"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ਸਮਝ ਲਿਆ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI ਹੀਪ ਡੰਪ ਕਰੋ"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> ਐਪ</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ਐਪਾਂ</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ਤੁਹਾਡੇ <xliff:g id="TYPES_LIST">%2$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀ ਹੈ।"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੁਹਾਡੇ <xliff:g id="TYPES_LIST">%s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਹਨ।"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ਰੱਦ ਕਰੋ"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index ed2902f..b5b6da4 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Anuluj"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Obszar komunikatu pomocy"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potwierdź"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Spróbuj jeszcze raz"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotknij czytnika linii papilarnych"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona odcisku palca"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Szukam Cię…"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Dźwięk"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Zestaw słuchawkowy"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Wejście"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Aparaty słuchowe"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Włączam…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Jasność"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Autoobracanie"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Zwykle odrzucasz te powiadomienia. \nNadal je pokazywać?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Nadal pokazywać te powiadomienia?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Zablokuj powiadomienia"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Zablokuj"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Pokazuj nadal"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimalizuj"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Pokazuj dyskretnie"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Zachowaj wyciszenie"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Powiadom mnie"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Powiadamiaj dalej"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Nadal pokazywać powiadomienia z tej aplikacji?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Tych powiadomień nie można wyłączyć"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"przez aplikację <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Ustawienia"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Zrzut stosu SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikacje</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacji</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacji</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplikacja</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Aplikacja <xliff:g id="APP">%1$s</xliff:g> używa: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikacje używają: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Anuluj"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikacje używają: <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
+ <item quantity="many"><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="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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index ac69917..bc73403 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancelar"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Área da mensagem de ajuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmar"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Tentar novamente"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toque no sensor de impressão digital"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícone de impressão digital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Procurando você…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Áudio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Fone de ouvido"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Aparelhos auditivos"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Ativando…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brilho"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Girar automaticamente"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Geralmente você dispensa essas notificações. \nQuer que elas continuem a ser exibidas?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Continuar mostrando essas notificações?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Bloquear notificações"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquear"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuar mostrando"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizar"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostrar silenciosamente"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Continuar sem som"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Receber alerta"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continuar alertando"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Continuar mostrando notificações desse app?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Não é possível desativar essas notificações"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"pelo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Configurações"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Ok"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Despejar pilha SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> app</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apps</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"O app <xliff:g id="APP">%1$s</xliff:g> está usando <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplicativos estão usando <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancelar"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index c1858fc..d7ae161 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancelar"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Área da mensagem de ajuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmar"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Tentar novamente"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toque no sensor de impressões digitais."</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícone de impressão digital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"À sua procura…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Áudio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Ausc. c/ mic. integ."</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Aparelhos auditivos"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"A ativar..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brilho"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotação automática"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Normalmente, ignora estas notificações. \nPretende continuar a mostrá-las?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Pretende continuar a ver estas notificações?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Parar notificações"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquear"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuar a mostrar"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizar"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostrar silenciosamente"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Continuar sem som"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Alertar-me"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continuar a alertar"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Pretende continuar a ver notificações desta aplicação?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Não é possível desativar estas notificações."</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"através da aplicação <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Definições"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Compreendi"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Cp ár. di. da. SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplic.</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplicação</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"A aplicação <xliff:g id="APP">%1$s</xliff:g> está a utilizar o(a) <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"As aplicações estão a utilizar o(a) <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancelar"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index ac69917..bc73403 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Cancelar"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Área da mensagem de ajuda"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmar"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Tentar novamente"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toque no sensor de impressão digital"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícone de impressão digital"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Procurando você…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Áudio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Fone de ouvido"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Entrada"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Aparelhos auditivos"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Ativando…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brilho"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Girar automaticamente"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Geralmente você dispensa essas notificações. \nQuer que elas continuem a ser exibidas?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Continuar mostrando essas notificações?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Bloquear notificações"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloquear"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuar mostrando"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizar"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Mostrar silenciosamente"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Continuar sem som"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Receber alerta"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Continuar alertando"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Continuar mostrando notificações desse app?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Não é possível desativar essas notificações"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"pelo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Configurações"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Ok"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Despejar pilha SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> app</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apps</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"O app <xliff:g id="APP">%1$s</xliff:g> está usando <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplicativos estão usando <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Cancelar"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index c393bde..268a406 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Anulați"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Zona mesajelor de ajutor"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirmați"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Încercați din nou"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Atingeți senzorul de amprente"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Pictograma amprentă"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Vă căutăm…"</string>
@@ -297,8 +302,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Căști"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Intrare"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Aparate auditive"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Se activează..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Luminozitate"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotire automată"</string>
@@ -614,17 +618,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"De regulă respingeți aceste notificări. \nDoriți să fie afișate în continuare?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Doriți să continuați afișarea acestor notificări?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Opriți notificările"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blocați"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Continuați afișarea"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizați"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Afișați fără sunet"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Păstrați modul silențios"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Alertează-mă"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Păstrați alerta"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Doriți să continuați afișarea notificărilor de la această aplicație?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Aceste notificări nu pot fi dezactivate"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"prin <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -876,11 +876,20 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Setări"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Date SysUI memorie"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplicații</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> de aplicații</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplicație</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> folosește <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplicațiile folosesc <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Anulați"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplicații folosesc <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index e643c8f..bbea694 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Подогнать по размерам экрана"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Растянуть на весь экран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Скриншот"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Отмена"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Справочное сообщение"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Подтвердить"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Повторить попытку"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Прикоснитесь к сканеру отпечатков пальцев."</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Значок отпечатка пальца"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Поиск лица…"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудиоустройство"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Гарнитура"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Устройство ввода"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Слуховые аппараты"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Включение…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яркость"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоповорот"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Обычно вы скрываете эти уведомления.\nПоказывать их?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Показывать эти уведомления?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Отключить уведомления"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Заблокировать"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Показывать"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Свернуть"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Без звука"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Не включать звук"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Оповещать меня"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Присылать уведомления"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Показывать уведомления от этого приложения?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Эти уведомления нельзя отключить."</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"через приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Открыть настройки"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"ОК"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Передача SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> прил.</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> прил.</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> прил.</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> прил.</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"В приложении \"<xliff:g id="APP">%1$s</xliff:g>\" используется <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"В приложениях используется <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Отмена"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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="few">Функцию \"<xliff:g id="TYPE_3">%2$s</xliff:g>\" используют <xliff:g id="NUM_APPS_2">%1$d</xliff:g> приложения.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml
index cb22f3d..aaaa703 100644
--- a/packages/SystemUI/res/values-si/strings.xml
+++ b/packages/SystemUI/res/values-si/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"තිරය පිරවීමට විශාලනය කරන්න"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"තිරය පිරවීමට අදින්න"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"තිර රුව"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"අවලංගු කරන්න"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"උදවු පණිවිඩ ප්රදේශය"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"තහවුරු කරන්න"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"නැවත උත්සාහ කරන්න"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ඇඟිලි සලකුණු නිරූපකය"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ඔබව සොයමින්…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ශ්රව්ය"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"හෙඩ්සෙටය"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ආදානය"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"ශ්රවණාධාරක"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ක්රියාත්මක කරමින්…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"දීප්තිය"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"ස්වයංක්රීය කරකැවීම"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"ඔබ සාමාන්යයෙන් මෙවැනි දැනුම්දීම් ඉවත දමයි. \nඒවා දිගටම පෙන්වන්නද?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"මෙම දැනුම්දීම් පෙන්වමින් තබන්නද?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"දැනුම්දීම් නවත්වන්න"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"අවහිර කරන්න"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"පෙන්වමින් තබන්න"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"කුඩා කරන්න"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"නිහඬව පෙන්වන්න"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"නිහඬව සිටින්න"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"මට අඟවන්න"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"අඟවමින් සිටින්න"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"මෙම යෙදුම වෙතින් දැනුම්දීම් පෙන්වමින් තබන්නද?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"මෙම දැනුම්දීම් ක්රියාවිරහිත කළ නොහැකිය"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> හරහා"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"සැකසීම්"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"තේරුණා"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one">යෙදුම් <xliff:g id="NUM_APPS_2">%d</xliff:g>ක්</item>
+ <item quantity="other">යෙදුම් <xliff:g id="NUM_APPS_2">%d</xliff:g>ක්</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ <xliff:g id="TYPES_LIST">%2$s</xliff:g> භාවිත කරමින් සිටී."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"යෙදුම් ඔබේ <xliff:g id="TYPES_LIST">%s</xliff:g> භාවිත කරමින් සිටී."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"අවලංගු කරන්න"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index bcc444f..28b3d24 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Zrušiť"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Oblasť správy pomocníka"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potvrdiť"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Skúsiť znova"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Klepnite na senzor odtlačkov prstov"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona odtlačku prsta"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Hľadáme vás…"</string>
@@ -236,11 +241,11 @@
<string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Zavrieť panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"Dlhší čas"</string>
<string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"Kratší čas"</string>
- <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"Svietidlo je vypnuté."</string>
- <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"Svietidlo nie je k dispozícii."</string>
- <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"Svietidlo je zapnuté."</string>
- <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"Svietidlo je vypnuté."</string>
- <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"Svietidlo je zapnuté."</string>
+ <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"Baterka je vypnutá."</string>
+ <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"Baterka nie je k dispozícii."</string>
+ <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"Baterka je zapnutá."</string>
+ <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"Baterka je vypnutá."</string>
+ <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"Baterka je zapnutá."</string>
<string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"Prevrátenie farieb je vypnuté."</string>
<string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Prevrátenie farieb je zapnuté."</string>
<string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"Mobilný hotspot je vypnutý."</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Zvuk"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Náhlavná súprava"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Vstup"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Načúvacie pomôcky"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Zapína sa…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Jas"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatické otáčanie"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Tieto upozornenia zvyčajne odmietate. \nChcete ich naďalej zobrazovať?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Majú sa tieto upozornenia naďalej zobrazovať?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Prestať zobrazovať upozornenia"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokovať"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Naďalej zobrazovať"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimalizovať"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Zobraziť potichu"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Naďalej upozorňovať potichu"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Upozorniť ma"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Naďalej upozorňovať"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Majú sa upozornenia z tejto aplikácie naďalej zobrazovať?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Tieto upozornenia sa nedajú vypnúť"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"prostredníctvom aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Nastavenia"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Dobre"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Výpis haldy SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikácie</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> apps</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikácií</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplikácia</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> používa zoznam <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikácie používajú zoznam <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Zrušiť"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="few"><xliff:g id="TYPE_3">%2$s</xliff:g> používajú <xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikácie</item>
+ <item quantity="many"><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="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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 706e700..b25a49d 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Prekliči"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Območje sporočila pomoči"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Potrdite"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Poskusi znova"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotaknite se tipala prstnih odtisov"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona prstnih odtisov"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Preverjanje vašega obraza …"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Zvok"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Slušalke z mikrofonom"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Vhodna naprava"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Slušni pripomočki"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Vklapljanje …"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Svetlost"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Samodejno sukanje"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Ta obvestila običajno opustite. \nAli želite, da se še naprej prikazujejo?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Želite, da so ta obvestila še naprej prikazana?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Ustavi prikazovanje obvestil"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blokiraj"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Prikazuj še naprej"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimiraj"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Prikaži brez zvoka"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Še naprej prikazuj brez zvoka"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Opozori me"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Še naprej opozarjaj"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Želite, da so obvestila te aplikacije še naprej prikazana?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Teh obvestil ni mogoče izklopiti"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"prek aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Nastavitve"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"V redu"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Izvoz kopice SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacija</item>
+ <item quantity="two"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikaciji</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> aplikacije</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacij</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> uporablja <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikacije uporabljajo <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Prekliči"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija uporablja <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <item quantity="two"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikaciji uporabljata <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml
index 66a5778..1642e99 100644
--- a/packages/SystemUI/res/values-sq/strings.xml
+++ b/packages/SystemUI/res/values-sq/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Anulo"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Zona e mesazhit të ndihmës"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Konfirmo"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Provo përsëri"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Prek sensorin e gjurmës së gishtit"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona e gjurmës së gishtit"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Po të kërkojmë…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Kufje me mikrofon"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Hyrja"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Aparatet e dëgjimit"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Po aktivizohet…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Ndriçimi"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rrotullim automatik"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Këto njoftime ti zakonisht i largon. \nDëshiron të vazhdosh t\'i shfaqësh ato?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Do të vazhdosh t\'i shfaqësh këto njoftime?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Ndalo njoftimet"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blloko"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Vazhdo të shfaqësh"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimizo"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Shfaq në heshtje"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Qëndro në heshtje"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Më sinjalizo"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Vazhdo të sinjalizosh"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Do të vazhdosh t\'i shfaqësh njoftimet nga ky aplikacion?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Këto njoftime nuk mund të çaktivizohen"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"nëpërmjet <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Cilësimet"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"E kuptova"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Hidh grumbullin SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> aplikacione</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> aplikacion</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> po përdor <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Aplikacionet po përdorin <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Anulo"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index 1ff65d7..dac91a870 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Зумирај на целом екрану"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Развуци на цео екран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Снимак екрана"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Откажи"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Област поруке за помоћ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Потврди"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Пробај поново"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Додирните сензор за отисак прста"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Икона отиска прста"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Тражимо вас…"</string>
@@ -297,8 +302,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудио"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Слушалице"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Унос"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Слушни апарати"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Укључује се..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Осветљеност"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Аутоматска ротација"</string>
@@ -614,17 +618,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Обично одбацујете ова обавештења. \nЖелите ли да се и даље приказују?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Желите ли да се ова обавештења и даље приказују?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Престани да приказујеш обавештења"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Блокирај"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Настави да приказујеш"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Умањи"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Прикажи без звука"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Не укључуј звук"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Обавести ме"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Настави са обавештењима"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Желите ли да се обавештења из ове апликације и даље приказују?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Не можете да искључите ова обавештења"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"преко апликације <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -876,11 +876,20 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Подешавања"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Важи"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Издвоји SysUI мем."</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> апликација</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> апликације</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> апликација</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> користи <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Апликације користе <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Откажи"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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="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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index 3c8c3ab..ff0d0c0 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Avbryt"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Område för hjälpmeddelande"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Bekräfta"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Försök igen"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Tryck på fingeravtryckssensorn"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon för fingeravtryck"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Håller utkik efter dig …"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Ljud"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Headset"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Ingång"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Hörapparater"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Aktiverar …"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Ljusstyrka"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Rotera automatiskt"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Du brukar avvisa de här aviseringarna. \nVill du fortsätta att visa dem?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Vill du fortsätta visa de här aviseringarna?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Stoppa aviseringar"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Blockera"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Fortsätt visa"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Minimera"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Visa utan ljud"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Fortsätt visa utan ljud"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Meddela mig"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Fortsätt meddela"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Vill du fortsätta visa aviseringar för den här appen?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"De här aviseringarna kan inte inaktiveras"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Inställningar"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dumpa SysUI-heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> appar</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="TYPES_LIST">%2$s</xliff:g> används av <xliff:g id="APP">%1$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"<xliff:g id="TYPES_LIST">%s</xliff:g> används av appar."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Avbryt"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index 69b3be7..dbb3a8d 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Ghairi"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Sehemu ya ujumbe wa usaidizi"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Thibitisha"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Jaribu tena"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Gusa kitambua alama ya kidole"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Aikoni ya alama ya kidole"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Inakutafuta…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Sauti"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Vifaa vya sauti"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Vifaa vya kuingiza sauti"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Visaidizi vya Kusikia"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Inawasha..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Ung\'avu"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Zungusha kiotomatiki"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Wewe huondoa arifa hizi. \nUngependa kuzionyesha?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Ungependa kuendelea kuonyesha arifa hizi?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Acha kuonyesha arifa"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Zuia"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Endelea kuonyesha"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Punguza"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Ionyeshe bila kutoa sauti"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Isitoe sauti"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Niarifu"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Endelea kutoa arifa"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Ungependa kuendelea kuonyesha arifa kutoka programu hii?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Huwezi kuzima arifa hizi"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"kupitia <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Mipangilio"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Nimeelewa"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other">Programu <xliff:g id="NUM_APPS_2">%d</xliff:g></item>
+ <item quantity="one">Programu <xliff:g id="NUM_APPS_0">%d</xliff:g></item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> inatumia <xliff:g id="TYPES_LIST">%2$s</xliff:g> yako."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Programu zinatumia <xliff:g id="TYPES_LIST">%s</xliff:g> yako."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Ghairi"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml
index f75cc4d..0ef8bbf 100644
--- a/packages/SystemUI/res/values-ta/strings.xml
+++ b/packages/SystemUI/res/values-ta/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"திரையை நிரப்ப அளவை மாற்று"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"திரையை நிரப்ப இழு"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ஸ்கிரீன் ஷாட்"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ரத்துசெய்"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"உதவிச் செய்திக்கான பகுதி"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"உறுதிப்படுத்துக"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"மீண்டும் முயல்க"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"கைரேகை உணர்வியைத் தொடவும்"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"கைரேகை ஐகான்"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"உங்கள் முகத்தைத் தேடுகிறது…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ஆடியோ"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ஹெட்செட்"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"உள்ளீடு"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"செவித்துணை கருவிகள்"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ஆன் செய்கிறது…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ஒளிர்வு"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"தானாகச் சுழற்று"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"வழக்கமாக, இந்த அறிவிப்புகளை நிராகரிக்கிறீர்கள். \nதொடர்ந்து இவற்றைக் காட்டலாமா?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"இந்த அறிவிப்புகளைத் தொடர்ந்து காட்டவா?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"அறிவிப்புகளை நிறுத்து"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"தடு"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"அறிவிப்புகளைத் தொடர்ந்து காட்டு"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"சிறிதாக்கு"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"ஒலிக்காமல் காட்டு"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"அறிவிப்புகளை ஒலியின்றிக் காட்டு"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"எனக்கு விழிப்பூட்டலை அனுப்பு"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"தொடர்ந்து விழிப்பூட்டு"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"இந்தப் பயன்பாட்டின் அறிவிப்புகளைத் தொடர்ந்து காட்டவா?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"இந்த அறிவிப்புகளை ஆஃப் செய்ய முடியாது"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> மூலமாக"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"அமைப்புகள்"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"சரி"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ஆப்ஸ்</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ஆப்ஸ்</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"உங்கள் <xliff:g id="TYPES_LIST">%2$s</xliff:g>ஐ <xliff:g id="APP">%1$s</xliff:g> ஆப்ஸ் பயன்படுத்துகிறது."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"உங்கள் <xliff:g id="TYPES_LIST">%s</xliff:g> ஆகியவற்றை ஆப்ஸ் பயன்படுத்துகின்றன."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ரத்துசெய்"</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> ஆப்ஸால் உங்கள் <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml
index 894263e..4b05f0f 100644
--- a/packages/SystemUI/res/values-te/strings.xml
+++ b/packages/SystemUI/res/values-te/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"స్క్రీన్కు నింపేలా జూమ్ చేయండి"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"స్క్రీన్కు నింపేలా విస్తరించండి"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"స్క్రీన్షాట్"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"రద్దు చేయి"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"సహాయ సందేశ ప్రాంతం"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"నిర్ధారించు"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"మళ్లీ ప్రయత్నించు"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"వేలిముద్ర సెన్సార్ను తాకండి"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"వేలిముద్ర చిహ్నం"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"మీ కోసం చూస్తోంది…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"ఆడియో"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"హెడ్సెట్"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ఇన్పుట్"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"వినికిడి పరికరాలు"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"ఆన్ చేస్తోంది…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ప్రకాశం"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"స్వయంచాలకంగా తిప్పడం"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"మీరు సాధారణంగా ఈ నోటిఫికేషన్లను విస్మరిస్తారు. \nవాటి ప్రదర్శనను కొనసాగించాలా?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"ఈ నోటిఫికేషన్లను చూపిస్తూ ఉండాలా?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"నోటిఫికేషన్లను ఆపివేయి"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"బ్లాక్ చేయి"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"చూపిస్తూనే ఉండు"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"కుదించు"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"నిశ్శబ్దంగా చూపండి"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"నిశబ్దంగా తెలియజేయి"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"నన్ను హెచ్చరించు"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"ఎప్పటికప్పుడు హెచ్చరించు"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"ఈ యాప్ నుండి నోటిఫికేషన్లను చూపిస్తూ ఉండాలా?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ఈ నోటిఫికేషన్లను ఆఫ్ చేయలేరు"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> ద్వారా"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"సెట్టింగ్లు"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"అర్థమైంది"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"డంప్ SysUI హీప్"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> యాప్లు</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> యాప్</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> మీ <xliff:g id="TYPES_LIST">%2$s</xliff:g>ని ఉపయోగిస్తోంది."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"అప్లికేషన్లు మీ <xliff:g id="TYPES_LIST">%s</xliff:g>ని ఉపయోగిస్తున్నాయి."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"రద్దు చేయండి"</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> అప్లికేషన్లు మీ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index ae581ac..707bcf9 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"ขยายจนเต็มหน้าจอ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ยืดจนเต็มหน้าจอ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ภาพหน้าจอ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"ยกเลิก"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"พื้นที่ข้อความช่วยเหลือ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"ยืนยัน"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"ลองอีกครั้ง"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"แตะเซ็นเซอร์ลายนิ้วมือ"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ไอคอนลายนิ้วมือ"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"กำลังหาใบหน้าคุณ…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"เสียง"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ชุดหูฟัง"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"อินพุต"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"เครื่องช่วยการได้ยิน"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"กำลังเปิด..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"ความสว่าง"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"หมุนอัตโนมัติ"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"โดยปกติแล้ว คุณจะปิดการแจ้งเตือนเหล่านี้ \nต้องการให้แสดงต่อไหม"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"แสดงการแจ้งเตือนเหล่านี้ต่อไปไหม"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"ปิดการแจ้งเตือน"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"บล็อก"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"แสดงต่อไป"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"ย่อเล็กสุด"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"แสดงโดยไม่ส่งเสียง"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"ปิดเสียงไว้"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"แจ้งเตือนฉัน"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"แจ้งเตือนต่อไป"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"แสดงการแจ้งเตือนจากแอปนี้ต่อไปไหม"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ปิดการแจ้งเตือนเหล่านี้ไม่ได้"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"ผ่าน <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"การตั้งค่า"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"รับทราบ"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> แอป</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> แอป</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ใช้<xliff:g id="TYPES_LIST">%2$s</xliff:g>ของคุณอยู่"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"หลายแอปพลิเคชันใช้<xliff:g id="TYPES_LIST">%s</xliff:g>ของคุณอยู่"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"ยกเลิก"</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> แอปพลิเคชันกำลังใช้<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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index ab20ff0..1d9460c 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Kanselahin"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Lugar ng mensahe ng tulong"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Kumpirmahin"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Subukang muli"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Pindutin ang fingerprint sensor"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icon ng fingerprint"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Hinahanap ka…"</string>
@@ -296,8 +301,7 @@
<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>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Mga Hearing Aid"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Ino-on…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brightness"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Awtomatikong i-rotate"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Karaniwan mong dini-dismiss ang mga ganitong notification. \nPatuloy na ipakita ang mga ito?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Patuloy na ipakita ang mga notification na ito?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Ihinto ang mga notification"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"I-block"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Patuloy na ipakita"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"I-minimize"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Ipakita nang tahimik"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Manatiling naka-silent"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Alertuhan ako"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Patuloy na mag-alerto"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Patuloy na ipakita ang mga notification mula sa app na ito?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Hindi maaaring i-off ang mga notification na ito"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"sa pamamagitan ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Mga Setting"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Itapon SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> app</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> na app</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Ginagamit ng <xliff:g id="APP">%1$s</xliff:g> ang iyong <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Ginagamit ng mga application ang iyong <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Kanselahin"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index 32201fb..0217720 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"İptal"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Yardım mesajı alanı"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Onaylayın"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Tekrar dene"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Parmak izi sensörüne dokunun"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Parmak izi simgesi"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Yüzünüz tanınmaya çalışılıyor…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Ses"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Mikrofonlu kulaklık"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Giriş"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"İşitme Cihazları"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Açılıyor…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Parlaklık"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Otomatik döndür"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Bu bildirimleri genellikle kapatıyorsunuz. \nBildirimler gösterilmeye devam edilsin mi?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Bu bildirimler gösterilmeye devam edilsin mi?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Bildirimleri durdur"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Engelle"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Göstermeye devam et"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Küçült"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Sessiz bir şekilde göster"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Sessiz uyarı göster"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Beni uyar"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Uyarıda bulunmaya devam et"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Bu uygulamadan gelen bildirimler gösterilmeye devam edilsin mi?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Bu bildirimler kapatılamaz"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> ile"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Ayarlar"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Anladım"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"SysUI Yığın Dökümü"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> uygulama</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> uygulama</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> şunları kullanıyor: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Uygulamalar şunları kullanıyor: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"İptal"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index a298c6a..69ed197 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"Масштабув. на весь екран"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Розтягнути на весь екран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Знімок екрана"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Скасувати"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Область довідкового повідомлення"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Підтвердити"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Повторити спробу"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Торкніться сканера відбитків пальців"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Значок відбитка пальця"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Пошук обличчя…"</string>
@@ -298,8 +303,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Аудіопристрій"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Гарнітура"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Джерело сигналу"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Слухові апарати"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Увімкнення…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яскравість"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Автоматичне обертання"</string>
@@ -617,17 +621,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Ви зазвичай закриваєте ці сповіщення. \nПоказувати їх?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Чи показувати ці сповіщення надалі?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Не показувати сповіщення"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Блокувати"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Показувати надалі"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Згорнути"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Показувати без звуку"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Без звуку"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Сповіщати мене"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Отримувати сповіщення"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Чи показувати сповіщення з цього додатка надалі?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Ці сповіщення не можна вимкнути"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"через додаток <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -881,11 +881,22 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Налаштування"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> додаток</item>
+ <item quantity="few"><xliff:g id="NUM_APPS_1">%d</xliff:g> додатки</item>
+ <item quantity="many"><xliff:g id="NUM_APPS_2">%d</xliff:g> додатків</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> додатка</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"Додаток <xliff:g id="APP">%1$s</xliff:g> використовує <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Додатки використовують <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Скасувати"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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="few"><xliff:g id="TYPE_3">%2$s</xliff:g> працює в <xliff:g id="NUM_APPS_2">%1$d</xliff:g> додатках.</item>
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml
index ee9da5e..59e8946 100644
--- a/packages/SystemUI/res/values-ur/strings.xml
+++ b/packages/SystemUI/res/values-ur/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"پوری سکرین پر زوم کریں"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"پوری سکرین پر پھیلائیں"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"اسکرین شاٹ"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"منسوخ کریں"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"امدادی پیغام کا علاقہ"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"تصدیق کریں"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"دوبارہ کوشش کریں"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"فنگر پرنٹ سینسر پر ٹچ کریں"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"فنگر پرنٹ آئیکن"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"آپ کے لیے تلاش کیا جا رہا ہے…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"آڈیو"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"ہیڈ سیٹ"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"ان پٹ"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"سماعتی آلات"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"آن ہو رہا ہے…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"چمکیلا پن"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"خود کار طور پر گھمائیں"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"آپ عام طور پر ان اطلاعات کو مسترد کرتے ہیں۔ \nان کو دکھاتے رہیں؟"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"یہ اطلاعات دکھانا جاری رکھیں؟"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"اطلاعات روک دیں"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"مسدود کریں"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"دکھانا جاری رکھیں"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"چھوٹا کریں"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"خاموشی سے دکھائیں"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"خاموش رہیں"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"مجھے متنبہ کریں"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"متنبہ کرنا جاری رکھیں"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"اس ایپ کی طرف سے اطلاعات دکھانا جاری رکھیں؟"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"ان اطلاعات کو آف نہیں کیا جا سکتا"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"بذریعہ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"ترتیبات"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"سمجھ آ گئی"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ایپس</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ایپ</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> آپ کی <xliff:g id="TYPES_LIST">%2$s</xliff:g> کا استعمال کر رہی ہے۔"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"ایپلیکیشنز آپ کی <xliff:g id="TYPES_LIST">%s</xliff:g> کا استعمال کر رہی ہیں۔"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"منسوخ کریں"</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> ایپلیکیشنز آپ کی <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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml
index 488bfae..85204af 100644
--- a/packages/SystemUI/res/values-uz/strings.xml
+++ b/packages/SystemUI/res/values-uz/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Bekor qilish"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Yordam xabari"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"OK"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Qayta urinish"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Barmoq izi skaneriga tegining"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Barmoq izi belgisi"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Yuzingiz tekshirilmoqda…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Garnitura"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Kirish"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Eshitish apparatlari"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Yoqilmoqda…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Yorqinlik"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Avtomatik burilish"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Odatda bunday bildirishnomalarni yopasiz. \nUlar ochiq tursinmi?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Mazkur bildirishnomalar chiqaversinmi?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Chiqmasin"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Bloklash"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Ha"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Kichraytirish"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Ovozsiz"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Ovozsiz qolsin"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Ogohlantirish"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Signal berishda davom etilsin"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Bu ilovadan keladigan bildirishnomalar chiqaversinmi?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Bu bildirishnomalarni chiqmaydigan qilish imkonsiz"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"<xliff:g id="APP_NAME">%1$s</xliff:g> orqali"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Sozlamalar"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ta ilova</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ta ilova</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> ishlatmoqda: <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Ilovalarda ishlatilmoqda: <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Bekor qilish"</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> 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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index 125eb72..d2b1384 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Hủy"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Vùng thông báo trợ giúp"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Xác nhận"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Thử lại"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Chạm vào cảm biến vân tay"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Biểu tượng vân tay"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Đang tìm kiếm bạn…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Âm thanh"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Tai nghe"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Thiết bị đầu vào"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Thiết bị trợ thính"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Đang bật…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Độ sáng"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Tự động xoay"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Bạn thường bỏ qua những thông báo này. \nTiếp tục hiển thị thông báo?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Tiếp tục hiển thị các thông báo này?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Dừng thông báo"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Chặn"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Tiếp tục hiển thị"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Thu nhỏ"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Hiển thị không phát âm báo"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Tiếp tục chế độ im lặng"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Cảnh báo cho tôi"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Tiếp tục cảnh báo"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Tiếp tục hiển thị các thông báo từ ứng dụng này?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Không thể tắt các thông báo này"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"thông qua <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Cài đặt"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"OK"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"Trích xuất bộ nhớ SysUI"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> ứng dụng</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> ứng dụng</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> đang dùng <xliff:g id="TYPES_LIST">%2$s</xliff:g> của bạn."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Các ứng dụng đang dùng <xliff:g id="TYPES_LIST">%s</xliff:g> của bạn."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Hủy"</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> ứ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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index d6fd3d89..b1eff03 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"缩放以填满屏幕"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"拉伸以填满屏幕"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"屏幕截图"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"取消"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"帮助消息区域"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"确认"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"重试"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"请触摸指纹传感器"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指纹图标"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"正在查找中…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"音频"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"耳机"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"输入"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"助听器"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"正在开启…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"亮度"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"自动旋转屏幕"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"您通常会关闭这些通知。\n是否继续显示通知?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"要继续显示这些通知吗?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"停止通知"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"屏蔽"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"继续显示"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"最小化"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"显示通知但不发出提示音"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"显示通知但不发出提示音"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"提醒我"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"继续提醒"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"要继续显示来自此应用的通知吗?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"无法关闭这些通知"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"通过<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"设置"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"知道了"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"转储 SysUI 堆"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> 个应用</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> 个应用</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g>正在使用您的<xliff:g id="TYPES_LIST">%2$s</xliff:g>。"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"有多个应用正在使用您的<xliff:g id="TYPES_LIST">%s</xliff:g>。"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"取消"</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> 个应用正在使用您的<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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 5c2a5d2..64f4e21 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"放大為全螢幕"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"放大為全螢幕"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"擷取螢幕畫面"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"取消"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"說明訊息區域"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"確認"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"請再試一次"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"請輕觸指紋感應器"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指紋圖示"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"正在搜尋您的臉孔…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"音訊"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"耳機"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"輸入"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"助聽器"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"正在開啟…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"亮度"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"自動旋轉"</string>
@@ -307,7 +311,7 @@
<string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"直向"</string>
<string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"橫向"</string>
<string name="quick_settings_ime_label" msgid="7073463064369468429">"輸入法"</string>
- <string name="quick_settings_location_label" msgid="5011327048748762257">"位置資訊"</string>
+ <string name="quick_settings_location_label" msgid="5011327048748762257">"定位"</string>
<string name="quick_settings_location_off_label" msgid="7464544086507331459">"位置資訊已關閉"</string>
<string name="quick_settings_media_device_label" msgid="1302906836372603762">"媒體裝置"</string>
<string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"您通常會關閉這些通知。\n要繼續顯示通知嗎?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"要繼續顯示這些通知嗎?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"停止通知"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"封鎖"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"繼續顯示"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"最小化"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"顯示通知但不發出音效"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"保持靜音"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"提示我"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"繼續提示"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"要繼續顯示此應用程式的通知嗎?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"無法關閉這些通知"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"透過「<xliff:g id="APP_NAME">%1$s</xliff:g>」"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"設定"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"知道了"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"傾印 SysUI 記憶體快照"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> 個應用程式</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> 個應用程式</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"「<xliff:g id="APP">%1$s</xliff:g>」正在使用<xliff:g id="TYPES_LIST">%2$s</xliff:g>。"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"有多個應用程式正在使用<xliff:g id="TYPES_LIST">%s</xliff:g>。"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"取消"</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> 個應用程式正在使用您的<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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index dbe24bb..bd1896a 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -57,8 +57,14 @@
<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_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="compat_mode_on" msgid="6623839244840638213">"放大為全螢幕"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"放大為全螢幕"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"擷取螢幕畫面"</string>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"取消"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"說明訊息區域"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"確認"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"再試一次"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"請輕觸指紋感應器"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指紋圖示"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"正在尋找你的臉孔…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"音訊"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"耳機"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"輸入"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"助聽器"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"開啟中…"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"亮度"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"自動旋轉"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"你通常會關閉這些通知。\n要繼續顯示通知嗎?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"要繼續顯示這些通知嗎?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"停止顯示通知"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"封鎖"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"繼續顯示"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"最小化"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"顯示通知但不發出音效"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"繼續顯示通知但不發出音效"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"顯示通知"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"繼續顯示通知"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"要繼續顯示這個應用程式的通知嗎?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"無法關閉這些通知"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"透過「<xliff:g id="APP_NAME">%1$s</xliff:g>」"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"設定"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"我知道了"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"傾印 SysUI 記憶體快照"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> 個應用程式</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> 個應用程式</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"「<xliff:g id="APP">%1$s</xliff:g>」正在使用<xliff:g id="TYPES_LIST">%2$s</xliff:g>。"</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"有多個應用程式正在使用<xliff:g id="TYPES_LIST">%s</xliff:g>。"</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"取消"</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> 個應用程式正在使用你的<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) -->
+ <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>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 098ed01..9f70420 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -57,8 +57,14 @@
<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_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="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>
@@ -112,8 +118,7 @@
<string name="cancel" msgid="6442560571259935130">"Khansela"</string>
<string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Indawo yosizo lomlayezo"</string>
<string name="biometric_dialog_confirm" msgid="6468457350041712674">"Qinisekisa"</string>
- <!-- no translation found for biometric_dialog_try_again (1900185172633183201) -->
- <skip />
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Zama futhi"</string>
<string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Thinta inzwa yesigxivizo somunwe"</string>
<string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Isithonjana sezigxivizo zeminwe"</string>
<string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Kufunwa wena…"</string>
@@ -296,8 +301,7 @@
<string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Umsindo"</string>
<string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Ihedisethi"</string>
<string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Okokufaka"</string>
- <!-- no translation found for quick_settings_bluetooth_secondary_label_hearing_aids (4930931771490695395) -->
- <skip />
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Izinsiza zokuzwa"</string>
<string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Iyavula..."</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"Ukugqama"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Ukuphenduka okuzenzakalelayo"</string>
@@ -611,17 +615,13 @@
<string name="inline_blocking_helper" msgid="3055064577771478591">"Uvamise ukucashisa lezi zaziso. \nQhubeka ulokhu uzibonisa?"</string>
<string name="inline_keep_showing" msgid="8945102997083836858">"Qhubeka nokubonisa lezi zaziso?"</string>
<string name="inline_stop_button" msgid="4172980096860941033">"Misa izaziso"</string>
- <!-- no translation found for inline_block_button (8735843688021655065) -->
- <skip />
+ <string name="inline_block_button" msgid="8735843688021655065">"Vimba"</string>
<string name="inline_keep_button" msgid="6665940297019018232">"Qhubeka nokubonisa"</string>
<string name="inline_minimize_button" msgid="966233327974702195">"Nciphisa"</string>
<string name="inline_silent_button_silent" msgid="4411510650503783646">"Bonisa ngokuthulile"</string>
- <!-- no translation found for inline_silent_button_stay_silent (6308371431217601009) -->
- <skip />
- <!-- no translation found for inline_silent_button_alert (7961887853830826523) -->
- <skip />
- <!-- no translation found for inline_silent_button_keep_alerting (327696842264359693) -->
- <skip />
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Hlala uthulile"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Ngazise"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Qhubeka wazise"</string>
<string name="inline_keep_showing_app" msgid="1723113469580031041">"Qhubeka nokubonisa izaziso kusuka kulolu hlelo lokusebenza?"</string>
<string name="notification_unblockable_desc" msgid="1037434112919403708">"Lezi zaziso azikwazi ukuvalwa"</string>
<string name="notification_delegate_header" msgid="9167022191405284627">"nge-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -871,11 +871,18 @@
<string name="open_saver_setting_action" msgid="8314624730997322529">"Izilungiselelo"</string>
<string name="auto_saver_okay_action" msgid="2701221740227683650">"Ngiyezwa"</string>
<string name="heap_dump_tile_name" msgid="9141031328971226374">"I-Dump SysUI Heap"</string>
- <!-- no translation found for ongoing_privacy_chip_multiple_apps (1406406529558080714) -->
+ <plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
+ <item quantity="one"><xliff:g id="NUM_APPS_2">%d</xliff:g> izinhlelo zokusebenza</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> izinhlelo zokusebenza</item>
+ </plurals>
<string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"I-<xliff:g id="APP">%1$s</xliff:g> isebenzisa i-<xliff:g id="TYPES_LIST">%2$s</xliff:g> yakho."</string>
<string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Izinhlelo zokusebenza zisebenzisa i-<xliff:g id="TYPES_LIST">%s</xliff:g> yakho."</string>
- <!-- no translation found for ongoing_privacy_chip_content_multiple_apps_single_op (4871926099254314088) -->
- <string name="ongoing_privacy_dialog_cancel" msgid="5479124524931216790">"Khansela"</string>
+ <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
+ <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) -->
+ <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>
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index 2aecc24..5040942 100644
--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -19,8 +19,11 @@
import static android.view.Display.DEFAULT_DISPLAY;
import android.app.WallpaperManager;
+import android.content.BroadcastReceiver;
import android.content.ComponentCallbacks2;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.RecordingCanvas;
@@ -28,7 +31,9 @@
import android.graphics.RectF;
import android.graphics.Region.Op;
import android.hardware.display.DisplayManager;
+import android.opengl.GLSurfaceView;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Handler;
import android.os.Trace;
import android.service.wallpaper.WallpaperService;
@@ -39,6 +44,7 @@
import android.view.SurfaceHolder;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.systemui.glwallpaper.ImageWallpaperRenderer;
import java.io.FileDescriptor;
import java.io.IOException;
@@ -51,12 +57,17 @@
public class ImageWallpaper extends WallpaperService {
private static final String TAG = "ImageWallpaper";
private static final String GL_LOG_TAG = "ImageWallpaperGL";
+ // TODO: Testing purpose, need to remove later, b/123616712.
+ private static final String SENSOR_EVENT_AWAKE = "systemui.test.event.awake";
+ // TODO: Testing purpose, need to remove later, b/123616712.
+ private static final String SENSOR_EVENT_SLEEP = "systemui.test.event.sleep";
private static final boolean DEBUG = false;
private static final String PROPERTY_KERNEL_QEMU = "ro.kernel.qemu";
private static final long DELAY_FORGET_WALLPAPER = 5000;
private WallpaperManager mWallpaperManager;
private DrawableEngine mEngine;
+ private GLEngine mGlEngine;
@Override
public void onCreate() {
@@ -73,10 +84,112 @@
@Override
public Engine onCreateEngine() {
- mEngine = new DrawableEngine();
- return mEngine;
+ mGlEngine = new GLEngine(this);
+ return mGlEngine;
}
+ class GLEngine extends Engine {
+ private GLWallpaperSurfaceView mWallpaperSurfaceView;
+
+ GLEngine(Context context) {
+ mWallpaperSurfaceView = new GLWallpaperSurfaceView(context);
+ mWallpaperSurfaceView.setRenderer(
+ new ImageWallpaperRenderer(context, mWallpaperSurfaceView));
+ mWallpaperSurfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+ setOffsetNotificationsEnabled(true);
+ }
+
+ @Override
+ public void onAmbientModeChanged(boolean inAmbientMode, long animationDuration) {
+ if (mWallpaperSurfaceView != null) {
+ mWallpaperSurfaceView.notifyAmbientModeChanged(inAmbientMode);
+ }
+ }
+
+ @Override
+ public void onOffsetsChanged(float xOffset, float yOffset, float xOffsetStep,
+ float yOffsetStep, int xPixelOffset, int yPixelOffset) {
+ if (mWallpaperSurfaceView != null) {
+ mWallpaperSurfaceView.notifyOffsetsChanged(xOffset, yOffset);
+ }
+ }
+
+ private class GLWallpaperSurfaceView extends GLSurfaceView implements ImageGLView {
+ private SensorEventListener mEventListener;
+ private WallpaperStatusListener mWallpaperChangedListener;
+
+ // TODO: Testing purpose, need to remove later, b/123616712.
+ /**
+ * For testing only: adb shell am broadcast -a <INTENT>
+ */
+ private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent == null) {
+ return;
+ }
+ switch (intent.getAction()) {
+ case SENSOR_EVENT_AWAKE:
+ notifySensorEvents(true);
+ break;
+ case SENSOR_EVENT_SLEEP:
+ notifySensorEvents(false);
+ break;
+ }
+ }
+ };
+
+ GLWallpaperSurfaceView(Context context) {
+ super(context);
+ setEGLContextClientVersion(2);
+ // TODO: Testing purpose, need to remove later, b/123616712.
+ if (Build.IS_DEBUGGABLE) {
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(SENSOR_EVENT_AWAKE);
+ filter.addAction(SENSOR_EVENT_SLEEP);
+ registerReceiver(mReceiver, filter);
+ }
+ }
+
+ @Override
+ public SurfaceHolder getHolder() {
+ return getSurfaceHolder();
+ }
+
+ @Override
+ public void setRenderer(Renderer renderer) {
+ super.setRenderer(renderer);
+ mEventListener = (SensorEventListener) renderer;
+ mWallpaperChangedListener = (WallpaperStatusListener) renderer;
+ }
+
+ private void notifySensorEvents(boolean reach) {
+ if (mEventListener != null) {
+ mEventListener.onSensorEvent(reach);
+ }
+ }
+
+ private void notifyAmbientModeChanged(boolean inAmbient) {
+ if (mWallpaperChangedListener != null) {
+ mWallpaperChangedListener.onAmbientModeChanged(inAmbient);
+ }
+ }
+
+ private void notifyOffsetsChanged(float xOffset, float yOffset) {
+ if (mWallpaperChangedListener != null) {
+ mWallpaperChangedListener.onOffsetsChanged(
+ xOffset, yOffset, getHolder().getSurfaceFrame());
+ }
+ }
+
+ @Override
+ public void render() {
+ requestRender();
+ }
+ }
+ }
+
+ // TODO: Remove this engine, tracking on b/123617158.
class DrawableEngine extends Engine {
private final Runnable mUnloadWallpaperCallback = () -> {
unloadWallpaper(false /* forgetSize */);
@@ -564,4 +677,46 @@
}
}
}
+
+ /**
+ * A listener to trace sensor event.
+ */
+ public interface SensorEventListener {
+
+ /**
+ * Called back while sensor event comes.
+ * @param reach The status of sensor.
+ */
+ void onSensorEvent(boolean reach);
+ }
+
+ /**
+ * A listener to trace status of image wallpaper.
+ */
+ public interface WallpaperStatusListener {
+
+ /**
+ * Called back while ambient mode changes.
+ * @param inAmbientMode true if is in ambient mode, false otherwise.
+ */
+ void onAmbientModeChanged(boolean inAmbientMode);
+
+ /**
+ * Called back while wallpaper offsets.
+ * @param xOffset The offset portion along x.
+ * @param yOffset The offset portion along y.
+ */
+ void onOffsetsChanged(float xOffset, float yOffset, Rect frame);
+ }
+
+ /**
+ * An abstraction for view of GLRenderer.
+ */
+ public interface ImageGLView {
+
+ /**
+ * Ask the view to render.
+ */
+ void render();
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index f66a57b..9b3d7ed 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -137,8 +137,10 @@
}
public NotificationIconAreaController createNotificationIconAreaController(Context context,
- StatusBar statusBar, StatusBarStateController statusBarStateController) {
- return new NotificationIconAreaController(context, statusBar, statusBarStateController);
+ StatusBar statusBar, StatusBarStateController statusBarStateController,
+ NotificationListener listener) {
+ return new NotificationIconAreaController(context, statusBar, statusBarStateController,
+ listener);
}
public KeyguardIndicationController createKeyguardIndicationController(Context context,
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 83fd970..8731bd5 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -238,14 +238,14 @@
*/
public void setExpandedBubble(BubbleView bubbleToExpand) {
mExpandedBubble = bubbleToExpand;
- boolean prevExpanded = mIsExpanded;
- mIsExpanded = true;
- if (!prevExpanded) {
+ if (!mIsExpanded) {
// If we weren't previously expanded we should animate open.
animateExpansion(true /* expand */);
} else {
- // If we were expanded just update the views
+ // Otherwise just update the views
+ // TODO: probably animate / page to expanded one
updateExpandedBubble();
+ updatePointerPosition();
requestUpdate();
}
mExpandedBubble.getEntry().setShowInShadeWhenBubble(false);
@@ -387,7 +387,6 @@
mIsExpanded = shouldExpand;
updateExpandedBubble();
applyCurrentState();
- //requestUpdate();
mIsAnimating = true;
@@ -400,7 +399,10 @@
if (shouldExpand) {
mBubbleContainer.setController(mExpandedAnimationController);
mExpandedAnimationController.expandFromStack(
- mStackAnimationController.getStackPosition(), updateAfter);
+ mStackAnimationController.getStackPosition(), () -> {
+ updatePointerPosition();
+ updateAfter.run();
+ });
} else {
mBubbleContainer.cancelAllAnimations();
mExpandedAnimationController.collapseBackToStack(
@@ -649,10 +651,7 @@
}
// Bubble with notification as expanded state doesn't need a header / title
mExpandedViewContainer.setHeaderText(null);
-
}
- float pointerPosition = mExpandedBubble.getPosition().x + (mExpandedBubble.getWidth() / 2);
- mExpandedViewContainer.setPointerPosition((int) pointerPosition);
}
private void applyCurrentState() {
@@ -690,6 +689,14 @@
}
}
+ private void updatePointerPosition() {
+ if (mExpandedBubble != null) {
+ float pointerPosition = mExpandedBubble.getPosition().x
+ + (mExpandedBubble.getWidth() / 2f);
+ mExpandedViewContainer.setPointerPosition((int) pointerPosition);
+ }
+ }
+
private void applyRowState(ExpandableNotificationRow view) {
view.reset();
view.setHeadsUp(false);
diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.java b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.java
new file mode 100644
index 0000000..d03b00b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.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 com.android.systemui.glwallpaper;
+
+import static android.opengl.GLES20.GL_FRAGMENT_SHADER;
+import static android.opengl.GLES20.GL_VERTEX_SHADER;
+import static android.opengl.GLES20.glAttachShader;
+import static android.opengl.GLES20.glCompileShader;
+import static android.opengl.GLES20.glCreateProgram;
+import static android.opengl.GLES20.glCreateShader;
+import static android.opengl.GLES20.glGetAttribLocation;
+import static android.opengl.GLES20.glGetUniformLocation;
+import static android.opengl.GLES20.glLinkProgram;
+import static android.opengl.GLES20.glShaderSource;
+import static android.opengl.GLES20.glUseProgram;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * This class takes charge of linking shader codes and then return a handle for OpenGL ES program.
+ */
+class ImageGLProgram {
+ private static final String TAG = ImageGLProgram.class.getSimpleName();
+
+ private Context mContext;
+ private int mProgramHandle;
+
+ ImageGLProgram(Context context) {
+ mContext = context.getApplicationContext();
+ }
+
+ private int loadShaderProgram(int vertexId, int fragmentId) {
+ final String vertexSrc = getShaderResource(vertexId);
+ final String fragmentSrc = getShaderResource(fragmentId);
+ final int vertexHandle = getShaderHandle(GL_VERTEX_SHADER, vertexSrc);
+ final int fragmentHandle = getShaderHandle(GL_FRAGMENT_SHADER, fragmentSrc);
+ return getProgramHandle(vertexHandle, fragmentHandle);
+ }
+
+ private String getShaderResource(int shaderId) {
+ Resources res = mContext.getResources();
+ StringBuilder code = new StringBuilder();
+
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(res.openRawResource(shaderId)))) {
+ String nextLine;
+ while ((nextLine = reader.readLine()) != null) {
+ code.append(nextLine).append("\n");
+ }
+ } catch (IOException | Resources.NotFoundException ex) {
+ Log.d(TAG, "Can not read the shader source", ex);
+ code = null;
+ }
+
+ return code == null ? "" : code.toString();
+ }
+
+ private int getShaderHandle(int type, String src) {
+ final int shader = glCreateShader(type);
+ if (shader == 0) {
+ Log.d(TAG, "Create shader failed, type=" + type);
+ return 0;
+ }
+ glShaderSource(shader, src);
+ glCompileShader(shader);
+ return shader;
+ }
+
+ private int getProgramHandle(int vertexHandle, int fragmentHandle) {
+ final int program = glCreateProgram();
+ if (program == 0) {
+ Log.d(TAG, "Can not create OpenGL ES program");
+ return 0;
+ }
+
+ glAttachShader(program, vertexHandle);
+ glAttachShader(program, fragmentHandle);
+ glLinkProgram(program);
+ return program;
+ }
+
+ boolean useGLProgram(int vertexResId, int fragmentResId) {
+ mProgramHandle = loadShaderProgram(vertexResId, fragmentResId);
+ glUseProgram(mProgramHandle);
+ return true;
+ }
+
+ int getAttributeHandle(String name) {
+ return glGetAttribLocation(mProgramHandle, name);
+ }
+
+ int getUniformHandle(String name) {
+ return glGetUniformLocation(mProgramHandle, name);
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java
new file mode 100644
index 0000000..4e07872
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java
@@ -0,0 +1,245 @@
+/*
+ * 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.glwallpaper;
+
+import static android.opengl.GLES20.GL_FLOAT;
+import static android.opengl.GLES20.GL_LINEAR;
+import static android.opengl.GLES20.GL_TEXTURE0;
+import static android.opengl.GLES20.GL_TEXTURE_2D;
+import static android.opengl.GLES20.GL_TEXTURE_MAG_FILTER;
+import static android.opengl.GLES20.GL_TEXTURE_MIN_FILTER;
+import static android.opengl.GLES20.GL_TRIANGLES;
+import static android.opengl.GLES20.glActiveTexture;
+import static android.opengl.GLES20.glBindTexture;
+import static android.opengl.GLES20.glDrawArrays;
+import static android.opengl.GLES20.glEnableVertexAttribArray;
+import static android.opengl.GLES20.glGenTextures;
+import static android.opengl.GLES20.glTexParameteri;
+import static android.opengl.GLES20.glUniform1i;
+import static android.opengl.GLES20.glVertexAttribPointer;
+
+import android.graphics.Bitmap;
+import android.opengl.GLUtils;
+import android.util.Log;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+/**
+ * This class takes charge of the geometry data like vertices and texture coordinates.
+ * It delivers these data to opengl runtime and triggers draw calls if necessary.
+ */
+class ImageGLWallpaper {
+ private static final String TAG = ImageGLWallpaper.class.getSimpleName();
+
+ static final String A_POSITION = "aPosition";
+ static final String A_TEXTURE_COORDINATES = "aTextureCoordinates";
+ static final String U_CENTER_REVEAL = "uCenterReveal";
+ static final String U_REVEAL = "uReveal";
+ static final String U_AOD2OPACITY = "uAod2Opacity";
+ static final String U_TEXTURE = "uTexture";
+ static final String U_AOD_MODE = "uAodMode";
+
+ private static final int HANDLE_UNDEFINED = -1;
+ private static final int POSITION_COMPONENT_COUNT = 2;
+ private static final int TEXTURE_COMPONENT_COUNT = 2;
+ private static final int BYTES_PER_FLOAT = 4;
+
+ // Vertices to define the square with 2 triangles.
+ private static final float[] VERTICES = {
+ -1.0f, -1.0f,
+ +1.0f, -1.0f,
+ +1.0f, +1.0f,
+ +1.0f, +1.0f,
+ -1.0f, +1.0f,
+ -1.0f, -1.0f
+ };
+
+ // Texture coordinates that maps to vertices.
+ private static final float[] TEXTURES = {
+ 0f, 1f,
+ 1f, 1f,
+ 1f, 0f,
+ 1f, 0f,
+ 0f, 0f,
+ 0f, 1f
+ };
+
+ private final FloatBuffer mVertexBuffer;
+ private final FloatBuffer mTextureBuffer;
+ private final ImageGLProgram mProgram;
+
+ private int mAttrPosition;
+ private int mAttrTextureCoordinates;
+ private int mUniAod2Opacity;
+ private int mUniAodMode;
+ private int mUniCenterReveal;
+ private int mUniReveal;
+ private int mUniTexture;
+ private int mTextureId;
+
+ ImageGLWallpaper(ImageGLProgram program) {
+ mProgram = program;
+
+ // Create an float array in opengles runtime (native) and put vertex data.
+ mVertexBuffer = ByteBuffer.allocateDirect(VERTICES.length * BYTES_PER_FLOAT)
+ .order(ByteOrder.nativeOrder())
+ .asFloatBuffer();
+ mVertexBuffer.put(VERTICES);
+ mVertexBuffer.position(0);
+
+ // Create an float array in opengles runtime (native) and put texture data.
+ mTextureBuffer = ByteBuffer.allocateDirect(TEXTURES.length * BYTES_PER_FLOAT)
+ .order(ByteOrder.nativeOrder())
+ .asFloatBuffer();
+ mTextureBuffer.put(TEXTURES);
+ mTextureBuffer.position(0);
+ }
+
+ void setup() {
+ setupAttributes();
+ setupUniforms();
+ }
+
+ private void setupAttributes() {
+ mAttrPosition = mProgram.getAttributeHandle(A_POSITION);
+ mVertexBuffer.position(0);
+ glVertexAttribPointer(mAttrPosition, POSITION_COMPONENT_COUNT, GL_FLOAT,
+ false, 0, mVertexBuffer);
+ glEnableVertexAttribArray(mAttrPosition);
+
+ mAttrTextureCoordinates = mProgram.getAttributeHandle(A_TEXTURE_COORDINATES);
+ mTextureBuffer.position(0);
+ glVertexAttribPointer(mAttrTextureCoordinates, TEXTURE_COMPONENT_COUNT, GL_FLOAT,
+ false, 0, mTextureBuffer);
+ glEnableVertexAttribArray(mAttrTextureCoordinates);
+ }
+
+ private void setupUniforms() {
+ mUniAod2Opacity = mProgram.getUniformHandle(U_AOD2OPACITY);
+ mUniAodMode = mProgram.getUniformHandle(U_AOD_MODE);
+ mUniCenterReveal = mProgram.getUniformHandle(U_CENTER_REVEAL);
+ mUniReveal = mProgram.getUniformHandle(U_REVEAL);
+ mUniTexture = mProgram.getUniformHandle(U_TEXTURE);
+ }
+
+ int getHandle(String name) {
+ switch (name) {
+ case A_POSITION:
+ return mAttrPosition;
+ case A_TEXTURE_COORDINATES:
+ return mAttrTextureCoordinates;
+ case U_AOD2OPACITY:
+ return mUniAod2Opacity;
+ case U_AOD_MODE:
+ return mUniAodMode;
+ case U_CENTER_REVEAL:
+ return mUniCenterReveal;
+ case U_REVEAL:
+ return mUniReveal;
+ case U_TEXTURE:
+ return mUniTexture;
+ default:
+ return HANDLE_UNDEFINED;
+ }
+ }
+
+ void draw() {
+ glDrawArrays(GL_TRIANGLES, 0, VERTICES.length / 2);
+ }
+
+ void setupTexture(Bitmap bitmap) {
+ final int[] tids = new int[1];
+
+ if (bitmap == null) {
+ Log.w(TAG, "setupTexture: invalid bitmap");
+ return;
+ }
+
+ // Generate one texture object and store the id in tids[0].
+ glGenTextures(1, tids, 0);
+ if (tids[0] == 0) {
+ Log.w(TAG, "setupTexture: glGenTextures() failed");
+ return;
+ }
+
+ // Bind a named texture to a texturing target.
+ glBindTexture(GL_TEXTURE_2D, tids[0]);
+ // Load the bitmap data and copy it over into the texture object that is currently bound.
+ GLUtils.texImage2D(GL_TEXTURE_2D, 0, bitmap, 0);
+ // Use bilinear texture filtering when minification.
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ // Use bilinear texture filtering when magnification.
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ mTextureId = tids[0];
+ }
+
+ void useTexture() {
+ // Set the active texture unit to texture unit 0.
+ glActiveTexture(GL_TEXTURE0);
+ // Bind the texture to this unit.
+ glBindTexture(GL_TEXTURE_2D, mTextureId);
+ // Let the texture sampler in fragment shader to read form this texture unit.
+ glUniform1i(mUniTexture, 0);
+ }
+
+ void adjustTextureCoordinates(Bitmap bitmap, int surfaceWidth, int surfaceHeight,
+ float xOffset, float yOffset) {
+ if (bitmap == null) {
+ Log.d(TAG, "adjustTextureCoordinates: invalid bitmap");
+ return;
+ }
+
+ float ratioW = 1f;
+ float ratioH = 1f;
+ int bitmapWidth = bitmap.getWidth();
+ int bitmapHeight = bitmap.getHeight();
+
+ boolean adjustWidth = bitmapWidth > surfaceWidth;
+ if (adjustWidth) {
+ ratioW = (float) surfaceWidth / bitmapWidth;
+ float referenceX = xOffset + ratioW > 1f ? 1f - ratioW : xOffset;
+ for (int i = 0; i < TEXTURES.length; i += 2) {
+ if (i == 2 || i == 4 || i == 6) {
+ TEXTURES[i] = Math.min(1f, referenceX + ratioW);
+ } else {
+ TEXTURES[i] = referenceX;
+ }
+ }
+ }
+
+ boolean adjustHeight = bitmapHeight > surfaceHeight;
+ if (adjustHeight) {
+ ratioH = (float) surfaceHeight / bitmapHeight;
+ float referenceY = yOffset + ratioH > 1f ? 1f - ratioH : yOffset;
+ for (int i = 1; i < TEXTURES.length; i += 2) {
+ if (i == 1 || i == 3 || i == 11) {
+ TEXTURES[i] = Math.min(1f, referenceY + ratioH);
+ } else {
+ TEXTURES[i] = referenceY;
+ }
+ }
+ }
+
+ if (adjustWidth || adjustHeight) {
+ mTextureBuffer.put(TEXTURES);
+ mTextureBuffer.position(0);
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java
new file mode 100644
index 0000000..477e7d7e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java
@@ -0,0 +1,144 @@
+/*
+ * 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.glwallpaper;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Handler.Callback;
+import android.os.Message;
+import android.util.Log;
+
+/**
+ * A helper class that computes histogram and percentile 85 from a bitmap.
+ * Percentile 85 will be computed each time the user picks a new image wallpaper.
+ */
+class ImageProcessHelper {
+ private static final String TAG = ImageProcessHelper.class.getSimpleName();
+ private static final float DEFAULT_PER85 = 0.8f;
+ private static final int MSG_UPDATE_PER85 = 1;
+
+ /**
+ * This color matrix will be applied to each pixel to get luminance from rgb by below formula:
+ * Luminance = .2126f * r + .7152f * g + .0722f * b.
+ */
+ private static final float[] LUMINOSITY_MATRIX = new float[] {
+ .2126f, .0000f, .0000f, .0000f, .0000f,
+ .0000f, .7152f, .0000f, .0000f, .0000f,
+ .0000f, .0000f, .0722f, .0000f, .0000f,
+ .0000f, .0000f, .0000f, 1.000f, .0000f
+ };
+
+ private final Handler mHandler = new Handler(new Callback() {
+ @Override
+ public boolean handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_UPDATE_PER85:
+ mPer85 = (float) msg.obj;
+ return true;
+ default:
+ return false;
+ }
+ }
+ });
+
+ private float mPer85 = DEFAULT_PER85;
+
+ void startComputingPercentile85(Bitmap bitmap) {
+ new Per85ComputeTask(mHandler).execute(bitmap);
+ }
+
+ float getPercentile85() {
+ return mPer85;
+ }
+
+ private static class Per85ComputeTask extends AsyncTask<Bitmap, Void, Float> {
+ private Handler mUpdateHandler;
+
+ Per85ComputeTask(Handler handler) {
+ super(handler);
+ mUpdateHandler = handler;
+ }
+
+ @Override
+ protected Float doInBackground(Bitmap... bitmaps) {
+ Bitmap bitmap = bitmaps[0];
+ if (bitmap != null) {
+ int[] histogram = processHistogram(bitmap);
+ return computePercentile85(bitmap, histogram);
+ }
+ Log.e(TAG, "Per85ComputeTask: Can't get bitmap");
+ return DEFAULT_PER85;
+ }
+
+ @Override
+ protected void onPostExecute(Float result) {
+ Message msg = mUpdateHandler.obtainMessage(MSG_UPDATE_PER85, result);
+ mUpdateHandler.sendMessage(msg);
+ }
+
+ private int[] processHistogram(Bitmap bitmap) {
+ int width = bitmap.getWidth();
+ int height = bitmap.getHeight();
+
+ Bitmap target = Bitmap.createBitmap(width, height, bitmap.getConfig());
+ Canvas canvas = new Canvas(target);
+ ColorMatrix cm = new ColorMatrix(LUMINOSITY_MATRIX);
+ Paint paint = new Paint();
+ paint.setColorFilter(new ColorMatrixColorFilter(cm));
+ canvas.drawBitmap(bitmap, new Matrix(), paint);
+
+ // TODO: Fine tune the performance here, tracking on b/123615079.
+ int[] histogram = new int[256];
+ for (int row = 0; row < height; row++) {
+ for (int col = 0; col < width; col++) {
+ int pixel = target.getPixel(col, row);
+ int y = Color.red(pixel) + Color.green(pixel) + Color.blue(pixel);
+ histogram[y]++;
+ }
+ }
+
+ return histogram;
+ }
+
+ private float computePercentile85(Bitmap bitmap, int[] histogram) {
+ float per85 = DEFAULT_PER85;
+ int pixelCount = bitmap.getWidth() * bitmap.getHeight();
+ float[] acc = new float[256];
+ for (int i = 0; i < acc.length; i++) {
+ acc[i] = (float) histogram[i] / pixelCount;
+ float prev = i == 0 ? 0f : acc[i - 1];
+ float next = acc[i];
+ float idx = (float) (i + 1) / 255;
+ float sum = prev + next;
+ if (prev < 0.85f && sum >= 0.85f) {
+ per85 = idx;
+ }
+ if (i > 0) {
+ acc[i] += acc[i - 1];
+ }
+ }
+ return per85;
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageRevealHelper.java b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageRevealHelper.java
new file mode 100644
index 0000000..787972c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageRevealHelper.java
@@ -0,0 +1,103 @@
+/*
+ * 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.glwallpaper;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+
+import com.android.systemui.Interpolators;
+
+/**
+ * Use ValueAnimator and appropriate interpolator to control the progress of reveal transition.
+ * The transition will happen while getting awake and quit events.
+ */
+class ImageRevealHelper {
+ private static final String TAG = ImageRevealHelper.class.getSimpleName();
+ private static final float MAX_REVEAL = 0f;
+ private static final float MIN_REVEAL = 1f;
+ private static final int REVEAL_DURATION = 1000;
+
+ private final ValueAnimator mAnimator;
+ private final RevealStateListener mRevealListener;
+ private float mReveal = MIN_REVEAL;
+ private boolean mAwake = false;
+
+ ImageRevealHelper(RevealStateListener listener) {
+ mRevealListener = listener;
+ mAnimator = ValueAnimator.ofFloat();
+ mAnimator.setDuration(REVEAL_DURATION);
+ mAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
+ mAnimator.addUpdateListener(animator -> {
+ mReveal = (float) animator.getAnimatedValue();
+ if (mRevealListener != null) {
+ mRevealListener.onRevealStateChanged();
+ }
+ });
+ mAnimator.addListener(new AnimatorListenerAdapter() {
+ private boolean mIsCanceled;
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ mIsCanceled = true;
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ if (!mIsCanceled) {
+ mAwake = !mAwake;
+ }
+ mIsCanceled = false;
+ }
+ });
+ }
+
+ private void animate() {
+ mAnimator.cancel();
+ mAnimator.setFloatValues(mReveal, !mAwake ? MIN_REVEAL : MAX_REVEAL);
+ mAnimator.start();
+ }
+
+ public float getReveal() {
+ return mReveal;
+ }
+
+ public boolean isAwake() {
+ return mAwake;
+ }
+
+ void updateAwake(boolean awake) {
+ mAwake = awake;
+ animate();
+ }
+
+ void sleep() {
+ mReveal = MIN_REVEAL;
+ mAwake = false;
+ }
+
+ /**
+ * A listener to trace value changes of reveal.
+ */
+ public interface RevealStateListener {
+
+ /**
+ * Called back while reveal status changes.
+ */
+ void onRevealStateChanged();
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java
new file mode 100644
index 0000000..8916b28
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java
@@ -0,0 +1,153 @@
+/*
+ * 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.glwallpaper;
+
+import static android.opengl.GLES20.GL_COLOR_BUFFER_BIT;
+import static android.opengl.GLES20.glClear;
+import static android.opengl.GLES20.glClearColor;
+import static android.opengl.GLES20.glUniform1f;
+import static android.opengl.GLES20.glUniform1i;
+import static android.opengl.GLES20.glViewport;
+
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.opengl.GLSurfaceView;
+import android.util.Log;
+
+import com.android.systemui.ImageWallpaper;
+import com.android.systemui.ImageWallpaper.ImageGLView;
+import com.android.systemui.R;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * A GL renderer for image wallpaper.
+ */
+public class ImageWallpaperRenderer implements GLSurfaceView.Renderer,
+ ImageWallpaper.SensorEventListener, ImageWallpaper.WallpaperStatusListener,
+ ImageRevealHelper.RevealStateListener {
+ private static final String TAG = ImageWallpaperRenderer.class.getSimpleName();
+
+ private final WallpaperManager mWallpaperManager;
+ private final ImageGLProgram mProgram;
+ private final ImageGLWallpaper mWallpaper;
+ private final ImageProcessHelper mImageProcessHelper;
+ private final ImageRevealHelper mImageRevealHelper;
+ private final ImageGLView mGLView;
+ private boolean mIsInAmbientMode;
+ private float mXOffset = 0f;
+ private float mYOffset = 0f;
+
+ public ImageWallpaperRenderer(Context context, ImageGLView glView) {
+ mWallpaperManager = context.getSystemService(WallpaperManager.class);
+ if (mWallpaperManager == null) {
+ Log.w(TAG, "WallpaperManager not available");
+ }
+
+ mProgram = new ImageGLProgram(context);
+ mWallpaper = new ImageGLWallpaper(mProgram);
+ mImageProcessHelper = new ImageProcessHelper();
+ mImageRevealHelper = new ImageRevealHelper(this);
+ mGLView = glView;
+
+ if (mWallpaperManager != null) {
+ // Compute per85 as transition threshold, this is an async work.
+ mImageProcessHelper.startComputingPercentile85(mWallpaperManager.getBitmap());
+ }
+ }
+
+ @Override
+ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+ glClearColor(0f, 0f, 0f, 1.0f);
+ mProgram.useGLProgram(
+ R.raw.image_wallpaper_vertex_shader, R.raw.image_wallpaper_fragment_shader);
+ mWallpaper.setup();
+ mWallpaper.setupTexture(mWallpaperManager.getBitmap());
+ }
+
+ @Override
+ public void onSurfaceChanged(GL10 gl, int width, int height) {
+ glViewport(0, 0, width, height);
+ mWallpaper.adjustTextureCoordinates(mWallpaperManager.getBitmap(),
+ width, height, mXOffset, mYOffset);
+ }
+
+ @Override
+ public void onDrawFrame(GL10 gl) {
+ float threshold = mImageProcessHelper.getPercentile85();
+ float reveal = mImageRevealHelper.getReveal();
+
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glUniform1f(mWallpaper.getHandle(ImageGLWallpaper.U_AOD2OPACITY), .25f);
+ glUniform1f(mWallpaper.getHandle(ImageGLWallpaper.U_CENTER_REVEAL), threshold);
+ glUniform1f(mWallpaper.getHandle(ImageGLWallpaper.U_REVEAL), reveal);
+ glUniform1i(mWallpaper.getHandle(ImageGLWallpaper.U_AOD_MODE), mIsInAmbientMode ? 1 : 0);
+
+ mWallpaper.useTexture();
+ mWallpaper.draw();
+ }
+
+ @Override
+ public void onSensorEvent(boolean awake) {
+ mImageRevealHelper.updateAwake(awake);
+ }
+
+ @Override
+ public void onAmbientModeChanged(boolean inAmbientMode) {
+ mIsInAmbientMode = inAmbientMode;
+ if (inAmbientMode) {
+ mImageRevealHelper.sleep();
+ }
+ requestRender();
+ }
+
+ @Override
+ public void onOffsetsChanged(float xOffset, float yOffset, Rect frame) {
+ if (frame == null || mWallpaperManager == null
+ || (xOffset == mXOffset && yOffset == mYOffset)) {
+ return;
+ }
+
+ Bitmap bitmap = mWallpaperManager.getBitmap();
+ if (bitmap == null) {
+ return;
+ }
+
+ int width = frame.width();
+ int height = frame.height();
+ mXOffset = xOffset;
+ mYOffset = yOffset;
+
+ mWallpaper.adjustTextureCoordinates(bitmap, width, height, mXOffset, mYOffset);
+ requestRender();
+ }
+
+ @Override
+ public void onRevealStateChanged() {
+ requestRender();
+ }
+
+ private void requestRender() {
+ if (mGLView != null) {
+ mGLView.render();
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java
index 968bd28..60dceef 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java
@@ -165,6 +165,11 @@
}
}
+ @Override
+ public void clearAccessibilityFocus() {
+ // We should not be here.
+ }
+
public static AccessibilityNodeInfo obtainRootAccessibilityNodeInfo() {
AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain();
info.setSourceNodeId(AccessibilityNodeInfo.ROOT_NODE_ID,
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
index db5c244..e2688f1 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
@@ -19,6 +19,7 @@
import android.content.Context
import android.content.DialogInterface
import android.content.Intent
+import android.content.pm.PackageManager
import android.content.res.ColorStateList
import android.os.UserHandle
import android.util.IconDrawableFactory
@@ -157,16 +158,21 @@
} else {
icons.visibility = View.GONE
}
- item.setOnClickListener(object : View.OnClickListener {
- val intent = Intent(Intent.ACTION_REVIEW_APP_PERMISSION_USAGE)
- .putExtra(Intent.EXTRA_PACKAGE_NAME, app.packageName)
- .putExtra(Intent.EXTRA_USER, UserHandle.getUserHandleForUid(app.uid))
- override fun onClick(v: View?) {
- Dependency.get(ActivityStarter::class.java)
- .postStartActivityDismissingKeyguard(intent, 0)
- dismissDialog?.invoke()
- }
- })
+ try {
+ // Check if package exists
+ context.packageManager.getPackageInfo(app.packageName, 0)
+ item.setOnClickListener(object : View.OnClickListener {
+ val intent = Intent(Intent.ACTION_REVIEW_APP_PERMISSION_USAGE)
+ .putExtra(Intent.EXTRA_PACKAGE_NAME, app.packageName)
+ .putExtra(Intent.EXTRA_USER, UserHandle.getUserHandleForUid(app.uid))
+ override fun onClick(v: View?) {
+ Dependency.get(ActivityStarter::class.java)
+ .postStartActivityDismissingKeyguard(intent, 0)
+ dismissDialog?.invoke()
+ }
+ })
+ } catch (e: PackageManager.NameNotFoundException) {}
+
itemList.addView(item)
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
index f3a46ce..0583843 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
@@ -20,6 +20,8 @@
import static com.android.systemui.statusbar.phone.StatusBar.DEBUG;
import static com.android.systemui.statusbar.phone.StatusBar.ENABLE_CHILD_NOTIFICATIONS;
+import android.annotation.SuppressLint;
+import android.app.NotificationManager;
import android.content.ComponentName;
import android.content.Context;
import android.os.RemoteException;
@@ -32,10 +34,13 @@
import com.android.systemui.statusbar.phone.NotificationGroupManager;
import com.android.systemui.statusbar.phone.NotificationListenerWithPlugins;
+import java.util.ArrayList;
+
/**
* This class handles listening to notification updates and passing them along to
* NotificationPresenter to be displayed to the user.
*/
+@SuppressLint("OverrideAbstract")
public class NotificationListener extends NotificationListenerWithPlugins {
private static final String TAG = "NotificationListener";
@@ -47,6 +52,7 @@
private final NotificationGroupManager mGroupManager =
Dependency.get(NotificationGroupManager.class);
+ private final ArrayList<NotificationSettingsListener> mSettingsListeners = new ArrayList<>();
private final Context mContext;
protected NotificationPresenter mPresenter;
@@ -55,6 +61,10 @@
mContext = context;
}
+ public void addNotificationSettingsListener(NotificationSettingsListener listener) {
+ mSettingsListeners.add(listener);
+ }
+
@Override
public void onListenerConnected() {
if (DEBUG) Log.d(TAG, "onListenerConnected");
@@ -70,6 +80,8 @@
mEntryManager.addNotification(sbn, currentRanking);
}
});
+ NotificationManager noMan = mContext.getSystemService(NotificationManager.class);
+ onStatusBarIconsBehaviorChanged(noMan.shouldHideSilentStatusBarIcons());
}
@Override
@@ -133,6 +145,13 @@
}
}
+ @Override
+ public void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) {
+ for (NotificationSettingsListener listener : mSettingsListeners) {
+ listener.onStatusBarIconsBehaviorChanged(hideSilentStatusIcons);
+ }
+ }
+
public void setUpWithPresenter(NotificationPresenter presenter) {
mPresenter = presenter;
@@ -144,4 +163,10 @@
Log.e(TAG, "Unable to register notification listener", e);
}
}
+
+ public interface NotificationSettingsListener {
+
+ default void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) { }
+
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 19ed13e..acacc8f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -594,8 +594,8 @@
mCurrentSetColor, Color.WHITE, mDarkAmount);
updateTintMatrix(mMatrix, color, DARK_ALPHA_BOOST * mDarkAmount);
mMatrixColorFilter.setColorMatrixArray(mMatrix);
+ setColorFilter(null); // setColorFilter only invalidates if the instance changed.
setColorFilter(mMatrixColorFilter);
- invalidate(); // setColorFilter only invalidates if the filter instance changed.
} else {
mDozer.updateGrayscale(this, mDarkAmount);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
index cb1384c..aa221993 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
@@ -25,7 +25,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.metrics.LogMaker;
import android.net.Uri;
import android.os.ServiceManager;
import android.os.UserHandle;
@@ -392,12 +391,6 @@
return false;
}
- LogMaker logMaker = (row.getStatusBarNotification() == null)
- ? new LogMaker(MetricsProto.MetricsEvent.ACTION_NOTE_CONTROLS)
- : row.getStatusBarNotification().getLogMaker();
- mMetricsLogger.write(logMaker.setCategory(MetricsProto.MetricsEvent.ACTION_NOTE_CONTROLS)
- .setType(MetricsProto.MetricsEvent.TYPE_ACTION));
-
// ensure that it's laid but not visible until actually laid out
guts.setVisibility(View.INVISIBLE);
// Post to ensure the the guts are properly laid out.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
index 359bc6e..b6948fc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
@@ -126,18 +126,23 @@
private OnClickListener mOnKeepShowing = v -> {
mExitReason = NotificationCounters.BLOCKING_HELPER_KEEP_SHOWING;
closeControls(v);
- mMetricsLogger.write(getLogMaker().setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
- .setType(MetricsEvent.TYPE_ACTION)
- .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_STAY_SILENT));
+ if (mIsForBlockingHelper) {
+ mMetricsLogger.write(getLogMaker().setCategory(
+ MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
+ .setType(MetricsEvent.TYPE_ACTION)
+ .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_STAY_SILENT));
+ }
};
private OnClickListener mOnToggleSilent = v -> {
Runnable saveImportance = () -> {
swapContent(ACTION_TOGGLE_SILENT, true /* animate */);
- mMetricsLogger.write(getLogMaker()
- .setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
- .setType(MetricsEvent.TYPE_ACTION)
- .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_ALERT_ME));
+ if (mIsForBlockingHelper) {
+ mMetricsLogger.write(getLogMaker()
+ .setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
+ .setType(MetricsEvent.TYPE_ACTION)
+ .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_ALERT_ME));
+ }
};
if (mCheckSaveListener != null) {
mCheckSaveListener.checkSave(saveImportance, mSbn);
@@ -149,10 +154,12 @@
private OnClickListener mOnStopOrMinimizeNotifications = v -> {
Runnable saveImportance = () -> {
swapContent(ACTION_BLOCK, true /* animate */);
- mMetricsLogger.write(getLogMaker()
- .setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
- .setType(MetricsEvent.TYPE_ACTION)
- .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_BLOCKED));
+ if (mIsForBlockingHelper) {
+ mMetricsLogger.write(getLogMaker()
+ .setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
+ .setType(MetricsEvent.TYPE_ACTION)
+ .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_BLOCKED));
+ }
};
if (mCheckSaveListener != null) {
mCheckSaveListener.checkSave(saveImportance, mSbn);
@@ -164,12 +171,16 @@
private OnClickListener mOnUndo = v -> {
// Reset exit counter that we'll log and record an undo event separately (not an exit event)
mExitReason = NotificationCounters.BLOCKING_HELPER_DISMISSED;
- logBlockingHelperCounter(NotificationCounters.BLOCKING_HELPER_UNDO);
- mMetricsLogger.write(importanceChangeLogMaker().setType(MetricsEvent.TYPE_DISMISS));
+ if (mIsForBlockingHelper) {
+ logBlockingHelperCounter(NotificationCounters.BLOCKING_HELPER_UNDO);
+ mMetricsLogger.write(getLogMaker().setCategory(
+ MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
+ .setType(MetricsEvent.TYPE_DISMISS)
+ .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_UNDO));
+ } else {
+ mMetricsLogger.write(importanceChangeLogMaker().setType(MetricsEvent.TYPE_DISMISS));
+ }
swapContent(ACTION_UNDO, true /* animate */);
- mMetricsLogger.write(getLogMaker().setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
- .setType(MetricsEvent.TYPE_DISMISS)
- .setSubtype(MetricsEvent.BLOCKING_HELPER_CLICK_UNDO));
};
public NotificationInfo(Context context, AttributeSet attrs) {
@@ -269,11 +280,11 @@
bindPrompt();
bindButtons();
- mMetricsLogger.write(getLogMaker().setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
- .setType(MetricsEvent.TYPE_OPEN)
- .setSubtype(MetricsEvent.BLOCKING_HELPER_DISPLAY));
+ mMetricsLogger.write(notificationControlsLogMaker());
}
+
+
private void bindHeader() throws RemoteException {
// Package name
Drawable pkgicon = null;
@@ -404,19 +415,6 @@
}
}
- /**
- * Returns an initialized LogMaker for logging importance changes.
- * The caller may override the type (to DISMISS) before passing it to mMetricsLogger.
- * @return new LogMaker
- */
- private LogMaker importanceChangeLogMaker() {
- Integer chosenImportance =
- mChosenImportance != null ? mChosenImportance : mStartingChannelImportance;
- return new LogMaker(MetricsEvent.ACTION_SAVE_IMPORTANCE)
- .setType(MetricsEvent.TYPE_ACTION)
- .setSubtype(chosenImportance - mStartingChannelImportance);
- }
-
private boolean hasImportanceChanged() {
return mSingleNotificationChannel != null
&& mChosenImportance != null
@@ -616,8 +614,8 @@
confirmation.setAlpha(1f);
header.setVisibility(VISIBLE);
header.setAlpha(1f);
- mMetricsLogger.write(getLogMaker().setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
- .setType(MetricsEvent.TYPE_CLOSE));
+
+ mMetricsLogger.write(notificationControlsLogMaker().setType(MetricsEvent.TYPE_CLOSE));
}
@Override
@@ -764,7 +762,39 @@
}
}
+ /**
+ * Returns a LogMaker with all available notification information.
+ * Caller should set category, type, and maybe subtype, before passing it to mMetricsLogger.
+ * @return LogMaker
+ */
private LogMaker getLogMaker() {
- return mSbn.getLogMaker();
+ // The constructor requires a category, so also do it in the other branch for consistency.
+ return mSbn == null ? new LogMaker(MetricsEvent.NOTIFICATION_BLOCKING_HELPER)
+ : mSbn.getLogMaker().setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER);
+ }
+
+ /**
+ * Returns an initialized LogMaker for logging importance changes.
+ * The caller may override the type before passing it to mMetricsLogger.
+ * @return LogMaker
+ */
+ private LogMaker importanceChangeLogMaker() {
+ Integer chosenImportance =
+ mChosenImportance != null ? mChosenImportance : mStartingChannelImportance;
+ return getLogMaker().setCategory(MetricsEvent.ACTION_SAVE_IMPORTANCE)
+ .setType(MetricsEvent.TYPE_ACTION)
+ .setSubtype(chosenImportance - mStartingChannelImportance);
+ }
+
+ /**
+ * Returns an initialized LogMaker for logging open/close of the info display.
+ * The caller may override the type before passing it to mMetricsLogger.
+ * @return LogMaker
+ */
+ private LogMaker notificationControlsLogMaker() {
+ return getLogMaker().setCategory(MetricsEvent.ACTION_NOTE_CONTROLS)
+ .setType(MetricsEvent.TYPE_OPEN)
+ .setSubtype(mIsForBlockingHelper ? MetricsEvent.BLOCKING_HELPER_DISPLAY
+ : MetricsEvent.BLOCKING_HELPER_UNKNOWN);
}
}
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 2e9d9bc..2fa9415 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -862,7 +862,8 @@
R.string.accessibility_voice_assist_button);
} else {
mIconState.isVisible = mUserSetupComplete && showAffordance && isPhoneVisible();
- mIconState.drawable = mContext.getDrawable(R.drawable.ic_phone_24dp);
+ mIconState.drawable = mContext.getDrawable(
+ com.android.internal.R.drawable.ic_phone);
mIconState.contentDescription = mContext.getString(
R.string.accessibility_phone_button);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
index e86996a..9e99fe9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
@@ -11,9 +11,7 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
-import androidx.annotation.NonNull;
-import androidx.collection.ArrayMap;
-
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.statusbar.StatusBarIcon;
import com.android.internal.util.ContrastColorUtil;
import com.android.internal.widget.ViewClippingUtil;
@@ -21,6 +19,7 @@
import com.android.systemui.R;
import com.android.systemui.plugins.DarkIconDispatcher;
import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;
+import com.android.systemui.statusbar.NotificationListener;
import com.android.systemui.statusbar.NotificationShelf;
import com.android.systemui.statusbar.StatusBarIconView;
import com.android.systemui.statusbar.StatusBarStateController;
@@ -28,11 +27,13 @@
import com.android.systemui.statusbar.notification.NotificationUtils;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
-import com.android.systemui.tuner.TunerService;
import java.util.ArrayList;
import java.util.function.Function;
+import androidx.annotation.NonNull;
+import androidx.collection.ArrayMap;
+
/**
* A controller for the space in the status bar to the left of the system icons. This area is
* normally reserved for notifications.
@@ -46,18 +47,19 @@
private final NotificationEntryManager mEntryManager;
private final Runnable mUpdateStatusBarIcons = this::updateStatusBarIcons;
private final StatusBarStateController mStatusBarStateController;
- private final TunerService.Tunable mTunable = new TunerService.Tunable() {
- @Override
- public void onTuningChanged(String key, String newValue) {
- if (key.equals(LOW_PRIORITY)) {
- mShowLowPriority = "1".equals(newValue)
- || !NotificationUtils.useNewInterruptionModel(mContext);
- if (mNotificationScrollLayout != null) {
- updateStatusBarIcons();
+ @VisibleForTesting
+ final NotificationListener.NotificationSettingsListener mSettingsListener =
+ new NotificationListener.NotificationSettingsListener() {
+ @Override
+ public void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) {
+ if (NotificationUtils.useNewInterruptionModel(mContext)) {
+ mShowLowPriority = !hideSilentStatusIcons;
+ if (mNotificationScrollLayout != null) {
+ updateStatusBarIcons();
+ }
+ }
}
- }
- }
- };
+ };
private int mIconSize;
private int mIconHPadding;
@@ -71,7 +73,7 @@
private ViewGroup mNotificationScrollLayout;
private Context mContext;
private boolean mFullyDark;
- private boolean mShowLowPriority;
+ private boolean mShowLowPriority = true;
/**
* Ratio representing being awake or in ambient mode, where 1 is dark and 0 awake.
@@ -90,15 +92,15 @@
view -> view instanceof StatusBarWindowView;
public NotificationIconAreaController(Context context, StatusBar statusBar,
- StatusBarStateController statusBarStateController) {
+ StatusBarStateController statusBarStateController,
+ NotificationListener notificationListener) {
mStatusBar = statusBar;
mContrastColorUtil = ContrastColorUtil.getInstance(context);
mContext = context;
mEntryManager = Dependency.get(NotificationEntryManager.class);
mStatusBarStateController = statusBarStateController;
mStatusBarStateController.addCallback(this);
-
- Dependency.get(TunerService.class).addTunable(mTunable, LOW_PRIORITY);
+ notificationListener.addNotificationSettingsListener(mSettingsListener);
initializeNotificationAreaViews(context);
}
@@ -243,6 +245,11 @@
true /* hideRepliedMessages */);
}
+ @VisibleForTesting
+ boolean shouldShouldLowPriorityIcons() {
+ return mShowLowPriority;
+ }
+
/**
* Updates the notification icons for a host layout. This will ensure that the notification
* host layout will have the same icons like the ones in here.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 1470d0f..dd23182 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -480,8 +480,7 @@
updateAodMaskVisibility(deviceSupportsAodWallpaper && aodImageWallpaperEnabled);
// If WallpaperInfo is null, it must be ImageWallpaper.
final boolean supportsAmbientMode = deviceSupportsAodWallpaper
- && (info == null && aodImageWallpaperEnabled
- || info != null && info.supportsAmbientMode());
+ && (info == null || info.supportsAmbientMode());
mStatusBarWindowController.setWallpaperSupportsAmbientMode(supportsAmbientMode);
mScrimController.setWallpaperSupportsAmbientMode(supportsAmbientMode);
@@ -801,7 +800,8 @@
mNotificationLogger.setUpWithContainer(notifListContainer);
mNotificationIconAreaController = SystemUIFactory.getInstance()
- .createNotificationIconAreaController(context, this, mStatusBarStateController);
+ .createNotificationIconAreaController(
+ context, this, mStatusBarStateController, mNotificationListener);
inflateShelf();
mNotificationIconAreaController.setupShelf(mNotificationShelf);
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index b588305..c903ab5 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -255,7 +255,8 @@
addRow(STREAM_ALARM,
R.drawable.ic_volume_alarm, R.drawable.ic_volume_alarm_mute, true, false);
addRow(AudioManager.STREAM_VOICE_CALL,
- R.drawable.ic_volume_voice, R.drawable.ic_volume_voice, false, false);
+ com.android.internal.R.drawable.ic_phone,
+ com.android.internal.R.drawable.ic_phone, false, false);
addRow(AudioManager.STREAM_BLUETOOTH_SCO,
R.drawable.ic_volume_bt_sco, R.drawable.ic_volume_bt_sco, false, false);
addRow(AudioManager.STREAM_SYSTEM, R.drawable.ic_volume_system,
diff --git a/packages/SystemUI/src/com/android/systemui/wallpaper/AodMaskView.java b/packages/SystemUI/src/com/android/systemui/wallpaper/AodMaskView.java
index 52cabe2..dd1d0ca 100644
--- a/packages/SystemUI/src/com/android/systemui/wallpaper/AodMaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/wallpaper/AodMaskView.java
@@ -156,6 +156,8 @@
private boolean checkIfNeedMask() {
// We need mask for ImageWallpaper / LockScreen Wallpaper (Music album art).
+ // Because of conflicting with another wallpaper feature,
+ // we only support LockScreen wallpaper currently.
return mWallpaperManager.getWallpaperInfo() == null || ScrimState.AOD.hasBackdrop();
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java
index c880172..bcf5964 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java
@@ -17,10 +17,12 @@
package com.android.systemui.statusbar;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Notification;
+import android.app.NotificationManager;
import android.os.Handler;
import android.os.UserHandle;
import android.service.notification.NotificationListenerService;
@@ -55,6 +57,7 @@
// Dependency mocks:
@Mock private NotificationEntryManager mEntryManager;
@Mock private NotificationRemoteInputManager mRemoteInputManager;
+ @Mock private NotificationManager mNotificationManager;
private NotificationListener mListener;
private StatusBarNotification mSbn;
@@ -67,6 +70,7 @@
mRemoteInputManager);
mDependency.injectTestDependency(Dependency.MAIN_HANDLER,
new Handler(TestableLooper.get(this).getLooper()));
+ mContext.addMockSystemService(NotificationManager.class, mNotificationManager);
when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
@@ -106,4 +110,28 @@
// RankingMap may be modified by plugins.
verify(mEntryManager).updateNotificationRanking(any());
}
+
+ @Test
+ public void testOnConnectReadStatusBarSetting() {
+ NotificationListener.NotificationSettingsListener settingsListener =
+ mock(NotificationListener.NotificationSettingsListener.class);
+ mListener.addNotificationSettingsListener(settingsListener);
+
+ when(mNotificationManager.shouldHideSilentStatusBarIcons()).thenReturn(true);
+
+ mListener.onListenerConnected();
+
+ verify(settingsListener).onStatusBarIconsBehaviorChanged(true);
+ }
+
+ @Test
+ public void testOnStatusBarIconsBehaviorChanged() {
+ NotificationListener.NotificationSettingsListener settingsListener =
+ mock(NotificationListener.NotificationSettingsListener.class);
+ mListener.addNotificationSettingsListener(settingsListener);
+
+ mListener.onStatusBarIconsBehaviorChanged(true);
+
+ verify(settingsListener).onStatusBarIconsBehaviorChanged(true);
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
index fdc9e0c..727e9af 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
@@ -45,7 +45,6 @@
import android.app.NotificationChannel;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.metrics.LogMaker;
import android.os.Binder;
import android.os.Handler;
import android.provider.Settings;
@@ -57,7 +56,6 @@
import android.view.View;
import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
import com.android.systemui.statusbar.NotificationPresenter;
@@ -220,34 +218,6 @@
}
@Test
- public void testOpenGutsLogging() {
- NotificationGutsManager gutsManager = spy(mGutsManager);
- doReturn(true).when(gutsManager).bindGuts(any(), any());
-
- NotificationGuts guts = spy(new NotificationGuts(mContext));
- doReturn(true).when(guts).post(any());
-
- ExpandableNotificationRow realRow = createTestNotificationRow();
- NotificationMenuRowPlugin.MenuItem menuItem = createTestMenuItem(realRow);
-
- ExpandableNotificationRow row = spy(realRow);
- when(row.getWindowToken()).thenReturn(new Binder());
- when(row.getGuts()).thenReturn(guts);
- StatusBarNotification notification = spy(realRow.getStatusBarNotification());
- when(row.getStatusBarNotification()).thenReturn(notification);
-
- assertTrue(gutsManager.openGuts(row, 0, 0, menuItem));
-
- ArgumentCaptor<LogMaker> logMakerCaptor = ArgumentCaptor.forClass(LogMaker.class);
- verify(notification).getLogMaker();
- verify(mMetricsLogger).write(logMakerCaptor.capture());
- assertEquals(MetricsProto.MetricsEvent.ACTION_NOTE_CONTROLS,
- logMakerCaptor.getValue().getCategory());
- assertEquals(MetricsProto.MetricsEvent.TYPE_ACTION,
- logMakerCaptor.getValue().getType());
- }
-
- @Test
public void testAppOpsSettingsIntent_camera() {
ArraySet<Integer> ops = new ArraySet<>();
ops.add(OP_CAMERA);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java
index 554baaf..2a64445 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java
@@ -83,7 +83,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -107,11 +106,16 @@
private NotificationChannel mDefaultNotificationChannel;
private StatusBarNotification mSbn;
- @Rule public MockitoRule mockito = MockitoJUnit.rule();
- @Mock private MetricsLogger mMetricsLogger;
- @Mock private INotificationManager mMockINotificationManager;
- @Mock private PackageManager mMockPackageManager;
- @Mock private NotificationBlockingHelperManager mBlockingHelperManager;
+ @Rule
+ public MockitoRule mockito = MockitoJUnit.rule();
+ @Mock
+ private MetricsLogger mMetricsLogger;
+ @Mock
+ private INotificationManager mMockINotificationManager;
+ @Mock
+ private PackageManager mMockPackageManager;
+ @Mock
+ private NotificationBlockingHelperManager mBlockingHelperManager;
@Before
public void setUp() throws Exception {
@@ -172,44 +176,25 @@
PollingCheck.waitFor(1000,
() -> VISIBLE == mNotificationInfo.findViewById(R.id.confirmation).getVisibility());
}
+
private void ensureNoUndoButton() {
PollingCheck.waitFor(1000,
() -> GONE == mNotificationInfo.findViewById(R.id.confirmation).getVisibility()
&& !mNotificationInfo.isAnimating());
}
+
private void waitForStopButton() {
PollingCheck.waitFor(1000,
() -> VISIBLE == mNotificationInfo.findViewById(R.id.prompt).getVisibility());
}
- class ImportanceChangeLogMaker implements ArgumentMatcher<LogMaker> {
- private static final int CATEGORY = MetricsProto.MetricsEvent.ACTION_SAVE_IMPORTANCE;
- private int mType, mSubtype;
-
- ImportanceChangeLogMaker(int type, int subtype) {
- mType = type;
- mSubtype = subtype;
- }
- public boolean matches(LogMaker l) {
- return (l.getCategory() == CATEGORY)
- && (l.getType() == mType)
- && (l.getSubtype() == mSubtype);
- }
-
- public String toString() {
- return String.format("LogMaker(%d, %d, %d)", CATEGORY, mType, mSubtype);
- }
- }
-
- private LogMaker importanceChangeLog(int type, int subtype) {
- return argThat(new ImportanceChangeLogMaker(type, subtype));
- }
-
@Test
public void testBindNotification_SetsTextApplicationName() throws Exception {
when(mMockPackageManager.getApplicationLabel(any())).thenReturn("App Name");
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null,
+ true, false,
IMPORTANCE_DEFAULT, true);
final TextView textView = mNotificationInfo.findViewById(R.id.pkgname);
assertTrue(textView.getText().toString().contains("App Name"));
@@ -330,9 +315,9 @@
@Test
public void testBindNotification_BlockButton() throws Exception {
- mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
- IMPORTANCE_DEFAULT, true);
+ mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
+ IMPORTANCE_DEFAULT, true);
final View block = mNotificationInfo.findViewById(R.id.int_block);
final View minimize = mNotificationInfo.findViewById(R.id.block_or_minimize);
assertEquals(VISIBLE, block.getVisibility());
@@ -340,7 +325,7 @@
}
@Test
- public void testBindNotification_BlockButton_BlockHelper() throws Exception {
+ public void testBindNotification_BlockButton_BlockingHelper() throws Exception {
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
true /* isBlockingHelper */, false, IMPORTANCE_DEFAULT, true);
@@ -498,13 +483,29 @@
}
@Test
- public void testLogBlockingHelperCounter_logGutsViewDisplayed() throws Exception {
+ public void testBindNotificationLogging_notBlockingHelper() throws Exception {
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null,
+ true, false,
IMPORTANCE_DEFAULT, true);
- mNotificationInfo.logBlockingHelperCounter("HowCanNotifsBeRealIfAppsArent");
verify(mMetricsLogger).write(argThat(logMaker ->
- logMaker.getCategory() == MetricsEvent.NOTIFICATION_BLOCKING_HELPER
+ logMaker.getCategory() == MetricsEvent.ACTION_NOTE_CONTROLS
+ && logMaker.getType() == MetricsEvent.TYPE_OPEN
+ && logMaker.getSubtype() == MetricsEvent.BLOCKING_HELPER_UNKNOWN
+ ));
+ }
+
+ @Test
+ public void testBindNotificationLogging_BlockingHelper() throws Exception {
+ mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null,
+ false, true,
+ true, true,
+ IMPORTANCE_DEFAULT, true);
+ verify(mMetricsLogger).write(argThat(logMaker ->
+ logMaker.getCategory() == MetricsEvent.ACTION_NOTE_CONTROLS
&& logMaker.getType() == MetricsEvent.TYPE_OPEN
&& logMaker.getSubtype() == MetricsEvent.BLOCKING_HELPER_DISPLAY
));
@@ -513,8 +514,11 @@
@Test
public void testLogBlockingHelperCounter_logsForBlockingHelper() throws Exception {
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, false, true,
- true, true, IMPORTANCE_DEFAULT, true);
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null,
+ false, true,
+ true, true,
+ IMPORTANCE_DEFAULT, true);
mNotificationInfo.logBlockingHelperCounter("HowCanNotifsBeRealIfAppsArent");
verify(mMetricsLogger).count(eq("HowCanNotifsBeRealIfAppsArent"), eq(1));
}
@@ -680,7 +684,7 @@
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
TEST_PACKAGE_NAME, mNotificationChannel /* notificationChannel */,
10 /* numUniqueChannelsInRow */, mSbn, null /* checkSaveListener */,
- null /* onSettingsClick */, null /* onAppSettingsClick */ ,
+ null /* onSettingsClick */, null /* onAppSettingsClick */,
true, false /* isNonblockable */, IMPORTANCE_DEFAULT, false
);
@@ -722,7 +726,7 @@
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
TEST_PACKAGE_NAME, mNotificationChannel /* notificationChannel */,
10 /* numUniqueChannelsInRow */, mSbn, null /* checkSaveListener */,
- null /* onSettingsClick */, null /* onAppSettingsClick */ ,
+ null /* onSettingsClick */, null /* onAppSettingsClick */,
true /* provisioned */,
false /* isNonblockable */, true /* isForBlockingHelper */,
true /* isUserSentimentNegative */, IMPORTANCE_DEFAULT, true);
@@ -744,14 +748,14 @@
}
@Test
- public void testCloseControls_nonNullCheckSaveListenerDoesntDelayKeepShowing()
+ public void testCloseControls_nonNullCheckSaveListenerDoesntDelayKeepShowing_BlockingHelper()
throws Exception {
NotificationInfo.CheckSaveListener listener =
mock(NotificationInfo.CheckSaveListener.class);
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
TEST_PACKAGE_NAME, mNotificationChannel /* notificationChannel */,
10 /* numUniqueChannelsInRow */, mSbn, listener /* checkSaveListener */,
- null /* onSettingsClick */, null /* onAppSettingsClick */ , true /* provisioned */,
+ null /* onSettingsClick */, null /* onAppSettingsClick */, true /* provisioned */,
false /* isNonblockable */, true /* isForBlockingHelper */,
true /* isUserSentimentNegative */, IMPORTANCE_DEFAULT, true);
@@ -772,14 +776,14 @@
}
@Test
- public void testCloseControls_nonNullCheckSaveListenerDoesntDelayDismiss()
+ public void testCloseControls_nonNullCheckSaveListenerDoesntDelayDismiss_BlockingHelper()
throws Exception {
NotificationInfo.CheckSaveListener listener =
mock(NotificationInfo.CheckSaveListener.class);
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
TEST_PACKAGE_NAME, mNotificationChannel /* notificationChannel */,
10 /* numUniqueChannelsInRow */, mSbn, listener /* checkSaveListener */,
- null /* onSettingsClick */, null /* onAppSettingsClick */ ,
+ null /* onSettingsClick */, null /* onAppSettingsClick */,
false /* isNonblockable */, true /* isForBlockingHelper */,
true, true /* isUserSentimentNegative */, /* isNoisy */
IMPORTANCE_DEFAULT, true);
@@ -791,7 +795,7 @@
}
@Test
- public void testCloseControls_checkSaveListenerDelaysStopNotifications()
+ public void testCloseControls_checkSaveListenerDelaysStopNotifications_BlockingHelper()
throws Exception {
NotificationInfo.CheckSaveListener listener =
mock(NotificationInfo.CheckSaveListener.class);
@@ -849,18 +853,25 @@
}
@Test
- public void testBlockChangedCallsUpdateNotificationChannel() throws Exception {
+ public void testBlockChangedCallsUpdateNotificationChannel_notBlockingHelper()
+ throws Exception {
mNotificationChannel.setImportance(IMPORTANCE_LOW);
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null,
+ true, false,
IMPORTANCE_DEFAULT, false);
mNotificationInfo.findViewById(R.id.int_block).performClick();
waitForUndoButton();
mNotificationInfo.handleCloseControls(true, false);
- verify(mMetricsLogger).write(importanceChangeLog(
- MetricsProto.MetricsEvent.TYPE_ACTION, IMPORTANCE_NONE - IMPORTANCE_LOW));
+ ArgumentCaptor<LogMaker> logMakerCaptor = ArgumentCaptor.forClass(LogMaker.class);
+ verify(mMetricsLogger, times(2)).write(logMakerCaptor.capture());
+ assertEquals(MetricsProto.MetricsEvent.TYPE_ACTION,
+ logMakerCaptor.getValue().getType());
+ assertEquals(IMPORTANCE_NONE - IMPORTANCE_LOW,
+ logMakerCaptor.getValue().getSubtype());
mTestableLooper.processAllMessages();
ArgumentCaptor<NotificationChannel> updated =
@@ -896,8 +907,12 @@
waitForUndoButton();
mNotificationInfo.handleCloseControls(true, false);
- verify(mMetricsLogger).write(importanceChangeLog(
- MetricsProto.MetricsEvent.TYPE_ACTION, IMPORTANCE_NONE - IMPORTANCE_LOW));
+ ArgumentCaptor<LogMaker> logMakerCaptor = ArgumentCaptor.forClass(LogMaker.class);
+ verify(mMetricsLogger, times(3)).write(logMakerCaptor.capture());
+ assertEquals(MetricsProto.MetricsEvent.TYPE_ACTION,
+ logMakerCaptor.getValue().getType());
+ assertEquals(IMPORTANCE_NONE - IMPORTANCE_LOW,
+ logMakerCaptor.getValue().getSubtype());
mTestableLooper.processAllMessages();
ArgumentCaptor<NotificationChannel> updated =
@@ -965,10 +980,12 @@
}
@Test
- public void testBlockUndoDoesNotBlockNotificationChannel() throws Exception {
+ public void testBlockUndoDoesNotBlockNotificationChannel_notBlockingHelper() throws Exception {
mNotificationChannel.setImportance(IMPORTANCE_LOW);
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, false,
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null,
+ true, false,
IMPORTANCE_DEFAULT, false);
mNotificationInfo.findViewById(R.id.int_block).performClick();
@@ -977,8 +994,15 @@
waitForStopButton();
// mNotificationInfo.handleCloseControls doesn't get called by this interaction.
- verify(mMetricsLogger).write(importanceChangeLog(
- MetricsProto.MetricsEvent.TYPE_DISMISS, IMPORTANCE_NONE - IMPORTANCE_LOW));
+ ArgumentCaptor<LogMaker> logMakerCaptor = ArgumentCaptor.forClass(LogMaker.class);
+ verify(mMetricsLogger, times(2)).write(logMakerCaptor.capture());
+ assertEquals(MetricsEvent.ACTION_SAVE_IMPORTANCE,
+ logMakerCaptor.getValue().getCategory());
+ assertEquals(MetricsEvent.TYPE_DISMISS,
+ logMakerCaptor.getValue().getType());
+ assertEquals(IMPORTANCE_NONE - IMPORTANCE_LOW,
+ logMakerCaptor.getValue().getSubtype());
+
mTestableLooper.processAllMessages();
verify(mMockINotificationManager, never()).updateNotificationChannelForPackage(
@@ -986,11 +1010,12 @@
}
@Test
- public void testMinUndoDoesNotMinNotificationChannel() throws Exception {
+ public void testMinUndoDoesNotMinNotificationChannel_notBlockingHelper() throws Exception {
mNotificationChannel.setImportance(IMPORTANCE_LOW);
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
- TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn, null, null, null, true, true,
- IMPORTANCE_DEFAULT, false);
+ TEST_PACKAGE_NAME, mNotificationChannel, 1, mSbn,
+ null, null, null, true,
+ true, IMPORTANCE_DEFAULT, false);
mNotificationInfo.findViewById(R.id.minimize).performClick();
waitForUndoButton();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.java
new file mode 100644
index 0000000..13145b8
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.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 com.android.systemui.statusbar.phone;
+
+import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.test.filters.SmallTest;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.statusbar.CommandQueue;
+import com.android.systemui.statusbar.NotificationListener;
+import com.android.systemui.statusbar.StatusBarStateController;
+import com.android.systemui.statusbar.phone.LightBarTransitionsController.DarkIntensityApplier;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper
+public class NotificationIconAreaControllerTest extends SysuiTestCase {
+
+ @Mock
+ private NotificationListener mListener;
+ @Mock
+ StatusBar mStatusBar;
+ @Mock
+ StatusBarStateController mStatusBarStateController;
+ private NotificationIconAreaController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+
+ mController = new NotificationIconAreaController(mContext, mStatusBar,
+ mStatusBarStateController, mListener);
+ }
+
+ @Test
+ public void testNotificationIcons_featureOff() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 0);
+ assertTrue(mController.shouldShouldLowPriorityIcons());
+ }
+
+ @Test
+ public void testNotificationIcons_featureOn_settingHideIcons() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
+ mController.mSettingsListener.onStatusBarIconsBehaviorChanged(true);
+
+ assertFalse(mController.shouldShouldLowPriorityIcons());
+ }
+
+ @Test
+ public void testNotificationIcons_featureOn_settingShowIcons() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
+ mController.mSettingsListener.onStatusBarIconsBehaviorChanged(false);
+
+ assertTrue(mController.shouldShouldLowPriorityIcons());
+ }
+}
diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml
index 8172e71..1d0b9b6 100644
--- a/packages/VpnDialogs/AndroidManifest.xml
+++ b/packages/VpnDialogs/AndroidManifest.xml
@@ -20,6 +20,7 @@
package="com.android.vpndialogs">
<uses-permission android:name="android.permission.CONTROL_VPN" />
+ <uses-permission android:name="android.permission.CONTROL_ALWAYS_ON_VPN" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<application android:label="VpnDialogs"
diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto
index 385931d..aeb4261 100644
--- a/proto/src/metrics_constants/metrics_constants.proto
+++ b/proto/src/metrics_constants/metrics_constants.proto
@@ -6910,6 +6910,11 @@
// CATEGORY: NOTIFICATION
FIELD_NOTIFICATION_CATEGORY = 1641;
+ // OPEN: Settings > Settings > Network & internet > Click Mobile network to land on page with
+ // details for a SIM/eSIM mobile network > Click edit icon to bring up a rename dialog.
+ // OS: Q
+ MOBILE_NETWORK_RENAME_DIALOG = 1642;
+
// ---- End Q Constants, all Q constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS
diff --git a/proto/src/wifi.proto b/proto/src/wifi.proto
index 84647a6..b84736b 100644
--- a/proto/src/wifi.proto
+++ b/proto/src/wifi.proto
@@ -1775,6 +1775,21 @@
}
message WifiUsabilityStatsEntry {
+ // Status codes for link probe status
+ enum LinkProbeStatus {
+ // Link probe status is unknown
+ PROBE_STATUS_UNKNOWN = 0;
+
+ // Link probe is not triggered
+ PROBE_STATUS_NO_PROBE = 1;
+
+ // Link probe is triggered and the result is success
+ PROBE_STATUS_SUCCESS = 2;
+
+ // Link probe is triggered and the result is failure
+ PROBE_STATUS_FAILURE = 3;
+ }
+
// Absolute milliseconds from device boot when these stats were sampled
optional int64 time_stamp_ms = 1;
@@ -1847,6 +1862,18 @@
// Prediction horizon (in second) of Wifi usability score provided by external
// system app
optional int32 prediction_horizon_sec = 23;
+
+ // The link probe status since last stats update
+ optional LinkProbeStatus probe_status_since_last_update = 24;
+
+ // The elapsed time of the most recent link probe since last stats update;
+ optional int32 probe_elapsed_time_ms_since_last_update = 25;
+
+ // The MCS rate of the most recent link probe since last stats update
+ optional int32 probe_mcs_rate_since_last_update = 26;
+
+ // Rx link speed at the sample time in Mbps
+ optional int32 rx_link_speed_mbps = 27;
}
message WifiUsabilityStats {
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index f88d521..47cd917 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -3024,9 +3024,19 @@
}
public void clearAccessibilityFocusNotLocked(int windowId) {
- AccessibilityNodeInfo focus = getAccessibilityFocusNotLocked(windowId);
- if (focus != null) {
- focus.performAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
+ RemoteAccessibilityConnection connection;
+ synchronized (mLock) {
+ connection = getConnectionLocked(windowId);
+ if (connection == null) {
+ return;
+ }
+ }
+ try {
+ connection.getRemote().clearAccessibilityFocus();
+ } catch (RemoteException re) {
+ if (DEBUG) {
+ Slog.e(LOG_TAG, "Error calling clearAccessibilityFocus()");
+ }
}
}
diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
index 7d228f1..8b2c1b9 100644
--- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
@@ -1863,7 +1863,7 @@
// The agent was running with a stub Application object, so shut it down.
// !!! We hardcode the confirmation UI's package name here rather than use a
// manifest flag! TODO something less direct.
- if (app.uid >= Process.FIRST_APPLICATION_UID
+ if (!UserHandle.isCore(app.uid)
&& !app.packageName.equals("com.android.backupconfirm")) {
if (MORE_DEBUG) Slog.d(TAG, "Killing agent host process");
mActivityManager.killApplicationProcess(app.processName, app.uid);
diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
index 7763d7b..324c2d9 100644
--- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
+++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
@@ -45,9 +45,9 @@
import android.os.Bundle;
import android.os.Message;
import android.os.ParcelFileDescriptor;
-import android.os.Process;
import android.os.RemoteException;
import android.os.SystemClock;
+import android.os.UserHandle;
import android.util.EventLog;
import android.util.Slog;
@@ -1174,7 +1174,7 @@
// b. the app does not state android:killAfterRestore="false" in its manifest
final int appFlags = mCurrentPackage.applicationInfo.flags;
final boolean killAfterRestore =
- (mCurrentPackage.applicationInfo.uid >= Process.FIRST_APPLICATION_UID)
+ !UserHandle.isCore(mCurrentPackage.applicationInfo.uid)
&& ((mRestoreDescription.getDataType()
== RestoreDescription.TYPE_FULL_STREAM)
|| ((appFlags & ApplicationInfo.FLAG_KILL_AFTER_RESTORE) != 0));
diff --git a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java
index 2db8928..7ee3047 100644
--- a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java
+++ b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java
@@ -31,7 +31,6 @@
import android.content.pm.PackageManagerInternal;
import android.content.pm.Signature;
import android.content.pm.SigningInfo;
-import android.os.Process;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Slog;
@@ -72,7 +71,7 @@
}
// 2. they run as a system-level uid
- if ((app.uid < Process.FIRST_APPLICATION_UID)) {
+ if (UserHandle.isCore(app.uid)) {
// and the backup is happening for non-system user
if (userId != UserHandle.USER_SYSTEM && !app.packageName.equals(
PACKAGE_MANAGER_SENTINEL)) {
diff --git a/services/backup/java/com/android/server/backup/utils/RestoreUtils.java b/services/backup/java/com/android/server/backup/utils/RestoreUtils.java
index cce5b3b..97bde9c 100644
--- a/services/backup/java/com/android/server/backup/utils/RestoreUtils.java
+++ b/services/backup/java/com/android/server/backup/utils/RestoreUtils.java
@@ -34,7 +34,7 @@
import android.content.pm.Signature;
import android.os.Bundle;
import android.os.IBinder;
-import android.os.Process;
+import android.os.UserHandle;
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
@@ -162,7 +162,7 @@
if (AppBackupUtils.signaturesMatch(sigs, pkg, pmi)) {
// If this is a system-uid app without a declared backup agent,
// don't restore any of the file data.
- if ((pkg.applicationInfo.uid < Process.FIRST_APPLICATION_UID)
+ if (UserHandle.isCore(pkg.applicationInfo.uid)
&& (pkg.applicationInfo.backupAgentName == null)) {
Slog.w(TAG, "Installed app " + info.packageName
+ " has restricted uid and no agent");
diff --git a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java
index f4b235a..f3b8098 100644
--- a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java
+++ b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java
@@ -53,7 +53,7 @@
import android.content.pm.PackageManagerInternal;
import android.content.pm.Signature;
import android.os.Bundle;
-import android.os.Process;
+import android.os.UserHandle;
import android.util.Slog;
import com.android.server.backup.FileMetadata;
@@ -404,8 +404,7 @@
if ((flags & ApplicationInfo.FLAG_ALLOW_BACKUP) != 0) {
// Restore system-uid-space packages only if they have
// defined a custom backup agent
- if ((pkgInfo.applicationInfo.uid
- >= Process.FIRST_APPLICATION_UID)
+ if (!UserHandle.isCore(pkgInfo.applicationInfo.uid)
|| (pkgInfo.applicationInfo.backupAgentName != null)) {
// Verify signatures against any installed version; if they
// don't match, then we fall though and ignore the data. The
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1519c17..58263fc 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -40,6 +40,7 @@
import static android.net.NetworkPolicyManager.uidRulesToString;
import static android.net.NetworkStack.NETWORKSTACK_PACKAGE_NAME;
import static android.net.shared.NetworkMonitorUtils.isValidationRequired;
+import static android.net.shared.NetworkParcelableUtil.toStableParcelable;
import static android.os.Process.INVALID_UID;
import static android.system.OsConstants.IPPROTO_TCP;
import static android.system.OsConstants.IPPROTO_UDP;
@@ -78,6 +79,7 @@
import android.net.NetworkAgent;
import android.net.NetworkCapabilities;
import android.net.NetworkConfig;
+import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc;
@@ -98,10 +100,10 @@
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.NetworkEvent;
import android.net.netlink.InetDiagMessage;
-import android.net.shared.NetdService;
import android.net.shared.NetworkMonitorUtils;
import android.net.shared.PrivateDnsConfig;
import android.net.util.MultinetworkPolicyTracker;
+import android.net.util.NetdService;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
@@ -144,6 +146,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats;
+import com.android.internal.logging.MetricsLogger;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo;
@@ -2683,6 +2686,11 @@
EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE,
mNai.network.netId));
}
+
+ @Override
+ public void logCaptivePortalLoginEvent(int eventId, String packageName) {
+ new MetricsLogger().action(eventId, packageName);
+ }
}
private boolean networkRequiresValidation(NetworkAgentInfo nai) {
@@ -2772,8 +2780,17 @@
for (NetworkRequestInfo nri : mNetworkRequests.values()) {
if (nri.request.isListen()) continue;
NetworkAgentInfo nai = getNetworkForRequest(nri.request.requestId);
- ac.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK,
- (nai != null ? nai.getCurrentScore() : 0), 0, nri.request);
+ final int score;
+ final int serial;
+ if (nai != null) {
+ score = nai.getCurrentScore();
+ serial = nai.factorySerialNumber;
+ } else {
+ score = 0;
+ serial = NetworkFactory.SerialNumber.NONE;
+ }
+ ac.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK, score, serial,
+ nri.request);
}
} else {
loge("Error connecting NetworkFactory");
@@ -2870,7 +2887,7 @@
NetworkAgentInfo currentNetwork = getNetworkForRequest(request.requestId);
if (currentNetwork != null && currentNetwork.network.netId == nai.network.netId) {
clearNetworkForRequest(request.requestId);
- sendUpdatedScoreToFactories(request, 0);
+ sendUpdatedScoreToFactories(request, null);
}
}
nai.clearLingerState();
@@ -2946,7 +2963,7 @@
}
rematchAllNetworksAndRequests(null, 0);
if (nri.request.isRequest() && getNetworkForRequest(nri.request.requestId) == null) {
- sendUpdatedScoreToFactories(nri.request, 0);
+ sendUpdatedScoreToFactories(nri.request, null);
}
}
@@ -4531,11 +4548,14 @@
public final String name;
public final Messenger messenger;
public final AsyncChannel asyncChannel;
+ public final int factorySerialNumber;
- public NetworkFactoryInfo(String name, Messenger messenger, AsyncChannel asyncChannel) {
+ NetworkFactoryInfo(String name, Messenger messenger, AsyncChannel asyncChannel,
+ int factorySerialNumber) {
this.name = name;
this.messenger = messenger;
this.asyncChannel = asyncChannel;
+ this.factorySerialNumber = factorySerialNumber;
}
}
@@ -4896,10 +4916,12 @@
}
@Override
- public void registerNetworkFactory(Messenger messenger, String name) {
+ public int registerNetworkFactory(Messenger messenger, String name) {
enforceConnectivityInternalPermission();
- NetworkFactoryInfo nfi = new NetworkFactoryInfo(name, messenger, new AsyncChannel());
+ NetworkFactoryInfo nfi = new NetworkFactoryInfo(name, messenger, new AsyncChannel(),
+ NetworkFactory.SerialNumber.nextSerialNumber());
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_FACTORY, nfi));
+ return nfi.factorySerialNumber;
}
private void handleRegisterNetworkFactory(NetworkFactoryInfo nfi) {
@@ -4991,9 +5013,35 @@
return nri.request.requestId == mDefaultRequest.requestId;
}
+ // TODO : remove this method. It's a stopgap measure to help sheperding a number of dependent
+ // changes that would conflict throughout the automerger graph. Having this method temporarily
+ // helps with the process of going through with all these dependent changes across the entire
+ // tree.
public int registerNetworkAgent(Messenger messenger, NetworkInfo networkInfo,
LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
int currentScore, NetworkMisc networkMisc) {
+ return registerNetworkAgent(messenger, networkInfo, linkProperties, networkCapabilities,
+ currentScore, networkMisc, NetworkFactory.SerialNumber.NONE);
+ }
+
+ /**
+ * Register a new agent with ConnectivityService to handle a network.
+ *
+ * @param messenger a messenger for ConnectivityService to contact the agent asynchronously.
+ * @param networkInfo the initial info associated with this network. It can be updated later :
+ * see {@link #updateNetworkInfo}.
+ * @param linkProperties the initial link properties of this network. They can be updated
+ * later : see {@link #updateLinkProperties}.
+ * @param networkCapabilities the initial capabilites of this network. They can be updated
+ * later : see {@link #updateNetworkCapabilities}.
+ * @param currentScore the initial score of the network. See
+ * {@link NetworkAgentInfo#getCurrentScore}.
+ * @param networkMisc metadata about the network. This is never updated.
+ * @param factorySerialNumber the serial number of the factory owning this NetworkAgent.
+ */
+ public int registerNetworkAgent(Messenger messenger, NetworkInfo networkInfo,
+ LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
+ int currentScore, NetworkMisc networkMisc, int factorySerialNumber) {
enforceConnectivityInternalPermission();
LinkProperties lp = new LinkProperties(linkProperties);
@@ -5003,7 +5051,8 @@
final NetworkCapabilities nc = new NetworkCapabilities(networkCapabilities);
final NetworkAgentInfo nai = new NetworkAgentInfo(messenger, new AsyncChannel(),
new Network(reserveNetId()), new NetworkInfo(networkInfo), lp, nc, currentScore,
- mContext, mTrackerHandler, new NetworkMisc(networkMisc), this, mNetd, mNMS);
+ mContext, mTrackerHandler, new NetworkMisc(networkMisc), this, mNetd, mNMS,
+ factorySerialNumber);
// Make sure the network capabilities reflect what the agent info says.
nai.networkCapabilities = mixInCapabilities(nai, nc);
final String extraInfo = networkInfo.getExtraInfo();
@@ -5012,8 +5061,8 @@
if (DBG) log("registerNetworkAgent " + nai);
final long token = Binder.clearCallingIdentity();
try {
- mContext.getSystemService(NetworkStack.class)
- .makeNetworkMonitor(nai.network, name, new NetworkMonitorCallbacks(nai));
+ mContext.getSystemService(NetworkStack.class).makeNetworkMonitor(
+ toStableParcelable(nai.network), name, new NetworkMonitorCallbacks(nai));
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -5419,17 +5468,23 @@
NetworkRequest nr = nai.requestAt(i);
// Don't send listening requests to factories. b/17393458
if (nr.isListen()) continue;
- sendUpdatedScoreToFactories(nr, nai.getCurrentScore());
+ sendUpdatedScoreToFactories(nr, nai);
}
}
- private void sendUpdatedScoreToFactories(NetworkRequest networkRequest, int score) {
+ private void sendUpdatedScoreToFactories(NetworkRequest networkRequest, NetworkAgentInfo nai) {
+ int score = 0;
+ int serial = 0;
+ if (nai != null) {
+ score = nai.getCurrentScore();
+ serial = nai.factorySerialNumber;
+ }
if (VDBG || DDBG){
log("sending new Min Network Score(" + score + "): " + networkRequest.toString());
}
for (NetworkFactoryInfo nfi : mNetworkFactoryInfos.values()) {
- nfi.asyncChannel.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK, score, 0,
- networkRequest);
+ nfi.asyncChannel.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK, score,
+ serial, networkRequest);
}
}
@@ -5705,7 +5760,7 @@
// TODO - this could get expensive if we have a lot of requests for this
// network. Think about if there is a way to reduce this. Push
// netid->request mapping to each factory?
- sendUpdatedScoreToFactories(nri.request, score);
+ sendUpdatedScoreToFactories(nri.request, newNetwork);
if (isDefaultRequest(nri)) {
isNewDefault = true;
oldDefaultNetwork = currentNetwork;
@@ -5729,7 +5784,7 @@
newNetwork.removeRequest(nri.request.requestId);
if (currentNetwork == newNetwork) {
clearNetworkForRequest(nri.request.requestId);
- sendUpdatedScoreToFactories(nri.request, 0);
+ sendUpdatedScoreToFactories(nri.request, null);
} else {
Slog.wtf(TAG, "BUG: Removing request " + nri.request.requestId + " from " +
newNetwork.name() +
diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java
index 371276f..126bf65 100644
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -44,7 +44,7 @@
import android.net.Network;
import android.net.NetworkUtils;
import android.net.TrafficStats;
-import android.net.shared.NetdService;
+import android.net.util.NetdService;
import android.os.Binder;
import android.os.IBinder;
import android.os.ParcelFileDescriptor;
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index b3997ef..f505b76 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -62,7 +62,7 @@
import android.net.RouteInfo;
import android.net.TetherStatsParcel;
import android.net.UidRange;
-import android.net.shared.NetdService;
+import android.net.util.NetdService;
import android.os.BatteryStats;
import android.os.Binder;
import android.os.Handler;
diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index 84577f1..4507193 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -21,6 +21,7 @@
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.content.Context;
+import android.content.pm.VersionedPackage;
import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
@@ -230,7 +231,6 @@
return null;
}
- // TODO(zezeozue:) Accept current versionCodes of failing packages?
/**
* Called when a process fails either due to a crash or ANR.
*
@@ -239,15 +239,16 @@
*
* <p>This method could be called frequently if there is a severe problem on the device.
*/
- public void onPackageFailure(String[] packages) {
+ public void onPackageFailure(List<VersionedPackage> packages) {
mWorkerHandler.post(() -> {
synchronized (mLock) {
if (mAllObservers.isEmpty()) {
return;
}
- for (int pIndex = 0; pIndex < packages.length; pIndex++) {
- String packageToReport = packages[pIndex];
+ 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
PackageHealthObserver currentObserverToNotify = null;
int currentObserverImpact = Integer.MAX_VALUE;
@@ -258,7 +259,8 @@
PackageHealthObserver registeredObserver = observer.mRegisteredObserver;
if (registeredObserver != null
&& observer.onPackageFailure(packageToReport)) {
- int impact = registeredObserver.onHealthCheckFailed(packageToReport);
+ int impact = registeredObserver.onHealthCheckFailed(packageToReport,
+ packageVersionCode);
if (impact != PackageHealthObserverImpact.USER_IMPACT_NONE
&& impact < currentObserverImpact) {
currentObserverToNotify = registeredObserver;
@@ -269,7 +271,7 @@
// Execute action with least user impact
if (currentObserverToNotify != null) {
- currentObserverToNotify.execute(packageToReport);
+ currentObserverToNotify.execute(packageToReport, packageVersionCode);
}
}
}
@@ -313,14 +315,14 @@
* @return any one of {@link PackageHealthObserverImpact} to express the impact
* to the user on {@link #execute}
*/
- @PackageHealthObserverImpact int onHealthCheckFailed(String packageName);
+ @PackageHealthObserverImpact int onHealthCheckFailed(String packageName, long versionCdoe);
/**
* Executes mitigation for {@link #onHealthCheckFailed}.
*
* @return {@code true} if action was executed successfully, {@code false} otherwise
*/
- boolean execute(String packageName);
+ boolean execute(String packageName, long versionCode);
// 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 f6e698f..9b9911a 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -593,7 +593,7 @@
Vibration vib = new Vibration(token, effect, usageHint, uid, opPkg, reason);
if (mProcStatesCache.get(uid, ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND)
> ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND
- && vib.isHapticFeedback()) {
+ && !vib.isNotification() && !vib.isRingtone()) {
Slog.e(TAG, "Ignoring incoming vibration as process with uid = "
+ uid + " is background");
return;
diff --git a/services/core/java/com/android/server/am/ActiveInstrumentation.java b/services/core/java/com/android/server/am/ActiveInstrumentation.java
index 15de3de..9510f59 100644
--- a/services/core/java/com/android/server/am/ActiveInstrumentation.java
+++ b/services/core/java/com/android/server/am/ActiveInstrumentation.java
@@ -49,6 +49,9 @@
// Connection to use the UI introspection APIs.
IUiAutomationConnection mUiAutomationConnection;
+ // Whether the caller holds START_ACTIVITIES_FROM_BACKGROUND permission
+ boolean mHasBackgroundActivityStartsPermission;
+
// As given to us
Bundle mArguments;
@@ -117,6 +120,8 @@
pw.print(prefix); pw.print("mUiAutomationConnection=");
pw.println(mUiAutomationConnection);
}
+ pw.print("mHasBackgroundActivityStartsPermission=");
+ pw.println(mHasBackgroundActivityStartsPermission);
pw.print(prefix); pw.print("mArguments=");
pw.println(mArguments);
}
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 15d7efb..d95604e 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -3318,8 +3318,7 @@
}
private boolean collectPackageServicesLocked(String packageName, Set<String> filterByClasses,
- boolean evenPersistent, boolean doit, boolean killProcess,
- ArrayMap<ComponentName, ServiceRecord> services) {
+ boolean evenPersistent, boolean doit, ArrayMap<ComponentName, ServiceRecord> services) {
boolean didSomething = false;
for (int i = services.size() - 1; i >= 0; i--) {
ServiceRecord service = services.valueAt(i);
@@ -3334,13 +3333,10 @@
}
didSomething = true;
Slog.i(TAG, " Force stopping service " + service);
- if (service.app != null) {
- service.app.removed = killProcess;
- if (!service.app.isPersistent()) {
- service.app.services.remove(service);
- if (service.whitelistManager) {
- updateWhitelistManagerLocked(service.app);
- }
+ if (service.app != null && !service.app.isPersistent()) {
+ service.app.services.remove(service);
+ if (service.whitelistManager) {
+ updateWhitelistManagerLocked(service.app);
}
}
service.setProcess(null);
@@ -3355,7 +3351,7 @@
}
boolean bringDownDisabledPackageServicesLocked(String packageName, Set<String> filterByClasses,
- int userId, boolean evenPersistent, boolean killProcess, boolean doit) {
+ int userId, boolean evenPersistent, boolean doit) {
boolean didSomething = false;
if (mTmpCollectionResults != null) {
@@ -3365,8 +3361,7 @@
if (userId == UserHandle.USER_ALL) {
for (int i = mServiceMap.size() - 1; i >= 0; i--) {
didSomething |= collectPackageServicesLocked(packageName, filterByClasses,
- evenPersistent, doit, killProcess,
- mServiceMap.valueAt(i).mServicesByInstanceName);
+ evenPersistent, doit, mServiceMap.valueAt(i).mServicesByInstanceName);
if (!doit && didSomething) {
return true;
}
@@ -3379,7 +3374,7 @@
if (smap != null) {
ArrayMap<ComponentName, ServiceRecord> items = smap.mServicesByInstanceName;
didSomething = collectPackageServicesLocked(packageName, filterByClasses,
- evenPersistent, doit, killProcess, items);
+ evenPersistent, doit, items);
}
if (doit && filterByClasses == null) {
forceStopPackageLocked(packageName, userId);
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index ffed2e0..66e9eb3a 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -22,6 +22,7 @@
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
import static android.Manifest.permission.REMOVE_TASKS;
+import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;
import static android.app.ActivityManager.INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS;
import static android.app.ActivityManager.INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL;
import static android.app.ActivityManager.PROCESS_STATE_LAST_ACTIVITY;
@@ -2217,7 +2218,7 @@
mConstants = hasHandlerThread ? new ActivityManagerConstants(this, mHandler) : null;
final ActiveUids activeUids = new ActiveUids(this, false /* postChangesToAtm */);
mProcessList.init(this, activeUids);
- mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids);
+ mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids, new Object());
mIntentFirewall = hasHandlerThread
? new IntentFirewall(new IntentFirewallInterface(), mHandler) : null;
@@ -2265,7 +2266,7 @@
mConstants = new ActivityManagerConstants(this, mHandler);
final ActiveUids activeUids = new ActiveUids(this, true /* postChangesToAtm */);
mProcessList.init(this, activeUids);
- mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids);
+ mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids, atm.getGlobalLock());
// Broadcast policy parameters
final BroadcastConstants foreConstants = new BroadcastConstants(
@@ -3091,7 +3092,7 @@
} else {
UidRecord validateUid = mValidateUids.get(item.uid);
if (validateUid == null) {
- validateUid = new UidRecord(item.uid, mAtmInternal);
+ validateUid = new UidRecord(item.uid);
mValidateUids.put(item.uid, validateUid);
}
if ((item.change & UidRecord.CHANGE_IDLE) != 0) {
@@ -3891,7 +3892,7 @@
}
synchronized (this) {
mProcessList.killPackageProcessesLocked(packageName, appId, targetUserId,
- ProcessList.SERVICE_ADJ, false, true, true, false, "kill background");
+ ProcessList.SERVICE_ADJ, "kill background");
}
}
} finally {
@@ -4252,7 +4253,7 @@
}
private void cleanupDisabledPackageComponentsLocked(
- String packageName, int userId, boolean killProcess, String[] changedClasses) {
+ String packageName, int userId, String[] changedClasses) {
Set<String> disabledClasses = null;
boolean packageDisabled = false;
@@ -4315,7 +4316,7 @@
// Clean-up disabled services.
mServices.bringDownDisabledPackageServicesLocked(
- packageName, disabledClasses, userId, false, killProcess, true);
+ packageName, disabledClasses, userId, false /* evenPersistent */, true /* doIt */);
// Clean-up disabled providers.
ArrayList<ContentProviderRecord> providers = new ArrayList<>();
@@ -4372,14 +4373,15 @@
}
boolean didSomething = mProcessList.killPackageProcessesLocked(packageName, appId, userId,
- ProcessList.INVALID_ADJ, callerWillRestart, true, doit, evenPersistent,
+ ProcessList.INVALID_ADJ, callerWillRestart, true /* allowRestart */, doit,
+ evenPersistent, true /* setRemoved */,
packageName == null ? ("stop user " + userId) : ("stop " + packageName));
didSomething |=
mAtmInternal.onForceStopPackage(packageName, doit, evenPersistent, userId);
if (mServices.bringDownDisabledPackageServicesLocked(
- packageName, null, userId, evenPersistent, true, doit)) {
+ packageName, null /* filterByClasses */, userId, evenPersistent, doit)) {
if (!doit) {
return true;
}
@@ -8336,9 +8338,10 @@
synchronized (this) {
final long identity = Binder.clearCallingIdentity();
try {
- mProcessList.killPackageProcessesLocked(null, appId, userId,
- ProcessList.PERSISTENT_PROC_ADJ, false, true, true, true,
- reason != null ? reason : "kill uid");
+ mProcessList.killPackageProcessesLocked(null /* packageName */, appId, userId,
+ ProcessList.PERSISTENT_PROC_ADJ, false /* callerWillRestart */,
+ true /* callerWillRestart */, true /* doit */, true /* evenPersistent */,
+ false /* setRemoved */, reason != null ? reason : "kill uid");
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -14573,10 +14576,9 @@
-1);
mProcessList.killPackageProcessesLocked(ssp,
UserHandle.getAppId(extraUid),
- userId, ProcessList.INVALID_ADJ,
- false, true, true, false, "change " + ssp);
+ userId, ProcessList.INVALID_ADJ, "change " + ssp);
}
- cleanupDisabledPackageComponentsLocked(ssp, userId, killProcess,
+ cleanupDisabledPackageComponentsLocked(ssp, userId,
intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST));
}
@@ -15194,7 +15196,9 @@
IInstrumentationWatcher watcher, IUiAutomationConnection uiAutomationConnection,
int userId, String abiOverride) {
enforceNotIsolatedCaller("startInstrumentation");
- userId = mUserController.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
+ final int callingUid = Binder.getCallingUid();
+ final int callingPid = Binder.getCallingPid();
+ userId = mUserController.handleIncomingUser(callingPid, callingUid,
userId, false, ALLOW_FULL_ONLY, "startInstrumentation", null);
// Refuse possible leaked file descriptors
if (arguments != null && arguments.hasFileDescriptors()) {
@@ -15259,6 +15263,9 @@
activeInstr.mWatcher = watcher;
activeInstr.mUiAutomationConnection = uiAutomationConnection;
activeInstr.mResultClass = className;
+ activeInstr.mHasBackgroundActivityStartsPermission = checkPermission(
+ START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)
+ == PackageManager.PERMISSION_GRANTED;
boolean disableHiddenApiChecks = ai.usesNonSdkApi()
|| (flags & INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;
@@ -17232,10 +17239,8 @@
// We don't kill persistent processes.
continue;
}
- if (app.removed) {
- procs.add(app);
- } else if (app.userId == userHandle && app.hasForegroundActivities()) {
- app.removed = true;
+ if (app.removed
+ || (app.userId == userHandle && app.hasForegroundActivities())) {
procs.add(app);
}
}
@@ -18080,8 +18085,7 @@
try {
synchronized(this) {
mProcessList.killPackageProcessesLocked(packageName, UserHandle.getAppId(pkgUid),
- userId, ProcessList.FOREGROUND_APP_ADJ, false, true, true, false,
- "dep: " + packageName);
+ userId, ProcessList.FOREGROUND_APP_ADJ, "dep: " + packageName);
}
} finally {
Binder.restoreCallingIdentity(callingId);
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index a634b57..f153ab9 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -34,6 +34,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
+import android.content.pm.VersionedPackage;
import android.net.Uri;
import android.os.Binder;
import android.os.Message;
@@ -60,6 +61,7 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.Collections;
+import java.util.List;
/**
* Controls error conditions in applications.
@@ -411,7 +413,7 @@
} else {
// If a non-persistent app is stuck in crash loop, we want to inform
// the package watchdog, maybe an update or experiment can be rolled back.
- mPackageWatchdog.onPackageFailure(r.getPackageList());
+ mPackageWatchdog.onPackageFailure(r.getPackageListWithVersionCode());
}
}
@@ -830,7 +832,7 @@
void handleShowAnrUi(Message msg) {
Dialog dialogToShow = null;
- String[] packageList = null;
+ List<VersionedPackage> packageList = null;
synchronized (mService) {
AppNotRespondingDialog.Data data = (AppNotRespondingDialog.Data) msg.obj;
final ProcessRecord proc = data.proc;
@@ -839,7 +841,7 @@
return;
}
if (!proc.isPersistent()) {
- packageList = proc.getPackageList();
+ packageList = proc.getPackageListWithVersionCode();
}
if (proc.anrDialog != null) {
Slog.e(TAG, "App already has anr dialog: " + proc);
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index 64a36ef..1fb11ba 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -450,7 +450,7 @@
if (state == BroadcastRecord.IDLE) {
Slog.w(TAG, "finishReceiver [" + mQueueName + "] called but state is IDLE");
}
- if (r.allowBackgroundActivityStarts) {
+ if (r.allowBackgroundActivityStarts && r.curApp != null) {
r.curApp.removeAllowBackgroundActivityStartsToken(r);
}
// If we're abandoning this broadcast before any receivers were actually spun up,
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 6e8646e..4985c52 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -127,8 +127,18 @@
private final ActivityManagerService mService;
private final ProcessList mProcessList;
- OomAdjuster(ActivityManagerService service, ProcessList processList, ActiveUids activeUids) {
+ /**
+ * Used to lock {@link #updateOomAdjImpl} for state consistency. It also reduces frequency lock
+ * and unlock when getting and setting value to {@link ProcessRecord#mWindowProcessController}.
+ * Note it is declared as Object type so the locked-region-code-injection won't wrap the
+ * unnecessary priority booster.
+ */
+ private final Object mAtmGlobalLock;
+
+ OomAdjuster(ActivityManagerService service, ProcessList processList, ActiveUids activeUids,
+ Object atmGlobalLock) {
mService = service;
+ mAtmGlobalLock = atmGlobalLock;
mProcessList = processList;
mActiveUids = activeUids;
@@ -186,6 +196,13 @@
@GuardedBy("mService")
final void updateOomAdjLocked() {
+ synchronized (mAtmGlobalLock) {
+ updateOomAdjImpl();
+ }
+ }
+
+ @GuardedBy({"mService", "mAtmGlobalLock"})
+ private void updateOomAdjImpl() {
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "updateOomAdj");
mService.mOomAdjProfiler.oomAdjStarted();
final ProcessRecord TOP_APP = mService.getTopAppLocked();
@@ -534,6 +551,7 @@
uidRec.setProcState = uidRec.getCurProcState();
uidRec.setWhitelist = uidRec.curWhitelist;
uidRec.setIdle = uidRec.idle;
+ mService.mAtmInternal.onUidProcStateChanged(uidRec.uid, uidRec.setProcState);
mService.enqueueUidChangeLocked(uidRec, -1, uidChange);
mService.noteUidProcessState(uidRec.uid, uidRec.getCurProcState());
if (uidRec.foregroundServices) {
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index c2e7763..49c4bc4 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -2043,25 +2043,25 @@
// We don't kill persistent processes.
continue;
}
- if (app.removed) {
- procs.add(app);
- } else if (app.setAdj >= ProcessList.CACHED_APP_MIN_ADJ) {
- app.removed = true;
+ if (app.removed || app.setAdj >= ProcessList.CACHED_APP_MIN_ADJ) {
procs.add(app);
}
}
}
+ }
- final int N = procs.size();
- for (int i = 0; i < N; i++) {
- removeProcessLocked(procs.get(i), false, true, "kill all background");
- }
+ @GuardedBy("mService")
+ boolean killPackageProcessesLocked(String packageName, int appId, int userId, int minOomAdj,
+ String reason) {
+ return killPackageProcessesLocked(packageName, appId, userId, minOomAdj,
+ false /* callerWillRestart */, true /* allowRestart */, true /* doit */,
+ false /* evenPersistent */, false /* setRemoved */, reason);
}
@GuardedBy("mService")
final boolean killPackageProcessesLocked(String packageName, int appId,
int userId, int minOomAdj, boolean callerWillRestart, boolean allowRestart,
- boolean doit, boolean evenPersistent, String reason) {
+ boolean doit, boolean evenPersistent, boolean setRemoved, String reason) {
ArrayList<ProcessRecord> procs = new ArrayList<>();
// Remove all processes this package may have touched: all with the
@@ -2119,7 +2119,9 @@
if (!doit) {
return true;
}
- app.removed = true;
+ if (setRemoved) {
+ app.removed = true;
+ }
procs.add(app);
}
}
@@ -2195,7 +2197,7 @@
}
UidRecord uidRec = mActiveUids.get(proc.uid);
if (uidRec == null) {
- uidRec = new UidRecord(proc.uid, mService.mAtmInternal);
+ uidRec = new UidRecord(proc.uid);
// This is the first appearance of the uid, report it now!
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
"Creating new process uid: " + uidRec);
@@ -2353,11 +2355,8 @@
final int NA = apps.size();
for (int ia = 0; ia < NA; ia++) {
final ProcessRecord app = apps.valueAt(ia);
- if (app.removed) {
- procs.add(app);
- } else if ((minTargetSdk < 0 || app.info.targetSdkVersion < minTargetSdk)
- && (maxProcState < 0 || app.setProcState > maxProcState)) {
- app.removed = true;
+ if (app.removed || ((minTargetSdk < 0 || app.info.targetSdkVersion < minTargetSdk)
+ && (maxProcState < 0 || app.setProcState > maxProcState))) {
procs.add(app);
}
}
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 7e52463..6161f7d 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -32,6 +32,7 @@
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.ServiceInfo;
+import android.content.pm.VersionedPackage;
import android.content.res.CompatibilityInfo;
import android.os.Binder;
import android.os.Debug;
@@ -66,6 +67,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
/**
* Full information about a particular process that
@@ -266,7 +268,9 @@
boolean forceCrashReport; // suppress normal auto-dismiss of crash dialog & report UI?
private boolean mNotResponding; // does the app have a not responding dialog?
Dialog anrDialog; // dialog being displayed due to app not resp.
- boolean removed; // has app package been removed from device?
+ volatile boolean removed; // Whether this process should be killed and removed from process
+ // list. It is set when the package is force-stopped or the process
+ // has crashed too many times.
private boolean mDebugging; // was app launched for debugging?
boolean waitedForDebugger; // has process show wait for debugger dialog?
Dialog waitDialog; // current wait for debugger dialog
@@ -651,10 +655,6 @@
return mWindowProcessController.hasActivities();
}
- void clearActivities() {
- mWindowProcessController.clearActivities();
- }
-
boolean hasActivitiesOrRecentTasks() {
return mWindowProcessController.hasActivitiesOrRecentTasks();
}
@@ -663,10 +663,6 @@
return mWindowProcessController.hasRecentTasks();
}
- void clearRecentTasks() {
- mWindowProcessController.clearRecentTasks();
- }
-
/**
* This method returns true if any of the activities within the process record are interesting
* to the user. See HistoryRecord.isInterestingToUserLocked()
@@ -972,6 +968,18 @@
return list;
}
+ public List<VersionedPackage> getPackageListWithVersionCode() {
+ int size = pkgList.size();
+ if (size == 0) {
+ return null;
+ }
+ List<VersionedPackage> list = new ArrayList<>();
+ for (int i = 0; i < pkgList.size(); i++) {
+ list.add(new VersionedPackage(pkgList.keyAt(i), pkgList.valueAt(i).appVersion));
+ }
+ return list;
+ }
+
WindowProcessController getWindowProcessController() {
return mWindowProcessController;
}
@@ -1165,6 +1173,8 @@
void setActiveInstrumentation(ActiveInstrumentation instr) {
mInstr = instr;
mWindowProcessController.setInstrumenting(instr != null);
+ mWindowProcessController.setInstrumentingWithBackgroundActivityStartPrivileges(instr != null
+ && instr.mHasBackgroundActivityStartsPermission);
}
ActiveInstrumentation getActiveInstrumentation() {
@@ -1236,10 +1246,8 @@
}
@Override
- public void setRemoved(boolean removed) {
- synchronized (mService) {
- this.removed = removed;
- }
+ public boolean isRemoved() {
+ return removed;
}
/**
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 5c60900..e731f34 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -77,6 +77,7 @@
// permission in the corresponding .te file your feature belongs to.
@VisibleForTesting
static final String[] sDeviceConfigScopes = new String[] {
+ DeviceConfig.ActivityManagerNativeBoot.NAMESPACE,
DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
DeviceConfig.NAMESPACE_NETD_NATIVE,
DeviceConfig.RuntimeNative.NAMESPACE,
diff --git a/services/core/java/com/android/server/am/UidRecord.java b/services/core/java/com/android/server/am/UidRecord.java
index 6cb1097..22a7de7 100644
--- a/services/core/java/com/android/server/am/UidRecord.java
+++ b/services/core/java/com/android/server/am/UidRecord.java
@@ -26,7 +26,6 @@
import android.util.proto.ProtoUtils;
import com.android.internal.annotations.GuardedBy;
-import com.android.server.wm.ActivityTaskManagerInternal;
/**
* Overall information about a uid that has actively running processes.
@@ -43,7 +42,6 @@
boolean idle;
boolean setIdle;
int numProcs;
- final ActivityTaskManagerInternal mAtmInternal;
/**
* Sequence number associated with the {@link #mCurProcState}. This is incremented using
@@ -117,10 +115,9 @@
ChangeItem pendingChange;
int lastReportedChange;
- public UidRecord(int _uid, ActivityTaskManagerInternal atmInternal) {
+ public UidRecord(int _uid) {
uid = _uid;
idle = true;
- mAtmInternal = atmInternal;
reset();
}
@@ -130,9 +127,6 @@
public void setCurProcState(int curProcState) {
mCurProcState = curProcState;
- if (mAtmInternal != null) {
- mAtmInternal.onUidProcStateChanged(uid, curProcState);
- }
}
public void reset() {
diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
index d0cff25..cd4ce2d 100644
--- a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
+++ b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
@@ -235,6 +235,8 @@
public final Messenger messenger;
public final AsyncChannel asyncChannel;
+ public final int factorySerialNumber;
+
// Used by ConnectivityService to keep track of 464xlat.
public Nat464Xlat clatd;
@@ -252,7 +254,7 @@
public NetworkAgentInfo(Messenger messenger, AsyncChannel ac, Network net, NetworkInfo info,
LinkProperties lp, NetworkCapabilities nc, int score, Context context, Handler handler,
NetworkMisc misc, ConnectivityService connService, INetd netd,
- INetworkManagementService nms) {
+ INetworkManagementService nms, int factorySerialNumber) {
this.messenger = messenger;
asyncChannel = ac;
network = net;
@@ -266,6 +268,7 @@
mContext = context;
mHandler = handler;
networkMisc = misc;
+ this.factorySerialNumber = factorySerialNumber;
}
/**
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 2508844..7e95f10 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -54,6 +54,7 @@
import android.net.Network;
import android.net.NetworkAgent;
import android.net.NetworkCapabilities;
+import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc;
@@ -942,7 +943,8 @@
try {
mNetworkAgent = new NetworkAgent(mLooper, mContext, NETWORKTYPE /* logtag */,
mNetworkInfo, mNetworkCapabilities, lp,
- ConnectivityConstants.VPN_DEFAULT_SCORE, networkMisc) {
+ ConnectivityConstants.VPN_DEFAULT_SCORE, networkMisc,
+ NetworkFactory.SerialNumber.VPN) {
@Override
public void unwanted() {
// We are user controlled, not driven by NetworkRequest.
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index b89768a..c9df86e 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -1241,27 +1241,59 @@
}
}
+ @Nullable
+ private IBinder getDisplayToken(int displayId) {
+ synchronized (mSyncRoot) {
+ final LogicalDisplay display = mLogicalDisplays.get(displayId);
+ if (display != null) {
+ final DisplayDevice device = display.getPrimaryDisplayDeviceLocked();
+ if (device != null) {
+ return device.getDisplayTokenLocked();
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private boolean screenshotInternal(int displayId, Surface outSurface) {
+ final IBinder token = getDisplayToken(displayId);
+ if (token == null) {
+ return false;
+ }
+ SurfaceControl.screenshot(token, outSurface);
+ return true;
+ }
+
@VisibleForTesting
DisplayedContentSamplingAttributes getDisplayedContentSamplingAttributesInternal(
int displayId) {
- IBinder displayToken = SurfaceControl.getBuiltInDisplay(displayId);
- return SurfaceControl.getDisplayedContentSamplingAttributes(displayToken);
+ final IBinder token = getDisplayToken(displayId);
+ if (token == null) {
+ return null;
+ }
+ return SurfaceControl.getDisplayedContentSamplingAttributes(token);
}
@VisibleForTesting
boolean setDisplayedContentSamplingEnabledInternal(
int displayId, boolean enable, int componentMask, int maxFrames) {
- IBinder displayToken = SurfaceControl.getBuiltInDisplay(displayId);
+ final IBinder token = getDisplayToken(displayId);
+ if (token == null) {
+ return false;
+ }
return SurfaceControl.setDisplayedContentSamplingEnabled(
- displayToken, enable, componentMask, maxFrames);
+ token, enable, componentMask, maxFrames);
}
@VisibleForTesting
DisplayedContentSample getDisplayedContentSampleInternal(int displayId,
long maxFrames, long timestamp) {
- IBinder displayToken = SurfaceControl.getBuiltInDisplay(displayId);
- return SurfaceControl.getDisplayedContentSample(
- displayToken, maxFrames, timestamp);
+ final IBinder token = getDisplayToken(displayId);
+ if (token == null) {
+ return null;
+ }
+ return SurfaceControl.getDisplayedContentSample(token, maxFrames, timestamp);
}
private void clearViewportsLocked() {
@@ -2257,20 +2289,7 @@
@Override
public boolean screenshot(int displayId, Surface outSurface) {
- synchronized (mSyncRoot) {
- final LogicalDisplay display = mLogicalDisplays.get(displayId);
- if (display != null) {
- final DisplayDevice device = display.getPrimaryDisplayDeviceLocked();
- if (device != null) {
- final IBinder token = device.getDisplayTokenLocked();
- if (token != null) {
- SurfaceControl.screenshot(token, outSurface);
- return true;
- }
- }
- }
- }
- return false;
+ return screenshotInternal(displayId, outSurface);
}
@Override
diff --git a/services/core/java/com/android/server/dreams/OWNERS b/services/core/java/com/android/server/dreams/OWNERS
index 3c9bbf8..426f002 100644
--- a/services/core/java/com/android/server/dreams/OWNERS
+++ b/services/core/java/com/android/server/dreams/OWNERS
@@ -1,3 +1,3 @@
-dsandler@google.com
+dsandler@android.com
michaelwr@google.com
roosa@google.com
diff --git a/services/core/java/com/android/server/gpu/GpuService.java b/services/core/java/com/android/server/gpu/GpuService.java
new file mode 100644
index 0000000..a68ceed
--- /dev/null
+++ b/services/core/java/com/android/server/gpu/GpuService.java
@@ -0,0 +1,163 @@
+/*
+ * 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 com.android.server.gpu;
+
+import static android.content.Intent.ACTION_PACKAGE_ADDED;
+import static android.content.Intent.ACTION_PACKAGE_CHANGED;
+import static android.content.Intent.ACTION_PACKAGE_REMOVED;
+
+import android.annotation.NonNull;
+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.net.Uri;
+import android.os.Build;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Slog;
+
+import com.android.server.SystemService;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+/**
+ * Service to manage GPU related features.
+ *
+ * <p>GPU service is a core service that monitors, coordinates all GPU related features,
+ * as well as collect metrics about the GPU and GPU driver.</p>
+ */
+public class GpuService extends SystemService {
+ public static final String TAG = "GpuService";
+ public static final boolean DEBUG = false;
+
+ private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0";
+ private static final String WHITELIST_FILENAME = "whitelist.txt";
+
+ private final Context mContext;
+ private final String mDriverPackageName;
+ private final PackageManager mPackageManager;
+
+ public GpuService(Context context) {
+ super(context);
+
+ mContext = context;
+ mDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER);
+ mPackageManager = context.getPackageManager();
+ if (mDriverPackageName != null && !mDriverPackageName.isEmpty()) {
+ final IntentFilter packageFilter = new IntentFilter();
+ packageFilter.addAction(ACTION_PACKAGE_ADDED);
+ packageFilter.addAction(ACTION_PACKAGE_CHANGED);
+ packageFilter.addAction(ACTION_PACKAGE_REMOVED);
+ packageFilter.addDataScheme("package");
+ getContext().registerReceiverAsUser(new PackageReceiver(), UserHandle.ALL,
+ packageFilter, null, null);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ }
+
+ @Override
+ public void onBootPhase(int phase) {
+ if (phase == PHASE_BOOT_COMPLETED) {
+ if (mDriverPackageName == null || mDriverPackageName.isEmpty()) {
+ return;
+ }
+ fetchGameDriverPackageProperties();
+ }
+ }
+
+ private final class PackageReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {
+ final Uri data = intent.getData();
+ if (data == null && DEBUG) {
+ Slog.e(TAG, "Cannot handle package broadcast with null data");
+ return;
+ }
+ final String packageName = data.getSchemeSpecificPart();
+ if (!packageName.equals(mDriverPackageName)) {
+ return;
+ }
+
+ final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+
+ switch (intent.getAction()) {
+ case ACTION_PACKAGE_ADDED:
+ case ACTION_PACKAGE_CHANGED:
+ case ACTION_PACKAGE_REMOVED:
+ fetchGameDriverPackageProperties();
+ break;
+ default:
+ // do nothing
+ break;
+ }
+ }
+ }
+
+ private void fetchGameDriverPackageProperties() {
+ final ApplicationInfo driverInfo;
+ try {
+ driverInfo = mPackageManager.getApplicationInfo(mDriverPackageName,
+ PackageManager.MATCH_SYSTEM_ONLY);
+ } catch (PackageManager.NameNotFoundException e) {
+ if (DEBUG) {
+ Slog.e(TAG, "driver package '" + mDriverPackageName + "' not installed");
+ }
+ return;
+ }
+
+ // O drivers are restricted to the sphal linker namespace, so don't try to use
+ // packages unless they declare they're compatible with that restriction.
+ if (driverInfo.targetSdkVersion < Build.VERSION_CODES.O) {
+ if (DEBUG) {
+ Slog.w(TAG, "Driver package is not known to be compatible with O");
+ }
+ return;
+ }
+
+ try {
+ final Context driverContext = mContext.createPackageContext(mDriverPackageName,
+ Context.CONTEXT_RESTRICTED);
+ final BufferedReader reader = new BufferedReader(
+ new InputStreamReader(driverContext.getAssets().open(WHITELIST_FILENAME)));
+ final ArrayList<String> whitelistedPackageNames = new ArrayList<>();
+ for (String packageName; (packageName = reader.readLine()) != null; ) {
+ whitelistedPackageNames.add(packageName);
+ }
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.GAME_DRIVER_WHITELIST,
+ String.join(",", whitelistedPackageNames));
+ } catch (PackageManager.NameNotFoundException e) {
+ if (DEBUG) {
+ Slog.w(TAG, "driver package '" + mDriverPackageName + "' not installed");
+ }
+ } catch (IOException e) {
+ if (DEBUG) {
+ Slog.w(TAG, "Failed to load whitelist driver package, abort.");
+ }
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 669ff2b..5e7ea05 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -234,6 +234,7 @@
private static native void nativeReloadPointerIcons(long ptr);
private static native void nativeSetCustomPointerIcon(long ptr, PointerIcon icon);
private static native void nativeSetPointerCapture(long ptr, boolean detached);
+ private static native boolean nativeCanDispatchToDisplay(long ptr, int deviceId, int displayId);
// Input event injection constants defined in InputDispatcher.h.
private static final int INPUT_EVENT_INJECTION_SUCCEEDED = 0;
@@ -1890,6 +1891,16 @@
return new String[0];
}
+ /**
+ * Gets if an input device could dispatch to the given display".
+ * @param deviceId The input device id.
+ * @param displayId The specific display id.
+ * @return True if the device could dispatch to the given display, false otherwise.
+ */
+ public boolean canDispatchToDisplay(int deviceId, int displayId) {
+ return nativeCanDispatchToDisplay(mPtr, deviceId, displayId);
+ }
+
// Native callback.
private int getKeyRepeatTimeout() {
return ViewConfiguration.getKeyRepeatTimeout();
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 19d10ec..cefe583 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -509,7 +509,7 @@
private static final float DEFAULT_CONN_CONGESTION_DELAY_FRAC = 0.5f;
private static final float DEFAULT_CONN_PREFETCH_RELAX_FRAC = 0.5f;
private static final boolean DEFAULT_USE_HEARTBEATS = false;
- private static final boolean DEFAULT_TIME_CONTROLLER_SKIP_NOT_READY_JOBS = false;
+ private static final boolean DEFAULT_TIME_CONTROLLER_SKIP_NOT_READY_JOBS = true;
private static final long DEFAULT_QUOTA_CONTROLLER_ALLOWED_TIME_PER_PERIOD_MS =
10 * 60 * 1000L; // 10 minutes
private static final long DEFAULT_QUOTA_CONTROLLER_IN_QUOTA_BUFFER_MS =
diff --git a/services/core/java/com/android/server/job/controllers/JobStatus.java b/services/core/java/com/android/server/job/controllers/JobStatus.java
index ed1a6d0..06db8b8 100644
--- a/services/core/java/com/android/server/job/controllers/JobStatus.java
+++ b/services/core/java/com/android/server/job/controllers/JobStatus.java
@@ -78,9 +78,9 @@
static final int CONSTRAINT_DEADLINE = 1<<30;
static final int CONSTRAINT_CONNECTIVITY = 1<<28;
static final int CONSTRAINT_CONTENT_TRIGGER = 1<<26;
- static final int CONSTRAINT_DEVICE_NOT_DOZING = 1<<25;
- static final int CONSTRAINT_WITHIN_QUOTA = 1 << 24;
- static final int CONSTRAINT_BACKGROUND_NOT_RESTRICTED = 1<<22;
+ static final int CONSTRAINT_DEVICE_NOT_DOZING = 1 << 25; // Implicit constraint
+ static final int CONSTRAINT_WITHIN_QUOTA = 1 << 24; // Implicit constraint
+ static final int CONSTRAINT_BACKGROUND_NOT_RESTRICTED = 1 << 22; // Implicit constraint
/**
* The constraints that we want to log to statsd.
@@ -1044,8 +1044,48 @@
* @return Whether or not this job would be ready to run if it had the specified constraint
* granted, based on its requirements.
*/
- public boolean wouldBeReadyWithConstraint(int constraint) {
- return isReady(mSatisfiedConstraintsOfInterest | constraint);
+ boolean wouldBeReadyWithConstraint(int constraint) {
+ boolean oldValue = false;
+ int satisfied = mSatisfiedConstraintsOfInterest;
+ switch (constraint) {
+ case CONSTRAINT_BACKGROUND_NOT_RESTRICTED:
+ oldValue = mReadyNotRestrictedInBg;
+ mReadyNotRestrictedInBg = true;
+ break;
+ case CONSTRAINT_DEADLINE:
+ oldValue = mReadyDeadlineSatisfied;
+ mReadyDeadlineSatisfied = true;
+ break;
+ case CONSTRAINT_DEVICE_NOT_DOZING:
+ oldValue = mReadyNotDozing;
+ mReadyNotDozing = true;
+ break;
+ case CONSTRAINT_WITHIN_QUOTA:
+ oldValue = mReadyWithinQuota;
+ mReadyWithinQuota = true;
+ break;
+ default:
+ satisfied |= constraint;
+ break;
+ }
+
+ boolean toReturn = isReady(satisfied);
+
+ switch (constraint) {
+ case CONSTRAINT_BACKGROUND_NOT_RESTRICTED:
+ mReadyNotRestrictedInBg = oldValue;
+ break;
+ case CONSTRAINT_DEADLINE:
+ mReadyDeadlineSatisfied = oldValue;
+ break;
+ case CONSTRAINT_DEVICE_NOT_DOZING:
+ mReadyNotDozing = oldValue;
+ break;
+ case CONSTRAINT_WITHIN_QUOTA:
+ mReadyWithinQuota = oldValue;
+ break;
+ }
+ return toReturn;
}
private boolean isReady(int satisfiedConstraints) {
diff --git a/services/core/java/com/android/server/location/ActivityRecognitionProxy.java b/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
index 22fabb2..80ab790 100644
--- a/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
+++ b/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
@@ -24,7 +24,7 @@
import android.os.RemoteException;
import android.util.Log;
-import com.android.internal.os.BackgroundThread;
+import com.android.server.FgThread;
import com.android.server.ServiceWatcher;
/**
@@ -84,7 +84,7 @@
overlaySwitchResId,
defaultServicePackageNameResId,
initialPackageNameResId,
- BackgroundThread.getHandler()) {
+ FgThread.getHandler()) {
@Override
protected void onBind() {
runOnBinder(ActivityRecognitionProxy.this::initializeService);
diff --git a/services/core/java/com/android/server/location/GeocoderProxy.java b/services/core/java/com/android/server/location/GeocoderProxy.java
index e6f0ed9..d9602b8 100644
--- a/services/core/java/com/android/server/location/GeocoderProxy.java
+++ b/services/core/java/com/android/server/location/GeocoderProxy.java
@@ -21,7 +21,7 @@
import android.location.GeocoderParams;
import android.location.IGeocodeProvider;
-import com.android.internal.os.BackgroundThread;
+import com.android.server.FgThread;
import com.android.server.ServiceWatcher;
import java.util.List;
@@ -53,7 +53,7 @@
int initialPackageNamesResId) {
mServiceWatcher = new ServiceWatcher(context, TAG, SERVICE_ACTION, overlaySwitchResId,
defaultServicePackageNameResId, initialPackageNamesResId,
- BackgroundThread.getHandler());
+ FgThread.getHandler());
}
private boolean bind() {
diff --git a/services/core/java/com/android/server/location/GeofenceProxy.java b/services/core/java/com/android/server/location/GeofenceProxy.java
index 38c7d49..ce93661 100644
--- a/services/core/java/com/android/server/location/GeofenceProxy.java
+++ b/services/core/java/com/android/server/location/GeofenceProxy.java
@@ -30,7 +30,7 @@
import android.os.UserHandle;
import android.util.Log;
-import com.android.internal.os.BackgroundThread;
+import com.android.server.FgThread;
import com.android.server.ServiceWatcher;
/**
@@ -82,7 +82,7 @@
mContext = context;
mServiceWatcher = new ServiceWatcher(context, TAG, SERVICE_ACTION, overlaySwitchResId,
defaultServicePackageNameResId, initialPackageNamesResId,
- BackgroundThread.getHandler()) {
+ FgThread.getHandler()) {
@Override
protected void onBind() {
runOnBinder(mUpdateGeofenceHardware);
diff --git a/services/core/java/com/android/server/location/LocationProviderProxy.java b/services/core/java/com/android/server/location/LocationProviderProxy.java
index 6b5b1be..776beb5 100644
--- a/services/core/java/com/android/server/location/LocationProviderProxy.java
+++ b/services/core/java/com/android/server/location/LocationProviderProxy.java
@@ -31,8 +31,8 @@
import com.android.internal.location.ILocationProviderManager;
import com.android.internal.location.ProviderProperties;
import com.android.internal.location.ProviderRequest;
-import com.android.internal.os.BackgroundThread;
import com.android.internal.os.TransferPipe;
+import com.android.server.FgThread;
import com.android.server.LocationManagerService;
import com.android.server.ServiceWatcher;
@@ -105,7 +105,7 @@
mServiceWatcher = new ServiceWatcher(context, TAG, action, overlaySwitchResId,
defaultServicePackageNameResId, initialPackageNamesResId,
- BackgroundThread.getHandler()) {
+ FgThread.getHandler()) {
@Override
protected void onBind() {
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index af790f2..b6ef180 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -283,6 +283,10 @@
Log.w(TAG, "Muting remote playback is not supported");
return;
}
+ if (DEBUG) {
+ Log.w(TAG, "adjusting volume, pkg=" + packageName + ", asSystemService="
+ + asSystemService + ", dir=" + direction);
+ }
mSessionCb.adjustVolume(packageName, pid, uid, caller, asSystemService, direction);
int volumeBefore = (mOptimisticVolume < 0 ? mCurrentVolume : mOptimisticVolume);
@@ -456,9 +460,25 @@
return mSessionCb.mCb;
}
- public void sendMediaButton(String packageName, int pid, int uid, boolean asSystemService,
+ /**
+ * Sends media button.
+ *
+ * @param packageName caller package name
+ * @param pid caller pid
+ * @param uid caller uid
+ * @param asSystemService {@code true} if the event sent to the session as if it was come from
+ * the system service instead of the app process.
+ * @param ke key events
+ * @param sequenceId (optional) sequence id. Use this only when a wake lock is needed.
+ * @param cb (optional) result receiver to receive callback. Use this only when a wake lock is
+ * needed.
+ * @return {@code true} if the attempt to send media button was successfuly.
+ * {@code false} otherwise.
+ */
+ public boolean sendMediaButton(String packageName, int pid, int uid, boolean asSystemService,
KeyEvent ke, int sequenceId, ResultReceiver cb) {
- mSessionCb.sendMediaButton(packageName, pid, uid, asSystemService, ke, sequenceId, cb);
+ return mSessionCb.sendMediaButton(packageName, pid, uid, asSystemService, ke, sequenceId,
+ cb);
}
public void dump(PrintWriter pw, String prefix) {
@@ -492,6 +512,10 @@
final String callingOpPackageName, final int callingPid, final int callingUid,
final boolean asSystemService, final boolean useSuggested,
final int previousFlagPlaySound) {
+ if (DEBUG) {
+ Log.w(TAG, "adjusting local volume, stream=" + stream + ", dir=" + direction
+ + ", asSystemService=" + asSystemService + ", useSuggested=" + useSuggested);
+ }
// Must use opPackageName for adjusting volumes with UID.
final String opPackageName;
final int uid;
@@ -1223,9 +1247,9 @@
@Override
public boolean sendMediaButton(String packageName, ControllerCallbackLink cb,
- boolean asSystemService, KeyEvent keyEvent) {
+ KeyEvent keyEvent) {
return mSessionCb.sendMediaButton(packageName, Binder.getCallingPid(),
- Binder.getCallingUid(), cb, asSystemService, keyEvent);
+ Binder.getCallingUid(), cb, false, keyEvent);
}
@Override
@@ -1292,14 +1316,13 @@
@Override
public void adjustVolume(String packageName, String opPackageName,
- ControllerCallbackLink caller, boolean asSystemService, int direction,
- int flags) {
+ ControllerCallbackLink caller, int direction, int flags) {
int pid = Binder.getCallingPid();
int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
MediaSessionRecord.this.adjustVolume(packageName, opPackageName, pid, uid, caller,
- asSystemService, direction, flags, false /* useSuggested */);
+ false, direction, flags, false /* useSuggested */);
} finally {
Binder.restoreCallingIdentity(token);
}
diff --git a/services/core/java/com/android/server/media/MediaSessionServiceImpl.java b/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
index 94de49e..409060e 100644
--- a/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
@@ -707,6 +707,14 @@
return mUserRecords.get(fullUserId);
}
+ private MediaSessionRecord getMediaSessionRecordLocked(MediaSession.Token sessionToken) {
+ FullUserRecord user = getFullUserRecordLocked(UserHandle.getUserId(sessionToken.getUid()));
+ if (user != null) {
+ return user.mPriorityStack.getMediaSessionRecord(sessionToken);
+ }
+ return null;
+ }
+
/**
* Information about a full user and its corresponding managed profiles.
*
@@ -1272,6 +1280,34 @@
}
@Override
+ public boolean dispatchMediaKeyEventToSessionAsSystemService(String packageName,
+ MediaSession.Token sessionToken, KeyEvent keyEvent) {
+ final int pid = Binder.getCallingPid();
+ final int uid = Binder.getCallingUid();
+ final long token = Binder.clearCallingIdentity();
+ try {
+ synchronized (mLock) {
+ MediaSessionRecord record = getMediaSessionRecordLocked(sessionToken);
+ if (record == null) {
+ if (DEBUG) {
+ Log.d(TAG, "Failed to find session to dispatch key event.");
+ }
+ return false;
+ }
+ if (DEBUG) {
+ Log.d(TAG, "dispatchMediaKeyEventToSessionAsSystemService, pkg="
+ + packageName + ", pid=" + pid + ", uid=" + uid + ", sessionToken="
+ + sessionToken + ", event=" + keyEvent + ", session=" + record);
+ }
+ return record.sendMediaButton(packageName, pid, uid, true /* asSystemService */,
+ keyEvent, 0, null);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
public void setCallback(ICallback callback) {
final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid();
@@ -1577,6 +1613,62 @@
}
@Override
+ public void dispatchVolumeKeyEventToSessionAsSystemService(String packageName,
+ String opPackageName, MediaSession.Token sessionToken, KeyEvent keyEvent) {
+ int pid = Binder.getCallingPid();
+ int uid = Binder.getCallingUid();
+ final long token = Binder.clearCallingIdentity();
+ try {
+ synchronized (mLock) {
+ MediaSessionRecord record = getMediaSessionRecordLocked(sessionToken);
+ if (record == null) {
+ if (DEBUG) {
+ Log.d(TAG, "Failed to find session to dispatch key event.");
+ }
+ return;
+ }
+ if (DEBUG) {
+ Log.d(TAG, "dispatchVolumeKeyEventToSessionAsSystemService, pkg="
+ + packageName + ", opPkg=" + opPackageName + ", pid=" + pid
+ + ", uid=" + uid + ", sessionToken=" + sessionToken + ", event="
+ + keyEvent + ", session=" + record);
+ }
+ switch (keyEvent.getAction()) {
+ case KeyEvent.ACTION_DOWN: {
+ int direction = 0;
+ switch (keyEvent.getKeyCode()) {
+ case KeyEvent.KEYCODE_VOLUME_UP:
+ direction = AudioManager.ADJUST_RAISE;
+ break;
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
+ direction = AudioManager.ADJUST_LOWER;
+ break;
+ case KeyEvent.KEYCODE_VOLUME_MUTE:
+ direction = AudioManager.ADJUST_TOGGLE_MUTE;
+ break;
+ }
+ record.adjustVolume(packageName, opPackageName, pid, uid,
+ null /* caller */, true /* asSystemService */, direction,
+ AudioManager.FLAG_SHOW_UI, false /* useSuggested */);
+ break;
+ }
+
+ case KeyEvent.ACTION_UP: {
+ final int flags =
+ AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_VIBRATE
+ | AudioManager.FLAG_FROM_KEY;
+ record.adjustVolume(packageName, opPackageName, pid, uid,
+ null /* caller */, true /* asSystemService */, 0,
+ flags, false /* useSuggested */);
+ }
+ }
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
public void dispatchAdjustVolume(String packageName, String opPackageName,
int suggestedStream, int delta, int flags) {
final int pid = Binder.getCallingPid();
diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java
index 719ec36..9ba50ee 100644
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -28,6 +28,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* Keeps track of media sessions and their priority for notifications, media
@@ -136,6 +137,21 @@
}
/**
+ * Gets the {@link MediaSessionRecord} with the {@link MediaSession.Token}.
+ *
+ * @param sessionToken session token
+ * @return the MediaSessionRecord. Can be {@code null} if the session is gone meanwhile.
+ */
+ public MediaSessionRecord getMediaSessionRecord(MediaSession.Token sessionToken) {
+ for (MediaSessionRecord record : mSessions) {
+ if (Objects.equals(record.getControllerLink(), sessionToken.getControllerLink())) {
+ return record;
+ }
+ }
+ return null;
+ }
+
+ /**
* Notify the priority tracker that a session's playback state changed.
*
* @param record The record that changed.
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 467b192..ba187c0 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -198,6 +198,7 @@
import com.android.internal.os.SomeArgs;
import com.android.internal.statusbar.NotificationVisibility;
import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.CollectionUtils;
import com.android.internal.util.DumpUtils;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.Preconditions;
@@ -2366,6 +2367,28 @@
}
@Override
+ public boolean shouldHideSilentStatusIcons(String callingPkg) {
+ checkCallerIsSameApp(callingPkg);
+
+ if (isCallerSystemOrPhone()
+ || mListeners.isListenerPackage(callingPkg)) {
+ return mPreferencesHelper.shouldHideSilentStatusIcons();
+ } else {
+ throw new SecurityException("Only available for notification listeners");
+ }
+ }
+
+ @Override
+ public void setHideSilentStatusIcons(boolean hide) {
+ checkCallerIsSystem();
+
+ mPreferencesHelper.setHideSilentStatusIcons(hide);
+ handleSavePolicyFile();
+
+ mListeners.onStatusBarIconsBehaviorChanged(hide);
+ }
+
+ @Override
public int getPackageImportance(String pkg) {
checkCallerIsSystemOrSameApp(pkg);
return mPreferencesHelper.getImportance(pkg, Binder.getCallingUid());
@@ -3633,6 +3656,22 @@
}
@Override
+ public ComponentName getAllowedNotificationAssistantForUser(int userId) {
+ checkCallerIsSystem();
+ List<ComponentName> allowedComponents = mAssistants.getAllowedComponents(userId);
+ if (allowedComponents.size() > 1) {
+ throw new IllegalStateException(
+ "At most one NotificationAssistant: " + allowedComponents.size());
+ }
+ return CollectionUtils.firstOrNull(allowedComponents);
+ }
+
+ @Override
+ public ComponentName getAllowedNotificationAssistant() {
+ return getAllowedNotificationAssistantForUser(getCallingUserHandle().getIdentifier());
+ }
+
+ @Override
public boolean isNotificationListenerAccessGranted(ComponentName listener) {
Preconditions.checkNotNull(listener);
checkCallerIsSystemOrSameApp(listener.getPackageName());
@@ -3700,8 +3739,15 @@
@Override
public void setNotificationAssistantAccessGrantedForUser(ComponentName assistant,
int userId, boolean granted) throws RemoteException {
- Preconditions.checkNotNull(assistant);
checkCallerIsSystemOrShell();
+ if (assistant == null) {
+ ComponentName allowedAssistant = CollectionUtils.firstOrNull(
+ mAssistants.getAllowedComponents(userId));
+ if (allowedAssistant != null) {
+ setNotificationAssistantAccessGrantedForUser(allowedAssistant, userId, false);
+ }
+ return;
+ }
final long identity = Binder.clearCallingIdentity();
try {
if (mAllowedManagedServicePackages.test(assistant.getPackageName())) {
@@ -7242,6 +7288,26 @@
}
}
}
+
+ @Override
+ protected void setPackageOrComponentEnabled(String pkgOrComponent, int userId,
+ boolean isPrimary, boolean enabled) {
+ // Ensures that only one component is enabled at a time
+ if (enabled) {
+ List<ComponentName> allowedComponents = getAllowedComponents(userId);
+ if (!allowedComponents.isEmpty()) {
+ ComponentName currentComponent = CollectionUtils.firstOrNull(allowedComponents);
+ if (currentComponent.flattenToString().equals(pkgOrComponent)) return;
+ try {
+ getBinderService().setNotificationAssistantAccessGrantedForUser(
+ currentComponent, userId, false);
+ } catch (RemoteException e) {
+ e.rethrowFromSystemServer();
+ }
+ }
+ }
+ super.setPackageOrComponentEnabled(pkgOrComponent, userId, isPrimary, enabled);
+ }
}
public class NotificationListeners extends ManagedServices {
@@ -7324,6 +7390,20 @@
return mLightTrimListeners.contains(info) ? TRIM_LIGHT : TRIM_FULL;
}
+ public void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) {
+ for (final ManagedServiceInfo info : getServices()) {
+ mHandler.post(() -> {
+ final INotificationListener listener = (INotificationListener) info.service;
+ try {
+ listener.onStatusBarIconsBehaviorChanged(hideSilentStatusIcons);
+ } catch (RemoteException ex) {
+ Log.e(TAG, "unable to notify listener "
+ + "(hideSilentStatusIcons): " + listener, ex);
+ }
+ });
+ }
+ }
+
/**
* asynchronously notify all listeners about a new notification
*
diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java
index 3f0043c..6ed4f5c 100644
--- a/services/core/java/com/android/server/notification/PreferencesHelper.java
+++ b/services/core/java/com/android/server/notification/PreferencesHelper.java
@@ -76,6 +76,7 @@
private static final String TAG_CHANNEL = "channel";
private static final String TAG_GROUP = "channelGroup";
private static final String TAG_DELEGATE = "delegate";
+ private static final String TAG_STATUS_ICONS = "status_icons";
private static final String ATT_VERSION = "version";
private static final String ATT_NAME = "name";
@@ -89,10 +90,13 @@
private static final String ATT_APP_USER_LOCKED_FIELDS = "app_user_locked_fields";
private static final String ATT_ENABLED = "enabled";
private static final String ATT_USER_ALLOWED = "allowed";
+ private static final String ATT_HIDE_SILENT = "hide_silent";
private static final int DEFAULT_PRIORITY = Notification.PRIORITY_DEFAULT;
private static final int DEFAULT_VISIBILITY = NotificationManager.VISIBILITY_NO_OVERRIDE;
private static final int DEFAULT_IMPORTANCE = NotificationManager.IMPORTANCE_UNSPECIFIED;
+ @VisibleForTesting
+ static final boolean DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS = false;
private static final boolean DEFAULT_SHOW_BADGE = true;
private static final boolean DEFAULT_ALLOW_BUBBLE = true;
private static final boolean DEFAULT_OEM_LOCKED_IMPORTANCE = false;
@@ -124,6 +128,7 @@
private SparseBooleanArray mBadgingEnabled;
private boolean mAreChannelsBypassingDnd;
+ private boolean mHideSilentStatusBarIcons;
public PreferencesHelper(Context context, PackageManager pm, RankingHandler rankingHandler,
ZenModeHelper zenHelper) {
@@ -143,9 +148,8 @@
String tag = parser.getName();
if (!TAG_RANKING.equals(tag)) return;
synchronized (mPackagePreferences) {
- // Clobber groups and channels with the xml, but don't delete other data that wasn't present
-
- // at the time of serialization.
+ // Clobber groups and channels with the xml, but don't delete other data that wasn't
+ // present at the time of serialization.
mRestoredWithoutUids.clear();
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
tag = parser.getName();
@@ -153,7 +157,10 @@
return;
}
if (type == XmlPullParser.START_TAG) {
- if (TAG_PACKAGE.equals(tag)) {
+ if (TAG_STATUS_ICONS.equals(tag)) {
+ mHideSilentStatusBarIcons = XmlUtils.readBooleanAttribute(
+ parser, ATT_HIDE_SILENT, DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS);
+ } else if (TAG_PACKAGE.equals(tag)) {
int uid = XmlUtils.readIntAttribute(parser, ATT_UID, UNKNOWN_UID);
String name = parser.getAttributeValue(null, ATT_NAME);
if (!TextUtils.isEmpty(name)) {
@@ -375,6 +382,11 @@
public void writeXml(XmlSerializer out, boolean forBackup) throws IOException {
out.startTag(null, TAG_RANKING);
out.attribute(null, ATT_VERSION, Integer.toString(XML_VERSION));
+ if (mHideSilentStatusBarIcons != DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS) {
+ out.startTag(null, TAG_STATUS_ICONS);
+ out.attribute(null, ATT_HIDE_SILENT, String.valueOf(mHideSilentStatusBarIcons));
+ out.endTag(null, TAG_STATUS_ICONS);
+ }
synchronized (mPackagePreferences) {
final int N = mPackagePreferences.size();
@@ -781,6 +793,14 @@
}
}
+ public boolean shouldHideSilentStatusIcons() {
+ return mHideSilentStatusBarIcons;
+ }
+
+ public void setHideSilentStatusIcons(boolean hide) {
+ mHideSilentStatusBarIcons = hide;
+ }
+
public void lockChannelsForOEM(String[] appOrChannelList) {
if (appOrChannelList == null) {
return;
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index c2ac27a..e3c41f3 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -430,6 +430,9 @@
if (!mVouchedSignaturesByUser.containsKey(user)) {
initVouchedSignatures(user);
}
+ if (isManagedProfileAdmin(user, appInfo.packageName)) {
+ return false;
+ }
if (mVouchProviders.contains(appInfo.packageName)) {
// If it's a vouching packages then we must show hidden app
return true;
@@ -453,6 +456,24 @@
return true;
}
+ private boolean isManagedProfileAdmin(UserHandle user, String packageName) {
+ final List<UserInfo> userInfoList = mUm.getProfiles(user.getIdentifier());
+ for (int i = 0; i < userInfoList.size(); i++) {
+ UserInfo userInfo = userInfoList.get(i);
+ if (!userInfo.isManagedProfile()) {
+ continue;
+ }
+ ComponentName componentName = mDpm.getProfileOwnerAsUser(userInfo.getUserHandle());
+ if (componentName == null) {
+ continue;
+ }
+ if (componentName.getPackageName().equals(packageName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@VisibleForTesting
static String computePackageCertDigest(Signature signature) {
MessageDigest messageDigest;
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 6f1eeeb..dc18dfc 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -61,6 +61,10 @@
import android.content.pm.dex.ISnapshotRuntimeProfileCallback;
import android.content.res.AssetManager;
import android.content.res.Resources;
+import android.content.rollback.IRollbackManager;
+import android.content.rollback.PackageRollbackInfo;
+import android.content.rollback.RollbackInfo;
+import android.content.rollback.RollbackManager;
import android.net.Uri;
import android.os.Binder;
import android.os.Build;
@@ -263,6 +267,8 @@
return getStagedSessions();
case "uninstall-system-updates":
return uninstallSystemUpdates();
+ case "rollback-app":
+ return runRollbackApp();
default: {
String nextArg = getNextArg();
if (nextArg == null) {
@@ -348,6 +354,55 @@
return 1;
}
+ private int runRollbackApp() {
+ final PrintWriter pw = getOutPrintWriter();
+
+ final String packageName = getNextArgRequired();
+ if (packageName == null) {
+ pw.println("Error: package name not specified");
+ return 1;
+ }
+
+ final LocalIntentReceiver receiver = new LocalIntentReceiver();
+ try {
+ IRollbackManager rm = IRollbackManager.Stub.asInterface(
+ ServiceManager.getService(Context.ROLLBACK_SERVICE));
+
+ RollbackInfo rollback = null;
+ for (RollbackInfo r : (List<RollbackInfo>) rm.getAvailableRollbacks().getList()) {
+ for (PackageRollbackInfo info : r.getPackages()) {
+ if (packageName.equals(info.getPackageName())) {
+ rollback = r;
+ break;
+ }
+ }
+ }
+
+ if (rollback == null) {
+ pw.println("No available rollbacks for: " + packageName);
+ return 1;
+ }
+
+ rm.commitRollback(rollback.getRollbackId(),
+ ParceledListSlice.<VersionedPackage>emptyList(),
+ "com.android.shell", receiver.getIntentSender());
+ } catch (RemoteException re) {
+ // Cannot happen.
+ }
+
+ final Intent result = receiver.getResult();
+ final int status = result.getIntExtra(RollbackManager.EXTRA_STATUS,
+ RollbackManager.STATUS_FAILURE);
+ if (status == RollbackManager.STATUS_SUCCESS) {
+ pw.println("Success");
+ return 0;
+ } else {
+ pw.println("Failure ["
+ + result.getStringExtra(RollbackManager.EXTRA_STATUS_MESSAGE) + "]");
+ return 1;
+ }
+ }
+
private void setParamsSize(InstallParams params, String inPath) {
if (params.sessionParams.sizeBytes == -1 && !STDIN_PATH.equals(inPath)) {
final ParcelFileDescriptor fd = openFileForSystem(inPath, "r");
diff --git a/services/core/java/com/android/server/pm/dex/DexManager.java b/services/core/java/com/android/server/pm/dex/DexManager.java
index 7ac7395..abbddf3 100644
--- a/services/core/java/com/android/server/pm/dex/DexManager.java
+++ b/services/core/java/com/android/server/pm/dex/DexManager.java
@@ -16,7 +16,7 @@
package com.android.server.pm.dex;
-import static android.provider.DeviceConfig.FsiBoot;
+import static android.provider.DeviceConfig.DexBoot;
import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
import static com.android.server.pm.dex.PackageDexUsage.DexUseInfo;
@@ -710,8 +710,8 @@
return isPackageSelectedToRunOobInternal(
SystemProperties.getBoolean(PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB, false),
SystemProperties.get(PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB_LIST, "ALL"),
- DeviceConfig.getProperty(FsiBoot.NAMESPACE, FsiBoot.OOB_ENABLED),
- DeviceConfig.getProperty(FsiBoot.NAMESPACE, FsiBoot.OOB_WHITELIST),
+ DeviceConfig.getProperty(DexBoot.NAMESPACE, DexBoot.PRIV_APPS_OOB_ENABLED),
+ DeviceConfig.getProperty(DexBoot.NAMESPACE, DexBoot.PRIV_APPS_OOB_WHITELIST),
packageNamesInSameProcess);
}
diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java
index 03ec57b..d72270e 100644
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -52,6 +52,7 @@
import android.service.sms.FinancialSmsService;
import android.telephony.IFinancialSmsCallback;
import android.text.TextUtils;
+import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.PackageUtils;
import android.util.Slog;
@@ -145,6 +146,9 @@
mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);
mAppOpsManager = context.getSystemService(AppOpsManager.class);
+ LocalServices.addService(RoleManagerServiceInternal.class,
+ new RoleManagerServiceInternalImpl());
+
registerUserRemovedReceiver();
}
@@ -382,6 +386,19 @@
}
}
+ /**
+ * 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
@@ -676,4 +693,16 @@
}
}
}
+
+ /**
+ * Entry point for internal calls into role manager
+ */
+ private final class RoleManagerServiceInternalImpl extends RoleManagerServiceInternal {
+
+ @NonNull
+ @Override
+ public ArrayMap<String, ArraySet<String>> getRoleHoldersAsUser(@NonNull UserHandle user) {
+ return RoleManagerService.this.getRoleHoldersAsUser(user);
+ }
+ }
}
diff --git a/services/core/java/com/android/server/role/RoleManagerServiceInternal.java b/services/core/java/com/android/server/role/RoleManagerServiceInternal.java
new file mode 100644
index 0000000..3afc3f7
--- /dev/null
+++ b/services/core/java/com/android/server/role/RoleManagerServiceInternal.java
@@ -0,0 +1,38 @@
+/*
+ * 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.role;
+
+import android.annotation.NonNull;
+import android.os.UserHandle;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+
+/**
+ * Internal calls into {@link RoleManagerService}
+ */
+public abstract class RoleManagerServiceInternal {
+ /**
+ * Get all roles and packages hold them.
+ *
+ * @param user The user to query to roles for
+ *
+ * @return The roles and their holders
+ */
+ @NonNull
+ public abstract ArrayMap<String, ArraySet<String>> getRoleHoldersAsUser(
+ @NonNull UserHandle user);
+}
diff --git a/services/core/java/com/android/server/role/RoleUserState.java b/services/core/java/com/android/server/role/RoleUserState.java
index 02dcc49..bc68dde 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 = snapshotRolesLocked();
+ roles = getRoleHolders();
}
AtomicFile atomicFile = new AtomicFile(getFile(mUserId), "roles-" + mUserId);
@@ -541,7 +541,7 @@
version = mVersion;
packagesHash = mPackagesHash;
- roles = snapshotRolesLocked();
+ roles = getRoleHolders();
}
long fieldToken = dumpOutputStream.start(fieldName, fieldId);
@@ -570,17 +570,24 @@
dumpOutputStream.end(fieldToken);
}
- @GuardedBy("mLock")
- 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);
+ /**
+ * Get the roles and their holders.
+ *
+ * @return A copy of the roles and their holders
+ */
+ @NonNull
+ public ArrayMap<String, ArraySet<String>> getRoleHolders() {
+ 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);
+ roleHolders = new ArraySet<>(roleHolders);
+ roles.put(roleName, roleHolders);
+ }
+ return roles;
}
- return roles;
}
/**
diff --git a/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java b/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java
new file mode 100644
index 0000000..8dd0760
--- /dev/null
+++ b/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java
@@ -0,0 +1,236 @@
+/*
+ * 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.rollback;
+
+import android.content.rollback.PackageRollbackInfo;
+import android.content.rollback.PackageRollbackInfo.RestoreInfo;
+import android.content.rollback.RollbackInfo;
+import android.os.storage.StorageManager;
+import android.util.IntArray;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.pm.Installer;
+import com.android.server.pm.Installer.InstallerException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Encapsulates the logic for initiating userdata snapshots and rollbacks via installd.
+ */
+@VisibleForTesting
+// TODO(narayan): Reason about the failure scenarios that involve one or more IPCs to installd
+// failing. We need to decide what course of action to take if calls to snapshotAppData or
+// restoreAppDataSnapshot fail.
+public class AppDataRollbackHelper {
+ private static final String TAG = "RollbackManager";
+
+ private final Installer mInstaller;
+
+ public AppDataRollbackHelper(Installer installer) {
+ mInstaller = installer;
+ }
+
+ /**
+ * Creates an app data snapshot for a specified {@code packageName} for {@code installedUsers},
+ * a specified set of users for whom the package is installed.
+ *
+ * @return a list of users for which the snapshot is pending, usually because data for one or
+ * more users is still credential locked.
+ */
+ public IntArray snapshotAppData(String packageName, int[] installedUsers) {
+ final IntArray pendingBackups = new IntArray();
+ for (int user : installedUsers) {
+ final int storageFlags;
+ if (isUserCredentialLocked(user)) {
+ // We've encountered a user that hasn't unlocked on a FBE device, so we can't copy
+ // across app user data until the user unlocks their device.
+ Log.v(TAG, "User: " + user + " isn't unlocked, skipping CE userdata backup.");
+ storageFlags = Installer.FLAG_STORAGE_DE;
+ pendingBackups.add(user);
+ } else {
+ storageFlags = Installer.FLAG_STORAGE_CE | Installer.FLAG_STORAGE_DE;
+ }
+
+ try {
+ mInstaller.snapshotAppData(packageName, user, storageFlags);
+ } catch (InstallerException ie) {
+ Log.e(TAG, "Unable to create app data snapshot for: " + packageName
+ + ", userId: " + user, ie);
+ }
+ }
+
+ return pendingBackups;
+ }
+
+ /**
+ * Restores an app data snapshot for a specified package ({@code packageName},
+ * {@code rollbackData}) for a specified {@code userId}.
+ *
+ * @return {@code true} iff. a change to the {@code rollbackData} has been made. Changes to
+ * {@code rollbackData} are restricted to the removal or addition of {@code userId} to
+ * the list of pending backups or restores.
+ */
+ public boolean restoreAppData(String packageName, RollbackData rollbackData,
+ int userId, int appId, long ceDataInode, String seInfo) {
+ if (rollbackData == null) {
+ return false;
+ }
+
+ if (!rollbackData.inProgress) {
+ Log.e(TAG, "Request to restore userData for: " + packageName
+ + ", but no rollback in progress.");
+ return false;
+ }
+
+ PackageRollbackInfo packageInfo = RollbackManagerServiceImpl.getPackageRollbackInfo(
+ rollbackData, packageName);
+ int storageFlags = Installer.FLAG_STORAGE_DE;
+
+ final IntArray pendingBackups = packageInfo.getPendingBackups();
+ final List<RestoreInfo> pendingRestores = packageInfo.getPendingRestores();
+ boolean changedRollbackData = false;
+
+ // If we still have a userdata backup pending for this user, it implies that the user
+ // hasn't unlocked their device between the point of backup and the point of restore,
+ // so the data cannot have changed. We simply skip restoring CE data in this case.
+ if (pendingBackups != null && pendingBackups.indexOf(userId) != -1) {
+ pendingBackups.remove(pendingBackups.indexOf(userId));
+ changedRollbackData = true;
+ } else {
+ // There's no pending CE backup for this user, which means that we successfully
+ // managed to backup data for the user, which means we seek to restore it
+ if (isUserCredentialLocked(userId)) {
+ // We've encountered a user that hasn't unlocked on a FBE device, so we can't
+ // copy across app user data until the user unlocks their device.
+ pendingRestores.add(new RestoreInfo(userId, appId, seInfo));
+ changedRollbackData = true;
+ } else {
+ // This user has unlocked, we can proceed to restore both CE and DE data.
+ storageFlags = storageFlags | Installer.FLAG_STORAGE_CE;
+ }
+ }
+
+ try {
+ mInstaller.restoreAppDataSnapshot(packageName, appId, ceDataInode,
+ seInfo, userId, storageFlags);
+ } catch (InstallerException ie) {
+ Log.e(TAG, "Unable to restore app data snapshot: " + packageName, ie);
+ }
+
+ return changedRollbackData;
+ }
+
+ /**
+ * Computes the list of pending backups and restores for {@code userId} given lists of
+ * available and recent rollbacks. Packages pending backup for the given user are added
+ * to {@code pendingBackups} and packages pending restore are added to {@code pendingRestores}
+ * along with their corresponding {@code RestoreInfo}.
+ *
+ * @return the list of {@code RollbackData} that have been modified during this computation.
+ */
+ public List<RollbackData> computePendingBackupsAndRestores(int userId,
+ ArrayList<String> pendingBackupPackages, Map<String, RestoreInfo> pendingRestores,
+ List<RollbackData> availableRollbacks, List<RollbackInfo> recentRollbacks) {
+ List<RollbackData> rd = new ArrayList<>();
+ // First check with the list of available rollbacks to see whether there are any
+ // pending backup operations that we've not managed to execute.
+ for (RollbackData data : availableRollbacks) {
+ for (PackageRollbackInfo info : data.packages) {
+ final IntArray pendingBackupUsers = info.getPendingBackups();
+ if (pendingBackupUsers != null) {
+ final int idx = pendingBackupUsers.indexOf(userId);
+ if (idx != -1) {
+ pendingBackupPackages.add(info.getPackageName());
+ pendingBackupUsers.remove(idx);
+ if (rd.indexOf(data) == -1) {
+ rd.add(data);
+ }
+ }
+ }
+ }
+ }
+
+ // Then check with the list of recently executed rollbacks to see whether there are
+ // any rollback operations
+ for (RollbackInfo data : recentRollbacks) {
+ for (PackageRollbackInfo info : data.getPackages()) {
+ final RestoreInfo ri = info.getRestoreInfo(userId);
+ if (ri != null) {
+ if (pendingBackupPackages.contains(info.getPackageName())) {
+ // This implies that the user hasn't unlocked their device between
+ // the request to backup data for this user and the request to restore
+ // it, so we do nothing here.
+ pendingBackupPackages.remove(info.getPackageName());
+ } else {
+ pendingRestores.put(info.getPackageName(), ri);
+ }
+
+ info.removeRestoreInfo(ri);
+ }
+ }
+ }
+
+ return rd;
+ }
+
+ /**
+ * Commits the list of pending backups and restores for a given {@code userId}.
+ */
+ public void commitPendingBackupAndRestoreForUser(int userId,
+ ArrayList<String> pendingBackups, Map<String, RestoreInfo> pendingRestores) {
+ if (!pendingBackups.isEmpty()) {
+ for (String packageName : pendingBackups) {
+ try {
+ mInstaller.snapshotAppData(packageName, userId, Installer.FLAG_STORAGE_CE);
+ } catch (InstallerException ie) {
+ Log.e(TAG, "Unable to create app data snapshot for: " + packageName, ie);
+ }
+ }
+ }
+
+ // TODO(narayan): Should we perform the restore before the backup for packages that have
+ // both backups and restores pending ? We could get into this case if we have a pending
+ // restore from a rollback + a snapshot request from a new restore.
+ if (!pendingRestores.isEmpty()) {
+ for (String packageName : pendingRestores.keySet()) {
+ try {
+ final RestoreInfo ri = pendingRestores.get(packageName);
+
+ // TODO(narayan): Verify that the user of "0" for ceDataInode is accurate
+ // here. We know that the user has unlocked (and that their CE data is
+ // available) so we shouldn't need to resort to the fallback path.
+ mInstaller.restoreAppDataSnapshot(packageName, ri.appId,
+ 0 /* ceDataInode */, ri.seInfo, userId, Installer.FLAG_STORAGE_CE);
+ } catch (InstallerException ie) {
+ Log.e(TAG, "Unable to restore app data snapshot for: " + packageName, ie);
+ }
+ }
+ }
+ }
+
+ /**
+ * @return {@code true} iff. {@code userId} is locked on an FBE device.
+ */
+ @VisibleForTesting
+ public boolean isUserCredentialLocked(int userId) {
+ return StorageManager.isFileEncryptedNativeOrEmulated()
+ && !StorageManager.isUserKeyUnlocked(userId);
+ }
+}
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerService.java b/services/core/java/com/android/server/rollback/RollbackManagerService.java
index 4b5e764..ba6cddd 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerService.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerService.java
@@ -39,4 +39,9 @@
mService = new RollbackManagerServiceImpl(getContext());
publishBinderService(Context.ROLLBACK_SERVICE, mService);
}
+
+ @Override
+ public void onUnlockUser(int user) {
+ mService.onUnlockUser(user);
+ }
}
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 289618e..5eb137b 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -31,6 +31,7 @@
import android.content.pm.VersionedPackage;
import android.content.rollback.IRollbackManager;
import android.content.rollback.PackageRollbackInfo;
+import android.content.rollback.PackageRollbackInfo.RestoreInfo;
import android.content.rollback.RollbackInfo;
import android.content.rollback.RollbackManager;
import android.os.Binder;
@@ -39,14 +40,13 @@
import android.os.HandlerThread;
import android.os.ParcelFileDescriptor;
import android.os.Process;
-import android.os.storage.StorageManager;
+import android.util.IntArray;
import android.util.Log;
import android.util.SparseBooleanArray;
import com.android.internal.annotations.GuardedBy;
import com.android.server.LocalServices;
import com.android.server.pm.Installer;
-import com.android.server.pm.Installer.InstallerException;
import com.android.server.pm.PackageManagerServiceUtils;
import java.io.File;
@@ -111,6 +111,7 @@
private final HandlerThread mHandlerThread;
private final Installer mInstaller;
private final RollbackPackageHealthObserver mPackageHealthObserver;
+ private final AppDataRollbackHelper mUserdataHelper;
RollbackManagerServiceImpl(Context context) {
mContext = context;
@@ -124,6 +125,7 @@
mRollbackStore = new RollbackStore(new File(Environment.getDataDirectory(), "rollback"));
mPackageHealthObserver = new RollbackPackageHealthObserver(mContext);
+ mUserdataHelper = new AppDataRollbackHelper(mInstaller);
// Kick off loading of the rollback data from strorage in a background
// thread.
@@ -424,6 +426,35 @@
}
}
+ void onUnlockUser(int userId) {
+ getHandler().post(() -> {
+ final ArrayList<String> pendingBackupPackages = new ArrayList<>();
+ final Map<String, RestoreInfo> pendingRestorePackages = new HashMap<>();
+ final List<RollbackData> changed;
+ synchronized (mLock) {
+ ensureRollbackDataLoadedLocked();
+ changed = mUserdataHelper.computePendingBackupsAndRestores(userId,
+ pendingBackupPackages, pendingRestorePackages, mAvailableRollbacks,
+ mRecentlyExecutedRollbacks);
+ }
+
+ mUserdataHelper.commitPendingBackupAndRestoreForUser(userId,
+ pendingBackupPackages, pendingRestorePackages);
+
+ for (RollbackData rd : changed) {
+ try {
+ mRollbackStore.saveAvailableRollback(rd);
+ } catch (IOException ioe) {
+ Log.e(TAG, "Unable to save rollback info for : " + rd.rollbackId, ioe);
+ }
+ }
+
+ synchronized (mLock) {
+ mRollbackStore.saveRecentlyExecutedRollbacks(mRecentlyExecutedRollbacks);
+ }
+ });
+ }
+
/**
* Load rollback data from storage if it has not already been loaded.
* After calling this funciton, mAvailableRollbacks and
@@ -533,6 +564,20 @@
// that are necessary to keep track of.
synchronized (mLock) {
ensureRollbackDataLoadedLocked();
+
+ // This should never happen because we can't have any pending backups left after
+ // a rollback has been executed. See AppDataRollbackHelper#restoreAppData where we
+ // clear all pending backups at the point of restore because they're guaranteed to be
+ // no-ops.
+ //
+ // We may, however, have one or more pending restores left to handle.
+ for (PackageRollbackInfo target : rollback.getPackages()) {
+ if (target.getPendingBackups().size() > 0) {
+ Log.e(TAG, "No backups allowed to be pending for: " + target);
+ target.getPendingBackups().clear();
+ }
+ }
+
mRecentlyExecutedRollbacks.add(rollback);
mRollbackStore.saveRecentlyExecutedRollbacks(mRecentlyExecutedRollbacks);
}
@@ -701,27 +746,12 @@
VersionedPackage installedVersion = new VersionedPackage(packageName,
installedPackage.getLongVersionCode());
- for (int user : installedUsers) {
- final int storageFlags;
- if (StorageManager.isFileEncryptedNativeOrEmulated()
- && !StorageManager.isUserKeyUnlocked(user)) {
- // We've encountered a user that hasn't unlocked on a FBE device, so we can't copy
- // across app user data until the user unlocks their device.
- Log.e(TAG, "User: " + user + " isn't unlocked, skipping CE userdata backup.");
- storageFlags = Installer.FLAG_STORAGE_DE;
- } else {
- storageFlags = Installer.FLAG_STORAGE_CE | Installer.FLAG_STORAGE_DE;
- }
- try {
- mInstaller.snapshotAppData(packageName, user, storageFlags);
- } catch (InstallerException ie) {
- Log.e(TAG, "Unable to create app data snapshot for: " + packageName, ie);
- }
- }
+ final IntArray pendingBackups = mUserdataHelper.snapshotAppData(packageName,
+ installedUsers);
- PackageRollbackInfo info = new PackageRollbackInfo(newVersion, installedVersion);
-
+ PackageRollbackInfo info = new PackageRollbackInfo(newVersion, installedVersion,
+ pendingBackups, new ArrayList<>());
RollbackData data;
try {
synchronized (mLock) {
@@ -760,40 +790,24 @@
}
getHandler().post(() -> {
- PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);
final RollbackData rollbackData = getRollbackForPackage(packageName);
- if (rollbackData == null) {
- pmi.finishPackageInstall(token, false);
- return;
- }
-
- if (!rollbackData.inProgress) {
- Log.e(TAG, "Request to restore userData for: " + packageName
- + ", but no rollback in progress.");
- pmi.finishPackageInstall(token, false);
- return;
- }
-
- final int storageFlags;
- if (StorageManager.isFileEncryptedNativeOrEmulated()
- && !StorageManager.isUserKeyUnlocked(userId)) {
- // We've encountered a user that hasn't unlocked on a FBE device, so we can't copy
- // across app user data until the user unlocks their device.
- Log.e(TAG, "User: " + userId + " isn't unlocked, skipping CE userdata restore.");
-
- storageFlags = Installer.FLAG_STORAGE_DE;
- } else {
- storageFlags = Installer.FLAG_STORAGE_CE | Installer.FLAG_STORAGE_DE;
- }
-
- try {
- mInstaller.restoreAppDataSnapshot(packageName, appId, ceDataInode,
- seInfo, userId, storageFlags);
- } catch (InstallerException ie) {
- Log.e(TAG, "Unable to restore app data snapshot: " + packageName, ie);
- }
-
+ final boolean changedRollbackData = mUserdataHelper.restoreAppData(packageName,
+ rollbackData, userId, appId, ceDataInode, seInfo);
+ final PackageManagerInternal pmi = LocalServices.getService(
+ PackageManagerInternal.class);
pmi.finishPackageInstall(token, false);
+
+ // We've updated metadata about this rollback, so save it to flash.
+ if (changedRollbackData) {
+ try {
+ mRollbackStore.saveAvailableRollback(rollbackData);
+ } catch (IOException ioe) {
+ // TODO(narayan): What is the right thing to do here ? This isn't a fatal error,
+ // since it will only result in us trying to restore data again, which will be
+ // a no-op if there's no data available.
+ Log.e(TAG, "Unable to save available rollback: " + packageName, ioe);
+ }
+ }
});
}
@@ -900,10 +914,8 @@
ensureRollbackDataLoadedLocked();
for (int i = 0; i < mAvailableRollbacks.size(); ++i) {
RollbackData data = mAvailableRollbacks.get(i);
- for (PackageRollbackInfo info : data.packages) {
- if (info.getPackageName().equals(packageName)) {
- return data;
- }
+ if (getPackageRollbackInfo(data, packageName) != null) {
+ return data;
}
}
}
@@ -926,6 +938,22 @@
}
}
}
+
+ return null;
+ }
+
+ /**
+ * Returns the {@code PackageRollbackInfo} associated with {@code packageName} from
+ * a specified {@code RollbackData}.
+ */
+ static PackageRollbackInfo getPackageRollbackInfo(RollbackData data,
+ String packageName) {
+ for (PackageRollbackInfo info : data.packages) {
+ if (info.getPackageName().equals(packageName)) {
+ return info;
+ }
+ }
+
return null;
}
diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
index 2880103..b3cc6de 100644
--- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
+++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInstaller;
+import android.content.pm.VersionedPackage;
import android.content.rollback.PackageRollbackInfo;
import android.content.rollback.RollbackInfo;
import android.content.rollback.RollbackManager;
@@ -41,12 +42,10 @@
private static final String TAG = "RollbackPackageHealthObserver";
private static final String NAME = "rollback-observer";
private Context mContext;
- private RollbackManager mRollbackManager;
private Handler mHandler;
RollbackPackageHealthObserver(Context context) {
mContext = context;
- mRollbackManager = mContext.getSystemService(RollbackManager.class);
HandlerThread handlerThread = new HandlerThread("RollbackPackageHealthObserver");
handlerThread.start();
mHandler = handlerThread.getThreadHandler();
@@ -54,8 +53,10 @@
}
@Override
- public int onHealthCheckFailed(String packageName) {
- RollbackInfo rollback = getAvailableRollback(packageName);
+ public int onHealthCheckFailed(String packageName, long versionCode) {
+ RollbackInfo rollback =
+ getAvailableRollback(mContext.getSystemService(RollbackManager.class),
+ packageName, versionCode);
if (rollback == null) {
// Don't handle the notification, no rollbacks available for the package
return PackageHealthObserverImpact.USER_IMPACT_NONE;
@@ -65,8 +66,9 @@
}
@Override
- public boolean execute(String packageName) {
- RollbackInfo rollback = getAvailableRollback(packageName);
+ 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?
return false;
@@ -86,12 +88,9 @@
});
// TODO(zezeozue): Log initiated metrics
- // TODO: Pass the package as a cause package instead of using
- // Collections.emptyList once the version of the failing package is
- // easily available.
mHandler.post(() ->
- mRollbackManager.commitRollback(rollback.getRollbackId(),
- Collections.emptyList(),
+ rollbackManager.commitRollback(rollback.getRollbackId(),
+ Collections.singletonList(new VersionedPackage(packageName, versionCode)),
rollbackReceiver.getIntentSender()));
// Assume rollback executed successfully
return true;
@@ -110,11 +109,13 @@
PackageWatchdog.getInstance(mContext).startObservingHealth(this, packages, durationMs);
}
- private RollbackInfo getAvailableRollback(String packageName) {
- for (RollbackInfo rollback : mRollbackManager.getAvailableRollbacks()) {
+ private RollbackInfo getAvailableRollback(RollbackManager rollbackManager,
+ String packageName, long versionCode) {
+ for (RollbackInfo rollback : rollbackManager.getAvailableRollbacks()) {
for (PackageRollbackInfo packageRollback : rollback.getPackages()) {
- if (packageName.equals(packageRollback.getPackageName())) {
- // TODO(zezeozue): Only rollback if rollback version == failed package version
+ if (packageName.equals(packageRollback.getPackageName())
+ && packageRollback.getVersionRolledBackFrom().getVersionCode()
+ == versionCode) {
return rollback;
}
}
diff --git a/services/core/java/com/android/server/rollback/RollbackStore.java b/services/core/java/com/android/server/rollback/RollbackStore.java
index 98ebb09..c70f47d 100644
--- a/services/core/java/com/android/server/rollback/RollbackStore.java
+++ b/services/core/java/com/android/server/rollback/RollbackStore.java
@@ -16,9 +16,12 @@
package com.android.server.rollback;
+import android.annotation.NonNull;
import android.content.pm.VersionedPackage;
import android.content.rollback.PackageRollbackInfo;
+import android.content.rollback.PackageRollbackInfo.RestoreInfo;
import android.content.rollback.RollbackInfo;
+import android.util.IntArray;
import android.util.Log;
import libcore.io.IoUtils;
@@ -99,6 +102,64 @@
}
/**
+ * Converts an {@code JSONArray} of integers to an {@code IntArray}.
+ */
+ private static @NonNull IntArray convertToIntArray(@NonNull JSONArray jsonArray)
+ throws JSONException {
+ if (jsonArray.length() == 0) {
+ return new IntArray();
+ }
+
+ final int[] ret = new int[jsonArray.length()];
+ for (int i = 0; i < ret.length; ++i) {
+ ret[i] = jsonArray.getInt(i);
+ }
+
+ return IntArray.wrap(ret);
+ }
+
+ /**
+ * Converts an {@code IntArray} into an {@code JSONArray} of integers.
+ */
+ private static @NonNull JSONArray convertToJsonArray(@NonNull IntArray intArray) {
+ JSONArray jsonArray = new JSONArray();
+ for (int i = 0; i < intArray.size(); ++i) {
+ jsonArray.put(intArray.get(i));
+ }
+
+ return jsonArray;
+ }
+
+ private static @NonNull JSONArray convertToJsonArray(@NonNull List<RestoreInfo> list)
+ throws JSONException {
+ JSONArray jsonArray = new JSONArray();
+ for (RestoreInfo ri : list) {
+ JSONObject jo = new JSONObject();
+ jo.put("userId", ri.userId);
+ jo.put("appId", ri.appId);
+ jo.put("seInfo", ri.seInfo);
+ jsonArray.put(jo);
+ }
+
+ return jsonArray;
+ }
+
+ private static @NonNull ArrayList<RestoreInfo> convertToRestoreInfoArray(
+ @NonNull JSONArray array) throws JSONException {
+ ArrayList<RestoreInfo> restoreInfos = new ArrayList<>();
+
+ for (int i = 0; i < array.length(); ++i) {
+ JSONObject jo = array.getJSONObject(i);
+ restoreInfos.add(new RestoreInfo(
+ jo.getInt("userId"),
+ jo.getInt("appId"),
+ jo.getString("seInfo")));
+ }
+
+ return restoreInfos;
+ }
+
+ /**
* Reads the list of recently executed rollbacks from persistent storage.
*/
List<RollbackInfo> loadRecentlyExecutedRollbacks() {
@@ -239,6 +300,12 @@
JSONObject json = new JSONObject();
json.put("versionRolledBackFrom", toJson(info.getVersionRolledBackFrom()));
json.put("versionRolledBackTo", toJson(info.getVersionRolledBackTo()));
+
+ IntArray pendingBackups = info.getPendingBackups();
+ List<RestoreInfo> pendingRestores = info.getPendingRestores();
+ json.put("pendingBackups", convertToJsonArray(pendingBackups));
+ json.put("pendingRestores", convertToJsonArray(pendingRestores));
+
return json;
}
@@ -247,7 +314,14 @@
json.getJSONObject("versionRolledBackFrom"));
VersionedPackage versionRolledBackTo = versionedPackageFromJson(
json.getJSONObject("versionRolledBackTo"));
- return new PackageRollbackInfo(versionRolledBackFrom, versionRolledBackTo);
+
+ final IntArray pendingBackups = convertToIntArray(
+ json.getJSONArray("pendingBackups"));
+ final ArrayList<RestoreInfo> pendingRestores = convertToRestoreInfoArray(
+ json.getJSONArray("pendingRestores"));
+
+ return new PackageRollbackInfo(versionRolledBackFrom, versionRolledBackTo,
+ pendingBackups, pendingRestores);
}
private JSONArray versionedPackagesToJson(List<VersionedPackage> packages)
diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java
index c6d2870..2be78fe3 100644
--- a/services/core/java/com/android/server/stats/StatsCompanionService.java
+++ b/services/core/java/com/android/server/stats/StatsCompanionService.java
@@ -23,6 +23,7 @@
import static com.android.server.am.MemoryStatUtil.readMemoryStatFromProcfs;
import static com.android.server.am.MemoryStatUtil.readRssHighWaterMarkFromProcfs;
+import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActivityManagerInternal;
import android.app.AlarmManager;
@@ -83,6 +84,7 @@
import android.telephony.ModemActivityInfo;
import android.telephony.TelephonyManager;
import android.util.ArrayMap;
+import android.util.ArraySet;
import android.util.Log;
import android.util.Slog;
import android.util.StatsLog;
@@ -112,6 +114,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.storage.DiskStatsFileLogger;
import com.android.server.storage.DiskStatsLoggingService;
@@ -1781,6 +1784,60 @@
}
/**
+ * Add a RoleHolder atom for each package that holds a role.
+ *
+ * @param elapsedNanos the time since boot
+ * @param wallClockNanos the time on the clock
+ * @param pulledData the data sink to write to
+ */
+ private void pullRoleHolders(long elapsedNanos, final long wallClockNanos,
+ @NonNull List<StatsLogEventWrapper> pulledData) {
+ long callingToken = Binder.clearCallingIdentity();
+ try {
+ PackageManager pm = mContext.getPackageManager();
+ RoleManagerServiceInternal rm =
+ LocalServices.getService(RoleManagerServiceInternal.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();
+
+ ArrayMap<String, ArraySet<String>> roles = rm.getRoleHoldersAsUser(user);
+
+ int numRoles = roles.size();
+ for (int roleNum = 0; roleNum < numRoles; roleNum++) {
+ String roleName = roles.keyAt(roleNum);
+ ArraySet<String> holders = roles.valueAt(roleNum);
+
+ int numHolders = holders.size();
+ for (int holderNum = 0; holderNum < numHolders; holderNum++) {
+ String holderName = holders.valueAt(holderNum);
+
+ PackageInfo pkg;
+ try {
+ pkg = pm.getPackageInfoAsUser(holderName, 0, user.getIdentifier());
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Role holder " + holderName + " not found");
+ return;
+ }
+
+ StatsLogEventWrapper e = new StatsLogEventWrapper(StatsLog.ROLE_HOLDER,
+ elapsedNanos, wallClockNanos);
+ e.writeInt(pkg.applicationInfo.uid);
+ e.writeString(holderName);
+ e.writeString(roleName);
+ pulledData.add(e);
+ }
+ }
+ }
+ } finally {
+ Binder.restoreCallingIdentity(callingToken);
+ }
+ }
+
+ /**
* Pulls various data.
*/
@Override // Binder call
@@ -1954,6 +2011,10 @@
pullDebugFailingElapsedClock(tagId, elapsedNanos, wallClockNanos, ret);
break;
}
+ case StatsLog.ROLE_HOLDER: {
+ pullRoleHolders(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/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index b0ef8a0..071dde7 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2243,12 +2243,9 @@
synchronized (mLock) {
mInAmbientMode = inAmbientMode;
final WallpaperData data = mWallpaperMap.get(mCurrentUserId);
- final boolean hasConnection = data != null && data.connection != null;
- final WallpaperInfo info = hasConnection ? data.connection.mInfo : null;
-
// The wallpaper info is null for image wallpaper, also use the engine in this case.
- if (hasConnection && (info == null && isAodImageWallpaperEnabled()
- || info != null && info.supportsAmbientMode())) {
+ if (data != null && data.connection != null && (data.connection.mInfo == null
+ || data.connection.mInfo.supportsAmbientMode())) {
// TODO(multi-display) Extends this method with specific display.
engine = data.connection.getDisplayConnectorOrCreate(DEFAULT_DISPLAY).mEngine;
} else {
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index b23dcb3..16c44aa 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -148,7 +148,6 @@
import android.util.IntArray;
import android.util.Log;
import android.util.Slog;
-import android.util.SparseArray;
import android.util.proto.ProtoOutputStream;
import android.view.Display;
@@ -377,8 +376,6 @@
/** Stores the override windowing-mode from before a transient mode change (eg. split) */
private int mRestoreOverrideWindowingMode = WINDOWING_MODE_UNDEFINED;
- private final SparseArray<Rect> mTmpBounds = new SparseArray<>();
- private final SparseArray<Rect> mTmpInsetBounds = new SparseArray<>();
private final Rect mTmpRect = new Rect();
private final Rect mTmpRect2 = new Rect();
private final Rect mTmpRect3 = new Rect();
@@ -4668,6 +4665,14 @@
removeHistoryRecordsForAppLocked(mStackSupervisor.mFinishingActivities, app,
"mFinishingActivities");
+ final boolean isProcessRemoved = app.isRemoved();
+ if (isProcessRemoved) {
+ // The package of the died process should be force-stopped, so make its activities as
+ // finishing to prevent the process from being started again if the next top (or being
+ // visible) activity also resides in the same process.
+ app.makeFinishingForProcessRemoved();
+ }
+
boolean hasVisibleActivities = false;
// Clean out the history list.
@@ -4720,7 +4725,7 @@
+ " stateNotNeeded=" + r.stateNotNeeded
+ " finishing=" + r.finishing
+ " state=" + r.getState() + " callers=" + Debug.getCallers(5));
- if (!r.finishing) {
+ if (!r.finishing || isProcessRemoved) {
Slog.w(TAG, "Force removing " + r + ": app died, no saved state");
EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY,
r.mUserId, System.identityHashCode(r),
@@ -4992,22 +4997,11 @@
// Update override configurations of all tasks in the stack.
final Rect taskBounds = tempTaskBounds != null ? tempTaskBounds : bounds;
- mTmpBounds.clear();
- mTmpInsetBounds.clear();
-
for (int i = mTaskHistory.size() - 1; i >= 0; i--) {
final TaskRecord task = mTaskHistory.get(i);
if (task.isResizeable()) {
task.updateOverrideConfiguration(taskBounds, tempTaskInsetBounds);
}
-
- if (task.hasDisplayedBounds()) {
- mTmpBounds.put(task.taskId, task.getDisplayedBounds());
- mTmpInsetBounds.put(task.taskId, task.getRequestedOverrideBounds());
- } else {
- mTmpBounds.put(task.taskId, task.getRequestedOverrideBounds());
- mTmpInsetBounds.put(task.taskId, null);
- }
}
setBounds(bounds);
@@ -5125,12 +5119,6 @@
}
didSomething = true;
Slog.i(TAG, " Force finishing activity " + r);
- if (sameComponent) {
- if (r.hasProcess()) {
- r.app.setRemoved(true);
- }
- r.app = null;
- }
lastTask = r.getTaskRecord();
finishActivityLocked(r, Activity.RESULT_CANCELED, null, "force-stop",
true);
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index 95a6f71..d1cd1db 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -926,6 +926,10 @@
if (callerApp != null && callerApp.hasForegroundActivities()) {
return false;
}
+ // don't abort if the callerApp is instrumenting with background activity starts privileges
+ if (callerApp != null && callerApp.isInstrumentingWithBackgroundActivityStartPrivileges()) {
+ return false;
+ }
// don't abort if the callingUid is in the foreground or is a persistent system process
final int callingUidProcState = mService.getUidStateLocked(callingUid);
final boolean callingUidHasAnyVisibleWindow =
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 5fabde4..09ef4b9 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -349,6 +349,14 @@
/* Global service lock used by the package the owns this service. */
final WindowManagerGlobalLock mGlobalLock = new WindowManagerGlobalLock();
+ /**
+ * It is the same instance as {@link mGlobalLock}, just declared as a type that the
+ * locked-region-code-injection does't recognize it. It is used to skip wrapping priority
+ * booster for places that are already in the scope of another booster (e.g. computing oom-adj).
+ *
+ * @see WindowManagerThreadPriorityBooster
+ */
+ final Object mGlobalLockWithoutBoost = mGlobalLock;
ActivityStackSupervisor mStackSupervisor;
RootActivityContainer mRootActivityContainer;
WindowManagerService mWindowManager;
@@ -6837,7 +6845,7 @@
@Override
public WindowProcessController getTopApp() {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
final ActivityRecord top = mRootActivityContainer.getTopResumedActivity();
return top != null ? top.app : null;
}
@@ -6845,7 +6853,7 @@
@Override
public void rankTaskLayersIfNeeded() {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
if (mRootActivityContainer != null) {
mRootActivityContainer.rankTaskLayersIfNeeded();
}
@@ -6889,28 +6897,28 @@
@Override
public void onUidActive(int uid, int procState) {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
mActiveUids.put(uid, procState);
}
}
@Override
public void onUidInactive(int uid) {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
mActiveUids.remove(uid);
}
}
@Override
public void onActiveUidsCleared() {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
mActiveUids.clear();
}
}
@Override
public void onUidProcStateChanged(int uid, int procState) {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
if (mActiveUids.get(uid) != null) {
mActiveUids.put(uid, procState);
}
@@ -6919,14 +6927,14 @@
@Override
public void onUidAddedToPendingTempWhitelist(int uid, String tag) {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
mPendingTempWhitelist.put(uid, tag);
}
}
@Override
public void onUidRemovedFromPendingTempWhitelist(int uid) {
- synchronized (mGlobalLock) {
+ synchronized (mGlobalLockWithoutBoost) {
mPendingTempWhitelist.remove(uid);
}
}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 3426ba6..080f965 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -29,6 +29,7 @@
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.FLAG_PRIVATE;
+import static android.view.Display.INVALID_DISPLAY;
import static android.view.InsetsState.TYPE_IME;
import static android.view.Surface.ROTATION_0;
import static android.view.Surface.ROTATION_180;
@@ -43,6 +44,7 @@
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
+import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH;
import static android.view.WindowManager.LayoutParams.NEEDS_MENU_SET_TRUE;
import static android.view.WindowManager.LayoutParams.NEEDS_MENU_UNSET;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
@@ -140,9 +142,11 @@
import android.graphics.Region;
import android.graphics.Region.Op;
import android.hardware.display.DisplayManagerInternal;
+import android.os.Binder;
import android.os.Debug;
import android.os.Handler;
import android.os.IBinder;
+import android.os.Process;
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.Trace;
@@ -157,6 +161,7 @@
import android.view.Gravity;
import android.view.InputChannel;
import android.view.InputDevice;
+import android.view.InputWindowHandle;
import android.view.InsetsState.InternalInsetType;
import android.view.MagnificationSpec;
import android.view.RemoteAnimationDefinition;
@@ -515,6 +520,9 @@
private final InsetsStateController mInsetsStateController;
+ private SurfaceControl mParentSurfaceControl;
+ private InputWindowHandle mPortalWindowHandle;
+
// Last systemUiVisibility we received from status bar.
private int mLastStatusBarVisibility = 0;
// Last systemUiVisibility we dispatched to windows.
@@ -1657,35 +1665,42 @@
final int len = devices != null ? devices.length : 0;
for (int i = 0; i < len; i++) {
InputDevice device = devices[i];
- if (!device.isVirtual()) {
- final int sources = device.getSources();
- final int presenceFlag = device.isExternal() ?
- WindowManagerPolicy.PRESENCE_EXTERNAL :
- WindowManagerPolicy.PRESENCE_INTERNAL;
+ // Ignore virtual input device.
+ if (device.isVirtual()) {
+ continue;
+ }
- // TODO(multi-display): Configure on per-display basis.
- if (mWmService.mIsTouchDevice) {
- if ((sources & InputDevice.SOURCE_TOUCHSCREEN) ==
- InputDevice.SOURCE_TOUCHSCREEN) {
- config.touchscreen = Configuration.TOUCHSCREEN_FINGER;
- }
- } else {
- config.touchscreen = Configuration.TOUCHSCREEN_NOTOUCH;
- }
+ // Check if input device can dispatch events to current display.
+ // If display type is virtual, will follow the default display.
+ if (!mWmService.mInputManager.canDispatchToDisplay(device.getId(),
+ displayInfo.type == Display.TYPE_VIRTUAL ? DEFAULT_DISPLAY : mDisplayId)) {
+ continue;
+ }
- if ((sources & InputDevice.SOURCE_TRACKBALL) == InputDevice.SOURCE_TRACKBALL) {
- config.navigation = Configuration.NAVIGATION_TRACKBALL;
- navigationPresence |= presenceFlag;
- } else if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD
- && config.navigation == Configuration.NAVIGATION_NONAV) {
- config.navigation = Configuration.NAVIGATION_DPAD;
- navigationPresence |= presenceFlag;
- }
+ final int sources = device.getSources();
+ final int presenceFlag = device.isExternal()
+ ? WindowManagerPolicy.PRESENCE_EXTERNAL : WindowManagerPolicy.PRESENCE_INTERNAL;
- if (device.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
- config.keyboard = Configuration.KEYBOARD_QWERTY;
- keyboardPresence |= presenceFlag;
+ if (mWmService.mIsTouchDevice) {
+ if ((sources & InputDevice.SOURCE_TOUCHSCREEN) == InputDevice.SOURCE_TOUCHSCREEN) {
+ config.touchscreen = Configuration.TOUCHSCREEN_FINGER;
}
+ } else {
+ config.touchscreen = Configuration.TOUCHSCREEN_NOTOUCH;
+ }
+
+ if ((sources & InputDevice.SOURCE_TRACKBALL) == InputDevice.SOURCE_TRACKBALL) {
+ config.navigation = Configuration.NAVIGATION_TRACKBALL;
+ navigationPresence |= presenceFlag;
+ } else if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD
+ && config.navigation == Configuration.NAVIGATION_NONAV) {
+ config.navigation = Configuration.NAVIGATION_DPAD;
+ navigationPresence |= presenceFlag;
+ }
+
+ if (device.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+ config.keyboard = Configuration.KEYBOARD_QWERTY;
+ keyboardPresence |= presenceFlag;
}
}
@@ -2410,10 +2425,7 @@
win.getTouchableRegion(mTmpRegion);
mTouchExcludeRegion.op(mTmpRegion, Region.Op.UNION);
}
- for (int i = mTapExcludeProvidingWindows.size() - 1; i >= 0; i--) {
- final WindowState win = mTapExcludeProvidingWindows.valueAt(i);
- win.amendTapExcludeRegion(mTouchExcludeRegion);
- }
+ amendWindowTapExcludeRegion(mTouchExcludeRegion);
// TODO(multi-display): Support docked stacks on secondary displays.
if (mDisplayId == DEFAULT_DISPLAY && getSplitScreenPrimaryStack() != null) {
mDividerControllerLocked.getTouchRegion(mTmpRect);
@@ -2425,6 +2437,18 @@
}
}
+ /**
+ * Union the region with all the tap exclude region provided by windows on this display.
+ *
+ * @param inOutRegion The region to be amended.
+ */
+ void amendWindowTapExcludeRegion(Region inOutRegion) {
+ for (int i = mTapExcludeProvidingWindows.size() - 1; i >= 0; i--) {
+ final WindowState win = mTapExcludeProvidingWindows.valueAt(i);
+ win.amendTapExcludeRegion(inOutRegion);
+ }
+ }
+
@Override
void switchUser() {
super.switchUser();
@@ -3586,6 +3610,13 @@
private void updateBounds() {
calculateBounds(mDisplayInfo, mTmpBounds);
setBounds(mTmpBounds);
+ if (mPortalWindowHandle != null && mParentSurfaceControl != null) {
+ mPortalWindowHandle.touchableRegion.getBounds(mTmpRect);
+ if (!mTmpBounds.equals(mTmpRect)) {
+ mPortalWindowHandle.touchableRegion.set(mTmpBounds);
+ mPendingTransaction.setInputWindowInfo(mParentSurfaceControl, mPortalWindowHandle);
+ }
+ }
}
// Determines the current display bounds based on the current state
@@ -4830,15 +4861,43 @@
|| mWmService.mForceDesktopModeOnExternalDisplays;
}
- /**
+ /**
* Re-parent the DisplayContent's top surfaces, {@link #mWindowingLayer} and
* {@link #mOverlayLayer} to the specified surfaceControl.
*
- * @param surfaceControlHandle The new SurfaceControl, where the DisplayContent's
- * surfaces will be re-parented to.
+ * @param sc The new SurfaceControl, where the DisplayContent's surfaces will be re-parented to.
*/
void reparentDisplayContent(SurfaceControl sc) {
- mPendingTransaction.reparent(mWindowingLayer, sc)
- .reparent(mOverlayLayer, sc);
+ mParentSurfaceControl = sc;
+ if (mPortalWindowHandle == null) {
+ mPortalWindowHandle = createPortalWindowHandle(sc.toString());
+ }
+ mPendingTransaction.setInputWindowInfo(sc, mPortalWindowHandle)
+ .reparent(mWindowingLayer, sc).reparent(mOverlayLayer, sc);
+ }
+
+ /**
+ * Create a portal window handle for input. This window transports any touch to the display
+ * indicated by {@link InputWindowHandle#portalToDisplayId} if the touch hits this window.
+ *
+ * @param name The name of the portal window handle.
+ * @return the new portal window handle.
+ */
+ private InputWindowHandle createPortalWindowHandle(String name) {
+ // Let surface flinger to set the display ID of this input window handle because we don't
+ // know which display the parent surface control is on.
+ final InputWindowHandle portalWindowHandle = new InputWindowHandle(
+ null /* inputApplicationHandle */, null /* clientWindow */, INVALID_DISPLAY);
+ portalWindowHandle.name = name;
+ portalWindowHandle.token = new Binder();
+ portalWindowHandle.layoutParamsFlags =
+ FLAG_SPLIT_TOUCH | FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL;
+ getBounds(mTmpBounds);
+ portalWindowHandle.touchableRegion.set(mTmpBounds);
+ portalWindowHandle.scaleFactor = 1f;
+ portalWindowHandle.ownerPid = Process.myPid();
+ portalWindowHandle.ownerUid = Process.myUid();
+ portalWindowHandle.portalToDisplayId = mDisplayId;
+ return portalWindowHandle;
}
}
diff --git a/services/core/java/com/android/server/wm/TapExcludeRegionHolder.java b/services/core/java/com/android/server/wm/TapExcludeRegionHolder.java
index cbc936f..0a4ab67 100644
--- a/services/core/java/com/android/server/wm/TapExcludeRegionHolder.java
+++ b/services/core/java/com/android/server/wm/TapExcludeRegionHolder.java
@@ -49,7 +49,9 @@
void amendRegion(Region region, Rect boundingRegion) {
for (int i = mTapExcludeRects.size() - 1; i>= 0 ; --i) {
final Rect rect = mTapExcludeRects.valueAt(i);
- rect.intersect(boundingRegion);
+ if (boundingRegion != null) {
+ rect.intersect(boundingRegion);
+ }
region.union(rect);
}
}
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index c88b0e5..59549e0 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -66,7 +66,6 @@
import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.Slog;
-import android.util.SparseArray;
import android.util.proto.ProtoOutputStream;
import android.view.DisplayCutout;
import android.view.DisplayInfo;
@@ -186,33 +185,6 @@
return mChildren.get(mChildren.size() - 1);
}
- /**
- * Set the bounds of the stack and its containing tasks.
- * @param stackBounds New stack bounds. Passing in null sets the bounds to fullscreen.
- * @param taskBounds Bounds for individual tasks, keyed by task id.
- * @param taskTempInsetBounds Inset bounds for individual tasks, keyed by task id.
- * @return True if the stack bounds was changed.
- * */
- boolean setBounds(
- Rect stackBounds, SparseArray<Rect> taskBounds, SparseArray<Rect> taskTempInsetBounds) {
- setBounds(stackBounds);
-
- // Update bounds of containing tasks.
- for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; --taskNdx) {
- final Task task = mChildren.get(taskNdx);
- final Rect insetBounds =
- taskTempInsetBounds != null ? taskTempInsetBounds.get(task.mTaskId) : null;
- if (insetBounds != null) {
- task.setBounds(insetBounds);
- task.setOverrideDisplayedBounds(taskBounds.get(task.mTaskId));
- } else {
- task.setBounds(taskBounds.get(task.mTaskId));
- task.setOverrideDisplayedBounds(null);
- }
- }
- return true;
- }
-
void prepareFreezingTaskBounds() {
for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; --taskNdx) {
final Task task = mChildren.get(taskNdx);
@@ -799,23 +771,6 @@
}
/**
- * Re-sizes a stack and its containing tasks.
- *
- * @param bounds New stack bounds. Passing in null sets the bounds to fullscreen.
- * @param taskBounds Bounds for tasks in the resized stack, keyed by task id.
- * @param taskTempInsetBounds Inset bounds for individual tasks, keyed by task id.
- */
- void resize(Rect bounds, SparseArray<Rect> taskBounds,
- SparseArray<Rect> taskTempInsetBounds) {
- // We might trigger a configuration change. Save the current task bounds for freezing.
- prepareFreezingTaskBounds();
- if (setBounds(bounds, taskBounds, taskTempInsetBounds) && isVisible()) {
- getDisplayContent().setLayoutNeeded();
- mWmService.mWindowPlacerLocked.performSurfacePlacement();
- }
- }
-
- /**
* Calculate an amount by which to expand the stack bounds in each direction.
* Used to make room for shadows in the pinned windowing mode.
*/
diff --git a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
index 2e5df45..dd94af6 100644
--- a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
@@ -70,6 +70,18 @@
// method target window will lose the focus.
return;
}
+ final Region windowTapExcludeRegion = Region.obtain();
+ mDisplayContent.amendWindowTapExcludeRegion(windowTapExcludeRegion);
+ if (windowTapExcludeRegion.contains(x, y)) {
+ windowTapExcludeRegion.recycle();
+ // The user is tapping on the window tap exclude region. We don't move this
+ // display to top. A window tap exclude region, for example, may be set by an
+ // ActivityView, and the region would match the bounds of both the ActivityView
+ // and the virtual display in it. In this case, we would take the tap that is on
+ // the embedded virtual display instead of this display.
+ return;
+ }
+ windowTapExcludeRegion.recycle();
WindowContainer parent = mDisplayContent.getParent();
if (parent != null && parent.getTopChild() != mDisplayContent) {
parent.positionChildAt(WindowContainer.POSITION_TOP, mDisplayContent,
@@ -81,9 +93,6 @@
@Override
public void onPointerEvent(MotionEvent motionEvent) {
- if (motionEvent.getDisplayId() != getDisplayId()) {
- return;
- }
switch (motionEvent.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
final int x = (int) motionEvent.getX();
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 752c24e..975e62a 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6532,8 +6532,13 @@
/**
* Update a tap exclude region with a rectangular area in the window identified by the provided
- * id. Touches on this region will not switch focus to this window. Passing an empty rect will
- * remove the area from the exclude region of this window.
+ * id. Touches down on this region will not:
+ * <ol>
+ * <li>Switch focus to this window.</li>
+ * <li>Move the display of this window to top.</li>
+ * <li>Send the touch events to this window.</li>
+ * </ol>
+ * Passing an empty rect will remove the area from the exclude region of this window.
*/
void updateTapExcludeRegion(IWindow client, int regionId, int left, int top, int width,
int height) {
diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index 07f26b4..8da39b6 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -138,6 +138,8 @@
private volatile boolean mDebugging;
// Active instrumentation running in process?
private volatile boolean mInstrumenting;
+ // Active instrumentation with background activity starts privilege running in process?
+ private volatile boolean mInstrumentingWithBackgroundActivityStartPrivileges;
// This process it perceptible by the user.
private volatile boolean mPerceptible;
// Set to true when process was launched with a wrapper attached
@@ -370,6 +372,23 @@
return mInstrumenting;
}
+ /**
+ * {@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
+ */
+ boolean isInstrumentingWithBackgroundActivityStartPrivileges() {
+ return mInstrumentingWithBackgroundActivityStartPrivileges;
+ }
+
public void setPerceptible(boolean perceptible) {
mPerceptible = perceptible;
}
@@ -394,13 +413,13 @@
}
public void addPackage(String packageName) {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
mPkgList.add(packageName);
}
}
public void clearPackageList() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
mPkgList.clear();
}
}
@@ -416,20 +435,24 @@
mActivities.remove(r);
}
- public void clearActivities() {
- synchronized (mAtm.mGlobalLock) {
- mActivities.clear();
+ void makeFinishingForProcessRemoved() {
+ for (int i = mActivities.size() - 1; i >= 0; --i) {
+ mActivities.get(i).makeFinishingLocked();
}
}
+ void clearActivities() {
+ mActivities.clear();
+ }
+
public boolean hasActivities() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
return !mActivities.isEmpty();
}
}
public boolean hasVisibleActivities() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
for (int i = mActivities.size() - 1; i >= 0; --i) {
final ActivityRecord r = mActivities.get(i);
if (r.visible) {
@@ -441,7 +464,7 @@
}
public boolean hasActivitiesOrRecentTasks() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
return !mActivities.isEmpty() || !mRecentTasks.isEmpty();
}
}
@@ -456,15 +479,13 @@
}
}
- public void finishActivities() {
- synchronized (mAtm.mGlobalLock) {
- ArrayList<ActivityRecord> activities = new ArrayList<>(mActivities);
- for (int i = 0; i < activities.size(); i++) {
- final ActivityRecord r = activities.get(i);
- if (!r.finishing && r.isInStackLocked()) {
- r.getActivityStack().finishActivityLocked(r, Activity.RESULT_CANCELED,
- null, "finish-heavy", true);
- }
+ void finishActivities() {
+ ArrayList<ActivityRecord> activities = new ArrayList<>(mActivities);
+ for (int i = 0; i < activities.size(); i++) {
+ final ActivityRecord r = activities.get(i);
+ if (!r.finishing && r.isInStackLocked()) {
+ r.getActivityStack().finishActivityLocked(r, Activity.RESULT_CANCELED,
+ null, "finish-heavy", true);
}
}
}
@@ -525,15 +546,13 @@
}
- public void updateIntentForHeavyWeightActivity(Intent intent) {
- synchronized (mAtm.mGlobalLock) {
- if (mActivities.isEmpty()) {
- return;
- }
- ActivityRecord hist = mActivities.get(0);
- intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_APP, hist.packageName);
- intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_TASK, hist.getTaskRecord().taskId);
+ void updateIntentForHeavyWeightActivity(Intent intent) {
+ if (mActivities.isEmpty()) {
+ return;
}
+ ActivityRecord hist = mActivities.get(0);
+ intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_APP, hist.packageName);
+ intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_TASK, hist.getTaskRecord().taskId);
}
boolean shouldKillProcessForRemovedTask(TaskRecord tr) {
@@ -603,7 +622,7 @@
}
public int computeOomAdjFromActivities(int minTaskLayer, ComputeOomAdjCallback callback) {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
final int activitiesSize = mActivities.size();
for (int j = 0; j < activitiesSize; j++) {
final ActivityRecord r = mActivities.get(j);
@@ -693,12 +712,8 @@
mAtm.mH.sendMessage(m);
}
- void setRemoved(boolean removed) {
- if (mListener == null) return;
- // Posting on handler so WM lock isn't held when we call into AM.
- final Message m = PooledLambda.obtainMessage(
- WindowProcessListener::setRemoved, mListener, removed);
- mAtm.mH.sendMessage(m);
+ boolean isRemoved() {
+ return mListener == null ? false : mListener.isRemoved();
}
void clearWaitingToKill() {
@@ -840,18 +855,16 @@
}
public boolean hasRecentTasks() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
return !mRecentTasks.isEmpty();
}
}
- public void clearRecentTasks() {
- synchronized (mAtm.mGlobalLock) {
- for (int i = mRecentTasks.size() - 1; i >= 0; i--) {
- mRecentTasks.get(i).clearRootProcess();
- }
- mRecentTasks.clear();
+ void clearRecentTasks() {
+ for (int i = mRecentTasks.size() - 1; i >= 0; i--) {
+ mRecentTasks.get(i).clearRootProcess();
}
+ mRecentTasks.clear();
}
public void appEarlyNotResponding(String annotation, Runnable killAppCallback) {
@@ -905,19 +918,19 @@
}
public void onTopProcChanged() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
mAtm.mVrController.onTopProcChangedLocked(this);
}
}
public boolean isHomeProcess() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
return this == mAtm.mHomeProcess;
}
}
public boolean isPreviousProcess() {
- synchronized (mAtm.mGlobalLock) {
+ synchronized (mAtm.mGlobalLockWithoutBoost) {
return this == mAtm.mPreviousProcess;
}
}
diff --git a/services/core/java/com/android/server/wm/WindowProcessListener.java b/services/core/java/com/android/server/wm/WindowProcessListener.java
index bce5e2d..d732e4e 100644
--- a/services/core/java/com/android/server/wm/WindowProcessListener.java
+++ b/services/core/java/com/android/server/wm/WindowProcessListener.java
@@ -44,8 +44,11 @@
void updateProcessInfo(boolean updateServiceConnectionActivities, boolean updateLru,
boolean activityChange, boolean updateOomAdj);
- /** Set process package been removed from device. */
- void setRemoved(boolean removed);
+ /**
+ * Returns true if the process is removed and we should completely clean up the related records
+ * belonging to this process.
+ */
+ boolean isRemoved();
/** Returns the total time (in milliseconds) spent executing in both user and system code. */
long getCpuTime();
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 4f12010..62e7200 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -536,7 +536,7 @@
private final Point mSurfacePosition = new Point();
/**
- * A region inside of this window to be excluded from touch-related focus switches.
+ * A region inside of this window to be excluded from touch.
*/
private TapExcludeRegionHolder mTapExcludeRegionHolder;
@@ -2168,6 +2168,24 @@
}
region.set(mTmpRect);
cropRegionToStackBoundsIfNeeded(region);
+ subtractTouchExcludeRegionIfNeeded(region);
+ } else if (modal && mTapExcludeRegionHolder != null) {
+ final Region touchExcludeRegion = Region.obtain();
+ amendTapExcludeRegion(touchExcludeRegion);
+ if (!touchExcludeRegion.isEmpty()) {
+ // Remove touch modal because there are some areas that cannot be touched.
+ flags |= FLAG_NOT_TOUCH_MODAL;
+ // Give it a large touchable region at first because it was touch modal. The window
+ // might be moved on the display, so the touchable region should be large enough to
+ // ensure it covers the whole display, no matter where it is moved.
+ getDisplayContent().getBounds(mTmpRect);
+ final int dw = mTmpRect.width();
+ final int dh = mTmpRect.height();
+ region.set(-dw, -dh, dw + dw, dh + dh);
+ // Subtract the area that cannot be touched.
+ region.op(touchExcludeRegion, Region.Op.DIFFERENCE);
+ }
+ touchExcludeRegion.recycle();
} else {
// Not modal or full screen modal
getTouchableRegion(region);
@@ -2837,6 +2855,7 @@
}
}
cropRegionToStackBoundsIfNeeded(outRegion);
+ subtractTouchExcludeRegionIfNeeded(outRegion);
}
private void cropRegionToStackBoundsIfNeeded(Region region) {
@@ -2855,6 +2874,22 @@
}
/**
+ * If this window has areas that cannot be touched, we subtract those areas from its touchable
+ * region.
+ */
+ private void subtractTouchExcludeRegionIfNeeded(Region touchableRegion) {
+ if (mTapExcludeRegionHolder == null) {
+ return;
+ }
+ final Region touchExcludeRegion = Region.obtain();
+ amendTapExcludeRegion(touchExcludeRegion);
+ if (!touchExcludeRegion.isEmpty()) {
+ touchableRegion.op(touchExcludeRegion, Region.Op.DIFFERENCE);
+ }
+ touchExcludeRegion.recycle();
+ }
+
+ /**
* Report a focus change. Must be called with no locks held, and consistently
* from the same serialized thread (such as dispatched from a handler).
*/
@@ -4728,11 +4763,25 @@
mTapExcludeRegionHolder.updateRegion(regionId, left, top, width, height);
// Trigger touch exclude region update on current display.
currentDisplay.updateTouchExcludeRegion();
+ // Trigger touchable region update for this window.
+ currentDisplay.getInputMonitor().updateInputWindowsLw(true /* force */);
}
- /** Union the region with current tap exclude region that this window provides. */
+ /**
+ * Union the region with current tap exclude region that this window provides.
+ *
+ * @param region The region to be amended. It is on the screen coordinates.
+ */
void amendTapExcludeRegion(Region region) {
- mTapExcludeRegionHolder.amendRegion(region, getBounds());
+ final Region tempRegion = Region.obtain();
+ mTmpRect.set(mWindowFrames.mFrame);
+ mTmpRect.offsetTo(0, 0);
+ mTapExcludeRegionHolder.amendRegion(tempRegion, mTmpRect);
+ // The region held by the holder is on the window coordinates. We need to translate it to
+ // the screen coordinates.
+ tempRegion.translate(mWindowFrames.mFrame.left, mWindowFrames.mFrame.top);
+ region.op(tempRegion, Region.Op.UNION);
+ tempRegion.recycle();
}
@Override
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index ff0b0d6..33317b5 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -1652,6 +1652,13 @@
im->setCustomPointerIcon(spriteIcon);
}
+static jboolean nativeCanDispatchToDisplay(JNIEnv* env, jclass /* clazz */, jlong ptr,
+ jint deviceId, jint displayId) {
+
+ NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
+ return im->getInputManager()->getReader()->canDispatchToDisplay(deviceId, displayId);
+}
+
// ----------------------------------------------------------------------------
static const JNINativeMethod gInputManagerMethods[] = {
@@ -1726,6 +1733,8 @@
(void*) nativeReloadPointerIcons },
{ "nativeSetCustomPointerIcon", "(JLandroid/view/PointerIcon;)V",
(void*) nativeSetCustomPointerIcon },
+ { "nativeCanDispatchToDisplay", "(JII)Z",
+ (void*) nativeCanDispatchToDisplay },
};
#define FIND_CLASS(var, className) \
diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index f3c19d0..cbc3791 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -73,6 +73,8 @@
static jmethodID method_correctionsGetLatitudeDegrees;
static jmethodID method_correctionsGetLongitudeDegrees;
static jmethodID method_correctionsGetAltitudeMeters;
+static jmethodID method_correctionsGetHorPosUncMeters;
+static jmethodID method_correctionsGetVerPosUncMeters;
static jmethodID method_correctionsGetToaGpsNanosecondsOfWeek;
static jmethodID method_correctionsGetSingleSatCorrectionList;
static jmethodID method_listSize;
@@ -2233,6 +2235,12 @@
method_correctionsGetAltitudeMeters = env->GetMethodID(
measCorrClass, "getAltitudeMeters", "()D");
+ method_correctionsGetHorPosUncMeters = env->GetMethodID(
+ measCorrClass, "getHorizontalPositionUncertaintyMeters", "()D");
+
+ method_correctionsGetVerPosUncMeters = env->GetMethodID(
+ measCorrClass, "getVerticalPositionUncertaintyMeters", "()D");
+
method_correctionsGetToaGpsNanosecondsOfWeek = env->GetMethodID(
measCorrClass, "getToaGpsNanosecondsOfWeek", "()J");
@@ -2246,6 +2254,10 @@
correctionsObj, method_correctionsGetLongitudeDegrees);
jdouble altitudeDegreesCorr = env->CallDoubleMethod(
correctionsObj, method_correctionsGetAltitudeMeters);
+ jdouble horizontalPositionUncertaintyMeters = env->CallDoubleMethod(
+ correctionsObj, method_correctionsGetHorPosUncMeters);
+ jdouble verticalPositionUncertaintyMeters = env->CallDoubleMethod(
+ correctionsObj, method_correctionsGetVerPosUncMeters);
jlong toaGpsNanosOfWeek = env->CallLongMethod(
correctionsObj, method_correctionsGetToaGpsNanosecondsOfWeek);
jobject singleSatCorrectionList = env->CallObjectMethod(correctionsObj,
@@ -2348,6 +2360,8 @@
.latitudeDegrees = latitudeDegreesCorr,
.longitudeDegrees = longitudeDegreesCorr,
.altitudeMeters = altitudeDegreesCorr,
+ .horizontalPositionUncertaintyMeters = horizontalPositionUncertaintyMeters,
+ .verticalPositionUncertaintyMeters = verticalPositionUncertaintyMeters,
.toaGpsNanosecondsOfWeek = static_cast<uint64_t>(toaGpsNanosOfWeek),
.satCorrections = list,
};
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 51bdbb3..a01a026 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -74,20 +74,14 @@
import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;
import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;
-
import static android.provider.Telephony.Carriers.DPC_URI;
import static android.provider.Telephony.Carriers.ENFORCE_KEY;
import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
- .PROVISIONING_ENTRY_POINT_ADB;
-import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker
- .STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
-
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.PROVISIONING_ENTRY_POINT_ADB;
+import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
import static com.android.server.devicepolicy.TransferOwnershipMetadataManager.ADMIN_TYPE_DEVICE_OWNER;
import static com.android.server.devicepolicy.TransferOwnershipMetadataManager.ADMIN_TYPE_PROFILE_OWNER;
-
-
import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
@@ -240,11 +234,11 @@
import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
import com.android.internal.util.JournaledFile;
import com.android.internal.util.Preconditions;
+import com.android.internal.util.StatLogger;
import com.android.internal.util.XmlUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.server.LocalServices;
import com.android.server.LockGuard;
-import com.android.internal.util.StatLogger;
import com.android.server.SystemServerInitThreadPool;
import com.android.server.SystemService;
import com.android.server.devicepolicy.DevicePolicyManagerService.ActiveAdmin.TrustAgentInfo;
@@ -7716,18 +7710,7 @@
}
// Shutting down backup manager service permanently.
- long ident = mInjector.binderClearCallingIdentity();
- try {
- if (mInjector.getIBackupManager() != null) {
- mInjector.getIBackupManager()
- .setBackupServiceActive(UserHandle.USER_SYSTEM, false);
- }
- } catch (RemoteException e) {
- throw new IllegalStateException("Failed deactivating backup service.", e);
- } finally {
- mInjector.binderRestoreCallingIdentity(ident);
- }
-
+ toggleBackupServiceActive(UserHandle.USER_SYSTEM, /* makeActive= */ false);
if (isAdb()) {
// Log device owner provisioning was started using adb.
MetricsLogger.action(mContext, PROVISIONING_ENTRY_POINT_ADB, LOG_TAG_DEVICE_OWNER);
@@ -7755,7 +7738,7 @@
saveUserRestrictionsLocked(userId);
}
- ident = mInjector.binderClearCallingIdentity();
+ long ident = mInjector.binderClearCallingIdentity();
try {
// TODO Send to system too?
sendOwnerChangedBroadcast(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED, userId);
@@ -8012,6 +7995,9 @@
.write();
}
+ // Shutting down backup manager service permanently.
+ toggleBackupServiceActive(userHandle, /* makeActive= */ false);
+
mOwners.setProfileOwner(who, ownerName, userHandle);
mOwners.writeProfileOwner(userHandle);
Slog.i(LOG_TAG, "Profile owner set: " + who + " on user " + userHandle);
@@ -8035,6 +8021,22 @@
}
}
+
+ private void toggleBackupServiceActive(int userId, boolean makeActive) {
+ long ident = mInjector.binderClearCallingIdentity();
+ try {
+ if (mInjector.getIBackupManager() != null) {
+ mInjector.getIBackupManager()
+ .setBackupServiceActive(userId, makeActive);
+ }
+ } catch (RemoteException e) {
+ throw new IllegalStateException("Failed deactivating backup service.", e);
+ } finally {
+ mInjector.binderRestoreCallingIdentity(ident);
+ }
+
+ }
+
@Override
public void clearProfileOwner(ComponentName who) {
if (!mHasFeature) {
@@ -12787,22 +12789,9 @@
return;
}
Preconditions.checkNotNull(admin);
- synchronized (getLockObject()) {
- getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
- }
-
- final long ident = mInjector.binderClearCallingIdentity();
- try {
- IBackupManager ibm = mInjector.getIBackupManager();
- if (ibm != null) {
- ibm.setBackupServiceActive(UserHandle.USER_SYSTEM, enabled);
- }
- } catch (RemoteException e) {
- throw new IllegalStateException(
- "Failed " + (enabled ? "" : "de") + "activating backup service.", e);
- } finally {
- mInjector.binderRestoreCallingIdentity(ident);
- }
+ enforceProfileOrDeviceOwner(admin);
+ int userId = mInjector.userHandleGetCallingUserId();
+ toggleBackupServiceActive(userId, enabled);
}
@Override
@@ -12811,11 +12800,13 @@
if (!mHasFeature) {
return true;
}
+
+ enforceProfileOrDeviceOwner(admin);
synchronized (getLockObject()) {
try {
- getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
IBackupManager ibm = mInjector.getIBackupManager();
- return ibm != null && ibm.isBackupServiceActive(UserHandle.USER_SYSTEM);
+ return ibm != null && ibm.isBackupServiceActive(
+ mInjector.userHandleGetCallingUserId());
} catch (RemoteException e) {
throw new IllegalStateException("Failed requesting backup service state.", e);
}
@@ -14207,7 +14198,8 @@
+ "calendar APIs", packageName));
return false;
}
- final Intent intent = new Intent(CalendarContract.ACTION_VIEW_WORK_CALENDAR_EVENT);
+ final Intent intent = new Intent(
+ CalendarContract.ACTION_VIEW_MANAGED_PROFILE_CALENDAR_EVENT);
intent.setPackage(packageName);
intent.putExtra(CalendarContract.EXTRA_EVENT_ID, eventId);
intent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, start);
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e378dd6..d030fa5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -91,6 +91,7 @@
import com.android.server.display.DisplayManagerService;
import com.android.server.dreams.DreamManagerService;
import com.android.server.emergency.EmergencyAffordanceService;
+import com.android.server.gpu.GpuService;
import com.android.server.hdmi.HdmiControlService;
import com.android.server.incident.IncidentCompanionService;
import com.android.server.input.InputManagerService;
@@ -813,6 +814,11 @@
traceBeginAndSlog("StartBugreportManagerService");
mSystemServiceManager.startService(BugreportManagerService.class);
traceEnd();
+
+ // Serivce for GPU and GPU driver.
+ traceBeginAndSlog("GpuService");
+ mSystemServiceManager.startService(GpuService.class);
+ traceEnd();
}
/**
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 30c7de5..638ec95 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -9,12 +9,6 @@
"java/android/net/ip/InterfaceController.java", // TODO: move to NetworkStack with tethering
"java/android/net/util/InterfaceParams.java", // TODO: move to NetworkStack with IpServer
"java/android/net/shared/*.java",
- ],
-}
-
-java_library {
- name: "services-netlink-lib",
- srcs: [
"java/android/net/netlink/*.java",
- ]
+ ],
}
diff --git a/services/net/java/android/net/ip/InterfaceController.java b/services/net/java/android/net/ip/InterfaceController.java
index b3af67c..970bc9c 100644
--- a/services/net/java/android/net/ip/InterfaceController.java
+++ b/services/net/java/android/net/ip/InterfaceController.java
@@ -17,7 +17,6 @@
package android.net.ip;
import android.net.INetd;
-import android.net.InterfaceConfiguration;
import android.net.InterfaceConfigurationParcel;
import android.net.LinkAddress;
import android.net.util.SharedLog;
@@ -49,14 +48,18 @@
mLog = log;
}
- private boolean setInterfaceConfig(InterfaceConfiguration config) {
- final InterfaceConfigurationParcel cfgParcel = config.toParcel(mIfName);
-
+ private boolean setInterfaceAddress(LinkAddress addr) {
+ final InterfaceConfigurationParcel ifConfig = new InterfaceConfigurationParcel();
+ ifConfig.ifName = mIfName;
+ ifConfig.ipv4Addr = addr.getAddress().getHostAddress();
+ ifConfig.prefixLength = addr.getPrefixLength();
+ ifConfig.hwAddr = "";
+ ifConfig.flags = new String[0];
try {
- mNetd.interfaceSetCfg(cfgParcel);
+ mNetd.interfaceSetCfg(ifConfig);
} catch (RemoteException | ServiceSpecificException e) {
logError("Setting IPv4 address to %s/%d failed: %s",
- cfgParcel.ipv4Addr, cfgParcel.prefixLength, e);
+ ifConfig.ipv4Addr, ifConfig.prefixLength, e);
return false;
}
return true;
@@ -69,18 +72,14 @@
if (!(address.getAddress() instanceof Inet4Address)) {
return false;
}
- final InterfaceConfiguration ifConfig = new InterfaceConfiguration();
- ifConfig.setLinkAddress(address);
- return setInterfaceConfig(ifConfig);
+ return setInterfaceAddress(address);
}
/**
* Clear the IPv4Address of the interface.
*/
public boolean clearIPv4Address() {
- final InterfaceConfiguration ifConfig = new InterfaceConfiguration();
- ifConfig.setLinkAddress(new LinkAddress("0.0.0.0/0"));
- return setInterfaceConfig(ifConfig);
+ return setInterfaceAddress(new LinkAddress("0.0.0.0/0"));
}
private boolean setEnableIPv6(boolean enabled) {
diff --git a/services/net/java/android/net/ip/IpServer.java b/services/net/java/android/net/ip/IpServer.java
index f7360f5..7910c9a 100644
--- a/services/net/java/android/net/ip/IpServer.java
+++ b/services/net/java/android/net/ip/IpServer.java
@@ -40,7 +40,7 @@
import android.net.ip.RouterAdvertisementDaemon.RaParams;
import android.net.util.InterfaceParams;
import android.net.util.InterfaceSet;
-import android.net.shared.NetdService;
+import android.net.util.NetdService;
import android.net.util.SharedLog;
import android.os.INetworkManagementService;
import android.os.Looper;
diff --git a/services/net/java/android/net/netlink/NetlinkSocket.java b/services/net/java/android/net/netlink/NetlinkSocket.java
index 2a98d90..16f72bd 100644
--- a/services/net/java/android/net/netlink/NetlinkSocket.java
+++ b/services/net/java/android/net/netlink/NetlinkSocket.java
@@ -27,14 +27,13 @@
import static android.system.OsConstants.SO_RCVTIMEO;
import static android.system.OsConstants.SO_SNDTIMEO;
+import android.net.util.SocketUtils;
import android.system.ErrnoException;
import android.system.Os;
-import android.system.StructTimeval;
import android.util.Log;
-import libcore.io.IoUtils;
-
import java.io.FileDescriptor;
+import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.SocketException;
import java.nio.ByteBuffer;
@@ -95,7 +94,11 @@
Log.e(TAG, errPrefix, e);
throw new ErrnoException(errPrefix, EIO, e);
} finally {
- IoUtils.closeQuietly(fd);
+ try {
+ SocketUtils.closeSocket(fd);
+ } catch (IOException e) {
+ // Nothing we can do here
+ }
}
}
@@ -106,7 +109,7 @@
}
public static void connectToKernel(FileDescriptor fd) throws ErrnoException, SocketException {
- Os.connect(fd, makeNetlinkSocketAddress(0, 0));
+ SocketUtils.connectSocket(fd, makeNetlinkSocketAddress(0, 0));
}
private static void checkTimeout(long timeoutMs) {
@@ -125,7 +128,7 @@
throws ErrnoException, IllegalArgumentException, InterruptedIOException {
checkTimeout(timeoutMs);
- Os.setsockoptTimeval(fd, SOL_SOCKET, SO_RCVTIMEO, StructTimeval.fromMillis(timeoutMs));
+ SocketUtils.setSocketTimeValueOption(fd, SOL_SOCKET, SO_RCVTIMEO, timeoutMs);
ByteBuffer byteBuffer = ByteBuffer.allocate(bufsize);
int length = Os.read(fd, byteBuffer);
@@ -148,7 +151,7 @@
FileDescriptor fd, byte[] bytes, int offset, int count, long timeoutMs)
throws ErrnoException, IllegalArgumentException, InterruptedIOException {
checkTimeout(timeoutMs);
- Os.setsockoptTimeval(fd, SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(timeoutMs));
+ SocketUtils.setSocketTimeValueOption(fd, SOL_SOCKET, SO_SNDTIMEO, timeoutMs);
return Os.write(fd, bytes, offset, count);
}
}
diff --git a/services/net/java/android/net/shared/InitialConfiguration.java b/services/net/java/android/net/shared/InitialConfiguration.java
index bc2373f..4ad7138 100644
--- a/services/net/java/android/net/shared/InitialConfiguration.java
+++ b/services/net/java/android/net/shared/InitialConfiguration.java
@@ -20,6 +20,7 @@
import static android.net.shared.ParcelableUtil.toParcelableArray;
import static android.text.TextUtils.join;
+import android.net.InetAddresses;
import android.net.InitialConfigurationParcelable;
import android.net.IpPrefix;
import android.net.IpPrefixParcelable;
@@ -27,7 +28,7 @@
import android.net.LinkAddressParcelable;
import android.net.RouteInfo;
-import java.net.Inet6Address;
+import java.net.Inet4Address;
import java.net.InetAddress;
import java.util.HashSet;
import java.util.List;
@@ -43,6 +44,8 @@
private static final int RFC6177_MIN_PREFIX_LENGTH = 48;
private static final int RFC7421_PREFIX_LENGTH = 64;
+ public static final InetAddress INET6_ANY = InetAddresses.parseNumericAddress("::");
+
/**
* Create a InitialConfiguration that is a copy of the specified configuration.
*/
@@ -102,7 +105,7 @@
return false;
}
// There no more than one IPv4 address
- if (ipAddresses.stream().filter(LinkAddress::isIPv4).count() > 1) {
+ if (ipAddresses.stream().filter(InitialConfiguration::isIPv4).count() > 1) {
return false;
}
@@ -184,11 +187,11 @@
}
private static boolean isPrefixLengthCompliant(LinkAddress addr) {
- return addr.isIPv4() || isCompliantIPv6PrefixLength(addr.getPrefixLength());
+ return isIPv4(addr) || isCompliantIPv6PrefixLength(addr.getPrefixLength());
}
private static boolean isPrefixLengthCompliant(IpPrefix prefix) {
- return prefix.isIPv4() || isCompliantIPv6PrefixLength(prefix.getPrefixLength());
+ return isIPv4(prefix) || isCompliantIPv6PrefixLength(prefix.getPrefixLength());
}
private static boolean isCompliantIPv6PrefixLength(int prefixLength) {
@@ -196,8 +199,16 @@
&& (prefixLength <= RFC7421_PREFIX_LENGTH);
}
+ private static boolean isIPv4(IpPrefix prefix) {
+ return prefix.getAddress() instanceof Inet4Address;
+ }
+
+ private static boolean isIPv4(LinkAddress addr) {
+ return addr.getAddress() instanceof Inet4Address;
+ }
+
private static boolean isIPv6DefaultRoute(IpPrefix prefix) {
- return prefix.getAddress().equals(Inet6Address.ANY);
+ return prefix.getAddress().equals(INET6_ANY);
}
private static boolean isIPv6GUA(LinkAddress addr) {
diff --git a/services/net/java/android/net/shared/IpConfigurationParcelableUtil.java b/services/net/java/android/net/shared/IpConfigurationParcelableUtil.java
index 0007350..1f0525e 100644
--- a/services/net/java/android/net/shared/IpConfigurationParcelableUtil.java
+++ b/services/net/java/android/net/shared/IpConfigurationParcelableUtil.java
@@ -44,11 +44,11 @@
@Nullable StaticIpConfiguration config) {
if (config == null) return null;
final StaticIpConfigurationParcelable p = new StaticIpConfigurationParcelable();
- p.ipAddress = LinkPropertiesParcelableUtil.toStableParcelable(config.ipAddress);
- p.gateway = parcelAddress(config.gateway);
+ p.ipAddress = LinkPropertiesParcelableUtil.toStableParcelable(config.getIpAddress());
+ p.gateway = parcelAddress(config.getGateway());
p.dnsServers = toParcelableArray(
- config.dnsServers, IpConfigurationParcelableUtil::parcelAddress, String.class);
- p.domains = config.domains;
+ config.getDnsServers(), IpConfigurationParcelableUtil::parcelAddress, String.class);
+ p.domains = config.getDomains();
return p;
}
@@ -59,11 +59,13 @@
@Nullable StaticIpConfigurationParcelable p) {
if (p == null) return null;
final StaticIpConfiguration config = new StaticIpConfiguration();
- config.ipAddress = LinkPropertiesParcelableUtil.fromStableParcelable(p.ipAddress);
- config.gateway = unparcelAddress(p.gateway);
- config.dnsServers.addAll(fromParcelableArray(
- p.dnsServers, IpConfigurationParcelableUtil::unparcelAddress));
- config.domains = p.domains;
+ config.setIpAddress(LinkPropertiesParcelableUtil.fromStableParcelable(p.ipAddress));
+ config.setGateway(unparcelAddress(p.gateway));
+ for (InetAddress addr : fromParcelableArray(
+ p.dnsServers, IpConfigurationParcelableUtil::unparcelAddress)) {
+ config.addDnsServer(addr);
+ }
+ config.setDomains(p.domains);
return config;
}
diff --git a/services/net/java/android/net/shared/NetdService.java b/services/net/java/android/net/util/NetdService.java
similarity index 99%
rename from services/net/java/android/net/shared/NetdService.java
rename to services/net/java/android/net/util/NetdService.java
index f5ae725..d4cd5bd 100644
--- a/services/net/java/android/net/shared/NetdService.java
+++ b/services/net/java/android/net/util/NetdService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.net.shared;
+package android.net.util;
import android.content.Context;
import android.net.INetd;
diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java
index b63138e..4bf62c6 100644
--- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java
@@ -19,17 +19,33 @@
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_BACKGROUND_NOT_RESTRICTED;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_BATTERY_NOT_LOW;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_CHARGING;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_CONNECTIVITY;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_CONTENT_TRIGGER;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_DEADLINE;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_DEVICE_NOT_DOZING;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_IDLE;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_STORAGE_NOT_LOW;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_TIMING_DELAY;
+import static com.android.server.job.controllers.JobStatus.CONSTRAINT_WITHIN_QUOTA;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import android.app.job.JobInfo;
+import android.app.usage.UsageStatsManagerInternal;
import android.content.ComponentName;
import android.content.pm.PackageManagerInternal;
import android.os.SystemClock;
+import android.provider.MediaStore;
import androidx.test.runner.AndroidJUnit4;
import com.android.server.LocalServices;
+import com.android.server.job.JobSchedulerInternal;
import com.android.server.job.JobSchedulerService;
import org.junit.After;
@@ -37,6 +53,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoSession;
+import org.mockito.quality.Strictness;
import java.time.Clock;
import java.time.ZoneOffset;
@@ -51,10 +68,15 @@
public void setUp() throws Exception {
mMockingSession = mockitoSession()
.initMocks(this)
+ .strictness(Strictness.LENIENT)
.mockStatic(LocalServices.class)
.startMocking();
+ doReturn(mock(JobSchedulerInternal.class))
+ .when(() -> LocalServices.getService(JobSchedulerInternal.class));
doReturn(mock(PackageManagerInternal.class))
.when(() -> LocalServices.getService(PackageManagerInternal.class));
+ doReturn(mock(UsageStatsManagerInternal.class))
+ .when(() -> LocalServices.getService(UsageStatsManagerInternal.class));
// Freeze the clocks at this moment in time
JobSchedulerService.sSystemClock =
@@ -91,6 +113,462 @@
assertEquals(1, createJobStatus(now - 2000, now).getFractionRunTime(), DELTA);
}
+ /**
+ * Test {@link JobStatus#wouldBeReadyWithConstraint} on explicit constraints that weren't
+ * requested.
+ */
+ @Test
+ public void testWouldBeReadyWithConstraint_NonRequestedConstraints() {
+ // Job with no explicit constraints.
+ final JobStatus job = createJobStatus(
+ new JobInfo.Builder(101, new ComponentName("foo", "bar")).build());
+
+ markImplicitConstraintsSatisfied(job, false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_IDLE));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_BATTERY_NOT_LOW));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_STORAGE_NOT_LOW));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_TIMING_DELAY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ markImplicitConstraintsSatisfied(job, true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_IDLE));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_BATTERY_NOT_LOW));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_STORAGE_NOT_LOW));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_TIMING_DELAY));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedCharging() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiresCharging(true)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setChargingConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ job.setChargingConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setChargingConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ job.setChargingConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedDeviceIdle() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiresDeviceIdle(true)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setIdleConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_IDLE));
+ job.setIdleConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_IDLE));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setIdleConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_IDLE));
+ job.setIdleConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_IDLE));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedBatteryNotLow() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiresBatteryNotLow(true)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setBatteryNotLowConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_BATTERY_NOT_LOW));
+ job.setBatteryNotLowConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_BATTERY_NOT_LOW));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setBatteryNotLowConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_BATTERY_NOT_LOW));
+ job.setBatteryNotLowConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_BATTERY_NOT_LOW));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedStorageNotLow() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiresStorageNotLow(true)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setStorageNotLowConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_STORAGE_NOT_LOW));
+ job.setStorageNotLowConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_STORAGE_NOT_LOW));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setStorageNotLowConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_STORAGE_NOT_LOW));
+ job.setStorageNotLowConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_STORAGE_NOT_LOW));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedTimingDelay() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setMinimumLatency(60_000)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setTimingDelayConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_TIMING_DELAY));
+ job.setTimingDelayConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_TIMING_DELAY));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setTimingDelayConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_TIMING_DELAY));
+ job.setTimingDelayConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_TIMING_DELAY));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedOverrideDeadline() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setOverrideDeadline(300_000)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setDeadlineConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ job.setDeadlineConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setDeadlineConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ job.setDeadlineConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedConnectivity() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setConnectivityConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ job.setConnectivityConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setConnectivityConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ job.setConnectivityConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedContentTrigger() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .addTriggerContentUri(new JobInfo.TriggerContentUri(
+ MediaStore.Images.Media.INTERNAL_CONTENT_URI,
+ JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS))
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ job.setContentTriggerConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ job.setContentTriggerConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedMixture_NoDeadline() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiresCharging(true)
+ .setRequiredNetworkType(JobInfo.NETWORK_TYPE_CELLULAR)
+ .addTriggerContentUri(new JobInfo.TriggerContentUri(
+ MediaStore.Images.Media.INTERNAL_CONTENT_URI,
+ JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS))
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, false);
+
+ job.setChargingConstraintSatisfied(false);
+ job.setConnectivityConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ job.setChargingConstraintSatisfied(true);
+ job.setConnectivityConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(true);
+ // Still false because implicit constraints aren't satisfied.
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ markImplicitConstraintsSatisfied(job, true);
+
+ job.setChargingConstraintSatisfied(false);
+ job.setConnectivityConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ // Turn on constraints one at a time.
+ job.setChargingConstraintSatisfied(true);
+ job.setConnectivityConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ job.setChargingConstraintSatisfied(false);
+ job.setConnectivityConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ job.setChargingConstraintSatisfied(false);
+ job.setConnectivityConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ // With two of the 3 constraints satisfied (and implicit constraints also satisfied), only
+ // the unsatisfied constraint should return true.
+ job.setChargingConstraintSatisfied(true);
+ job.setConnectivityConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ job.setChargingConstraintSatisfied(true);
+ job.setConnectivityConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ job.setChargingConstraintSatisfied(false);
+ job.setConnectivityConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+
+ job.setChargingConstraintSatisfied(true);
+ job.setConnectivityConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONNECTIVITY));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_RequestedMixture_WithDeadline() {
+ final JobInfo jobInfo =
+ new JobInfo.Builder(101, new ComponentName("foo", "bar"))
+ .setRequiresCharging(true)
+ .setOverrideDeadline(300_000)
+ .addTriggerContentUri(new JobInfo.TriggerContentUri(
+ MediaStore.Images.Media.INTERNAL_CONTENT_URI,
+ JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS))
+ .build();
+ final JobStatus job = createJobStatus(jobInfo);
+
+ markImplicitConstraintsSatisfied(job, false);
+
+ job.setChargingConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(false);
+ job.setDeadlineConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ job.setChargingConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(true);
+ job.setDeadlineConstraintSatisfied(true);
+ // Still false because implicit constraints aren't satisfied.
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ markImplicitConstraintsSatisfied(job, true);
+
+ job.setChargingConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(false);
+ job.setDeadlineConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ // Turn on constraints one at a time.
+ job.setChargingConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(false);
+ job.setDeadlineConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ // Deadline should force isReady to be true, but isn't needed for the job to be
+ // considered ready.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ job.setChargingConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(true);
+ job.setDeadlineConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ job.setChargingConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(false);
+ job.setDeadlineConstraintSatisfied(true);
+ // Since the deadline constraint is satisfied, none of the other explicit constraints are
+ // needed.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ // With two of the 3 constraints satisfied (and implicit constraints also satisfied), only
+ // the unsatisfied constraint should return true.
+ job.setChargingConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(true);
+ job.setDeadlineConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ job.setChargingConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(false);
+ job.setDeadlineConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ job.setChargingConstraintSatisfied(false);
+ job.setContentTriggerConstraintSatisfied(true);
+ job.setDeadlineConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+
+ job.setChargingConstraintSatisfied(true);
+ job.setContentTriggerConstraintSatisfied(true);
+ job.setDeadlineConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CHARGING));
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_CONTENT_TRIGGER));
+ // Once implicit constraint are satisfied, deadline constraint should always return true.
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEADLINE));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_ImplicitDeviceNotDozing() {
+ // Job with no explicit constraints.
+ final JobStatus job = createJobStatus(
+ new JobInfo.Builder(101, new ComponentName("foo", "bar")).build());
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setDeviceNotDozingConstraintSatisfied(false, false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEVICE_NOT_DOZING));
+ job.setDeviceNotDozingConstraintSatisfied(true, false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_DEVICE_NOT_DOZING));
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setDeviceNotDozingConstraintSatisfied(false, false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEVICE_NOT_DOZING));
+ job.setDeviceNotDozingConstraintSatisfied(true, false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_DEVICE_NOT_DOZING));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_ImplicitQuota() {
+ // Job with no explicit constraints.
+ final JobStatus job = createJobStatus(
+ new JobInfo.Builder(101, new ComponentName("foo", "bar")).build());
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setQuotaConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_WITHIN_QUOTA));
+ job.setQuotaConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_WITHIN_QUOTA));
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setQuotaConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_WITHIN_QUOTA));
+ job.setQuotaConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_WITHIN_QUOTA));
+ }
+
+ @Test
+ public void testWouldBeReadyWithConstraint_ImplicitBackgroundNotRestricted() {
+ // Job with no explicit constraints.
+ final JobStatus job = createJobStatus(
+ new JobInfo.Builder(101, new ComponentName("foo", "bar")).build());
+
+ markImplicitConstraintsSatisfied(job, false);
+ job.setBackgroundNotRestrictedConstraintSatisfied(false);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_BACKGROUND_NOT_RESTRICTED));
+ job.setBackgroundNotRestrictedConstraintSatisfied(true);
+ assertFalse(job.wouldBeReadyWithConstraint(CONSTRAINT_BACKGROUND_NOT_RESTRICTED));
+
+ markImplicitConstraintsSatisfied(job, true);
+ job.setBackgroundNotRestrictedConstraintSatisfied(false);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_BACKGROUND_NOT_RESTRICTED));
+ job.setBackgroundNotRestrictedConstraintSatisfied(true);
+ assertTrue(job.wouldBeReadyWithConstraint(CONSTRAINT_BACKGROUND_NOT_RESTRICTED));
+ }
+
+ private void markImplicitConstraintsSatisfied(JobStatus job, boolean isSatisfied) {
+ job.setQuotaConstraintSatisfied(isSatisfied);
+ job.setDeviceNotDozingConstraintSatisfied(isSatisfied, false);
+ job.setBackgroundNotRestrictedConstraintSatisfied(isSatisfied);
+ }
+
private static JobStatus createJobStatus(long earliestRunTimeElapsedMillis,
long latestRunTimeElapsedMillis) {
final JobInfo job = new JobInfo.Builder(101, new ComponentName("foo", "bar"))
@@ -98,4 +576,8 @@
return new JobStatus(job, 0, null, -1, 0, 0, null, earliestRunTimeElapsedMillis,
latestRunTimeElapsedMillis, 0, 0, null, 0);
}
+
+ private static JobStatus createJobStatus(JobInfo job) {
+ return JobStatus.createFromJobInfo(job, 0, null, -1, "JobStatusTest");
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java
index 00a60b9..5dafe07 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java
@@ -122,7 +122,7 @@
private UidRecord addActiveUidRecord(int uid, long curProcStateSeq,
long lastNetworkUpdatedProcStateSeq) {
- final UidRecord record = new UidRecord(uid, null /* atmInternal */);
+ final UidRecord record = new UidRecord(uid);
record.lastNetworkUpdatedProcStateSeq = lastNetworkUpdatedProcStateSeq;
record.curProcStateSeq = curProcStateSeq;
record.waitingForNetwork = true;
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
index 419c736..4e21fd0c 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
@@ -250,7 +250,7 @@
}
private UidRecord addUidRecord(int uid) {
- final UidRecord uidRec = new UidRecord(uid, null /* atmInternal */);
+ final UidRecord uidRec = new UidRecord(uid);
uidRec.waitingForNetwork = true;
uidRec.hasInternetPermission = true;
mAms.mProcessList.mActiveUids.put(uid, uidRec);
@@ -405,7 +405,7 @@
@Test
public void testBlockStateForUid() {
- final UidRecord uidRec = new UidRecord(TEST_UID, null /* atmInternal */);
+ final UidRecord uidRec = new UidRecord(TEST_UID);
int expectedBlockState;
final String errorTemplate = "Block state should be %s, prevState: %s, curState: %s";
@@ -732,7 +732,7 @@
@Test
public void testEnqueueUidChangeLocked_procStateSeqUpdated() {
- final UidRecord uidRecord = new UidRecord(TEST_UID, null /* atmInternal */);
+ final UidRecord uidRecord = new UidRecord(TEST_UID);
uidRecord.curProcStateSeq = TEST_PROC_STATE_SEQ1;
// Verify with no pending changes for TEST_UID.
@@ -778,7 +778,7 @@
@MediumTest
@Test
public void testEnqueueUidChangeLocked_dispatchUidsChanged() {
- final UidRecord uidRecord = new UidRecord(TEST_UID, null /* atmInternal */);
+ final UidRecord uidRecord = new UidRecord(TEST_UID);
final int expectedProcState = PROCESS_STATE_SERVICE;
uidRecord.setProcState = expectedProcState;
uidRecord.curProcStateSeq = TEST_PROC_STATE_SEQ1;
@@ -850,7 +850,7 @@
private void verifyWaitingForNetworkStateUpdate(long curProcStateSeq,
long lastDispatchedProcStateSeq, long lastNetworkUpdatedProcStateSeq,
final long procStateSeqToWait, boolean expectWait) throws Exception {
- final UidRecord record = new UidRecord(Process.myUid(), null /* atmInternal */);
+ final UidRecord record = new UidRecord(Process.myUid());
record.curProcStateSeq = curProcStateSeq;
record.lastDispatchedProcStateSeq = lastDispatchedProcStateSeq;
record.lastNetworkUpdatedProcStateSeq = lastNetworkUpdatedProcStateSeq;
diff --git a/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java b/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java
new file mode 100644
index 0000000..33cbf7a
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java
@@ -0,0 +1,176 @@
+/*
+ * 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.rollback;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import android.content.pm.VersionedPackage;
+import android.content.rollback.PackageRollbackInfo;
+import android.content.rollback.PackageRollbackInfo.RestoreInfo;
+import android.util.IntArray;
+
+import com.android.server.pm.Installer;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
+
+import java.io.File;
+import java.util.ArrayList;
+
+@RunWith(JUnit4.class)
+public class AppDataRollbackHelperTest {
+
+ @Test
+ public void testSnapshotAppData() throws Exception {
+ Installer installer = mock(Installer.class);
+ AppDataRollbackHelper helper = spy(new AppDataRollbackHelper(installer));
+
+ // All users are unlocked so we should snapshot data for them.
+ doReturn(true).when(helper).isUserCredentialLocked(eq(10));
+ doReturn(true).when(helper).isUserCredentialLocked(eq(11));
+ IntArray pending = helper.snapshotAppData("com.foo.bar", new int[]{10, 11});
+ assertEquals(2, pending.size());
+ assertEquals(10, pending.get(0));
+ assertEquals(11, pending.get(1));
+
+ InOrder inOrder = Mockito.inOrder(installer);
+ inOrder.verify(installer).snapshotAppData(
+ eq("com.foo.bar"), eq(10), eq(Installer.FLAG_STORAGE_DE));
+ inOrder.verify(installer).snapshotAppData(
+ eq("com.foo.bar"), eq(11), eq(Installer.FLAG_STORAGE_DE));
+ inOrder.verifyNoMoreInteractions();
+
+ // One of the users is unlocked but the other isn't
+ doReturn(false).when(helper).isUserCredentialLocked(eq(10));
+ doReturn(true).when(helper).isUserCredentialLocked(eq(11));
+
+ pending = helper.snapshotAppData("com.foo.bar", new int[]{10, 11});
+ assertEquals(1, pending.size());
+ assertEquals(11, pending.get(0));
+
+ inOrder = Mockito.inOrder(installer);
+ inOrder.verify(installer).snapshotAppData(
+ eq("com.foo.bar"), eq(10),
+ eq(Installer.FLAG_STORAGE_CE | Installer.FLAG_STORAGE_DE));
+ inOrder.verify(installer).snapshotAppData(
+ eq("com.foo.bar"), eq(11), eq(Installer.FLAG_STORAGE_DE));
+ inOrder.verifyNoMoreInteractions();
+ }
+
+ private static RollbackData createInProgressRollbackData(String packageName) {
+ RollbackData data = new RollbackData(1, new File("/does/not/exist"));
+ data.packages.add(new PackageRollbackInfo(
+ new VersionedPackage(packageName, 1), new VersionedPackage(packageName, 1),
+ new IntArray(), new ArrayList<>()));
+ data.inProgress = true;
+
+ return data;
+ }
+
+ @Test
+ public void testRestoreAppDataSnapshot_noRollbackData() throws Exception {
+ Installer installer = mock(Installer.class);
+ AppDataRollbackHelper helper = spy(new AppDataRollbackHelper(installer));
+
+ assertFalse(helper.restoreAppData("com.foo", null, 0, 0, 0, "seinfo"));
+ verifyZeroInteractions(installer);
+ }
+
+ @Test
+ public void testRestoreAppDataSnapshot_noRollbackInProgress() throws Exception {
+ Installer installer = mock(Installer.class);
+ AppDataRollbackHelper helper = spy(new AppDataRollbackHelper(installer));
+
+ RollbackData rd = createInProgressRollbackData("com.foo");
+ // Override the in progress flag.
+ rd.inProgress = false;
+ assertFalse(helper.restoreAppData("com.foo", rd, 0, 0, 0, "seinfo"));
+ verifyZeroInteractions(installer);
+ }
+
+ @Test
+ public void testRestoreAppDataSnapshot_pendingBackupForUser() throws Exception {
+ Installer installer = mock(Installer.class);
+ AppDataRollbackHelper helper = spy(new AppDataRollbackHelper(installer));
+
+ RollbackData rd = createInProgressRollbackData("com.foo");
+ IntArray pendingBackups = rd.packages.get(0).getPendingBackups();
+ pendingBackups.add(10);
+ pendingBackups.add(11);
+
+ assertTrue(helper.restoreAppData("com.foo", rd, 10 /* userId */, 1, 2, "seinfo"));
+
+ // Should only require FLAG_STORAGE_DE here because we have a pending backup that we
+ // didn't manage to execute.
+ InOrder inOrder = Mockito.inOrder(installer);
+ inOrder.verify(installer).restoreAppDataSnapshot(
+ eq("com.foo"), eq(1), eq(2L), eq("seinfo"), eq(10), eq(Installer.FLAG_STORAGE_DE));
+ inOrder.verifyNoMoreInteractions();
+
+ assertEquals(1, pendingBackups.size());
+ assertEquals(11, pendingBackups.get(0));
+ }
+
+ @Test
+ public void testRestoreAppDataSnapshot_availableBackupForLockedUser() throws Exception {
+ Installer installer = mock(Installer.class);
+ AppDataRollbackHelper helper = spy(new AppDataRollbackHelper(installer));
+ doReturn(true).when(helper).isUserCredentialLocked(eq(10));
+
+ RollbackData rd = createInProgressRollbackData("com.foo");
+
+ assertTrue(helper.restoreAppData("com.foo", rd, 10 /* userId */, 1, 2, "seinfo"));
+
+ InOrder inOrder = Mockito.inOrder(installer);
+ inOrder.verify(installer).restoreAppDataSnapshot(
+ eq("com.foo"), eq(1), eq(2L), eq("seinfo"), eq(10), eq(Installer.FLAG_STORAGE_DE));
+ inOrder.verifyNoMoreInteractions();
+
+ ArrayList<RestoreInfo> pendingRestores = rd.packages.get(0).getPendingRestores();
+ assertEquals(1, pendingRestores.size());
+ assertEquals(10, pendingRestores.get(0).userId);
+ assertEquals(1, pendingRestores.get(0).appId);
+ assertEquals("seinfo", pendingRestores.get(0).seInfo);
+ }
+
+ @Test
+ public void testRestoreAppDataSnapshot_availableBackupForUnockedUser() throws Exception {
+ Installer installer = mock(Installer.class);
+ AppDataRollbackHelper helper = spy(new AppDataRollbackHelper(installer));
+ doReturn(false).when(helper).isUserCredentialLocked(eq(10));
+
+ RollbackData rd = createInProgressRollbackData("com.foo");
+ assertFalse(helper.restoreAppData("com.foo", rd, 10 /* userId */, 1, 2, "seinfo"));
+
+ InOrder inOrder = Mockito.inOrder(installer);
+ inOrder.verify(installer).restoreAppDataSnapshot(
+ eq("com.foo"), eq(1), eq(2L), eq("seinfo"), eq(10),
+ eq(Installer.FLAG_STORAGE_DE | Installer.FLAG_STORAGE_CE));
+ inOrder.verifyNoMoreInteractions();
+
+ ArrayList<RestoreInfo> pendingRestores = rd.packages.get(0).getPendingRestores();
+ assertEquals(0, pendingRestores.size());
+ }
+}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java
index 1de1e4e..0b488c0 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.INotificationManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.IPackageManager;
@@ -36,22 +37,17 @@
import android.util.IntArray;
import android.util.Xml;
-import com.android.internal.util.FastXmlSerializer;
import com.android.server.UiServiceTestCase;
import com.android.server.notification.NotificationManagerService.NotificationAssistants;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlSerializer;
import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -65,6 +61,8 @@
private UserManager mUm;
@Mock
NotificationManagerService mNm;
+ @Mock
+ private INotificationManager mINm;
NotificationAssistants mAssistants;
@@ -83,6 +81,7 @@
getContext().setMockPackageManager(mPm);
getContext().addMockSystemService(Context.USER_SERVICE, mUm);
mAssistants = spy(mNm.new NotificationAssistants(getContext(), mLock, mUserProfiles, miPm));
+ when(mNm.getBinderService()).thenReturn(mINm);
List<ResolveInfo> approved = new ArrayList<>();
ResolveInfo resolve = new ResolveInfo();
@@ -136,4 +135,30 @@
verify(mAssistants, times(1)).addApprovedList(
new ComponentName("b", "b").flattenToString(),10, true);
}
+
+ @Test
+ public void testSetPackageOrComponentEnabled_onlyOnePackage() throws Exception {
+ ComponentName component1 = ComponentName.unflattenFromString("package/Component1");
+ ComponentName component2 = ComponentName.unflattenFromString("package/Component2");
+ mAssistants.setPackageOrComponentEnabled(component1.flattenToString(), mZero.id, true,
+ true);
+ verify(mINm, never()).setNotificationAssistantAccessGrantedForUser(any(ComponentName.class),
+ eq(mZero.id), anyBoolean());
+
+ mAssistants.setPackageOrComponentEnabled(component2.flattenToString(), mZero.id, true,
+ true);
+ verify(mINm, times(1)).setNotificationAssistantAccessGrantedForUser(component1, mZero.id,
+ false);
+ }
+
+ @Test
+ public void testSetPackageOrComponentEnabled_samePackage() throws Exception {
+ ComponentName component1 = ComponentName.unflattenFromString("package/Component1");
+ mAssistants.setPackageOrComponentEnabled(component1.flattenToString(), mZero.id, true,
+ true);
+ mAssistants.setPackageOrComponentEnabled(component1.flattenToString(), mZero.id, true,
+ true);
+ verify(mINm, never()).setNotificationAssistantAccessGrantedForUser(any(ComponentName.class),
+ eq(mZero.id), anyBoolean());
+ }
}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index 5d46f0f..4cae3b3 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -2029,6 +2029,31 @@
}
@Test
+ public void testGetAssistantAllowedForUser() throws Exception {
+ UserHandle user = UserHandle.of(10);
+ try {
+ mBinderService.getAllowedNotificationAssistantForUser(user.getIdentifier());
+ } catch (IllegalStateException e) {
+ if (!e.getMessage().contains("At most one NotificationAssistant")) {
+ throw e;
+ }
+ }
+ verify(mAssistants, times(1)).getAllowedComponents(user.getIdentifier());
+ }
+
+ @Test
+ public void testGetAssistantAllowed() throws Exception {
+ try {
+ mBinderService.getAllowedNotificationAssistant();
+ } catch (IllegalStateException e) {
+ if (!e.getMessage().contains("At most one NotificationAssistant")) {
+ throw e;
+ }
+ }
+ verify(mAssistants, times(1)).getAllowedComponents(0);
+ }
+
+ @Test
public void testSetDndAccessForUser() throws Exception {
UserHandle user = UserHandle.of(10);
ComponentName c = ComponentName.unflattenFromString("package/Component");
@@ -2089,6 +2114,54 @@
}
@Test
+ public void testSetAssistantAccess_nullWithAllowedAssistant() throws Exception {
+ ArrayList<ComponentName> componentList = new ArrayList<>();
+ ComponentName c = ComponentName.unflattenFromString("package/Component");
+ componentList.add(c);
+ when(mAssistants.getAllowedComponents(anyInt())).thenReturn(componentList);
+
+ try {
+ mBinderService.setNotificationAssistantAccessGranted(null, true);
+ } catch (SecurityException e) {
+ if (!e.getMessage().contains("Permission Denial: not allowed to send broadcast")) {
+ throw e;
+ }
+ }
+
+ verify(mAssistants, times(1)).setPackageOrComponentEnabled(
+ c.flattenToString(), 0, true, false);
+ verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
+ c.flattenToString(), 0, false, false);
+ verify(mListeners, never()).setPackageOrComponentEnabled(
+ any(), anyInt(), anyBoolean(), anyBoolean());
+ }
+
+ @Test
+ public void testSetAssistantAccessForUser_nullWithAllowedAssistant() throws Exception {
+ UserHandle user = UserHandle.of(10);
+ ArrayList<ComponentName> componentList = new ArrayList<>();
+ ComponentName c = ComponentName.unflattenFromString("package/Component");
+ componentList.add(c);
+ when(mAssistants.getAllowedComponents(anyInt())).thenReturn(componentList);
+
+ try {
+ mBinderService.setNotificationAssistantAccessGrantedForUser(
+ null, user.getIdentifier(), true);
+ } catch (SecurityException e) {
+ if (!e.getMessage().contains("Permission Denial: not allowed to send broadcast")) {
+ throw e;
+ }
+ }
+
+ verify(mAssistants, times(1)).setPackageOrComponentEnabled(
+ c.flattenToString(), user.getIdentifier(), true, false);
+ verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
+ c.flattenToString(), user.getIdentifier(), false, false);
+ verify(mListeners, never()).setPackageOrComponentEnabled(
+ any(), anyInt(), anyBoolean(), anyBoolean());
+ }
+
+ @Test
public void testSetDndAccess() throws Exception {
ComponentName c = ComponentName.unflattenFromString("package/Component");
try {
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
index bde9dde..47ec390 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
@@ -2006,6 +2006,28 @@
}
@Test
+ public void testXml_statusBarIcons_default() throws Exception {
+ ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false);
+ mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper);
+ loadStreamXml(baos, false);
+
+ assertEquals(PreferencesHelper.DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS,
+ mHelper.shouldHideSilentStatusIcons());
+ }
+
+ @Test
+ public void testXml_statusBarIcons() throws Exception {
+ mHelper.setHideSilentStatusIcons(!PreferencesHelper.DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS);
+
+ ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false);
+ mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper);
+ loadStreamXml(baos, false);
+
+ assertEquals(!PreferencesHelper.DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS,
+ mHelper.shouldHideSilentStatusIcons());
+ }
+
+ @Test
public void testSetNotificationDelegate() {
mHelper.setNotificationDelegate(PKG_O, UID_O, "other", 53);
assertEquals("other", mHelper.getNotificationDelegate(PKG_O, UID_O));
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java
index 35c1ede..986943a 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java
@@ -34,6 +34,7 @@
import static com.android.server.wm.ActivityStack.ActivityState.PAUSED;
import static com.android.server.wm.ActivityStack.ActivityState.PAUSING;
import static com.android.server.wm.ActivityStack.ActivityState.RESUMED;
+import static com.android.server.wm.ActivityStack.ActivityState.STOPPED;
import static com.android.server.wm.ActivityStack.ActivityState.STOPPING;
import static com.android.server.wm.ActivityStack.REMOVE_TASK_MODE_DESTROYING;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE;
@@ -51,6 +52,7 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
+import android.content.ComponentName;
import android.content.pm.ActivityInfo;
import android.os.UserHandle;
import android.platform.test.annotations.Presubmit;
@@ -647,20 +649,50 @@
}
@Test
- public void testFinishDisabledPackageActivities() {
+ public void testFinishDisabledPackageActivities_FinishAliveActivities() {
final ActivityRecord firstActivity = new ActivityBuilder(mService).setTask(mTask).build();
final ActivityRecord secondActivity = new ActivityBuilder(mService).setTask(mTask).build();
+ firstActivity.setState(STOPPED, "testFinishDisabledPackageActivities");
+ secondActivity.setState(RESUMED, "testFinishDisabledPackageActivities");
+ mStack.mResumedActivity = secondActivity;
- // Making the second activity a task overlay without an app means it will be removed from
- // the task's activities as well once first activity is removed.
- secondActivity.mTaskOverlay = true;
- secondActivity.app = null;
+ // Note the activities have non-null ActivityRecord.app, so it won't remove directly.
+ mStack.finishDisabledPackageActivitiesLocked(firstActivity.packageName,
+ null /* filterByClasses */, true /* doit */, true /* evenPersistent */,
+ UserHandle.USER_ALL);
+
+ // If the activity is disabled with {@link android.content.pm.PackageManager#DONT_KILL_APP}
+ // the activity should still follow the normal flow to finish and destroy.
+ assertThat(firstActivity.getState()).isEqualTo(DESTROYING);
+ assertThat(secondActivity.getState()).isEqualTo(PAUSING);
+ assertTrue(secondActivity.finishing);
+ }
+
+ @Test
+ public void testFinishDisabledPackageActivities_RemoveNonAliveActivities() {
+ final ActivityRecord activity = new ActivityBuilder(mService).setTask(mTask).build();
+
+ // The overlay activity is not in the disabled package but it is in the same task.
+ final ActivityRecord overlayActivity = new ActivityBuilder(mService).setTask(mTask)
+ .setComponent(new ComponentName("package.overlay", ".OverlayActivity")).build();
+ // If the task only remains overlay activity, the task should also be removed.
+ // See {@link ActivityStack#removeActivityFromHistoryLocked}.
+ overlayActivity.mTaskOverlay = true;
+
+ // The activity without an app means it will be removed immediately.
+ // See {@link ActivityStack#destroyActivityLocked}.
+ activity.app = null;
+ overlayActivity.app = null;
assertEquals(2, mTask.mActivities.size());
- mStack.finishDisabledPackageActivitiesLocked(firstActivity.packageName, null,
- true /* doit */, true /* evenPersistent */, UserHandle.USER_ALL);
+ mStack.finishDisabledPackageActivitiesLocked(activity.packageName,
+ null /* filterByClasses */, true /* doit */, true /* evenPersistent */,
+ UserHandle.USER_ALL);
+ // Although the overlay activity is in another package, the non-overlay activities are
+ // removed from the task. Since the overlay activity should be removed as well, the task
+ // should be empty.
assertThat(mTask.mActivities).isEmpty();
assertThat(mStack.getAllTasks()).isEmpty();
}
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 ace965b..62ec838 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -561,7 +561,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);
}
/**
@@ -576,7 +576,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);
}
/**
@@ -591,57 +591,64 @@
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);
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);
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);
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);
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);
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);
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);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_hasForegroundActivities_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- true, false, false);
+ true, 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, true, 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, true, false);
+ runAndVerifyBackgroundActivityStartsSubtest(
+ "disallowed_callerIsInstrumentingWithBackgroundActivityStartPrivileges_notAborted",
+ false,
+ UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
+ UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
+ false, false, false, true);
}
private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted,
int callingUid, boolean callingUidHasVisibleWindow, int callingUidProcState,
int realCallingUid, boolean realCallingUidHasVisibleWindow, int realCallingUidProcState,
boolean hasForegroundActivities, boolean callerIsRecents,
- boolean callerIsTempWhitelisted) {
+ boolean callerIsTempWhitelisted,
+ boolean callerIsInstrumentingWithBackgroundActivityStartPrivileges) {
// window visibility
doReturn(callingUidHasVisibleWindow).when(mService.mWindowManager.mRoot)
.isAnyNonToastWindowVisibleForUid(callingUid);
@@ -664,6 +671,9 @@
doReturn(callerIsRecents).when(recentTasks).isCallerRecents(callingUid);
// caller is temp whitelisted
callerApp.setAllowBackgroundActivityStarts(callerIsTempWhitelisted);
+ // caller is instrumenting with background activity starts privileges
+ callerApp.setInstrumentingWithBackgroundActivityStartPrivileges(
+ callerIsInstrumentingWithBackgroundActivityStartPrivileges);
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 ea8f33f..3b399ff 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
@@ -474,6 +474,10 @@
}
@Override
+ void updateCpuStats() {
+ }
+
+ @Override
void updateBatteryStats(ActivityRecord component, boolean resumed) {
}
diff --git a/services/usb/java/com/android/server/usb/UsbPortManager.java b/services/usb/java/com/android/server/usb/UsbPortManager.java
index 50e4faa..ae05750 100644
--- a/services/usb/java/com/android/server/usb/UsbPortManager.java
+++ b/services/usb/java/com/android/server/usb/UsbPortManager.java
@@ -41,11 +41,11 @@
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus;
+import android.hardware.usb.V1_0.IUsb;
import android.hardware.usb.V1_0.PortRole;
import android.hardware.usb.V1_0.PortRoleType;
import android.hardware.usb.V1_0.Status;
import android.hardware.usb.V1_1.PortStatus_1_1;
-import android.hardware.usb.V1_2.IUsb;
import android.hardware.usb.V1_2.IUsbCallback;
import android.hardware.usb.V1_2.PortStatus;
import android.hidl.manager.V1_0.IServiceManager;
@@ -320,9 +320,12 @@
try {
// Oneway call into the hal
- mProxy.enableContaminantPresenceDetection(portId, enable);
+ android.hardware.usb.V1_2.IUsb proxy = (android.hardware.usb.V1_2.IUsb) mProxy;
+ proxy.enableContaminantPresenceDetection(portId, enable);
} catch (RemoteException e) {
- logAndPrintException(null, "Failed to set contaminant detection", e);
+ logAndPrintException(pw, "Failed to set contaminant detection", e);
+ } catch (ClassCastException e) {
+ logAndPrintException(pw, "Method only applicable to V1.2 or above implementation", e);
}
}
diff --git a/startop/iorap/tests/Android.mk b/startop/iorap/tests/Android.mk
index 1b2aa46..fa8c8b5 100644
--- a/startop/iorap/tests/Android.mk
+++ b/startop/iorap/tests/Android.mk
@@ -43,4 +43,7 @@
LOCAL_CERTIFICATE := platform
LOCAL_PRIVATE_PLATFORM_APIS := true
+# Disable presubmit test until it works with disabled iorap by default.
+LOCAL_PRESUBMIT_DISABLED := true
+
include $(BUILD_PACKAGE)
diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java
index 0d94c4d..c1786be 100644
--- a/telephony/java/android/telephony/RadioAccessFamily.java
+++ b/telephony/java/android/telephony/RadioAccessFamily.java
@@ -17,12 +17,15 @@
package android.telephony;
import android.annotation.UnsupportedAppUsage;
+import android.hardware.radio.V1_0.RadioTechnology;
+import android.hardware.radio.V1_4.CellInfo.Info;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.telephony.RILConstants;
+
/**
* Object to indicate the phone radio type and access technology.
*
@@ -33,32 +36,34 @@
/**
* TODO: get rid of RAF definition in RadioAccessFamily and
* use {@link TelephonyManager.NetworkTypeBitMask}
+ * TODO: public definition {@link TelephonyManager.NetworkTypeBitMask} is long.
+ * TODO: Convert from int to long everywhere including HAL definitions.
*/
// 2G
- public static final int RAF_UNKNOWN = TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
- public static final int RAF_GSM = TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
- public static final int RAF_GPRS = TelephonyManager.NETWORK_TYPE_BITMASK_GPRS;
- public static final int RAF_EDGE = TelephonyManager.NETWORK_TYPE_BITMASK_EDGE;
- public static final int RAF_IS95A = TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
- public static final int RAF_IS95B = TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
- public static final int RAF_1xRTT = TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
+ public static final int RAF_UNKNOWN = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
+ public static final int RAF_GSM = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
+ public static final int RAF_GPRS = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GPRS;
+ public static final int RAF_EDGE = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EDGE;
+ public static final int RAF_IS95A = (int) TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+ public static final int RAF_IS95B = (int) TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+ public static final int RAF_1xRTT = (int) TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
// 3G
- public static final int RAF_EVDO_0 = TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0;
- public static final int RAF_EVDO_A = TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A;
- public static final int RAF_EVDO_B = TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B;
- public static final int RAF_EHRPD = TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD;
- public static final int RAF_HSUPA = TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA;
- public static final int RAF_HSDPA = TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA;
- public static final int RAF_HSPA = TelephonyManager.NETWORK_TYPE_BITMASK_HSPA;
- public static final int RAF_HSPAP = TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP;
- public static final int RAF_UMTS = TelephonyManager.NETWORK_TYPE_BITMASK_UMTS;
- public static final int RAF_TD_SCDMA = TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
+ public static final int RAF_EVDO_0 = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0;
+ public static final int RAF_EVDO_A = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A;
+ public static final int RAF_EVDO_B = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B;
+ public static final int RAF_EHRPD = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD;
+ public static final int RAF_HSUPA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA;
+ public static final int RAF_HSDPA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA;
+ public static final int RAF_HSPA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSPA;
+ public static final int RAF_HSPAP = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP;
+ public static final int RAF_UMTS = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UMTS;
+ public static final int RAF_TD_SCDMA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
// 4G
- public static final int RAF_LTE = TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
- public static final int RAF_LTE_CA = TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;
+ public static final int RAF_LTE = (int) TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
+ public static final int RAF_LTE_CA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;
// 5G
- public static final int RAF_NR = TelephonyManager.NETWORK_TYPE_BITMASK_NR;
+ public static final int RAF_NR = (int) TelephonyManager.NETWORK_TYPE_BITMASK_NR;
// Grouping of RAFs
// 2G
@@ -147,20 +152,20 @@
/**
* Implement the Parcelable interface.
*/
- public static final Creator<RadioAccessFamily> CREATOR =
- new Creator<RadioAccessFamily>() {
+ public static final Creator<android.telephony.RadioAccessFamily> CREATOR =
+ new Creator<android.telephony.RadioAccessFamily>() {
@Override
- public RadioAccessFamily createFromParcel(Parcel in) {
+ public android.telephony.RadioAccessFamily createFromParcel(Parcel in) {
int phoneId = in.readInt();
int radioAccessFamily = in.readInt();
- return new RadioAccessFamily(phoneId, radioAccessFamily);
+ return new android.telephony.RadioAccessFamily(phoneId, radioAccessFamily);
}
@Override
- public RadioAccessFamily[] newArray(int size) {
- return new RadioAccessFamily[size];
+ public android.telephony.RadioAccessFamily[] newArray(int size) {
+ return new android.telephony.RadioAccessFamily[size];
}
};
@@ -391,76 +396,78 @@
}
/**
- * convert RAF from {@link ServiceState.RilRadioTechnology} bitmask to
+ * convert RAF from {@link android.hardware.radio.V1_0.RadioAccessFamily} to
* {@link TelephonyManager.NetworkTypeBitMask}, the bitmask represented by
- * {@link TelephonyManager.NetworkType}. Reasons are {@link TelephonyManager.NetworkType} are
- * public while {@link ServiceState.RilRadioTechnology} are hidden. We
- * don't want to expose two sets of definition to public.
+ * {@link TelephonyManager.NetworkType}.
*
- * @param raf bitmask represented by {@link ServiceState.RilRadioTechnology}
+ * @param raf {@link android.hardware.radio.V1_0.RadioAccessFamily}
* @return {@link TelephonyManager.NetworkTypeBitMask}
*/
public static int convertToNetworkTypeBitMask(int raf) {
int networkTypeRaf = 0;
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_GSM)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.GSM) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_GPRS)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.GPRS) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_GPRS;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_EDGE)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EDGE) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EDGE;
}
// convert both IS95A/IS95B to CDMA as network mode doesn't support CDMA
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_IS95A)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.IS95A) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_IS95B)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.IS95B) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.ONE_X_RTT) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_0) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_A) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_B) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EHRPD) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSUPA) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSDPA) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_HSPA)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSPA) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSPA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSPAP) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_UMTS)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.UMTS) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_UMTS;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.TD_SCDMA) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_LTE)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.LTE) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA)) != 0) {
+ if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.LTE_CA) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;
}
- if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_NR)) != 0) {
+ if ((raf & android.hardware.radio.V1_4.RadioAccessFamily.NR) != 0) {
networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_NR;
}
+ // TODO: need hal definition
+ if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN)) != 0) {
+ networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN;
+ }
return (networkTypeRaf == 0) ? TelephonyManager.NETWORK_TYPE_UNKNOWN : networkTypeRaf;
}
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 4475630..3317876 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -540,7 +540,7 @@
*
* @hide
*/
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
+ @UnsupportedAppUsage
public int getDataRegState() {
return mDataRegState;
}
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 3645057..0e63b2b 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -23,6 +23,7 @@
import android.Manifest;
import android.annotation.CallbackExecutor;
import android.annotation.IntDef;
+import android.annotation.LongDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -349,41 +350,30 @@
* Returns 0 if none of voice, sms, data is not supported
* Returns 1 for Single standby mode (Single SIM functionality)
* Returns 2 for Dual standby mode.(Dual SIM functionality)
+ * Returns 3 for Tri standby mode.(Tri SIM functionality)
*/
public int getPhoneCount() {
- int phoneCount = 1;
- switch (getMultiSimConfiguration()) {
- case UNKNOWN:
- // if voice or sms or data is supported, return 1 otherwise 0
- if (isVoiceCapable() || isSmsCapable()) {
- phoneCount = 1;
- } else {
- // todo: try to clean this up further by getting rid of the nested conditions
- if (mContext == null) {
- phoneCount = 1;
- } else {
- // check for data support
- ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(
- Context.CONNECTIVITY_SERVICE);
- if (cm == null) {
- phoneCount = 1;
- } else {
- if (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
- phoneCount = 1;
- } else {
- phoneCount = 0;
- }
- }
- }
+ 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;
}
- break;
- case DSDS:
- case DSDA:
- phoneCount = PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM;
- break;
- case TSTS:
- phoneCount = PhoneConstants.MAX_PHONE_COUNT_TRI_SIM;
- break;
+ }
+ }
+
+ phoneCount = 1;
+ try {
+ ITelephony telephony = getITelephony();
+ if (telephony != null) {
+ phoneCount = telephony.getNumOfActiveSims();
+ }
+ } catch (RemoteException ex) {
+ Rlog.e(TAG, "getNumOfActiveSims RemoteException", ex);
}
return phoneCount;
}
@@ -6539,17 +6529,17 @@
* {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE}
* or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
*
- * @return a 32-bit bitmap.
+ * @return The bitmap of preferred network types.
*
* @hide
*/
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@SystemApi
- public @NetworkTypeBitMask int getPreferredNetworkTypeBitmap() {
+ public @NetworkTypeBitMask long getPreferredNetworkTypeBitmap() {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return RadioAccessFamily.getRafFromNetworkType(
+ return (long) RadioAccessFamily.getRafFromNetworkType(
telephony.getPreferredNetworkType(getSubId()));
}
} catch (RemoteException ex) {
@@ -6784,18 +6774,19 @@
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
* app has carrier privileges (see {@link #hasCarrierPrivileges}).
*
- * @param networkTypeBitmap a 32-bit bitmap.
+ * @param networkTypeBitmap The bitmap of preferred network types.
* @return true on success; false on any failure.
* @hide
*/
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
@SystemApi
- public boolean setPreferredNetworkTypeBitmap(@NetworkTypeBitMask int networkTypeBitmap) {
+ public boolean setPreferredNetworkTypeBitmap(@NetworkTypeBitMask long networkTypeBitmap) {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.setPreferredNetworkType(
- getSubId(), RadioAccessFamily.getNetworkTypeFromRaf(networkTypeBitmap));
+ getSubId(), RadioAccessFamily.getNetworkTypeFromRaf(
+ (int) networkTypeBitmap));
}
} catch (RemoteException ex) {
Rlog.e(TAG, "setPreferredNetworkType RemoteException", ex);
@@ -9704,7 +9695,7 @@
/** @hide */
@Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true, prefix = {"NETWORK_TYPE_BITMASK_"},
+ @LongDef(flag = true, prefix = {"NETWORK_TYPE_BITMASK_"},
value = {NETWORK_TYPE_BITMASK_UNKNOWN,
NETWORK_TYPE_BITMASK_GSM,
NETWORK_TYPE_BITMASK_GPRS,
@@ -9733,118 +9724,125 @@
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_UNKNOWN = (1 << NETWORK_TYPE_UNKNOWN);
+ public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L;
/**
* network type bitmask indicating the support of radio tech GSM.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_GSM = (1 << NETWORK_TYPE_GSM);
+ public static final long NETWORK_TYPE_BITMASK_GSM = (1 << (NETWORK_TYPE_GSM -1));
/**
* network type bitmask indicating the support of radio tech GPRS.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_GPRS = (1 << NETWORK_TYPE_GPRS);
+ public static final long NETWORK_TYPE_BITMASK_GPRS = (1 << (NETWORK_TYPE_GPRS -1));
/**
* network type bitmask indicating the support of radio tech EDGE.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_EDGE = (1 << NETWORK_TYPE_EDGE);
+ public static final long NETWORK_TYPE_BITMASK_EDGE = (1 << (NETWORK_TYPE_EDGE -1));
/**
* network type bitmask indicating the support of radio tech CDMA(IS95A/IS95B).
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_CDMA = (1 << NETWORK_TYPE_CDMA);
+ public static final long NETWORK_TYPE_BITMASK_CDMA = (1 << (NETWORK_TYPE_CDMA -1));
/**
* network type bitmask indicating the support of radio tech 1xRTT.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_1xRTT = (1 << NETWORK_TYPE_1xRTT);
+ public static final long NETWORK_TYPE_BITMASK_1xRTT = (1 << (NETWORK_TYPE_1xRTT - 1));
// 3G
/**
* network type bitmask indicating the support of radio tech EVDO 0.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_EVDO_0 = (1 << NETWORK_TYPE_EVDO_0);
+ public static final long NETWORK_TYPE_BITMASK_EVDO_0 = (1 << (NETWORK_TYPE_EVDO_0 -1));
/**
* network type bitmask indicating the support of radio tech EVDO A.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_EVDO_A = (1 << NETWORK_TYPE_EVDO_A);
+ public static final long NETWORK_TYPE_BITMASK_EVDO_A = (1 << (NETWORK_TYPE_EVDO_A - 1));
/**
* network type bitmask indicating the support of radio tech EVDO B.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_EVDO_B = (1 << NETWORK_TYPE_EVDO_B);
+ public static final long NETWORK_TYPE_BITMASK_EVDO_B = (1 << (NETWORK_TYPE_EVDO_B -1));
/**
* network type bitmask indicating the support of radio tech EHRPD.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_EHRPD = (1 << NETWORK_TYPE_EHRPD);
+ public static final long NETWORK_TYPE_BITMASK_EHRPD = (1 << (NETWORK_TYPE_EHRPD -1));
/**
* network type bitmask indicating the support of radio tech HSUPA.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_HSUPA = (1 << NETWORK_TYPE_HSUPA);
+ public static final long NETWORK_TYPE_BITMASK_HSUPA = (1 << (NETWORK_TYPE_HSUPA -1));
/**
* network type bitmask indicating the support of radio tech HSDPA.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_HSDPA = (1 << NETWORK_TYPE_HSDPA);
+ public static final long NETWORK_TYPE_BITMASK_HSDPA = (1 << (NETWORK_TYPE_HSDPA -1));
/**
* network type bitmask indicating the support of radio tech HSPA.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_HSPA = (1 << NETWORK_TYPE_HSPA);
+ public static final long NETWORK_TYPE_BITMASK_HSPA = (1 << (NETWORK_TYPE_HSPA -1));
/**
* network type bitmask indicating the support of radio tech HSPAP.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_HSPAP = (1 << NETWORK_TYPE_HSPAP);
+ public static final long NETWORK_TYPE_BITMASK_HSPAP = (1 << (NETWORK_TYPE_HSPAP -1));
/**
* network type bitmask indicating the support of radio tech UMTS.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_UMTS = (1 << NETWORK_TYPE_UMTS);
+ public static final long NETWORK_TYPE_BITMASK_UMTS = (1 << (NETWORK_TYPE_UMTS -1));
/**
* network type bitmask indicating the support of radio tech TD_SCDMA.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_TD_SCDMA = (1 << NETWORK_TYPE_TD_SCDMA);
+ public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = (1 << (NETWORK_TYPE_TD_SCDMA -1));
// 4G
/**
* network type bitmask indicating the support of radio tech LTE.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_LTE = (1 << NETWORK_TYPE_LTE);
+ public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1));
/**
* network type bitmask indicating the support of radio tech LTE CA (carrier aggregation).
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_LTE_CA = (1 << NETWORK_TYPE_LTE_CA);
+ public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1));
/**
* network type bitmask indicating the support of radio tech NR(New Radio) 5G.
* @hide
*/
@SystemApi
- public static final int NETWORK_TYPE_BITMASK_NR = (1 << NETWORK_TYPE_NR);
+ public static final long NETWORK_TYPE_BITMASK_NR = (1 << (NETWORK_TYPE_NR -1));
+
+ /**
+ * network type bitmask indicating the support of radio tech IWLAN.
+ * @hide
+ */
+ @SystemApi
+ public static final long NETWORK_TYPE_BITMASK_IWLAN = (1 << (NETWORK_TYPE_IWLAN -1));
/**
* @return Modem supported radio access family bitmask
@@ -9855,11 +9853,11 @@
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
- public @NetworkTypeBitMask int getSupportedRadioAccessFamily() {
+ public @NetworkTypeBitMask long getSupportedRadioAccessFamily() {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());
+ return (long) telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());
} else {
// This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_BITMASK_UNKNOWN;
@@ -10214,4 +10212,51 @@
}
return true;
}
+
+ /**
+ * Switch configs to enable multi-sim or switch back to single-sim
+ * <p>Requires Permission:
+ * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the
+ * calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
+ * @param numOfSims number of live SIMs we want to switch to
+ * @throws android.os.RemoteException
+ */
+ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
+ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
+ public void switchMultiSimConfig(int numOfSims) {
+ //only proceed if multi-sim is not restricted
+ if (isMultisimCarrierRestricted()) {
+ Rlog.e(TAG, "switchMultiSimConfig not possible. It is restricted.");
+ return;
+ }
+
+ try {
+ ITelephony telephony = getITelephony();
+ if (telephony != null) {
+ telephony.switchMultiSimConfig(numOfSims);
+ }
+ } catch (RemoteException ex) {
+ Rlog.e(TAG, "switchMultiSimConfig RemoteException", ex);
+ }
+ }
+
+ /**
+ * Get whether reboot is required or not after making changes to modem configurations.
+ * @Return {@code True} if reboot is required after making changes to modem configurations,
+ * otherwise return {@code False}.
+ *
+ * @hide
+ */
+ @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
+ public boolean isRebootRequiredForModemConfigChange() {
+ try {
+ ITelephony service = getITelephony();
+ if (service != null) {
+ return service.isRebootRequiredForModemConfigChange();
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "isRebootRequiredForModemConfigChange RemoteException", e);
+ }
+ return false;
+ }
}
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index c8fadae..62f9999 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -1837,4 +1837,19 @@
* @hide
*/
boolean isMultisimCarrierRestricted();
+
+ /**
+ * Switch configs to enable multi-sim or switch back to single-sim
+ * @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
+ */
+ boolean isRebootRequiredForModemConfigChange();
}
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index d9b206f..77b7979 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -480,6 +480,7 @@
int RIL_REQUEST_SET_PREFERRED_DATA_MODEM = 204;
int RIL_REQUEST_EMERGENCY_DIAL = 205;
int RIL_REQUEST_GET_PHONE_CAPABILITY = 206;
+ int RIL_REQUEST_SWITCH_DUAL_SIM_CONFIG = 207;
/* Responses begin */
int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;
diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
index 6567ea7..603c4c2 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
@@ -194,6 +194,13 @@
*/
static final String PROPERTY_MULTI_SIM_CONFIG = "persist.radio.multisim.config";
+ /**
+ * Property to indicate if reboot is required when changing modems configurations
+ * Type: String(true, false) default is false; most devices don't need reboot
+ */
+ String PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE =
+ "persist.radio.reboot_on_modem_change";
+
/**
* Property to store default subscription.
*/
diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
index 86af642..c1c598d 100644
--- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
+++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import android.content.pm.VersionedPackage;
import android.os.test.TestLooper;
import android.support.test.InstrumentationRegistry;
@@ -47,6 +48,7 @@
private static final String APP_B = "com.package.b";
private static final String APP_C = "com.package.c";
private static final String APP_D = "com.package.d";
+ private static final long VERSION_CODE = 1L;
private static final String OBSERVER_NAME_1 = "observer1";
private static final String OBSERVER_NAME_2 = "observer2";
private static final String OBSERVER_NAME_3 = "observer3";
@@ -193,7 +195,7 @@
// Then fail APP_A below the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT - 1; i++) {
- watchdog.onPackageFailure(new String[]{APP_A});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
@@ -209,12 +211,10 @@
* the failed packages.
*/
@Test
- public void testPackageFailureNotifyNone() throws Exception {
+ public void testPackageFailureDifferentPackageNotifyNone() throws Exception {
PackageWatchdog watchdog = createWatchdog();
- TestObserver observer1 = new TestObserver(OBSERVER_NAME_1,
- PackageHealthObserverImpact.USER_IMPACT_HIGH);
- TestObserver observer2 = new TestObserver(OBSERVER_NAME_2,
- PackageHealthObserverImpact.USER_IMPACT_HIGH);
+ TestObserver observer1 = new TestObserver(OBSERVER_NAME_1);
+ TestObserver observer2 = new TestObserver(OBSERVER_NAME_2);
watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), SHORT_DURATION);
@@ -222,7 +222,7 @@
// Then fail APP_C (not observed) above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_C});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_C, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
@@ -234,6 +234,40 @@
}
/**
+ * Test package failure and does not notify any observer because the failed package version
+ * does not match the available rollback-from-version.
+ */
+ @Test
+ public void testPackageFailureDifferentVersionNotifyNone() throws Exception {
+ PackageWatchdog watchdog = createWatchdog();
+ long differentVersionCode = 2L;
+ TestObserver observer = new TestObserver(OBSERVER_NAME_1) {
+ public int onHealthCheckFailed(String packageName, long versionCode) {
+ if (versionCode == VERSION_CODE) {
+ // Only rollback for specific versionCode
+ return PackageHealthObserverImpact.USER_IMPACT_MEDIUM;
+ }
+ return PackageHealthObserverImpact.USER_IMPACT_NONE;
+ }
+ };
+
+ watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION);
+
+ // Then fail APP_A (different version) above the threshold
+ for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
+ watchdog.onPackageFailure(Arrays.asList(
+ new VersionedPackage(APP_A, differentVersionCode)));
+ }
+
+ // Run handler so package failures are dispatched to observers
+ mTestLooper.dispatchAll();
+
+ // Verify that observers are not notified
+ assertEquals(0, observer.mFailedPackages.size());
+ }
+
+
+ /**
* Test package failure and notifies only least impact observers.
*/
@Test
@@ -260,7 +294,10 @@
// Then fail all apps above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_A, APP_B, APP_C, APP_D});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE),
+ new VersionedPackage(APP_B, VERSION_CODE),
+ new VersionedPackage(APP_C, VERSION_CODE),
+ new VersionedPackage(APP_D, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
@@ -297,7 +334,7 @@
* <ul>
*/
@Test
- public void testPackageFailureNotifyLeastSuccessively() throws Exception {
+ public void testPackageFailureNotifyLeastImpactSuccessively() throws Exception {
PackageWatchdog watchdog = createWatchdog();
TestObserver observerFirst = new TestObserver(OBSERVER_NAME_1,
PackageHealthObserverImpact.USER_IMPACT_LOW);
@@ -310,7 +347,7 @@
// Then fail APP_A above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_A});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
mTestLooper.dispatchAll();
@@ -327,7 +364,7 @@
// Then fail APP_A again above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_A});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
mTestLooper.dispatchAll();
@@ -344,7 +381,7 @@
// Then fail APP_A again above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_A});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
mTestLooper.dispatchAll();
@@ -361,7 +398,7 @@
// Then fail APP_A again above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_A});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
mTestLooper.dispatchAll();
@@ -388,7 +425,7 @@
// Then fail APP_A above the threshold
for (int i = 0; i < TRIGGER_FAILURE_COUNT; i++) {
- watchdog.onPackageFailure(new String[]{APP_A});
+ watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)));
}
// Run handler so package failures are dispatched to observers
@@ -420,11 +457,11 @@
mImpact = impact;
}
- public int onHealthCheckFailed(String packageName) {
+ public int onHealthCheckFailed(String packageName, long versionCode) {
return mImpact;
}
- public boolean execute(String packageName) {
+ public boolean execute(String packageName, long versionCode) {
mFailedPackages.add(packageName);
return true;
}
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 02a439b..2310c82 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
@@ -17,17 +17,30 @@
package com.android.tests.rollback.testapp;
import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
import android.os.Bundle;
/**
* A crashing test app for testing apk rollback support.
*/
public class CrashingMainActivity extends Activity {
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+ incrementCountAndBroadcast();
throw new RuntimeException("Intended force crash");
}
+
+ public void incrementCountAndBroadcast() {
+ SharedPreferences preferences = getSharedPreferences("prefs", Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = preferences.edit();
+ int count = preferences.getInt("crash_count", 0);
+ editor.putInt("crash_count", ++count).commit();
+
+ Intent intent = new Intent("com.android.tests.rollback.CRASH");
+ intent.putExtra("count", count);
+ sendBroadcast(intent);
+ }
}
diff --git a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
index e128a6c..4b277ae 100644
--- a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
+++ b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
@@ -17,6 +17,7 @@
package com.android.tests.rollback;
import android.Manifest;
+import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -36,7 +37,6 @@
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;
@@ -45,6 +45,7 @@
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
/**
@@ -413,7 +414,6 @@
/**
* Test that app user data is rolled back.
- * TODO: Stop ignoring this test once user data rollback is supported.
*/
@Test
public void testUserDataRollback() throws Exception {
@@ -568,9 +568,7 @@
}
/**
- * Test rollback of multi-package installs.
- * TODO: Stop ignoring this test once support for multi-package rollback
- * is implemented.
+ * Test rollback of multi-package installs is implemented.
*/
@Test
public void testMultiPackage() throws Exception {
@@ -630,18 +628,20 @@
assertEquals(versionRolledBackTo, info.getVersionRolledBackTo().getLongVersionCode());
}
- // TODO(zezeozue): Stop ignoring after fixing race between rolling back and testing version
/**
* Test bad update automatic rollback.
*/
- @Ignore("Flaky")
@Test
public void testBadUpdateRollback() throws Exception {
+ BroadcastReceiver crashCountReceiver = null;
+ Context context = InstrumentationRegistry.getContext();
try {
RollbackTestUtils.adoptShellPermissionIdentity(
Manifest.permission.INSTALL_PACKAGES,
Manifest.permission.DELETE_PACKAGES,
- Manifest.permission.MANAGE_ROLLBACKS);
+ Manifest.permission.MANAGE_ROLLBACKS,
+ Manifest.permission.KILL_BACKGROUND_PROCESSES,
+ Manifest.permission.RESTART_PACKAGES);
RollbackManager rm = RollbackTestUtils.getRollbackManager();
// Prep installation of the test apps.
@@ -669,23 +669,52 @@
rm.getAvailableRollbacks(), TEST_APP_B);
assertRollbackInfoEquals(TEST_APP_B, 2, 1, rollbackB);
+ BlockingQueue<Integer> crashQueue = new SynchronousQueue<>();
+
+ IntentFilter crashCountFilter = new IntentFilter();
+ crashCountFilter.addAction("com.android.tests.rollback.CRASH");
+ crashCountFilter.addCategory(Intent.CATEGORY_DEFAULT);
+
+ crashCountReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ try {
+ // Sleep long enough for packagewatchdog to be notified of crash
+ Thread.sleep(1000);
+ // Kill app and close AppErrorDialog
+ ActivityManager am = context.getSystemService(ActivityManager.class);
+ am.killBackgroundProcesses(TEST_APP_A);
+ // Allow another package launch
+ crashQueue.offer(intent.getIntExtra("count", 0), 5, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ fail("Failed to communicate with test app");
+ }
+ }
+ };
+ context.registerReceiver(crashCountReceiver, crashCountFilter);
+
// Start apps PackageWatchdog#TRIGGER_FAILURE_COUNT times so TEST_APP_A crashes
- for (int i = 0; i < 5; i++) {
+ Integer crashCount = null;
+ do {
RollbackTestUtils.launchPackage(TEST_APP_A);
- Thread.sleep(1000);
- }
- Thread.sleep(1000);
+ crashCount = crashQueue.poll(5, TimeUnit.SECONDS);
+ if (crashCount == null) {
+ fail("Timed out waiting for crash signal from test app");
+ }
+ } while(crashCount < 5);
// TEST_APP_A is automatically rolled back by the RollbackPackageHealthObserver
assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A));
// Instrumented app is still the package installer
- Context context = InstrumentationRegistry.getContext();
String installer = context.getPackageManager().getInstallerPackageName(TEST_APP_A);
assertEquals(INSTRUMENTED_APP, installer);
// TEST_APP_B is untouched
assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_B));
} finally {
RollbackTestUtils.dropShellPermissionIdentity();
+ if (crashCountReceiver != null) {
+ context.unregisterReceiver(crashCountReceiver);
+ }
}
}
diff --git a/tests/net/java/android/net/ip/InterfaceControllerTest.java b/tests/net/java/android/net/ip/InterfaceControllerTest.java
new file mode 100644
index 0000000..d27a4f9
--- /dev/null
+++ b/tests/net/java/android/net/ip/InterfaceControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * 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.net.ip;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.net.INetd;
+import android.net.InetAddresses;
+import android.net.InterfaceConfigurationParcel;
+import android.net.LinkAddress;
+import android.net.util.SharedLog;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class InterfaceControllerTest {
+ private static final String TEST_IFACE = "testif";
+ private static final String TEST_IPV4_ADDR = "192.168.123.28";
+ private static final int TEST_PREFIXLENGTH = 31;
+
+ @Mock private INetd mNetd;
+ @Mock private SharedLog mLog;
+ @Captor private ArgumentCaptor<InterfaceConfigurationParcel> mConfigCaptor;
+
+ private InterfaceController mController;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mController = new InterfaceController(TEST_IFACE, mNetd, mLog);
+
+ doNothing().when(mNetd).interfaceSetCfg(mConfigCaptor.capture());
+ }
+
+ @Test
+ public void testSetIPv4Address() throws Exception {
+ mController.setIPv4Address(
+ new LinkAddress(InetAddresses.parseNumericAddress(TEST_IPV4_ADDR),
+ TEST_PREFIXLENGTH));
+ verify(mNetd, times(1)).interfaceSetCfg(any());
+ final InterfaceConfigurationParcel parcel = mConfigCaptor.getValue();
+ assertEquals(TEST_IFACE, parcel.ifName);
+ assertEquals(TEST_IPV4_ADDR, parcel.ipv4Addr);
+ assertEquals(TEST_PREFIXLENGTH, parcel.prefixLength);
+ assertEquals("", parcel.hwAddr);
+ assertArrayEquals(new String[0], parcel.flags);
+ }
+
+ @Test
+ public void testClearIPv4Address() throws Exception {
+ mController.clearIPv4Address();
+ verify(mNetd, times(1)).interfaceSetCfg(any());
+ final InterfaceConfigurationParcel parcel = mConfigCaptor.getValue();
+ assertEquals(TEST_IFACE, parcel.ifName);
+ assertEquals("0.0.0.0", parcel.ipv4Addr);
+ assertEquals(0, parcel.prefixLength);
+ assertEquals("", parcel.hwAddr);
+ assertArrayEquals(new String[0], parcel.flags);
+ }
+}
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 923c7dd..3127d74 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -57,6 +57,7 @@
import static android.net.NetworkPolicyManager.RULE_NONE;
import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
+import static android.net.shared.NetworkParcelableUtil.fromStableParcelable;
import static com.android.internal.util.TestUtils.waitForIdleHandler;
import static com.android.internal.util.TestUtils.waitForIdleLooper;
@@ -119,6 +120,7 @@
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc;
+import android.net.NetworkParcelable;
import android.net.NetworkRequest;
import android.net.NetworkSpecifier;
import android.net.NetworkStack;
@@ -482,8 +484,8 @@
fail(e.getMessage());
}
- final ArgumentCaptor<Network> nmNetworkCaptor =
- ArgumentCaptor.forClass(Network.class);
+ final ArgumentCaptor<NetworkParcelable> nmNetworkCaptor =
+ ArgumentCaptor.forClass(NetworkParcelable.class);
final ArgumentCaptor<INetworkMonitorCallbacks> nmCbCaptor =
ArgumentCaptor.forClass(INetworkMonitorCallbacks.class);
doNothing().when(mNetworkStack).makeNetworkMonitor(
@@ -493,7 +495,7 @@
mNetworkAgent = new NetworkAgent(mHandlerThread.getLooper(), mServiceContext,
"Mock-" + typeName, mNetworkInfo, mNetworkCapabilities,
- linkProperties, mScore, new NetworkMisc()) {
+ linkProperties, mScore, new NetworkMisc(), NetworkFactory.SerialNumber.NONE) {
@Override
public void unwanted() { mDisconnected.open(); }
@@ -523,7 +525,8 @@
}
};
- assertEquals(mNetworkAgent.netId, nmNetworkCaptor.getValue().netId);
+ assertEquals(
+ mNetworkAgent.netId, fromStableParcelable(nmNetworkCaptor.getValue()).netId);
mNmCallbacks = nmCbCaptor.getValue();
try {
@@ -722,7 +725,7 @@
/**
* A NetworkFactory that allows tests to wait until any in-flight NetworkRequest add or remove
* operations have been processed. Before ConnectivityService can add or remove any requests,
- * the factory must be told to expect those operations by calling expectAddRequests or
+ * the factory must be told to expect those operations by calling expectAddRequestsWithScores or
* expectRemoveRequests.
*/
private static class MockNetworkFactory extends NetworkFactory {
@@ -731,19 +734,22 @@
private final AtomicBoolean mNetworkStarted = new AtomicBoolean(false);
// Used to expect that requests be removed or added on a separate thread, without sleeping.
- // Callers can call either expectAddRequests() or expectRemoveRequests() exactly once, then
- // cause some other thread to add or remove requests, then call waitForRequests(). We can
- // either expect requests to be added or removed, but not both, because CountDownLatch can
- // only count in one direction.
- private CountDownLatch mExpectations;
+ // Callers can call either expectAddRequestsWithScores() or expectRemoveRequests() exactly
+ // once, then cause some other thread to add or remove requests, then call
+ // waitForRequests().
+ // It is not possible to wait for both add and remove requests. When adding, the queue
+ // contains the expected score. When removing, the value is unused, all matters is the
+ // number of objects in the queue.
+ private final LinkedBlockingQueue<Integer> mExpectations;
// Whether we are currently expecting requests to be added or removed. Valid only if
- // mExpectations is non-null.
+ // mExpectations is non-empty.
private boolean mExpectingAdditions;
public MockNetworkFactory(Looper looper, Context context, String logTag,
NetworkCapabilities filter) {
super(looper, context, logTag, filter);
+ mExpectations = new LinkedBlockingQueue<>();
}
public int getMyRequestCount() {
@@ -775,69 +781,82 @@
}
@Override
- protected void handleAddRequest(NetworkRequest request, int score) {
- // If we're expecting anything, we must be expecting additions.
- if (mExpectations != null && !mExpectingAdditions) {
- fail("Can't add requests while expecting requests to be removed");
- }
+ protected void handleAddRequest(NetworkRequest request, int score,
+ int factorySerialNumber) {
+ synchronized (mExpectations) {
+ final Integer expectedScore = mExpectations.poll(); // null if the queue is empty
- // Add the request.
- super.handleAddRequest(request, score);
+ assertNotNull("Added more requests than expected (" + request + " score : "
+ + score + ")", expectedScore);
+ // If we're expecting anything, we must be expecting additions.
+ if (!mExpectingAdditions) {
+ fail("Can't add requests while expecting requests to be removed");
+ }
+ if (expectedScore != score) {
+ fail("Expected score was " + expectedScore + " but actual was " + score
+ + " in added request");
+ }
- // Reduce the number of request additions we're waiting for.
- if (mExpectingAdditions) {
- assertTrue("Added more requests than expected", mExpectations.getCount() > 0);
- mExpectations.countDown();
+ // Add the request.
+ super.handleAddRequest(request, score, factorySerialNumber);
+ mExpectations.notify();
}
}
@Override
protected void handleRemoveRequest(NetworkRequest request) {
- // If we're expecting anything, we must be expecting removals.
- if (mExpectations != null && mExpectingAdditions) {
- fail("Can't remove requests while expecting requests to be added");
- }
+ synchronized (mExpectations) {
+ final Integer expectedScore = mExpectations.poll(); // null if the queue is empty
- // Remove the request.
- super.handleRemoveRequest(request);
+ assertTrue("Removed more requests than expected", expectedScore != null);
+ // If we're expecting anything, we must be expecting removals.
+ if (mExpectingAdditions) {
+ fail("Can't remove requests while expecting requests to be added");
+ }
- // Reduce the number of request removals we're waiting for.
- if (!mExpectingAdditions) {
- assertTrue("Removed more requests than expected", mExpectations.getCount() > 0);
- mExpectations.countDown();
+ // Remove the request.
+ super.handleRemoveRequest(request);
+ mExpectations.notify();
}
}
private void assertNoExpectations() {
- if (mExpectations != null) {
- fail("Can't add expectation, " + mExpectations.getCount() + " already pending");
+ if (mExpectations.size() != 0) {
+ fail("Can't add expectation, " + mExpectations.size() + " already pending");
}
}
- // Expects that count requests will be added.
- public void expectAddRequests(final int count) {
+ // Expects that requests with the specified scores will be added.
+ public void expectAddRequestsWithScores(final int... scores) {
assertNoExpectations();
mExpectingAdditions = true;
- mExpectations = new CountDownLatch(count);
+ for (int score : scores) {
+ mExpectations.add(score);
+ }
}
// Expects that count requests will be removed.
public void expectRemoveRequests(final int count) {
assertNoExpectations();
mExpectingAdditions = false;
- mExpectations = new CountDownLatch(count);
+ for (int i = 0; i < count; ++i) {
+ mExpectations.add(0); // For removals the score is ignored so any value will do.
+ }
}
// Waits for the expected request additions or removals to happen within a timeout.
public void waitForRequests() throws InterruptedException {
- assertNotNull("Nothing to wait for", mExpectations);
- mExpectations.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
- final long count = mExpectations.getCount();
+ final long deadline = SystemClock.elapsedRealtime() + TIMEOUT_MS;
+ synchronized (mExpectations) {
+ while (mExpectations.size() > 0 && SystemClock.elapsedRealtime() < deadline) {
+ mExpectations.wait(deadline - SystemClock.elapsedRealtime());
+ }
+ }
+ final long count = mExpectations.size();
final String msg = count + " requests still not " +
(mExpectingAdditions ? "added" : "removed") +
" after " + TIMEOUT_MS + " ms";
assertEquals(msg, 0, count);
- mExpectations = null;
}
public void waitForNetworkRequests(final int count) throws InterruptedException {
@@ -2268,6 +2287,12 @@
callback.expectCallback(CallbackState.LOST, mEthernetNetworkAgent);
}
+ private int[] makeIntArray(final int size, final int value) {
+ final int[] array = new int[size];
+ Arrays.fill(array, value);
+ return array;
+ }
+
private void tryNetworkFactoryRequests(int capability) throws Exception {
// Verify NOT_RESTRICTED is set appropriately
final NetworkCapabilities nc = new NetworkRequest.Builder().addCapability(capability)
@@ -2289,7 +2314,7 @@
mServiceContext, "testFactory", filter);
testFactory.setScoreFilter(40);
ConditionVariable cv = testFactory.getNetworkStartedCV();
- testFactory.expectAddRequests(1);
+ testFactory.expectAddRequestsWithScores(0);
testFactory.register();
testFactory.waitForNetworkRequests(1);
int expectedRequestCount = 1;
@@ -2300,7 +2325,7 @@
assertFalse(testFactory.getMyStartRequested());
NetworkRequest request = new NetworkRequest.Builder().addCapability(capability).build();
networkCallback = new NetworkCallback();
- testFactory.expectAddRequests(1);
+ testFactory.expectAddRequestsWithScores(0); // New request
mCm.requestNetwork(request, networkCallback);
expectedRequestCount++;
testFactory.waitForNetworkRequests(expectedRequestCount);
@@ -2320,7 +2345,7 @@
// When testAgent connects, ConnectivityService will re-send us all current requests with
// the new score. There are expectedRequestCount such requests, and we must wait for all of
// them.
- testFactory.expectAddRequests(expectedRequestCount);
+ testFactory.expectAddRequestsWithScores(makeIntArray(expectedRequestCount, 50));
testAgent.connect(false);
testAgent.addCapability(capability);
waitFor(cv);
@@ -2328,7 +2353,7 @@
assertFalse(testFactory.getMyStartRequested());
// Bring in a bunch of requests.
- testFactory.expectAddRequests(10);
+ testFactory.expectAddRequestsWithScores(makeIntArray(10, 50));
assertEquals(expectedRequestCount, testFactory.getMyRequestCount());
ConnectivityManager.NetworkCallback[] networkCallbacks =
new ConnectivityManager.NetworkCallback[10];
@@ -2351,8 +2376,11 @@
// Drop the higher scored network.
cv = testFactory.getNetworkStartedCV();
+ // With the default network disconnecting, the requests are sent with score 0 to factories.
+ testFactory.expectAddRequestsWithScores(makeIntArray(expectedRequestCount, 0));
testAgent.disconnect();
waitFor(cv);
+ testFactory.waitForNetworkRequests(expectedRequestCount);
assertEquals(expectedRequestCount, testFactory.getMyRequestCount());
assertTrue(testFactory.getMyStartRequested());
@@ -3174,22 +3202,23 @@
testFactory.setScoreFilter(40);
// Register the factory and expect it to start looking for a network.
- testFactory.expectAddRequests(1);
+ testFactory.expectAddRequestsWithScores(0); // Score 0 as the request is not served yet.
testFactory.register();
testFactory.waitForNetworkRequests(1);
assertTrue(testFactory.getMyStartRequested());
// Bring up wifi. The factory stops looking for a network.
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
- testFactory.expectAddRequests(2); // Because the default request changes score twice.
+ // Score 60 - 40 penalty for not validated yet, then 60 when it validates
+ testFactory.expectAddRequestsWithScores(20, 60);
mWiFiNetworkAgent.connect(true);
- testFactory.waitForNetworkRequests(1);
+ testFactory.waitForRequests();
assertFalse(testFactory.getMyStartRequested());
ContentResolver cr = mServiceContext.getContentResolver();
// Turn on mobile data always on. The factory starts looking again.
- testFactory.expectAddRequests(1);
+ testFactory.expectAddRequestsWithScores(0); // Always on requests comes up with score 0
setAlwaysOnNetworks(true);
testFactory.waitForNetworkRequests(2);
assertTrue(testFactory.getMyStartRequested());
@@ -3197,7 +3226,7 @@
// Bring up cell data and check that the factory stops looking.
assertLength(1, mCm.getAllNetworks());
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
- testFactory.expectAddRequests(2); // Because the cell request changes score twice.
+ testFactory.expectAddRequestsWithScores(10, 50); // Unvalidated, then validated
mCellNetworkAgent.connect(true);
cellNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
testFactory.waitForNetworkRequests(2);
diff --git a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
index 9578ded..e877a8f 100644
--- a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
+++ b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
@@ -35,6 +35,7 @@
import android.net.INetd;
import android.net.Network;
import android.net.NetworkCapabilities;
+import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkMisc;
import android.net.NetworkStack;
@@ -356,7 +357,8 @@
caps.addCapability(0);
caps.addTransportType(transport);
NetworkAgentInfo nai = new NetworkAgentInfo(null, null, new Network(netId), info, null,
- caps, 50, mCtx, null, mMisc, mConnService, mNetd, mNMS);
+ caps, 50, mCtx, null, mMisc, mConnService, mNetd, mNMS,
+ NetworkFactory.SerialNumber.NONE);
nai.everValidated = true;
return nai;
}
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 3c3edda..672731c 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -301,6 +301,7 @@
break;
}
// This is not alphabetical, so we fall through to variant
+ [[fallthrough]];
case 5:
case 6:
case 7:
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index 17847ea..145e269 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -23,17 +23,9 @@
import android.text.TextUtils;
import android.util.Log;
-import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -1126,6 +1118,12 @@
String value = PASSWORD_KEY.equals(key) ? "<removed>" : mFields.get(key);
sb.append(key).append(" ").append(value).append("\n");
}
+ if (mEapMethod >= 0 && mEapMethod < Eap.strings.length) {
+ sb.append("eap_method: ").append(Eap.strings[mEapMethod]).append("\n");
+ }
+ if (mPhase2Method > 0 && mPhase2Method < Phase2.strings.length) {
+ sb.append("phase2_method: ").append(Phase2.strings[mPhase2Method]).append("\n");
+ }
return sb.toString();
}
diff --git a/wifi/java/android/net/wifi/WifiUsabilityStatsEntry.java b/wifi/java/android/net/wifi/WifiUsabilityStatsEntry.java
index c796e29..c43818d 100644
--- a/wifi/java/android/net/wifi/WifiUsabilityStatsEntry.java
+++ b/wifi/java/android/net/wifi/WifiUsabilityStatsEntry.java
@@ -16,10 +16,14 @@
package android.net.wifi;
+import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* This class makes a subset of
* com.android.server.wifi.nano.WifiMetricsProto.WifiUsabilityStatsEntry parcelable.
@@ -28,6 +32,24 @@
*/
@SystemApi
public final class WifiUsabilityStatsEntry implements Parcelable {
+ /** {@hide} */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(prefix = {"PROBE_STATUS_"}, value = {
+ PROBE_STATUS_UNKNOWN,
+ PROBE_STATUS_NO_PROBE,
+ PROBE_STATUS_SUCCESS,
+ PROBE_STATUS_FAILURE})
+ public @interface ProbeStatus {}
+
+ /** Link probe status is unknown */
+ public static final int PROBE_STATUS_UNKNOWN = 0;
+ /** Link probe is not triggered */
+ public static final int PROBE_STATUS_NO_PROBE = 1;
+ /** Link probe is triggered and the result is success */
+ public static final int PROBE_STATUS_SUCCESS = 2;
+ /** Link probe is triggered and the result is failure */
+ public static final int PROBE_STATUS_FAILURE = 3;
+
/** Absolute milliseconds from device boot when these stats were sampled */
public final long timeStampMs;
/** The RSSI (in dBm) at the sample time */
@@ -68,6 +90,14 @@
public final long totalRadioOnFreqTimeMs;
/** The total number of beacons received from the last radio chip reset */
public final long totalBeaconRx;
+ /** The status of link probe since last stats update */
+ public final int probeStatusSinceLastUpdate;
+ /** The elapsed time of the most recent link probe since last stats update */
+ public final int probeElapsedTimeMsSinceLastUpdate;
+ /** The MCS rate of the most recent link probe since last stats update */
+ public final int probeMcsRateSinceLastUpdate;
+ /** Rx link speed at the sample time in Mbps */
+ public final int rxLinkSpeedMbps;
/** Constructor function {@hide} */
public WifiUsabilityStatsEntry(long timeStampMs, int rssi,
@@ -76,7 +106,9 @@
long totalRadioTxTimeMs, long totalRadioRxTimeMs, long totalScanTimeMs,
long totalNanScanTimeMs, long totalBackgroundScanTimeMs, long totalRoamScanTimeMs,
long totalPnoScanTimeMs, long totalHotspot2ScanTimeMs, long totalCcaBusyFreqTimeMs,
- long totalRadioOnFreqTimeMs, long totalBeaconRx) {
+ long totalRadioOnFreqTimeMs, long totalBeaconRx,
+ @ProbeStatus int probeStatusSinceLastUpdate, int probeElapsedTimeMsSinceLastUpdate,
+ int probeMcsRateSinceLastUpdate, int rxLinkSpeedMbps) {
this.timeStampMs = timeStampMs;
this.rssi = rssi;
this.linkSpeedMbps = linkSpeedMbps;
@@ -96,6 +128,10 @@
this.totalCcaBusyFreqTimeMs = totalCcaBusyFreqTimeMs;
this.totalRadioOnFreqTimeMs = totalRadioOnFreqTimeMs;
this.totalBeaconRx = totalBeaconRx;
+ this.probeStatusSinceLastUpdate = probeStatusSinceLastUpdate;
+ this.probeElapsedTimeMsSinceLastUpdate = probeElapsedTimeMsSinceLastUpdate;
+ this.probeMcsRateSinceLastUpdate = probeMcsRateSinceLastUpdate;
+ this.rxLinkSpeedMbps = rxLinkSpeedMbps;
}
/** Implement the Parcelable interface */
@@ -124,6 +160,10 @@
dest.writeLong(totalCcaBusyFreqTimeMs);
dest.writeLong(totalRadioOnFreqTimeMs);
dest.writeLong(totalBeaconRx);
+ dest.writeInt(probeStatusSinceLastUpdate);
+ dest.writeInt(probeElapsedTimeMsSinceLastUpdate);
+ dest.writeInt(probeMcsRateSinceLastUpdate);
+ dest.writeInt(rxLinkSpeedMbps);
}
/** Implement the Parcelable interface */
@@ -137,7 +177,8 @@
in.readLong(), in.readLong(), in.readLong(),
in.readLong(), in.readLong(), in.readLong(),
in.readLong(), in.readLong(), in.readLong(),
- in.readLong(), in.readLong()
+ in.readLong(), in.readLong(), in.readInt(),
+ in.readInt(), in.readInt(), in.readInt()
);
}
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java
index 052ab99..63f47e7 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java
@@ -190,6 +190,10 @@
* the network info in the form of a {@link android.net.NetworkInfo}. A third extra provides
* the details of the group.
*
+ * All of these permissions are required to receive this broadcast:
+ * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} and
+ * {@link android.Manifest.permission#ACCESS_WIFI_STATE}
+ *
* @see #EXTRA_WIFI_P2P_INFO
* @see #EXTRA_NETWORK_INFO
* @see #EXTRA_WIFI_P2P_GROUP
@@ -222,6 +226,10 @@
* Broadcast intent action indicating that the available peer list has changed. This
* can be sent as a result of peers being found, lost or updated.
*
+ * All of these permissions are required to receive this broadcast:
+ * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} and
+ * {@link android.Manifest.permission#ACCESS_WIFI_STATE}
+ *
* <p> An extra {@link #EXTRA_P2P_DEVICE_LIST} provides the full list of
* current peers. The full list of peers can also be obtained any time with
* {@link #requestPeers}.
@@ -238,7 +246,7 @@
*
* <p>Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
*/
- public static final String EXTRA_P2P_DEVICE_LIST = "wifiP2pDeviceList";
+ public static final String EXTRA_P2P_DEVICE_LIST = "wifiP2pDeviceList";
/**
* Broadcast intent action indicating that peer discovery has either started or stopped.
@@ -285,6 +293,18 @@
/**
* Broadcast intent action indicating that this device details have changed.
+ *
+ * <p> An extra {@link #EXTRA_WIFI_P2P_DEVICE} provides this device details.
+ * The valid device details can also be obtained with
+ * {@link #requestDeviceInfo(Channel, DeviceInfoListener)} when p2p is enabled.
+ * To get information notifications on P2P getting enabled refers
+ * {@link #WIFI_P2P_STATE_ENABLED}.
+ *
+ * All of these permissions are required to receive this broadcast:
+ * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} and
+ * {@link android.Manifest.permission#ACCESS_WIFI_STATE}
+ *
+ * @see #EXTRA_WIFI_P2P_DEVICE
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String WIFI_P2P_THIS_DEVICE_CHANGED_ACTION =
@@ -546,6 +566,11 @@
/** @hide */
public static final int UPDATE_CHANNEL_INFO = BASE + 96;
+ /** @hide */
+ public static final int REQUEST_DEVICE_INFO = BASE + 97;
+ /** @hide */
+ public static final int RESPONSE_DEVICE_INFO = BASE + 98;
+
/**
* Create a new WifiP2pManager instance. Applications use
* {@link android.content.Context#getSystemService Context.getSystemService()} to retrieve
@@ -783,6 +808,17 @@
void onOngoingPeerAvailable(WifiP2pConfig peerConfig);
}
+ /** Interface for callback invocation when {@link android.net.wifi.p2p.WifiP2pDevice}
+ * is available in response to {@link #requestDeviceInfo(Channel, DeviceInfoListener)}.
+ */
+ public interface DeviceInfoListener {
+ /**
+ * The requested {@link android.net.wifi.p2p.WifiP2pDevice} is available.
+ * @param wifiP2pDevice Wi-Fi p2p {@link android.net.wifi.p2p.WifiP2pDevice}
+ */
+ void onDeviceInfoAvailable(WifiP2pDevice wifiP2pDevice);
+ }
+
/**
* A channel that connects the application to the Wifi p2p framework.
* Most p2p operations require a Channel as an argument. An instance of Channel is obtained
@@ -988,6 +1024,12 @@
.onNetworkInfoAvailable((NetworkInfo) message.obj);
}
break;
+ case RESPONSE_DEVICE_INFO:
+ if (listener != null) {
+ ((DeviceInfoListener) listener)
+ .onDeviceInfoAvailable((WifiP2pDevice) message.obj);
+ }
+ break;
default:
Log.d(TAG, "Ignored " + message);
break;
@@ -1826,4 +1868,29 @@
if (listener == null) throw new IllegalArgumentException("This listener cannot be null.");
c.mAsyncChannel.sendMessage(REQUEST_NETWORK_INFO, 0, c.putListener(listener));
}
+
+ /**
+ * Request Device Info
+ *
+ * <p> This method provides the device info
+ * in the form of a {@link android.net.wifi.p2p.WifiP2pDevice}.
+ * Valid {@link android.net.wifi.p2p.WifiP2pDevice} is returned when p2p is enabled.
+ * To get information notifications on P2P getting enabled refers
+ * {@link #WIFI_P2P_STATE_ENABLED}.
+ *
+ * <p> This {@link android.net.wifi.p2p.WifiP2pDevice} is returned using the
+ * {@link DeviceInfoListener} listener.
+ *
+ * <p> This information is also included in the {@link #WIFI_P2P_THIS_DEVICE_CHANGED_ACTION}
+ * broadcast event with extra {@link #EXTRA_WIFI_P2P_DEVICE}.
+ *
+ * @param c is the channel created at {@link #initialize(Context, Looper, ChannelListener)}.
+ * @param listener for callback when network info is available.
+ */
+ @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION)
+ public void requestDeviceInfo(@NonNull Channel c, @NonNull DeviceInfoListener listener) {
+ checkChannel(c);
+ if (listener == null) throw new IllegalArgumentException("This listener cannot be null.");
+ c.mAsyncChannel.sendMessage(REQUEST_DEVICE_INFO, 0, c.putListener(listener));
+ }
}
diff --git a/wifi/tests/src/android/net/wifi/WifiUsabilityStatsEntryTest.java b/wifi/tests/src/android/net/wifi/WifiUsabilityStatsEntryTest.java
index a947b55..a22f8ce 100644
--- a/wifi/tests/src/android/net/wifi/WifiUsabilityStatsEntryTest.java
+++ b/wifi/tests/src/android/net/wifi/WifiUsabilityStatsEntryTest.java
@@ -74,7 +74,7 @@
private static WifiUsabilityStatsEntry createResult() {
return new WifiUsabilityStatsEntry(
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22
);
}
@@ -100,5 +100,10 @@
assertEquals(expected.totalCcaBusyFreqTimeMs, actual.totalCcaBusyFreqTimeMs);
assertEquals(expected.totalRadioOnFreqTimeMs, actual.totalRadioOnFreqTimeMs);
assertEquals(expected.totalBeaconRx, actual.totalBeaconRx);
+ assertEquals(expected.probeStatusSinceLastUpdate, actual.probeStatusSinceLastUpdate);
+ assertEquals(expected.probeElapsedTimeMsSinceLastUpdate,
+ actual.probeElapsedTimeMsSinceLastUpdate);
+ assertEquals(expected.probeMcsRateSinceLastUpdate, actual.probeMcsRateSinceLastUpdate);
+ assertEquals(expected.rxLinkSpeedMbps, actual.rxLinkSpeedMbps);
}
}