diff options
1207 files changed, 26251 insertions, 11854 deletions
diff --git a/apct-tests/perftests/packagemanager/Android.bp b/apct-tests/perftests/packagemanager/Android.bp index e84aea1e7fac..b6ea54d3d53f 100644 --- a/apct-tests/perftests/packagemanager/Android.bp +++ b/apct-tests/perftests/packagemanager/Android.bp @@ -34,6 +34,55 @@ android_test { test_suites: ["device-tests"], data: [ + ":QueriesAll4", + ":QueriesAll31", + ":QueriesAll43", + ":QueriesAll15", + ":QueriesAll27", + ":QueriesAll39", + ":QueriesAll11", + ":QueriesAll23", + ":QueriesAll35", + ":QueriesAll47", + ":QueriesAll9", + ":QueriesAll19", + ":QueriesAll1", + ":QueriesAll5", + ":QueriesAll40", + ":QueriesAll20", + ":QueriesAll32", + ":QueriesAll48", + ":QueriesAll16", + ":QueriesAll28", + ":QueriesAll44", + ":QueriesAll12", + ":QueriesAll24", + ":QueriesAll36", + ":QueriesAll6", + ":QueriesAll2", + ":QueriesAll41", + ":QueriesAll21", + ":QueriesAll37", + ":QueriesAll49", + ":QueriesAll17", + ":QueriesAll29", + ":QueriesAll33", + ":QueriesAll45", + ":QueriesAll13", + ":QueriesAll25", + ":QueriesAll7", + ":QueriesAll3", + ":QueriesAll30", + ":QueriesAll42", + ":QueriesAll10", + ":QueriesAll26", + ":QueriesAll38", + ":QueriesAll18", + ":QueriesAll22", + ":QueriesAll34", + ":QueriesAll46", + ":QueriesAll14", + ":QueriesAll8", ":QueriesAll0", ":perfetto_artifacts", ], diff --git a/apct-tests/perftests/settingsprovider/AndroidManifest.xml b/apct-tests/perftests/settingsprovider/AndroidManifest.xml index 9509c8389892..82f882af0495 100644 --- a/apct-tests/perftests/settingsprovider/AndroidManifest.xml +++ b/apct-tests/perftests/settingsprovider/AndroidManifest.xml @@ -19,7 +19,8 @@ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG" /> <application> <uses-library android:name="android.test.runner" /> diff --git a/apex/jobscheduler/framework/java/com/android/server/job/JobSchedulerInternal.java b/apex/jobscheduler/framework/java/com/android/server/job/JobSchedulerInternal.java index c956bf52ed55..64b242334a8a 100644 --- a/apex/jobscheduler/framework/java/com/android/server/job/JobSchedulerInternal.java +++ b/apex/jobscheduler/framework/java/com/android/server/job/JobSchedulerInternal.java @@ -16,6 +16,7 @@ package com.android.server.job; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.job.JobInfo; import android.app.job.JobParameters; @@ -59,6 +60,19 @@ public interface JobSchedulerInternal { void reportAppUsage(String packageName, int userId); /** + * @return {@code true} if the given notification is associated with any user-initiated jobs. + */ + boolean isNotificationAssociatedWithAnyUserInitiatedJobs(int notificationId, + int userId, @NonNull String packageName); + + /** + * @return {@code true} if the given notification channel is associated with any user-initiated + * jobs. + */ + boolean isNotificationChannelAssociatedWithAnyUserInitiatedJobs(String notificationChannel, + int userId, String packageName); + + /** * Report a snapshot of sync-related jobs back to the sync manager */ JobStorePersistStats getPersistStats(); diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java index 4477e94b77f1..8bd3d127c21b 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java @@ -1925,6 +1925,20 @@ class JobConcurrencyManager { return null; } + @GuardedBy("mLock") + boolean isNotificationAssociatedWithAnyUserInitiatedJobs(int notificationId, int userId, + String packageName) { + return mNotificationCoordinator.isNotificationAssociatedWithAnyUserInitiatedJobs( + notificationId, userId, packageName); + } + + @GuardedBy("mLock") + boolean isNotificationChannelAssociatedWithAnyUserInitiatedJobs(String notificationChannel, + int userId, String packageName) { + return mNotificationCoordinator.isNotificationChannelAssociatedWithAnyUserInitiatedJobs( + notificationChannel, userId, packageName); + } + @NonNull private JobServiceContext createNewJobServiceContext() { return mInjector.createJobServiceContext(mService, this, mNotificationCoordinator, diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobNotificationCoordinator.java b/apex/jobscheduler/service/java/com/android/server/job/JobNotificationCoordinator.java index 5a1214296526..f6e00ec24b33 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobNotificationCoordinator.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobNotificationCoordinator.java @@ -31,6 +31,7 @@ import android.util.Slog; import android.util.SparseSetArray; import com.android.server.LocalServices; +import com.android.server.job.controllers.JobStatus; import com.android.server.notification.NotificationManagerInternal; class JobNotificationCoordinator { @@ -52,16 +53,18 @@ class JobNotificationCoordinator { @NonNull public final UserPackage userPackage; public final int notificationId; + public final String notificationChannel; public final int appPid; public final int appUid; @JobService.JobEndNotificationPolicy public final int jobEndNotificationPolicy; NotificationDetails(@NonNull UserPackage userPackage, int appPid, int appUid, - int notificationId, + int notificationId, String notificationChannel, @JobService.JobEndNotificationPolicy int jobEndNotificationPolicy) { this.userPackage = userPackage; this.notificationId = notificationId; + this.notificationChannel = notificationChannel; this.appPid = appPid; this.appUid = appUid; this.jobEndNotificationPolicy = jobEndNotificationPolicy; @@ -84,14 +87,14 @@ class JobNotificationCoordinator { removeNotificationAssociation(hostingContext, JobParameters.STOP_REASON_UNDEFINED); } final int userId = UserHandle.getUserId(callingUid); - // TODO(260848384): ensure apps can't cancel the notification for user-initiated job - // eg., by calling NotificationManager.cancel/All or deleting the notification channel - mNotificationManagerInternal.enqueueNotification( - packageName, packageName, callingUid, callingPid, /* tag */ null, - notificationId, notification, userId); + final JobStatus jobStatus = hostingContext.getRunningJobLocked(); + if (jobStatus != null && jobStatus.startedAsUserInitiatedJob) { + notification.flags |= Notification.FLAG_USER_INITIATED_JOB; + } final UserPackage userPackage = UserPackage.of(userId, packageName); final NotificationDetails details = new NotificationDetails( - userPackage, callingPid, callingUid, notificationId, jobEndNotificationPolicy); + userPackage, callingPid, callingUid, notificationId, notification.getChannelId(), + jobEndNotificationPolicy); SparseSetArray<JobServiceContext> appNotifications = mCurrentAssociations.get(userPackage); if (appNotifications == null) { appNotifications = new SparseSetArray<>(); @@ -99,6 +102,11 @@ class JobNotificationCoordinator { } appNotifications.add(notificationId, hostingContext); mNotificationDetails.put(hostingContext, details); + // Call into NotificationManager after internal data structures have been updated since + // NotificationManager calls into this class to check for any existing associations. + mNotificationManagerInternal.enqueueNotification( + packageName, packageName, callingUid, callingPid, /* tag */ null, + notificationId, notification, userId); } void removeNotificationAssociation(@NonNull JobServiceContext hostingContext, @@ -113,6 +121,9 @@ class JobNotificationCoordinator { Slog.wtf(TAG, "Association data structures not in sync"); return; } + final String packageName = details.userPackage.packageName; + final int userId = UserHandle.getUserId(details.appUid); + boolean stripUijFlag = true; ArraySet<JobServiceContext> associatedContexts = associations.get(details.notificationId); if (associatedContexts == null || associatedContexts.isEmpty()) { // No more jobs using this notification. Apply the final job stop policy. @@ -120,12 +131,63 @@ class JobNotificationCoordinator { // so the user doesn't get confused about the app state. if (details.jobEndNotificationPolicy == JOB_END_NOTIFICATION_POLICY_REMOVE || stopReason == JobParameters.STOP_REASON_USER) { - final String packageName = details.userPackage.packageName; mNotificationManagerInternal.cancelNotification( packageName, packageName, details.appUid, details.appPid, /* tag */ null, - details.notificationId, UserHandle.getUserId(details.appUid)); + details.notificationId, userId); + stripUijFlag = false; + } + } else { + // Strip the UIJ flag only if there are no other UIJs associated with the notification + stripUijFlag = !isNotificationAssociatedWithAnyUserInitiatedJobs( + details.notificationId, userId, packageName); + } + if (stripUijFlag) { + // Strip the user-initiated job flag from the notification. + mNotificationManagerInternal.removeUserInitiatedJobFlagFromNotification( + packageName, details.notificationId, userId); + } + } + + boolean isNotificationAssociatedWithAnyUserInitiatedJobs(int notificationId, + int userId, String packageName) { + final UserPackage pkgDetails = UserPackage.of(userId, packageName); + final SparseSetArray<JobServiceContext> associations = mCurrentAssociations.get(pkgDetails); + if (associations == null) { + return false; + } + final ArraySet<JobServiceContext> associatedContexts = associations.get(notificationId); + if (associatedContexts == null) { + return false; + } + + // Check if any UIJs associated with this package are using the same notification + for (int i = associatedContexts.size() - 1; i >= 0; i--) { + final JobStatus jobStatus = associatedContexts.valueAt(i).getRunningJobLocked(); + if (jobStatus != null && jobStatus.startedAsUserInitiatedJob) { + return true; + } + } + return false; + } + + boolean isNotificationChannelAssociatedWithAnyUserInitiatedJobs(String notificationChannel, + int userId, String packageName) { + for (int i = mNotificationDetails.size() - 1; i >= 0; i--) { + final JobServiceContext jsc = mNotificationDetails.keyAt(i); + final NotificationDetails details = mNotificationDetails.get(jsc); + // Check if the details for the given notification match and if the associated job + // was started as a user initiated job + if (details != null + && UserHandle.getUserId(details.appUid) == userId + && details.userPackage.packageName.equals(packageName) + && details.notificationChannel.equals(notificationChannel)) { + final JobStatus jobStatus = jsc.getRunningJobLocked(); + if (jobStatus != null && jobStatus.startedAsUserInitiatedJob) { + return true; + } } } + return false; } private void validateNotification(@NonNull String packageName, int callingUid, diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 887ee5fe1583..aef9dd058658 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -33,6 +33,7 @@ import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.AppGlobals; import android.app.IUidObserver; +import android.app.UidObserver; import android.app.compat.CompatChanges; import android.app.job.IJobScheduler; import android.app.job.IUserVisibleJobObserver; @@ -1250,7 +1251,7 @@ public class JobSchedulerService extends com.android.server.SystemService return pkg; } - final private IUidObserver mUidObserver = new IUidObserver.Stub() { + final private IUidObserver mUidObserver = new UidObserver() { @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { final SomeArgs args = SomeArgs.obtain(); @@ -1264,19 +1265,13 @@ public class JobSchedulerService extends com.android.server.SystemService mHandler.obtainMessage(MSG_UID_GONE, uid, disabled ? 1 : 0).sendToTarget(); } - @Override public void onUidActive(int uid) throws RemoteException { + @Override public void onUidActive(int uid) { mHandler.obtainMessage(MSG_UID_ACTIVE, uid, 0).sendToTarget(); } @Override public void onUidIdle(int uid, boolean disabled) { mHandler.obtainMessage(MSG_UID_IDLE, uid, disabled ? 1 : 0).sendToTarget(); } - - @Override public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override public void onUidProcAdjChanged(int uid) { - } }; public Context getTestableContext() { @@ -3717,6 +3712,30 @@ public class JobSchedulerService extends com.android.server.SystemService } @Override + public boolean isNotificationAssociatedWithAnyUserInitiatedJobs(int notificationId, + int userId, String packageName) { + if (packageName == null) { + return false; + } + synchronized (mLock) { + return mConcurrencyManager.isNotificationAssociatedWithAnyUserInitiatedJobs( + notificationId, userId, packageName); + } + } + + @Override + public boolean isNotificationChannelAssociatedWithAnyUserInitiatedJobs( + String notificationChannel, int userId, String packageName) { + if (packageName == null || notificationChannel == null) { + return false; + } + synchronized (mLock) { + return mConcurrencyManager.isNotificationChannelAssociatedWithAnyUserInitiatedJobs( + notificationChannel, userId, packageName); + } + } + + @Override public JobStorePersistStats getPersistStats() { synchronized (mLock) { return new JobStorePersistStats(mJobs.getPersistStats()); diff --git a/boot/OWNERS b/boot/OWNERS index 0e258d042c08..3fe1a41f10b2 100644 --- a/boot/OWNERS +++ b/boot/OWNERS @@ -2,5 +2,5 @@ file:platform/build/soong:/OWNERS # art-team@ manages the boot image profiles for frameworks -per-file boot-* = calin@google.com, yawanng@google.com, ngeoffray@google.com -per-file preloaded-classes* = calin@google.com, yawanng@google.com, ngeoffray@google.com +per-file boot-* = islamelbanna@google.com, ngeoffray@google.com, vmarko@google.com +per-file preloaded-classes* = islamelbanna@google.com, ngeoffray@google.com, vmarko@google.com diff --git a/boot/preloaded-classes b/boot/preloaded-classes index d2eb4ce25935..21ae13474d84 100644 --- a/boot/preloaded-classes +++ b/boot/preloaded-classes @@ -211,7 +211,7 @@ android.app.ActivityManager$RunningTaskInfo$1 android.app.ActivityManager$RunningTaskInfo android.app.ActivityManager$TaskDescription$1 android.app.ActivityManager$TaskDescription -android.app.ActivityManager$UidObserver +android.app.ActivityManager$MyUidObserver android.app.ActivityManager android.app.ActivityManagerInternal android.app.ActivityOptions$1 diff --git a/config/OWNERS b/config/OWNERS index 74813bc3e6da..6a5df76e96ab 100644 --- a/config/OWNERS +++ b/config/OWNERS @@ -1,8 +1,8 @@ include /ZYGOTE_OWNERS # art-team@ manages the boot image profiles -per-file boot-* = ngeoffray@google.com, vmarko@google.com -per-file dirty-image-objects = ngeoffray@google.com, vmarko@google.com -per-file generate-preloaded-classes.sh = ngeoffray@google.com, vmarko@google.com -per-file preloaded-classes* = ngeoffray@google.com, vmarko@google.com +per-file boot-* = islamelbanna@google.com, ngeoffray@google.com, vmarko@google.com +per-file dirty-image-objects = ishcheikin@google.com, ngeoffray@google.com, vmarko@google.com +per-file generate-preloaded-classes.sh = islamelbanna@google.com, ngeoffray@google.com, vmarko@google.com +per-file preloaded-classes* = islamelbanna@google.com, ngeoffray@google.com, vmarko@google.com diff --git a/config/preloaded-classes b/config/preloaded-classes index 5e2c02110cba..8e50fe8e4e0f 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -211,7 +211,7 @@ android.app.ActivityManager$RunningTaskInfo$1 android.app.ActivityManager$RunningTaskInfo android.app.ActivityManager$TaskDescription$1 android.app.ActivityManager$TaskDescription -android.app.ActivityManager$UidObserver +android.app.ActivityManager$MyUidObserver android.app.ActivityManager android.app.ActivityManagerInternal android.app.ActivityOptions$1 diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 873234a04460..2dfda517b495 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -338,10 +338,12 @@ package android.app { } public class Notification implements android.os.Parcelable { + method public boolean isUserInitiatedJob(); method public boolean shouldShowForegroundImmediately(); field public static final String EXTRA_MEDIA_REMOTE_DEVICE = "android.mediaRemoteDevice"; field public static final String EXTRA_MEDIA_REMOTE_ICON = "android.mediaRemoteIcon"; field public static final String EXTRA_MEDIA_REMOTE_INTENT = "android.mediaRemoteIntent"; + field public static final int FLAG_USER_INITIATED_JOB = 32768; // 0x8000 } public final class NotificationChannel implements android.os.Parcelable { @@ -351,10 +353,10 @@ package android.app { method public void setDeleted(boolean); method public void setDeletedTimeMs(long); method public void setDemoted(boolean); - method public void setFgServiceShown(boolean); method public void setImportanceLockedByCriticalDeviceFunction(boolean); method public void setImportantConversation(boolean); method public void setOriginalImportance(int); + method public void setUserVisibleTaskShown(boolean); } public final class NotificationChannelGroup implements android.os.Parcelable { @@ -2275,12 +2277,12 @@ package android.os { method public int getMainDisplayIdAssignedToUser(); method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String); method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType(); - method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean); + method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean hasBaseUserRestriction(@NonNull String, @NonNull android.os.UserHandle); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isUserTypeEnabled(@NonNull String); method public boolean isVisibleBackgroundUsersOnDefaultDisplaySupported(); method public boolean isVisibleBackgroundUsersSupported(); - method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo preCreateUser(@NonNull String) throws android.os.UserManager.UserOperationException; + method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo preCreateUser(@NonNull String) throws android.os.UserManager.UserOperationException; } public final class VibrationAttributes implements android.os.Parcelable { diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 3615435b7d75..08a1af47ee64 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -2878,9 +2878,7 @@ public abstract class AccessibilityService extends Service { public IAccessibilityServiceClientWrapper(Context context, Looper looper, Callbacks callback) { - mCallback = callback; - mContext = context; - mExecutor = new HandlerExecutor(new Handler(looper)); + this(context, new HandlerExecutor(new Handler(looper)), callback); } public void init(IAccessibilityServiceConnection connection, int connectionId, diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 6dcf33114b19..808f25eb7cd9 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -860,10 +860,10 @@ public class AccessibilityServiceInfo implements Parcelable { * <p> * <strong>Generated by the system.</strong> * </p> - * @return The id. + * @return The id (or {@code null} if the component is not set yet). */ public String getId() { - return mComponentName.flattenToShortString(); + return mComponentName == null ? null : mComponentName.flattenToShortString(); } /** diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 813e32a81983..521bf05d9d4f 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -193,11 +193,11 @@ public class ActivityManager { */ public static final int INSTR_FLAG_INSTRUMENT_SDK_SANDBOX = 1 << 5; - static final class UidObserver extends IUidObserver.Stub { + static final class MyUidObserver extends UidObserver { final OnUidImportanceListener mListener; final Context mContext; - UidObserver(OnUidImportanceListener listener, Context clientContext) { + MyUidObserver(OnUidImportanceListener listener, Context clientContext) { mListener = listener; mContext = clientContext; } @@ -212,23 +212,9 @@ public class ActivityManager { public void onUidGone(int uid, boolean disabled) { mListener.onUidImportance(uid, RunningAppProcessInfo.IMPORTANCE_GONE); } - - @Override - public void onUidActive(int uid) { - } - - @Override - public void onUidIdle(int uid, boolean disabled) { - } - - @Override public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override public void onUidProcAdjChanged(int uid) { - } } - final ArrayMap<OnUidImportanceListener, UidObserver> mImportanceListeners = new ArrayMap<>(); + final ArrayMap<OnUidImportanceListener, MyUidObserver> mImportanceListeners = new ArrayMap<>(); /** * Map of callbacks that have registered for {@link UidFrozenStateChanged} events. @@ -4273,7 +4259,7 @@ public class ActivityManager { throw new IllegalArgumentException("Listener already registered: " + listener); } // TODO: implement the cut point in the system process to avoid IPCs. - UidObserver observer = new UidObserver(listener, mContext); + MyUidObserver observer = new MyUidObserver(listener, mContext); try { getService().registerUidObserver(observer, UID_OBSERVER_PROCSTATE | UID_OBSERVER_GONE, @@ -4297,7 +4283,7 @@ public class ActivityManager { @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(OnUidImportanceListener listener) { synchronized (this) { - UidObserver observer = mImportanceListeners.remove(listener); + MyUidObserver observer = mImportanceListeners.remove(listener); if (observer == null) { throw new IllegalArgumentException("Listener not registered: " + listener); } diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 7b4aeeca2855..29e135f8b0e9 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -41,6 +41,7 @@ import static com.android.internal.os.SafeZipPathValidatorCallback.VALIDATE_ZIP_ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.RemoteServiceException.BadForegroundServiceNotificationException; +import android.app.RemoteServiceException.BadUserInitiatedJobNotificationException; import android.app.RemoteServiceException.CannotPostForegroundServiceNotificationException; import android.app.RemoteServiceException.CrashedByAdbException; import android.app.RemoteServiceException.ForegroundServiceDidNotStartInTimeException; @@ -2078,6 +2079,9 @@ public final class ActivityThread extends ClientTransactionHandler case BadForegroundServiceNotificationException.TYPE_ID: throw new BadForegroundServiceNotificationException(message); + case BadUserInitiatedJobNotificationException.TYPE_ID: + throw new BadUserInitiatedJobNotificationException(message); + case MissingRequestPasswordComplexityPermissionException.TYPE_ID: throw new MissingRequestPasswordComplexityPermissionException(message); diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl index f4373a67a967..ee242635bfb2 100644 --- a/core/java/android/app/IWallpaperManager.aidl +++ b/core/java/android/app/IWallpaperManager.aidl @@ -243,4 +243,11 @@ interface IWallpaperManager { * @hide */ boolean lockScreenWallpaperExists(); + + /** + * Temporary method for project b/197814683. + * Return true if the lockscreen wallpaper always uses a WallpaperService, not a static image. + * @hide + */ + boolean isLockscreenLiveWallpaperEnabled(); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 7aedd30d660e..f80373912dcb 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -722,6 +722,16 @@ public class Notification implements Parcelable */ public static final int FLAG_FSI_REQUESTED_BUT_DENIED = 0x00004000; + /** + * Bit to be bitwise-ored into the {@link #flags} field that should be + * set if this notification represents a currently running user-initiated job. + * + * This flag is for internal use only; applications cannot set this flag directly. + * @hide + */ + @TestApi + public static final int FLAG_USER_INITIATED_JOB = 0x00008000; + private static final List<Class<? extends Style>> PLATFORM_STYLE_CLASSES = Arrays.asList( BigTextStyle.class, BigPictureStyle.class, InboxStyle.class, MediaStyle.class, DecoratedCustomViewStyle.class, DecoratedMediaCustomViewStyle.class, @@ -731,7 +741,8 @@ public class Notification implements Parcelable @IntDef(flag = true, prefix = { "FLAG_" }, value = {FLAG_SHOW_LIGHTS, FLAG_ONGOING_EVENT, FLAG_INSISTENT, FLAG_ONLY_ALERT_ONCE, FLAG_AUTO_CANCEL, FLAG_NO_CLEAR, FLAG_FOREGROUND_SERVICE, FLAG_HIGH_PRIORITY, - FLAG_LOCAL_ONLY, FLAG_GROUP_SUMMARY, FLAG_AUTOGROUP_SUMMARY, FLAG_BUBBLE}) + FLAG_LOCAL_ONLY, FLAG_GROUP_SUMMARY, FLAG_AUTOGROUP_SUMMARY, FLAG_BUBBLE, + FLAG_USER_INITIATED_JOB}) @Retention(RetentionPolicy.SOURCE) public @interface NotificationFlags{}; @@ -4067,8 +4078,9 @@ public class Notification implements Parcelable * notification if alerts for this notification's group should be handled by a different * notification. This is only applicable for notifications that belong to a * {@link #setGroup(String) group}. This must be called on all notifications you want to - * mute. For example, if you want only the summary of your group to make noise, all - * children in the group should have the group alert behavior {@link #GROUP_ALERT_SUMMARY}. + * mute. For example, if you want only the summary of your group to make noise and/or peek + * on screen, all children in the group should have the group alert behavior + * {@link #GROUP_ALERT_SUMMARY}. * * <p> The default value is {@link #GROUP_ALERT_ALL}.</p> */ @@ -5726,7 +5738,8 @@ public class Notification implements Parcelable } private void bindSnoozeAction(RemoteViews big, StandardTemplateParams p) { - boolean hideSnoozeButton = mN.isForegroundService() || mN.fullScreenIntent != null + boolean hideSnoozeButton = mN.isFgsOrUij() + || mN.fullScreenIntent != null || isBackgroundColorized(p) || p.mViewType != StandardTemplateParams.VIEW_TYPE_BIG; big.setBoolean(R.id.snooze_button, "setEnabled", !hideSnoozeButton); @@ -6867,6 +6880,24 @@ public class Notification implements Parcelable } /** + * @return whether this notification is associated with a user initiated job + * @hide + */ + @TestApi + public boolean isUserInitiatedJob() { + return (flags & Notification.FLAG_USER_INITIATED_JOB) != 0; + } + + /** + * @return whether this notification is associated with either a foreground service or + * a user initiated job + * @hide + */ + public boolean isFgsOrUij() { + return isForegroundService() || isUserInitiatedJob(); + } + + /** * Describe whether this notification's content such that it should always display * immediately when tied to a foreground service, even if the system might generally * avoid showing the notifications for short-lived foreground service lifetimes. diff --git a/core/java/android/app/NotificationChannel.java b/core/java/android/app/NotificationChannel.java index 9615b684ee4b..746dcb6f2e13 100644 --- a/core/java/android/app/NotificationChannel.java +++ b/core/java/android/app/NotificationChannel.java @@ -32,7 +32,6 @@ import android.os.Parcelable; import android.provider.Settings; import android.service.notification.NotificationListenerService; import android.text.TextUtils; -import android.util.Slog; import android.util.proto.ProtoOutputStream; import com.android.internal.util.Preconditions; @@ -150,6 +149,10 @@ public final class NotificationChannel implements Parcelable { private static final String ATT_CONTENT_TYPE = "content_type"; private static final String ATT_SHOW_BADGE = "show_badge"; private static final String ATT_USER_LOCKED = "locked"; + /** + * This attribute represents both foreground services and user initiated jobs in U+. + * It was not renamed in U on purpose, in order to avoid creating an unnecessary migration path. + */ private static final String ATT_FG_SERVICE_SHOWN = "fgservice"; private static final String ATT_GROUP = "group"; private static final String ATT_BLOCKABLE_SYSTEM = "blockable_system"; @@ -249,7 +252,7 @@ public final class NotificationChannel implements Parcelable { // Bitwise representation of fields that have been changed by the user, preventing the app from // making changes to these fields. private int mUserLockedFields; - private boolean mFgServiceShown; + private boolean mUserVisibleTaskShown; private boolean mVibrationEnabled; private boolean mShowBadge = DEFAULT_SHOW_BADGE; private boolean mDeleted = DEFAULT_DELETED; @@ -317,7 +320,7 @@ public final class NotificationChannel implements Parcelable { mVibration = Arrays.copyOf(mVibration, MAX_VIBRATION_LENGTH); } mUserLockedFields = in.readInt(); - mFgServiceShown = in.readByte() != 0; + mUserVisibleTaskShown = in.readByte() != 0; mVibrationEnabled = in.readByte() != 0; mShowBadge = in.readByte() != 0; mDeleted = in.readByte() != 0; @@ -371,7 +374,7 @@ public final class NotificationChannel implements Parcelable { dest.writeByte(mLights ? (byte) 1 : (byte) 0); dest.writeLongArray(mVibration); dest.writeInt(mUserLockedFields); - dest.writeByte(mFgServiceShown ? (byte) 1 : (byte) 0); + dest.writeByte(mUserVisibleTaskShown ? (byte) 1 : (byte) 0); dest.writeByte(mVibrationEnabled ? (byte) 1 : (byte) 0); dest.writeByte(mShowBadge ? (byte) 1 : (byte) 0); dest.writeByte(mDeleted ? (byte) 1 : (byte) 0); @@ -418,8 +421,8 @@ public final class NotificationChannel implements Parcelable { * @hide */ @TestApi - public void setFgServiceShown(boolean shown) { - mFgServiceShown = shown; + public void setUserVisibleTaskShown(boolean shown) { + mUserVisibleTaskShown = shown; } /** @@ -845,8 +848,8 @@ public final class NotificationChannel implements Parcelable { /** * @hide */ - public boolean isFgServiceShown() { - return mFgServiceShown; + public boolean isUserVisibleTaskShown() { + return mUserVisibleTaskShown; } /** @@ -965,7 +968,7 @@ public final class NotificationChannel implements Parcelable { parser, ATT_DELETED_TIME_MS, DEFAULT_DELETION_TIME_MS)); setGroup(parser.getAttributeValue(null, ATT_GROUP)); lockFields(safeInt(parser, ATT_USER_LOCKED, 0)); - setFgServiceShown(safeBool(parser, ATT_FG_SERVICE_SHOWN, false)); + setUserVisibleTaskShown(safeBool(parser, ATT_FG_SERVICE_SHOWN, false)); setBlockable(safeBool(parser, ATT_BLOCKABLE_SYSTEM, false)); setAllowBubbles(safeInt(parser, ATT_ALLOW_BUBBLE, DEFAULT_ALLOW_BUBBLE)); setOriginalImportance(safeInt(parser, ATT_ORIG_IMP, DEFAULT_IMPORTANCE)); @@ -1072,8 +1075,8 @@ public final class NotificationChannel implements Parcelable { if (getUserLockedFields() != 0) { out.attributeInt(null, ATT_USER_LOCKED, getUserLockedFields()); } - if (isFgServiceShown()) { - out.attributeBoolean(null, ATT_FG_SERVICE_SHOWN, isFgServiceShown()); + if (isUserVisibleTaskShown()) { + out.attributeBoolean(null, ATT_FG_SERVICE_SHOWN, isUserVisibleTaskShown()); } if (canShowBadge()) { out.attributeBoolean(null, ATT_SHOW_BADGE, canShowBadge()); @@ -1147,7 +1150,7 @@ public final class NotificationChannel implements Parcelable { record.put(ATT_LIGHT_COLOR, Integer.toString(getLightColor())); record.put(ATT_VIBRATION_ENABLED, Boolean.toString(shouldVibrate())); record.put(ATT_USER_LOCKED, Integer.toString(getUserLockedFields())); - record.put(ATT_FG_SERVICE_SHOWN, Boolean.toString(isFgServiceShown())); + record.put(ATT_FG_SERVICE_SHOWN, Boolean.toString(isUserVisibleTaskShown())); record.put(ATT_VIBRATION, longArrayToString(getVibrationPattern())); record.put(ATT_SHOW_BADGE, Boolean.toString(canShowBadge())); record.put(ATT_DELETED, Boolean.toString(isDeleted())); @@ -1239,7 +1242,7 @@ public final class NotificationChannel implements Parcelable { && mLights == that.mLights && getLightColor() == that.getLightColor() && getUserLockedFields() == that.getUserLockedFields() - && isFgServiceShown() == that.isFgServiceShown() + && isUserVisibleTaskShown() == that.isUserVisibleTaskShown() && mVibrationEnabled == that.mVibrationEnabled && mShowBadge == that.mShowBadge && isDeleted() == that.isDeleted() @@ -1265,8 +1268,8 @@ public final class NotificationChannel implements Parcelable { public int hashCode() { int result = Objects.hash(getId(), getName(), mDesc, getImportance(), mBypassDnd, getLockscreenVisibility(), getSound(), mLights, getLightColor(), - getUserLockedFields(), - isFgServiceShown(), mVibrationEnabled, mShowBadge, isDeleted(), getDeletedTimeMs(), + getUserLockedFields(), isUserVisibleTaskShown(), + mVibrationEnabled, mShowBadge, isDeleted(), getDeletedTimeMs(), getGroup(), getAudioAttributes(), isBlockable(), mAllowBubbles, mImportanceLockedDefaultApp, mOriginalImportance, mParentId, mConversationId, mDemoted, mImportantConvo); @@ -1304,7 +1307,7 @@ public final class NotificationChannel implements Parcelable { + ", mLightColor=" + mLightColor + ", mVibration=" + Arrays.toString(mVibration) + ", mUserLockedFields=" + Integer.toHexString(mUserLockedFields) - + ", mFgServiceShown=" + mFgServiceShown + + ", mUserVisibleTaskShown=" + mUserVisibleTaskShown + ", mVibrationEnabled=" + mVibrationEnabled + ", mShowBadge=" + mShowBadge + ", mDeleted=" + mDeleted @@ -1342,7 +1345,7 @@ public final class NotificationChannel implements Parcelable { } } proto.write(NotificationChannelProto.USER_LOCKED_FIELDS, mUserLockedFields); - proto.write(NotificationChannelProto.FG_SERVICE_SHOWN, mFgServiceShown); + proto.write(NotificationChannelProto.USER_VISIBLE_TASK_SHOWN, mUserVisibleTaskShown); proto.write(NotificationChannelProto.IS_VIBRATION_ENABLED, mVibrationEnabled); proto.write(NotificationChannelProto.SHOW_BADGE, mShowBadge); proto.write(NotificationChannelProto.IS_DELETED, mDeleted); diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index d2f2c3c4e95a..80f64e03afe8 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -726,8 +726,9 @@ public class NotificationManager { * Cancels a previously posted notification. * * <p>If the notification does not currently represent a - * {@link Service#startForeground(int, Notification) foreground service}, it will be - * removed from the UI and live + * {@link Service#startForeground(int, Notification) foreground service} or a + * {@link android.app.job.JobInfo.Builder#setUserInitiated(boolean) user-initiated job}, + * it will be removed from the UI and live * {@link android.service.notification.NotificationListenerService notification listeners} * will be informed so they can remove the notification from their UIs.</p> */ @@ -740,8 +741,9 @@ public class NotificationManager { * Cancels a previously posted notification. * * <p>If the notification does not currently represent a - * {@link Service#startForeground(int, Notification) foreground service}, it will be - * removed from the UI and live + * {@link Service#startForeground(int, Notification) foreground service} or a + * {@link android.app.job.JobInfo.Builder#setUserInitiated(boolean) user-initiated job}, + * it will be removed from the UI and live * {@link android.service.notification.NotificationListenerService notification listeners} * will be informed so they can remove the notification from their UIs.</p> */ @@ -754,8 +756,9 @@ public class NotificationManager { * Cancels a previously posted notification. * * <p>If the notification does not currently represent a - * {@link Service#startForeground(int, Notification) foreground service}, it will be - * removed from the UI and live + * {@link Service#startForeground(int, Notification) foreground service} or a + * {@link android.app.job.JobInfo.Builder#setUserInitiated(boolean) user-initiated job}, + * it will be removed from the UI and live * {@link android.service.notification.NotificationListenerService notification listeners} * will be informed so they can remove the notification from their UIs.</p> * diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index 9bf56b374576..99a7fa21b911 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -841,7 +841,8 @@ public final class PendingIntent implements Parcelable { /** * Perform the operation associated with this PendingIntent. * - * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler) + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String, + * Bundle) * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. @@ -855,7 +856,8 @@ public final class PendingIntent implements Parcelable { * * @param code Result code to supply back to the PendingIntent's target. * - * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler) + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String, + * Bundle) * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. @@ -875,7 +877,8 @@ public final class PendingIntent implements Parcelable { * original Intent. If flag {@link #FLAG_IMMUTABLE} was set when this * pending intent was created, this argument will be ignored. * - * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler) + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String, + * Bundle) * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. @@ -892,6 +895,11 @@ public final class PendingIntent implements Parcelable { * @param options Additional options the caller would like to provide to modify the * sending behavior. May be built from an {@link ActivityOptions} to apply to an * activity start. + * + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String) + * + * @throws CanceledException Throws CanceledException if the PendingIntent + * is no longer allowing more intents to be sent through it. */ public void send(@Nullable Bundle options) throws CanceledException { send(null, 0, null, null, null, null, options); @@ -908,7 +916,8 @@ public final class PendingIntent implements Parcelable { * should happen. If null, the callback will happen from the thread * pool of the process. * - * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler) + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String, + * Bundle) * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. @@ -942,11 +951,8 @@ public final class PendingIntent implements Parcelable { * should happen. If null, the callback will happen from the thread * pool of the process. * - * @see #send() - * @see #send(int) - * @see #send(Context, int, Intent) - * @see #send(int, android.app.PendingIntent.OnFinished, Handler) - * @see #send(Context, int, Intent, OnFinished, Handler, String) + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String, + * Bundle) * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. @@ -985,11 +991,8 @@ public final class PendingIntent implements Parcelable { * {@link Context#sendBroadcast(Intent, String) Context.sendOrderedBroadcast(Intent, String)}. * If null, no permission is required. * - * @see #send() - * @see #send(int) - * @see #send(Context, int, Intent) - * @see #send(int, android.app.PendingIntent.OnFinished, Handler) - * @see #send(Context, int, Intent, OnFinished, Handler) + * @see #send(Context, int, Intent, android.app.PendingIntent.OnFinished, Handler, String, + * Bundle) * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. @@ -1032,12 +1035,6 @@ public final class PendingIntent implements Parcelable { * @param options Additional options the caller would like to provide to modify the sending * behavior. May be built from an {@link ActivityOptions} to apply to an activity start. * - * @see #send() - * @see #send(int) - * @see #send(Context, int, Intent) - * @see #send(int, android.app.PendingIntent.OnFinished, Handler) - * @see #send(Context, int, Intent, OnFinished, Handler) - * * @throws CanceledException Throws CanceledException if the PendingIntent * is no longer allowing more intents to be sent through it. */ diff --git a/core/java/android/app/RemoteServiceException.java b/core/java/android/app/RemoteServiceException.java index 620adbedc903..c5ad1105397e 100644 --- a/core/java/android/app/RemoteServiceException.java +++ b/core/java/android/app/RemoteServiceException.java @@ -102,6 +102,21 @@ public class RemoteServiceException extends AndroidRuntimeException { } /** + * Exception used to crash an app process when the system finds an error in a user-initiated job + * notification. + * + * @hide + */ + public static class BadUserInitiatedJobNotificationException extends RemoteServiceException { + /** The type ID passed to {@link IApplicationThread#scheduleCrash}. */ + public static final int TYPE_ID = 6; + + public BadUserInitiatedJobNotificationException(String msg) { + super(msg); + } + } + + /** * Exception used to crash an app process when it calls a setting activity that requires * the {@code REQUEST_PASSWORD_COMPLEXITY} permission. * diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index 86f6a93ede1e..658e08444006 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -46,6 +46,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.util.ArraySet; +import android.util.DebugUtils; import android.util.Log; import android.util.SparseArray; import android.view.Display; @@ -111,6 +112,7 @@ public final class UiAutomation { private static final String LOG_TAG = UiAutomation.class.getSimpleName(); private static final boolean DEBUG = false; + private static final boolean VERBOSE = false; private static final int CONNECTION_ID_UNDEFINED = -1; @@ -321,11 +323,18 @@ public final class UiAutomation { * @hide */ public void connectWithTimeout(int flags, long timeoutMillis) throws TimeoutException { + if (DEBUG) { + Log.d(LOG_TAG, "connectWithTimeout: user=" + Process.myUserHandle().getIdentifier() + + ", flags=" + DebugUtils.flagsToString(UiAutomation.class, "FLAG_", flags) + + ", timeout=" + timeoutMillis + "ms"); + } synchronized (mLock) { throwIfConnectedLocked(); if (mConnectionState == ConnectionState.CONNECTING) { + if (DEBUG) Log.d(LOG_TAG, "already connecting"); return; } + if (DEBUG) Log.d(LOG_TAG, "setting state to CONNECTING"); mConnectionState = ConnectionState.CONNECTING; mRemoteCallbackThread = new HandlerThread("UiAutomation"); mRemoteCallbackThread.start(); @@ -341,6 +350,7 @@ public final class UiAutomation { // If UiAutomation is not allowed to use the accessibility subsystem, the // connection state should keep disconnected and not to start the client connection. if (!useAccessibility()) { + if (DEBUG) Log.d(LOG_TAG, "setting state to DISCONNECTED"); mConnectionState = ConnectionState.DISCONNECTED; return; } @@ -357,6 +367,7 @@ public final class UiAutomation { final long elapsedTimeMillis = SystemClock.uptimeMillis() - startTimeMillis; final long remainingTimeMillis = timeoutMillis - elapsedTimeMillis; if (remainingTimeMillis <= 0) { + if (DEBUG) Log.d(LOG_TAG, "setting state to FAILED"); mConnectionState = ConnectionState.FAILED; throw new TimeoutException("Timeout while connecting " + this); } @@ -1367,7 +1378,8 @@ public final class UiAutomation { UserHandle userHandle) { try { if (DEBUG) { - Log.i(LOG_TAG, "Granting runtime permission"); + Log.i(LOG_TAG, "Granting runtime permission (" + permission + ") to package " + + packageName + " on user " + userHandle); } // Calling out without a lock held. mUiAutomationConnection.grantRuntimePermission(packageName, @@ -1592,7 +1604,7 @@ public final class UiAutomation { private class IAccessibilityServiceClientImpl extends IAccessibilityServiceClientWrapper { public IAccessibilityServiceClientImpl(Looper looper, int generationId) { - super(null, looper, new Callbacks() { + super(/* context= */ null, looper, new Callbacks() { private final int mGenerationId = generationId; /** @@ -1606,10 +1618,21 @@ public final class UiAutomation { @Override public void init(int connectionId, IBinder windowToken) { + if (DEBUG) { + Log.d(LOG_TAG, "init(): connectionId=" + connectionId + ", windowToken=" + + windowToken + ", user=" + Process.myUserHandle() + + ", mGenerationId=" + mGenerationId + + ", UiAutomation.mGenerationId=" + + UiAutomation.this.mGenerationId); + } synchronized (mLock) { if (isGenerationChangedLocked()) { + if (DEBUG) { + Log.d(LOG_TAG, "init(): returning because generation id changed"); + } return; } + if (DEBUG) Log.d(LOG_TAG, "setting state to CONNECTED"); mConnectionState = ConnectionState.CONNECTED; mConnectionId = connectionId; mLock.notifyAll(); @@ -1662,9 +1685,20 @@ public final class UiAutomation { @Override public void onAccessibilityEvent(AccessibilityEvent event) { + if (VERBOSE) { + Log.v(LOG_TAG, "onAccessibilityEvent(" + Process.myUserHandle() + "): " + + event); + } + final OnAccessibilityEventListener listener; synchronized (mLock) { if (isGenerationChangedLocked()) { + if (VERBOSE) { + Log.v(LOG_TAG, "onAccessibilityEvent(): returning because " + + "generation id changed (from " + + UiAutomation.this.mGenerationId + " to " + + mGenerationId + ")"); + } return; } // It is not guaranteed that the accessibility framework sends events by the diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java index 3a32f2362c0d..13e800e38cca 100644 --- a/core/java/android/app/UiAutomationConnection.java +++ b/core/java/android/app/UiAutomationConnection.java @@ -103,6 +103,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UiAutomationConnection() { + Log.d(TAG, "Created on user " + Process.myUserHandle()); } @Override diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 4d55fee35506..ebd525ec6508 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -142,9 +142,6 @@ public class WallpaperManager { private static final @NonNull RectF LOCAL_COLOR_BOUNDS = new RectF(0, 0, 1, 1); - /** Temporary feature flag for project b/197814683 */ - private final boolean mLockscreenLiveWallpaper; - /** {@hide} */ private static final String PROP_WALLPAPER = "ro.config.wallpaper"; /** {@hide} */ @@ -306,6 +303,7 @@ public class WallpaperManager { private final Context mContext; private final boolean mWcgEnabled; private final ColorManagementProxy mCmProxy; + private Boolean mIsLockscreenLiveWallpaperEnabled = null; /** * Special drawable that draws a wallpaper as fast as possible. Assumes @@ -794,8 +792,6 @@ public class WallpaperManager { mWcgEnabled = context.getResources().getConfiguration().isScreenWideColorGamut() && context.getResources().getBoolean(R.bool.config_enableWcgMode); mCmProxy = new ColorManagementProxy(context); - mLockscreenLiveWallpaper = context.getResources() - .getBoolean(R.bool.config_independentLockscreenLiveWallpaper); } // no-op constructor called just by DisabledWallpaperManager @@ -803,7 +799,6 @@ public class WallpaperManager { mContext = null; mCmProxy = null; mWcgEnabled = false; - mLockscreenLiveWallpaper = false; } /** @@ -827,7 +822,19 @@ public class WallpaperManager { */ @TestApi public boolean isLockscreenLiveWallpaperEnabled() { - return mLockscreenLiveWallpaper; + if (sGlobals == null) { + mIsLockscreenLiveWallpaperEnabled = SystemProperties.getBoolean( + "persist.wm.debug.lockscreen_live_wallpaper", false); + } + if (mIsLockscreenLiveWallpaperEnabled == null) { + try { + mIsLockscreenLiveWallpaperEnabled = + sGlobals.mService.isLockscreenLiveWallpaperEnabled(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return mIsLockscreenLiveWallpaperEnabled; } /** diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index bad6c77a17f3..4d3338beded5 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6413,7 +6413,7 @@ public class DevicePolicyManager { public void lockNow(@LockNowFlag int flags) { if (mService != null) { try { - mService.lockNow(flags, mParentInstance); + mService.lockNow(flags, mContext.getPackageName(), mParentInstance); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -9634,7 +9634,8 @@ public class DevicePolicyManager { * @see #isProfileOwnerApp * @see #isDeviceOwnerApp * @param admin Which {@link DeviceAdminReceiver} this request is associate with. - * @param profileName The name of the profile. + * @param profileName The name of the profile. If the name is longer than 200 characters + * it will be truncated. * @throws SecurityException if {@code admin} is not a device or profile owner. */ public void setProfileName(@NonNull ComponentName admin, String profileName) { @@ -13646,8 +13647,8 @@ public class DevicePolicyManager { * privacy-sensitive events happening outside the managed profile would have been redacted * already. * - * @param admin Which device admin this request is associated with. Null if the caller is not - * a device admin + * @param admin Which device admin this request is associated with, or {@code null} + * if called by a delegated app. * @param enabled whether security logging should be enabled or not. * @throws SecurityException if the caller is not permitted to control security logging. * @see #setAffiliationIds @@ -13699,8 +13700,8 @@ public class DevicePolicyManager { * it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown. * See {@link #isAffiliatedUser}. * - * @param admin Which device admin this request is associated with. Null if the caller is not - * a device admin. + * @param admin Which device admin this request is associated with, or {@code null} + * if called by a delegated app. * @return the new batch of security logs which is a list of {@link SecurityEvent}, * or {@code null} if rate limitation is exceeded or if logging is currently disabled. * @throws SecurityException if the caller is not allowed to access security logging, @@ -13857,8 +13858,8 @@ public class DevicePolicyManager { * it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown. * See {@link #isAffiliatedUser}. * - * @param admin Which device admin this request is associated with. Null if the caller is not - * a device admin. + * @param admin Which device admin this request is associated with, or {@code null} + * if called by a delegated app. * @return Device logs from before the latest reboot of the system, or {@code null} if this API * is not supported on the device. * @throws SecurityException if the caller is not allowed to access security logging, or diff --git a/core/java/android/app/admin/DevicePolicyResources.java b/core/java/android/app/admin/DevicePolicyResources.java index a49891356ccd..052f670b71bd 100644 --- a/core/java/android/app/admin/DevicePolicyResources.java +++ b/core/java/android/app/admin/DevicePolicyResources.java @@ -1802,14 +1802,6 @@ public final class DevicePolicyResources { PREFIX + "UNLAUNCHABLE_APP_WORK_PAUSED_TITLE"; /** - * Text for dialog shown when user tries to open a work app when the work profile is - * turned off, confirming that the user wants to turn on access to their - * work apps. - */ - public static final String UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE = - PREFIX + "UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE"; - - /** * Notification title shown when work profile is credential encrypted and requires * the user to unlock before it's usable. */ @@ -1857,6 +1849,17 @@ public final class DevicePolicyResources { public static final String WORK_PROFILE_TELEPHONY_PAUSED_TURN_ON_BUTTON = PREFIX + "TURN_ON_WORK_PROFILE_BUTTON_TEXT"; + public static final String MINIRESOLVER_OPEN_IN_WORK = + PREFIX + "MINIRESOLVER_OPEN_IN_WORK"; + + public static final String MINIRESOLVER_OPEN_IN_PERSONAL = + PREFIX + "MINIRESOLVER_OPEN_IN_PERSONAL"; + + public static final String MINIRESOLVER_USE_WORK_BROWSER = + PREFIX + "MINIRESOLVER_OPEN_IN_PERSONAL"; + + public static final String MINIRESOLVER_USE_PERSONAL_BROWSER = + PREFIX + "MINIRESOLVER_OPEN_IN_PERSONAL"; } /** diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 8d508c0fb79d..9b0b18ac74ec 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -119,7 +119,7 @@ interface IDevicePolicyManager { void setRequiredStrongAuthTimeout(in ComponentName who, String callerPackageName, long timeMs, boolean parent); long getRequiredStrongAuthTimeout(in ComponentName who, int userId, boolean parent); - void lockNow(int flags, boolean parent); + void lockNow(int flags, String callerPackageName, boolean parent); /** * @param factoryReset only applicable when `targetSdk >= U`, either tries to factoryReset/fail or removeUser/fail otherwise diff --git a/core/java/android/app/admin/IntentFilterPolicyKey.java b/core/java/android/app/admin/IntentFilterPolicyKey.java index 30aad965c008..7526a7b2c934 100644 --- a/core/java/android/app/admin/IntentFilterPolicyKey.java +++ b/core/java/android/app/admin/IntentFilterPolicyKey.java @@ -28,7 +28,9 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import android.util.Log; +import com.android.internal.util.XmlUtils; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; @@ -45,6 +47,10 @@ import java.util.Objects; */ @SystemApi public final class IntentFilterPolicyKey extends PolicyKey { + + private static final String TAG = "IntentFilterPolicyKey"; + + private static final String TAG_INTENT_FILTER_ENTRY = "filter"; private final IntentFilter mFilter; /** @@ -83,7 +89,9 @@ public final class IntentFilterPolicyKey extends PolicyKey { @Override public void saveToXml(TypedXmlSerializer serializer) throws IOException { serializer.attribute(/* namespace= */ null, ATTR_POLICY_IDENTIFIER, getIdentifier()); + serializer.startTag(/* namespace= */ null, TAG_INTENT_FILTER_ENTRY); mFilter.writeToXml(serializer); + serializer.endTag(/* namespace= */ null, TAG_INTENT_FILTER_ENTRY); } /** @@ -93,11 +101,27 @@ public final class IntentFilterPolicyKey extends PolicyKey { public IntentFilterPolicyKey readFromXml(TypedXmlPullParser parser) throws XmlPullParserException, IOException { String identifier = parser.getAttributeValue(/* namespace= */ null, ATTR_POLICY_IDENTIFIER); - IntentFilter filter = new IntentFilter(); - filter.readFromXml(parser); + IntentFilter filter = readIntentFilterFromXml(parser); return new IntentFilterPolicyKey(identifier, filter); } + @Nullable + private IntentFilter readIntentFilterFromXml(TypedXmlPullParser parser) + throws XmlPullParserException, IOException { + int outerDepth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + String tag = parser.getName(); + if (tag.equals(TAG_INTENT_FILTER_ENTRY)) { + IntentFilter filter = new IntentFilter(); + filter.readFromXml(parser); + return filter; + } + Log.e(TAG, "Unknown tag: " + tag); + } + Log.e(TAG, "Error parsing IntentFilterPolicyKey, IntentFilter not found"); + return null; + } + /** * @hide */ diff --git a/core/java/android/app/search/SearchTarget.java b/core/java/android/app/search/SearchTarget.java index a3874f7cb007..8132b813cba0 100644 --- a/core/java/android/app/search/SearchTarget.java +++ b/core/java/android/app/search/SearchTarget.java @@ -186,16 +186,6 @@ public final class SearchTarget implements Parcelable { mAppWidgetProviderInfo = appWidgetProviderInfo; mSliceUri = sliceUri; mExtras = extras != null ? extras : new Bundle(); - - int published = 0; - if (mSearchAction != null) published++; - if (mShortcutInfo != null) published++; - if (mAppWidgetProviderInfo != null) published++; - if (mSliceUri != null) published++; - if (published > 1) { - throw new IllegalStateException("Only one of SearchAction, ShortcutInfo," - + " AppWidgetProviderInfo, SliceUri can be assigned in a SearchTarget."); - } } /** diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java index da6784be4404..2ca2b79bcc08 100644 --- a/core/java/android/companion/virtual/VirtualDeviceManager.java +++ b/core/java/android/companion/virtual/VirtualDeviceManager.java @@ -64,6 +64,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.Executor; import java.util.function.IntConsumer; @@ -171,6 +172,7 @@ public final class VirtualDeviceManager { public VirtualDevice createVirtualDevice( int associationId, @NonNull VirtualDeviceParams params) { + Objects.requireNonNull(params, "params must not be null"); try { return new VirtualDevice(mService, mContext, associationId, params); } catch (RemoteException e) { @@ -409,6 +411,9 @@ public final class VirtualDeviceManager { @NonNull PendingIntent pendingIntent, @NonNull Executor executor, @NonNull IntConsumer listener) { + Objects.requireNonNull(pendingIntent, "pendingIntent must not be null"); + Objects.requireNonNull(executor, "executor must not be null"); + Objects.requireNonNull(listener, "listener must not be null"); mVirtualDeviceInternal.launchPendingIntent( displayId, pendingIntent, executor, listener); } @@ -483,6 +488,7 @@ public final class VirtualDeviceManager { @NonNull VirtualDisplayConfig config, @Nullable @CallbackExecutor Executor executor, @Nullable VirtualDisplay.Callback callback) { + Objects.requireNonNull(config, "config must not be null"); return mVirtualDeviceInternal.createVirtualDisplay(config, executor, callback); } @@ -503,6 +509,7 @@ public final class VirtualDeviceManager { @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) @NonNull public VirtualDpad createVirtualDpad(@NonNull VirtualDpadConfig config) { + Objects.requireNonNull(config, "config must not be null"); return mVirtualDeviceInternal.createVirtualDpad(config); } @@ -514,6 +521,7 @@ public final class VirtualDeviceManager { @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) @NonNull public VirtualKeyboard createVirtualKeyboard(@NonNull VirtualKeyboardConfig config) { + Objects.requireNonNull(config, "config must not be null"); return mVirtualDeviceInternal.createVirtualKeyboard(config); } @@ -550,6 +558,7 @@ public final class VirtualDeviceManager { @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) @NonNull public VirtualMouse createVirtualMouse(@NonNull VirtualMouseConfig config) { + Objects.requireNonNull(config, "config must not be null"); return mVirtualDeviceInternal.createVirtualMouse(config); } @@ -587,6 +596,7 @@ public final class VirtualDeviceManager { @NonNull public VirtualTouchscreen createVirtualTouchscreen( @NonNull VirtualTouchscreenConfig config) { + Objects.requireNonNull(config, "config must not be null"); return mVirtualDeviceInternal.createVirtualTouchscreen(config); } @@ -659,6 +669,7 @@ public final class VirtualDeviceManager { @NonNull VirtualDisplay display, @Nullable Executor executor, @Nullable AudioConfigurationChangeCallback callback) { + Objects.requireNonNull(display, "display must not be null"); return mVirtualDeviceInternal.createVirtualAudioDevice(display, executor, callback); } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 58b0571653f1..154068eb9e09 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4233,6 +4233,13 @@ public class Intent implements Parcelable, Cloneable { "com.android.intent.action.SHOW_BRIGHTNESS_DIALOG"; /** + * Activity Action: Shows the contrast setting dialog. + * @hide + */ + public static final String ACTION_SHOW_CONTRAST_DIALOG = + "com.android.intent.action.SHOW_CONTRAST_DIALOG"; + + /** * Broadcast Action: A global button was pressed. Includes a single * extra field, {@link #EXTRA_KEY_EVENT}, containing the key event that * caused the broadcast. diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 6ff42711ef1a..f946754bd9a1 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -531,8 +531,9 @@ public class IntentFilter implements Parcelable { mInstantAppVisibility = o.mInstantAppVisibility; } - /** {@inheritDoc} */ - public String toString() { + /** @hide */ + public String toLongString() { + // Not implemented directly as toString() due to potential memory regression final StringBuilder sb = new StringBuilder(); sb.append("IntentFilter {"); sb.append(" pri="); diff --git a/core/java/android/content/pm/ILauncherApps.aidl b/core/java/android/content/pm/ILauncherApps.aidl index 96a42e24bc1a..563ed7dd6e7a 100644 --- a/core/java/android/content/pm/ILauncherApps.aidl +++ b/core/java/android/content/pm/ILauncherApps.aidl @@ -38,6 +38,7 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.UserHandle; import android.os.ParcelFileDescriptor; +import android.window.IDumpCallback; import com.android.internal.infra.AndroidFuture; @@ -116,4 +117,10 @@ interface ILauncherApps { String getShortcutIconUri(String callingPackage, String packageName, String shortcutId, int userId); Map<String, LauncherActivityInfoInternal> getActivityOverrides(String callingPackage, int userId); + + /** Register a callback to be called right before the wmtrace data is moved to the bugreport. */ + void registerDumpCallback(IDumpCallback cb); + + /** Unregister a callback, so that it won't be called when LauncherApps dumps. */ + void unRegisterDumpCallback(IDumpCallback cb); } diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 8989006a7e83..27270d9f378f 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -17,6 +17,7 @@ package android.content.pm; import static android.Manifest.permission; +import static android.Manifest.permission.READ_FRAME_BUFFER; import android.annotation.CallbackExecutor; import android.annotation.IntDef; @@ -68,6 +69,7 @@ import android.util.ArrayMap; import android.util.DisplayMetrics; import android.util.Log; import android.util.Pair; +import android.window.IDumpCallback; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.infra.AndroidFuture; @@ -1172,6 +1174,32 @@ public class LauncherApps { } /** + * Register a callback to be called right before the wmtrace data is moved to the bugreport. + * @hide + */ + @RequiresPermission(READ_FRAME_BUFFER) + public void registerDumpCallback(IDumpCallback cb) { + try { + mService.registerDumpCallback(cb); + } catch (RemoteException e) { + e.rethrowAsRuntimeException(); + } + } + + /** + * Unregister a callback, so that it won't be called when LauncherApps dumps. + * @hide + */ + @RequiresPermission(READ_FRAME_BUFFER) + public void unRegisterDumpCallback(IDumpCallback cb) { + try { + mService.unRegisterDumpCallback(cb); + } catch (RemoteException e) { + e.rethrowAsRuntimeException(); + } + } + + /** * Returns {@link ShortcutInfo}s that match {@code query}. * * <p>Callers must be allowed to access the shortcut information, as defined in {@link diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index cb988dfdb203..30fd77ca467c 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -2991,6 +2991,10 @@ public class PackageInstaller { * The update ownership enforcement can only be enabled on initial installation. Set * this to {@code true} on package update is a no-op. * + * Apps may opt themselves out of update ownership by setting the + * <a href="https://developer.android.com/guide/topics/manifest/manifest-element.html#allowupdateownership">android:alllowUpdateOwnership</a> + * attribute in their manifest to <code>false</code>. + * * Note: To enable the update ownership enforcement, the installer must have the * {@link android.Manifest.permission#ENFORCE_UPDATE_OWNERSHIP ENFORCE_UPDATE_OWNERSHIP} * permission. diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java index 81fc0293b685..23ba33698739 100644 --- a/core/java/android/content/pm/UserInfo.java +++ b/core/java/android/content/pm/UserInfo.java @@ -261,14 +261,17 @@ public class UserInfo implements Parcelable { public boolean guestToRemove; /** - * This is used to optimize the creation of an user, i.e. OEMs might choose to pre-create a + * This is used to optimize the creation of a user, i.e. OEMs might choose to pre-create a * number of users at the first boot, so the actual creation later is faster. * * <p>A {@code preCreated} user is not a real user yet, so it should not show up on regular * user operations (other than user creation per se). * - * <p>Once the pre-created is used to create a "real" user later on, {@code preCreate} is set to - * {@code false}. + * <p>Once the pre-created is used to create a "real" user later on, {@code preCreated} is set + * to {@code false}. + * + * <p><b>NOTE: Pre-created users are deprecated. This field remains to be able to recognize + * pre-created users in older versions, but will eventually be removed. */ public boolean preCreated; @@ -277,6 +280,9 @@ public class UserInfo implements Parcelable { * user. * * <p><b>NOTE: </b>only used for debugging purposes, it's not set when marshalled to a parcel. + * + * <p><b>NOTE: Pre-created users are deprecated. This field remains to be able to recognize + * pre-created users in older versions, but will eventually ve removed. */ public boolean convertedFromPreCreated; diff --git a/core/java/android/content/pm/parsing/ApkLite.java b/core/java/android/content/pm/parsing/ApkLite.java index 269bec256282..408f7ed9f766 100644 --- a/core/java/android/content/pm/parsing/ApkLite.java +++ b/core/java/android/content/pm/parsing/ApkLite.java @@ -138,6 +138,11 @@ public class ApkLite { */ private final boolean mIsSdkLibrary; + /** + * Indicates if this package allows an installer to declare update ownership of it. + */ + private final boolean mAllowUpdateOwnership; + public ApkLite(String path, String packageName, String splitName, boolean isFeatureSplit, String configForSplit, String usesSplitName, boolean isSplitRequired, int versionCode, int versionCodeMajor, int revisionCode, int installLocation, @@ -148,7 +153,7 @@ public class ApkLite { String requiredSystemPropertyName, String requiredSystemPropertyValue, int minSdkVersion, int targetSdkVersion, int rollbackDataPolicy, Set<String> requiredSplitTypes, Set<String> splitTypes, - boolean hasDeviceAdminReceiver, boolean isSdkLibrary) { + boolean hasDeviceAdminReceiver, boolean isSdkLibrary, boolean allowUpdateOwnership) { mPath = path; mPackageName = packageName; mSplitName = splitName; @@ -182,6 +187,7 @@ public class ApkLite { mRollbackDataPolicy = rollbackDataPolicy; mHasDeviceAdminReceiver = hasDeviceAdminReceiver; mIsSdkLibrary = isSdkLibrary; + mAllowUpdateOwnership = allowUpdateOwnership; } /** @@ -474,6 +480,9 @@ public class ApkLite { return mRollbackDataPolicy; } + /** + * Indicates if this app contains a {@link android.app.admin.DeviceAdminReceiver}. + */ @DataClass.Generated.Member public boolean isHasDeviceAdminReceiver() { return mHasDeviceAdminReceiver; @@ -487,11 +496,19 @@ public class ApkLite { return mIsSdkLibrary; } + /** + * Indicates if this package allows an installer to declare update ownership of it. + */ + @DataClass.Generated.Member + public boolean isAllowUpdateOwnership() { + return mAllowUpdateOwnership; + } + @DataClass.Generated( - time = 1643063342990L, + time = 1680122754650L, codegenVersion = "1.0.23", sourceFile = "frameworks/base/core/java/android/content/pm/parsing/ApkLite.java", - inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.Nullable java.lang.String mUsesSplitName\nprivate final @android.annotation.Nullable java.lang.String mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mSplitTypes\nprivate final int mVersionCodeMajor\nprivate final int mVersionCode\nprivate final int mRevisionCode\nprivate final int mInstallLocation\nprivate final int mMinSdkVersion\nprivate final int mTargetSdkVersion\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final boolean mFeatureSplit\nprivate final boolean mIsolatedSplits\nprivate final boolean mSplitRequired\nprivate final boolean mCoreApp\nprivate final boolean mDebuggable\nprivate final boolean mProfileableByShell\nprivate final boolean mMultiArch\nprivate final boolean mUse32bitAbi\nprivate final boolean mExtractNativeLibs\nprivate final boolean mUseEmbeddedDex\nprivate final @android.annotation.Nullable java.lang.String mTargetPackageName\nprivate final boolean mOverlayIsStatic\nprivate final int mOverlayPriority\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyName\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyValue\nprivate final int mRollbackDataPolicy\nprivate final boolean mHasDeviceAdminReceiver\nprivate final boolean mIsSdkLibrary\npublic long getLongVersionCode()\nprivate boolean hasAnyRequiredSplitTypes()\nclass ApkLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)") + inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.Nullable java.lang.String mUsesSplitName\nprivate final @android.annotation.Nullable java.lang.String mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mSplitTypes\nprivate final int mVersionCodeMajor\nprivate final int mVersionCode\nprivate final int mRevisionCode\nprivate final int mInstallLocation\nprivate final int mMinSdkVersion\nprivate final int mTargetSdkVersion\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final boolean mFeatureSplit\nprivate final boolean mIsolatedSplits\nprivate final boolean mSplitRequired\nprivate final boolean mCoreApp\nprivate final boolean mDebuggable\nprivate final boolean mProfileableByShell\nprivate final boolean mMultiArch\nprivate final boolean mUse32bitAbi\nprivate final boolean mExtractNativeLibs\nprivate final boolean mUseEmbeddedDex\nprivate final @android.annotation.Nullable java.lang.String mTargetPackageName\nprivate final boolean mOverlayIsStatic\nprivate final int mOverlayPriority\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyName\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyValue\nprivate final int mRollbackDataPolicy\nprivate final boolean mHasDeviceAdminReceiver\nprivate final boolean mIsSdkLibrary\nprivate final boolean mAllowUpdateOwnership\npublic long getLongVersionCode()\nprivate boolean hasAnyRequiredSplitTypes()\nclass ApkLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)") @Deprecated private void __metadata() {} diff --git a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java index 64fed63c7159..a4339d41dfd2 100644 --- a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java +++ b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java @@ -127,7 +127,8 @@ public class ApkLiteParseUtils { null /* isFeatureSplits */, null /* usesSplitNames */, null /* configForSplit */, null /* splitApkPaths */, null /* splitRevisionCodes */, baseApk.getTargetSdkVersion(), - null /* requiredSplitTypes */, null /* splitTypes */)); + null /* requiredSplitTypes */, null, /* splitTypes */ + baseApk.isAllowUpdateOwnership())); } finally { Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } @@ -273,7 +274,8 @@ public class ApkLiteParseUtils { return input.success( new PackageLite(codePath, baseCodePath, baseApk, splitNames, isFeatureSplits, usesSplitNames, configForSplits, splitCodePaths, splitRevisionCodes, - baseApk.getTargetSdkVersion(), requiredSplitTypes, splitTypes)); + baseApk.getTargetSdkVersion(), requiredSplitTypes, splitTypes, + baseApk.isAllowUpdateOwnership())); } /** @@ -400,6 +402,8 @@ public class ApkLiteParseUtils { "isFeatureSplit", false); boolean isSplitRequired = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE, "isSplitRequired", false); + boolean allowUpdateOwnership = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE, + "allowUpdateOwnership", true); String configForSplit = parser.getAttributeValue(null, "configForSplit"); int targetSdkVersion = DEFAULT_TARGET_SDK_VERSION; @@ -583,7 +587,7 @@ public class ApkLiteParseUtils { overlayIsStatic, overlayPriority, requiredSystemPropertyName, requiredSystemPropertyValue, minSdkVersion, targetSdkVersion, rollbackDataPolicy, requiredSplitTypes.first, requiredSplitTypes.second, - hasDeviceAdminReceiver, isSdkLibrary)); + hasDeviceAdminReceiver, isSdkLibrary, allowUpdateOwnership)); } private static boolean isDeviceAdminReceiver( diff --git a/core/java/android/content/pm/parsing/PackageLite.java b/core/java/android/content/pm/parsing/PackageLite.java index e2789c93516f..e24b9320110e 100644 --- a/core/java/android/content/pm/parsing/PackageLite.java +++ b/core/java/android/content/pm/parsing/PackageLite.java @@ -110,10 +110,16 @@ public class PackageLite { */ private final boolean mIsSdkLibrary; + /** + * Indicates if this package allows an installer to declare update ownership of it. + */ + private final boolean mAllowUpdateOwnership; + public PackageLite(String path, String baseApkPath, ApkLite baseApk, String[] splitNames, boolean[] isFeatureSplits, String[] usesSplitNames, String[] configForSplit, String[] splitApkPaths, int[] splitRevisionCodes, - int targetSdk, Set<String>[] requiredSplitTypes, Set<String>[] splitTypes) { + int targetSdk, Set<String>[] requiredSplitTypes, Set<String>[] splitTypes, + boolean allowUpdateOwnership) { // The following paths may be different from the path in ApkLite because we // move or rename the APK files. Use parameters to indicate the correct paths. mPath = path; @@ -144,6 +150,7 @@ public class PackageLite { mSplitApkPaths = splitApkPaths; mSplitRevisionCodes = splitRevisionCodes; mTargetSdk = targetSdk; + mAllowUpdateOwnership = allowUpdateOwnership; } /** @@ -414,12 +421,19 @@ public class PackageLite { return mIsSdkLibrary; } + /** + * Indicates if this package allows an installer to declare update ownership of it. + */ + @DataClass.Generated.Member + public boolean isAllowUpdateOwnership() { + return mAllowUpdateOwnership; + } + @DataClass.Generated( - time = 1643132127068L, + time = 1680125514341L, codegenVersion = "1.0.23", sourceFile = "frameworks/base/core/java/android/content/pm/parsing/PackageLite.java", - inputSignatures = - "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.NonNull java.lang.String mBaseApkPath\nprivate final @android.annotation.Nullable java.lang.String[] mSplitApkPaths\nprivate final @android.annotation.Nullable java.lang.String[] mSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mUsesSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mBaseRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mSplitTypes\nprivate final int mVersionCodeMajor\nprivate final int mVersionCode\nprivate final int mTargetSdk\nprivate final int mBaseRevisionCode\nprivate final @android.annotation.Nullable int[] mSplitRevisionCodes\nprivate final int mInstallLocation\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.Nullable boolean[] mIsFeatureSplits\nprivate final boolean mIsolatedSplits\nprivate final boolean mSplitRequired\nprivate final boolean mCoreApp\nprivate final boolean mDebuggable\nprivate final boolean mMultiArch\nprivate final boolean mUse32bitAbi\nprivate final boolean mExtractNativeLibs\nprivate final boolean mProfileableByShell\nprivate final boolean mUseEmbeddedDex\nprivate final boolean mIsSdkLibrary\npublic java.util.List<java.lang.String> getAllApkPaths()\npublic long getLongVersionCode()\nprivate boolean hasAnyRequiredSplitTypes()\nclass PackageLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)") + inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.NonNull java.lang.String mBaseApkPath\nprivate final @android.annotation.Nullable java.lang.String[] mSplitApkPaths\nprivate final @android.annotation.Nullable java.lang.String[] mSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mUsesSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mBaseRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mSplitTypes\nprivate final int mVersionCodeMajor\nprivate final int mVersionCode\nprivate final int mTargetSdk\nprivate final int mBaseRevisionCode\nprivate final @android.annotation.Nullable int[] mSplitRevisionCodes\nprivate final int mInstallLocation\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.Nullable boolean[] mIsFeatureSplits\nprivate final boolean mIsolatedSplits\nprivate final boolean mSplitRequired\nprivate final boolean mCoreApp\nprivate final boolean mDebuggable\nprivate final boolean mMultiArch\nprivate final boolean mUse32bitAbi\nprivate final boolean mExtractNativeLibs\nprivate final boolean mProfileableByShell\nprivate final boolean mUseEmbeddedDex\nprivate final boolean mIsSdkLibrary\nprivate final boolean mAllowUpdateOwnership\npublic java.util.List<java.lang.String> getAllApkPaths()\npublic long getLongVersionCode()\nprivate boolean hasAnyRequiredSplitTypes()\nclass PackageLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)") @Deprecated private void __metadata() {} diff --git a/core/java/android/content/res/AssetFileDescriptor.java b/core/java/android/content/res/AssetFileDescriptor.java index d2a6f03cc1a1..ac65933db136 100644 --- a/core/java/android/content/res/AssetFileDescriptor.java +++ b/core/java/android/content/res/AssetFileDescriptor.java @@ -21,20 +21,12 @@ import android.os.Bundle; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.Parcelable; -import android.system.ErrnoException; -import android.system.Os; import java.io.Closeable; import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.nio.channels.FileLock; -import java.nio.channels.ReadableByteChannel; -import java.nio.channels.WritableByteChannel; /** * File descriptor of an entry in the AssetManager. This provides your own @@ -211,26 +203,19 @@ public class AssetFileDescriptor implements Parcelable, Closeable { */ public static class AutoCloseInputStream extends ParcelFileDescriptor.AutoCloseInputStream { - /** Size of current file. */ - private long mTotalSize; - /** The absolute position of current file start point. */ - private final long mFileOffset; - /** The relative position where input stream is against mFileOffset. */ - private long mOffset; - private OffsetCorrectFileChannel mOffsetCorrectFileChannel; + private long mRemaining; public AutoCloseInputStream(AssetFileDescriptor fd) throws IOException { super(fd.getParcelFileDescriptor()); - mTotalSize = fd.getLength(); - mFileOffset = fd.getStartOffset(); + super.skip(fd.getStartOffset()); + mRemaining = (int) fd.getLength(); } @Override public int available() throws IOException { - long available = mTotalSize - mOffset; - return available >= 0 - ? (available < 0x7fffffff ? (int) available : 0x7fffffff) - : 0; + return mRemaining >= 0 + ? (mRemaining < 0x7fffffff ? (int) mRemaining : 0x7fffffff) + : super.available(); } @Override @@ -242,24 +227,15 @@ public class AssetFileDescriptor implements Parcelable, Closeable { @Override public int read(byte[] buffer, int offset, int count) throws IOException { - int available = available(); - if (available <= 0) { - return -1; - } - - if (count > available) count = available; - try { - int res = Os.pread(getFD(), buffer, offset, count, mFileOffset + mOffset); - // pread returns 0 at end of file, while java's InputStream interface requires -1 - if (res == 0) res = -1; - if (res > 0) { - mOffset += res; - updateChannelPosition(mOffset + mFileOffset); - } + if (mRemaining >= 0) { + if (mRemaining == 0) return -1; + if (count > mRemaining) count = (int) mRemaining; + int res = super.read(buffer, offset, count); + if (res >= 0) mRemaining -= res; return res; - } catch (ErrnoException e) { - throw new IOException(e); } + + return super.read(buffer, offset, count); } @Override @@ -269,185 +245,41 @@ public class AssetFileDescriptor implements Parcelable, Closeable { @Override public long skip(long count) throws IOException { - int available = available(); - if (available <= 0) { - return -1; + if (mRemaining >= 0) { + if (mRemaining == 0) return -1; + if (count > mRemaining) count = mRemaining; + long res = super.skip(count); + if (res >= 0) mRemaining -= res; + return res; } - if (count > available) count = available; - mOffset += count; - updateChannelPosition(mOffset + mFileOffset); - return count; + return super.skip(count); } @Override public void mark(int readlimit) { - // Not supported. - return; + if (mRemaining >= 0) { + // Not supported. + return; + } + super.mark(readlimit); } @Override public boolean markSupported() { - return false; + if (mRemaining >= 0) { + return false; + } + return super.markSupported(); } @Override public synchronized void reset() throws IOException { - // Not supported. - return; - } - - @Override - public FileChannel getChannel() { - if (mOffsetCorrectFileChannel == null) { - mOffsetCorrectFileChannel = new OffsetCorrectFileChannel(super.getChannel()); - } - try { - updateChannelPosition(mOffset + mFileOffset); - } catch (IOException e) { - throw new RuntimeException(e); - } - return mOffsetCorrectFileChannel; - } - - /** - * Update the position of mOffsetCorrectFileChannel only after it is constructed. - * - * @param newPosition The absolute position mOffsetCorrectFileChannel needs to be moved to. - */ - private void updateChannelPosition(long newPosition) throws IOException { - if (mOffsetCorrectFileChannel != null) { - mOffsetCorrectFileChannel.position(newPosition); - } - } - - /** - * A FileChannel wrapper that will update mOffset of the AutoCloseInputStream - * to correct position when using FileChannel to read. All occurrence of position - * should be using absolute solution and each override method just do Delegation - * besides additional check. All methods related to write mode have been disabled - * and will throw UnsupportedOperationException with customized message. - */ - private class OffsetCorrectFileChannel extends FileChannel { - private final FileChannel mDelegate; - private static final String METHOD_NOT_SUPPORTED_MESSAGE = - "This Method is not supported in AutoCloseInputStream FileChannel."; - - OffsetCorrectFileChannel(FileChannel fc) { - mDelegate = fc; - } - - @Override - public int read(ByteBuffer dst) throws IOException { - if (available() <= 0) return -1; - int bytesRead = mDelegate.read(dst); - if (bytesRead != -1) mOffset += bytesRead; - return bytesRead; - } - - @Override - public long read(ByteBuffer[] dsts, int offset, int length) throws IOException { - if (available() <= 0) return -1; - if (mOffset + length > mTotalSize) { - length = (int) (mTotalSize - mOffset); - } - long bytesRead = mDelegate.read(dsts, offset, length); - if (bytesRead != -1) mOffset += bytesRead; - return bytesRead; - } - - @Override - /**The only read method that does not move channel position*/ - public int read(ByteBuffer dst, long position) throws IOException { - if (position - mFileOffset > mTotalSize) return -1; - return mDelegate.read(dst, position); - } - - @Override - public long position() throws IOException { - return mDelegate.position(); - } - - @Override - public FileChannel position(long newPosition) throws IOException { - mOffset = newPosition - mFileOffset; - return mDelegate.position(newPosition); - } - - @Override - public long size() throws IOException { - return mTotalSize; - } - - @Override - public long transferTo(long position, long count, WritableByteChannel target) - throws IOException { - if (position - mFileOffset > mTotalSize) { - return 0; - } - if (position - mFileOffset + count > mTotalSize) { - count = mTotalSize - (position - mFileOffset); - } - return mDelegate.transferTo(position, count, target); - } - - @Override - public MappedByteBuffer map(MapMode mode, long position, long size) throws IOException { - if (position - mFileOffset > mTotalSize) { - throw new IOException( - "Cannot map to buffer because position exceed current file size."); - } - if (position - mFileOffset + size > mTotalSize) { - size = mTotalSize - (position - mFileOffset); - } - return mDelegate.map(mode, position, size); - } - - @Override - protected void implCloseChannel() throws IOException { - mDelegate.close(); - } - - @Override - public int write(ByteBuffer src) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public long write(ByteBuffer[] srcs, int offset, int length) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public int write(ByteBuffer src, long position) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public long transferFrom(ReadableByteChannel src, long position, long count) - throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public FileChannel truncate(long size) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public void force(boolean metaData) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public FileLock lock(long position, long size, boolean shared) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); - } - - @Override - public FileLock tryLock(long position, long size, boolean shared) throws IOException { - throw new UnsupportedOperationException(METHOD_NOT_SUPPORTED_MESSAGE); + if (mRemaining >= 0) { + // Not supported. + return; } + super.reset(); } } diff --git a/core/java/android/credentials/CredentialManager.java b/core/java/android/credentials/CredentialManager.java index 00ce17adfda6..9140d02e223d 100644 --- a/core/java/android/credentials/CredentialManager.java +++ b/core/java/android/credentials/CredentialManager.java @@ -460,9 +460,17 @@ public final class CredentialManager { return false; } + /** + * Returns whether the service is enabled. + * + * @hide + */ private boolean isServiceEnabled() { - return DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_CREDENTIAL, DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER, true); + try { + return mService.isServiceEnabled(); + } catch (RemoteException e) { + return false; + } } /** diff --git a/core/java/android/credentials/ICredentialManager.aidl b/core/java/android/credentials/ICredentialManager.aidl index 5fde96b0b9ff..b779c56035d3 100644 --- a/core/java/android/credentials/ICredentialManager.aidl +++ b/core/java/android/credentials/ICredentialManager.aidl @@ -58,5 +58,7 @@ interface ICredentialManager { List<CredentialProviderInfo> getCredentialProviderServices(in int userId, in int providerFilter); List<CredentialProviderInfo> getCredentialProviderServicesForTesting(in int providerFilter); + + boolean isServiceEnabled(); } diff --git a/core/java/android/hardware/biometrics/ComponentInfoInternal.java b/core/java/android/hardware/biometrics/ComponentInfoInternal.java index 3b61a56bd9f1..2e708de21762 100644 --- a/core/java/android/hardware/biometrics/ComponentInfoInternal.java +++ b/core/java/android/hardware/biometrics/ComponentInfoInternal.java @@ -19,6 +19,8 @@ package android.hardware.biometrics; import android.annotation.NonNull; import android.os.Parcel; import android.os.Parcelable; +import android.text.TextUtils; +import android.util.IndentingPrintWriter; /** * The internal class for storing the component info for a subsystem of the biometric sensor, @@ -90,12 +92,19 @@ public class ComponentInfoInternal implements Parcelable { dest.writeString(softwareVersion); } - @Override - public String toString() { - return "ComponentId: " + componentId - + ", HardwareVersion: " + hardwareVersion - + ", FirmwareVersion: " + firmwareVersion - + ", SerialNumber " + serialNumber - + ", SoftwareVersion: " + softwareVersion; + /** + * Print the component info into the given stream. + * + * @param pw The stream to dump the info into. + * @hide + */ + public void dump(@NonNull IndentingPrintWriter pw) { + pw.println(TextUtils.formatSimple("componentId: %s", componentId)); + pw.increaseIndent(); + pw.println(TextUtils.formatSimple("hardwareVersion: %s", hardwareVersion)); + pw.println(TextUtils.formatSimple("firmwareVersion: %s", firmwareVersion)); + pw.println(TextUtils.formatSimple("serialNumber: %s", serialNumber)); + pw.println(TextUtils.formatSimple("softwareVersion: %s", softwareVersion)); + pw.decreaseIndent(); } } diff --git a/core/java/android/hardware/biometrics/IBiometricContextListener.aidl b/core/java/android/hardware/biometrics/IBiometricContextListener.aidl index bf3df90c3e80..6ac658144164 100644 --- a/core/java/android/hardware/biometrics/IBiometricContextListener.aidl +++ b/core/java/android/hardware/biometrics/IBiometricContextListener.aidl @@ -23,11 +23,6 @@ package android.hardware.biometrics; * @hide */ oneway interface IBiometricContextListener { - // Called when aod or awake (screen on) status changes. - // These may be called while the device is still transitioning to the new state - // (i.e. about to become awake or enter doze) - void onDozeChanged(boolean isAod, boolean isAwake); - @VintfStability @Backing(type="int") enum FoldState { diff --git a/core/java/android/hardware/biometrics/IBiometricService.aidl b/core/java/android/hardware/biometrics/IBiometricService.aidl index c88af5aad738..1a38c8897b76 100644 --- a/core/java/android/hardware/biometrics/IBiometricService.aidl +++ b/core/java/android/hardware/biometrics/IBiometricService.aidl @@ -58,10 +58,10 @@ interface IBiometricService { boolean hasEnrolledBiometrics(int userId, String opPackageName); // Registers an authenticator (e.g. face, fingerprint, iris). - // Id must be unique, whereas strength and modality don't need to be. + // Sensor Id in sensor props must be unique, whereas modality doesn't need to be. // TODO(b/123321528): Turn strength and modality into enums. @EnforcePermission("USE_BIOMETRIC_INTERNAL") - void registerAuthenticator(int id, int modality, int strength, + void registerAuthenticator(int modality, in SensorPropertiesInternal props, IBiometricAuthenticator authenticator); // Register callback for when keyguard biometric eligibility changes. diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index b5281a5025b8..2aead3c22deb 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -1758,10 +1758,12 @@ public final class DisplayManager { /** * Key for the brightness throttling data as a String formatted: * <displayId>,<no of throttling levels>,[<severity as string>,<brightness cap>] - * Where the latter part is repeated for each throttling level, and the entirety is repeated - * for each display, separated by a semicolon. + * [,<throttlingId>]? + * Where [<severity as string>,<brightness cap>] is repeated for each throttling level. + * The entirety is repeated for each display and throttling id, separated by a semicolon. * For example: * 123,1,critical,0.8;456,2,moderate,0.9,critical,0.7 + * 123,1,critical,0.8,default;123,1,moderate,0.6,id_2;456,2,moderate,0.9,critical,0.7 */ String KEY_BRIGHTNESS_THROTTLING_DATA = "brightness_throttling_data"; } diff --git a/core/java/android/inputmethodservice/InkWindow.java b/core/java/android/inputmethodservice/InkWindow.java index 70bd5046524e..15ed45041d32 100644 --- a/core/java/android/inputmethodservice/InkWindow.java +++ b/core/java/android/inputmethodservice/InkWindow.java @@ -26,13 +26,17 @@ import android.annotation.NonNull; import android.content.Context; import android.os.IBinder; import android.util.Slog; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.ViewRootImpl; import android.view.ViewTreeObserver; import android.view.WindowManager; import com.android.internal.policy.PhoneWindow; +import java.util.Objects; + /** * Window of type {@code LayoutParams.TYPE_INPUT_METHOD_DIALOG} for drawing * Handwriting Ink on screen. @@ -185,4 +189,12 @@ final class InkWindow extends PhoneWindow { return getDecorView().getVisibility() == View.VISIBLE && mInkView != null && mInkView.isVisibleToUser(); } + + void dispatchHandwritingEvent(@NonNull MotionEvent event) { + final View decor = getDecorView(); + Objects.requireNonNull(decor); + final ViewRootImpl viewRoot = decor.getViewRootImpl(); + Objects.requireNonNull(viewRoot); + viewRoot.enqueueInputEvent(event); + } } diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index ee9d8a44167c..a9c4818393a8 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -2563,7 +2563,7 @@ public class InputMethodService extends AbstractInputMethodService { */ public void onStylusHandwritingMotionEvent(@NonNull MotionEvent motionEvent) { if (mInkWindow != null && mInkWindow.isInkViewVisible()) { - mInkWindow.getDecorView().dispatchTouchEvent(motionEvent); + mInkWindow.dispatchHandwritingEvent(motionEvent); } else { if (mPendingEvents == null) { mPendingEvents = new RingBuffer(MotionEvent.class, MAX_EVENTS_BUFFER); @@ -2576,7 +2576,7 @@ public class InputMethodService extends AbstractInputMethodService { if (mInkWindow == null) { break; } - mInkWindow.getDecorView().dispatchTouchEvent(event); + mInkWindow.dispatchHandwritingEvent(event); } mPendingEvents.clear(); } diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index b3604da49f5e..24e28e95cd98 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -3706,17 +3706,24 @@ public class UserManager { * {@link android.Manifest.permission#CREATE_USERS} suffices if flags are in * com.android.server.pm.UserManagerService#ALLOWED_FLAGS_FOR_CREATE_USERS_PERMISSION. * + * * @param userType the type of user, such as {@link UserManager#USER_TYPE_FULL_GUEST}. * @return the {@link UserInfo} object for the created user. * * @throws UserOperationException if the user could not be created. + * + * @deprecated Pre-created users are deprecated. This method should no longer be used, and will + * be removed once all the callers are removed. + * * @hide */ + @Deprecated @TestApi @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}) public @NonNull UserInfo preCreateUser(@NonNull String userType) throws UserOperationException { + Log.w(TAG, "preCreateUser(): Pre-created user is deprecated."); try { return mService.preCreateUserWithThrow(userType); } catch (ServiceSpecificException e) { @@ -4296,8 +4303,12 @@ public class UserManager { /** * Returns information for all users on this device, based on the filtering parameters. * + * @deprecated Pre-created users are deprecated and no longer supported. + * Use {@link #getUsers()}, {@link #getUsers(boolean)}, or {@link #getAliveUsers()} + * instead. * @hide */ + @Deprecated @TestApi @RequiresPermission(anyOf = { android.Manifest.permission.MANAGE_USERS, diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c473d3f81823..7cb959dee245 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3431,7 +3431,7 @@ public final class Settings { + " type:" + mUri.getPath() + " in package:" + cr.getPackageName()); } - for (int i = 0; i < mValues.size(); ++i) { + for (int i = mValues.size() - 1; i >= 0; i--) { String key = mValues.keyAt(i); if (key.startsWith(prefix)) { mValues.remove(key); @@ -18125,12 +18125,6 @@ public final class Settings { public static final String WEAR_OS_VERSION_STRING = "wear_os_version_string"; /** - * Whether the physical button has been set. - * @hide - */ - public static final String BUTTON_SET = "button_set"; - - /** * Whether there is a side button. * @hide */ @@ -18302,6 +18296,12 @@ public final class Settings { public static final int COMPANION_OS_VERSION_UNDEFINED = -1; /** + * The companion App name. + * @hide + */ + public static final String COMPANION_APP_NAME = "wear_companion_app_name"; + + /** * A boolean value to indicate if we want to support all languages in LE edition on * wear. 1 for supporting, 0 for not supporting. * @hide @@ -18413,10 +18413,13 @@ public final class Settings { public static final String BURN_IN_PROTECTION_ENABLED = "burn_in_protection"; /** - * Whether the device has combined location setting enabled. + * + * @deprecated Use LocationManager as the source of truth for all location states. + * * @hide */ + @Deprecated public static final String COMBINED_LOCATION_ENABLED = "combined_location_enable"; /** @@ -18482,67 +18485,36 @@ public final class Settings { public static final String CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED = "clockwork_long_press_to_assistant_enabled"; - /* + /** * Whether the device has Cooldown Mode enabled. * @hide */ public static final String COOLDOWN_MODE_ON = "cooldown_mode_on"; - /* + /** * Whether the device has Wet Mode/ Touch Lock Mode enabled. * @hide */ public static final String WET_MODE_ON = "wet_mode_on"; - /* + /** * Whether the RSB wake feature is enabled. * @hide */ public static final String RSB_WAKE_ENABLED = "rsb_wake_enabled"; - /* + /** * Whether the screen-unlock (keyguard) sound is enabled. * @hide */ public static final String SCREEN_UNLOCK_SOUND_ENABLED = "screen_unlock_sound_enabled"; - /* + /** * Whether charging sounds are enabled. * @hide */ public static final String CHARGING_SOUNDS_ENABLED = "wear_charging_sounds_enabled"; - /** The status of the early updates process. - * @hide - */ - public static final String EARLY_UPDATES_STATUS = "early_updates_status"; - - /** - * Early updates not started - * @hide - */ - public static final int EARLY_UPDATES_STATUS_NOT_STARTED = 0; - /** - * Early updates started and in progress - * @hide - */ - public static final int EARLY_UPDATES_STATUS_STARTED = 1; - /** - * Early updates completed and was successful - * @hide - */ - public static final int EARLY_UPDATES_STATUS_SUCCESS = 2; - /** - * Early updates skipped - * @hide - */ - public static final int EARLY_UPDATES_STATUS_SKIPPED = 3; - /** - * Early updates aborted due to timeout - * @hide - */ - public static final int EARLY_UPDATES_STATUS_ABORTED = 4; - /** * Whether dynamic color theming (e.g. Material You) is enabled for apps which support * it. @@ -18669,6 +18641,174 @@ public final class Settings { * @hide */ public static final int UPGRADE_DATA_MIGRATION_DONE = 2; + + /** + * Whether to disable AOD while plugged. + * (0 = false, 1 = true) + * @hide + */ + public static final String DISABLE_AOD_WHILE_PLUGGED = "disable_aod_while_plugged"; + + /** + * Whether the user has consented for network location provider (NLP). + * This setting key will only be used once during OOBE to set NLP initial value through + * the companion app ToS. This setting key will be synced over from Companion and + * corresponding toggle in GMS will be enabled. + * @hide + */ + public static final String NETWORK_LOCATION_OPT_IN = "network_location_opt_in"; + + /** + * The custom foreground color. + * @hide + */ + public static final String CUSTOM_COLOR_FOREGROUND = "custom_foreground_color"; + + /** + * The custom background color. + * @hide + */ + public static final String CUSTOM_COLOR_BACKGROUND = "custom_background_color"; + + /** The status of the phone switching process. + * @hide + */ + public static final String PHONE_SWITCHING_STATUS = "phone_switching_status"; + + /** + * Phone switching not started + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_NOT_STARTED = 0; + + /** + * Phone switching started + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_STARTED = 1; + + /** + * Phone switching completed and was successful + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_SUCCESS = 2; + + /** + * Phone switching was cancelled + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_CANCELLED = 3; + + /** + * Phone switching failed + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_FAILED = 4; + + /** + * Phone switching is in progress of advertising to new companion device. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_ADVERTISING = 5; + + /** + * Phone switching successfully bonded with new companion device. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_BONDED = 6; + + /** + * Phone switching successfully completed on phone side. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_PHONE_COMPLETE = 7; + + /** + * Connection config migration in progress. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION = 8; + + /** + * Connection config migration failed. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_FAILED = 9; + + /** + * Connection config migration cancellation in progress. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_CANCELLED = 10; + + /** + * Connection config migration success. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS = 11; + + + /** + * Whether the device has enabled the feature to reduce motion and animation + * (0 = false, 1 = true) + * @hide + */ + public static final String REDUCE_MOTION = "reduce_motion"; + + /** + * Whether RTL swipe-to-dismiss is enabled by developer options. + * (0 = false, 1 = true) + * @hide + */ + public static final String RTL_SWIPE_TO_DISMISS_ENABLED_DEV = + "rtl_swipe_to_dismiss_enabled_dev"; + + /** + * Tethered Configuration state. + * @hide + */ + public static final String TETHER_CONFIG_STATE = "tethered_config_state"; + + /** + * Tethered configuration state is unknown. + * @hide + */ + public static final int TETHERED_CONFIG_UNKNOWN = 0; + + /** + * Device is set into standalone mode. + * @hide + */ + public static final int TETHERED_CONFIG_STANDALONE = 1; + + /** + * Device is set in tethered mode. + * @hide + */ + public static final int TETHERED_CONFIG_TETHERED = 2; + + + /** + * Whether phone switching is supported. + * + * (0 = false, 1 = true) + * @hide + */ + public static final String PHONE_SWITCHING_SUPPORTED = "phone_switching_supported"; + + /** + * Setting indicating the name of the Wear OS package that hosts the Media Controls UI. + * + * @hide + */ + public static final String WEAR_MEDIA_CONTROLS_PACKAGE = "wear_media_controls_package"; + + /** + * Setting indicating the name of the Wear OS package responsible for bridging media. + * + * @hide + */ + public static final String WEAR_MEDIA_SESSIONS_PACKAGE = "wear_media_sessions_package"; } } diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index c962bf1954bf..3fb94ee93c14 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -122,10 +122,11 @@ public final class FillResponse implements Parcelable { * * @hide */ - public static FillResponse shallowCopy(FillResponse r, List<Dataset> datasets) { + public static FillResponse shallowCopy( + FillResponse r, List<Dataset> datasets, SaveInfo saveInfo) { return new FillResponse( (datasets != null) ? new ParceledListSlice<>(datasets) : null, - r.mSaveInfo, + saveInfo, r.mClientState, r.mPresentation, r.mInlinePresentation, diff --git a/core/java/android/service/autofill/SaveInfo.java b/core/java/android/service/autofill/SaveInfo.java index 828e466783d1..954cc960665f 100644 --- a/core/java/android/service/autofill/SaveInfo.java +++ b/core/java/android/service/autofill/SaveInfo.java @@ -334,6 +334,39 @@ public final class SaveInfo implements Parcelable { private final AutofillId[][] mSanitizerValues; private final AutofillId mTriggerId; + /** + * Creates a copy of the provided SaveInfo. + * + * @hide + */ + public static SaveInfo copy(SaveInfo s, AutofillId[] optionalIds) { + return new SaveInfo(s.mType, s.mNegativeButtonStyle, s.mPositiveButtonStyle, + s.mNegativeActionListener, s.mRequiredIds, assertValid(optionalIds), s.mDescription, + s.mFlags, s.mCustomDescription, s.mValidator, s.mSanitizerKeys, s.mSanitizerValues, + s.mTriggerId); + } + + private SaveInfo(@SaveDataType int type, @NegativeButtonStyle int negativeButtonStyle, + @PositiveButtonStyle int positiveButtonStyle, IntentSender negativeActionListener, + AutofillId[] requiredIds, AutofillId[] optionalIds, CharSequence description, int flags, + CustomDescription customDescription, InternalValidator validator, + InternalSanitizer[] sanitizerKeys, AutofillId[][] sanitizerValues, + AutofillId triggerId) { + mType = type; + mNegativeButtonStyle = negativeButtonStyle; + mNegativeActionListener = negativeActionListener; + mPositiveButtonStyle = positiveButtonStyle; + mRequiredIds = requiredIds; + mOptionalIds = optionalIds; + mDescription = description; + mFlags = flags; + mCustomDescription = customDescription; + mValidator = validator; + mSanitizerKeys = sanitizerKeys; + mSanitizerValues = sanitizerValues; + mTriggerId = triggerId; + } + private SaveInfo(Builder builder) { mType = builder.mType; mNegativeButtonStyle = builder.mNegativeButtonStyle; diff --git a/core/java/android/service/credentials/CredentialProviderService.java b/core/java/android/service/credentials/CredentialProviderService.java index b97760656059..e87333fe4941 100644 --- a/core/java/android/service/credentials/CredentialProviderService.java +++ b/core/java/android/service/credentials/CredentialProviderService.java @@ -231,12 +231,18 @@ public abstract class CredentialProviderService extends Service { } private final ICredentialProviderService mInterface = new ICredentialProviderService.Stub() { - public ICancellationSignal onBeginGetCredential(BeginGetCredentialRequest request, + @Override + public void onBeginGetCredential(BeginGetCredentialRequest request, IBeginGetCredentialCallback callback) { Objects.requireNonNull(request); Objects.requireNonNull(callback); ICancellationSignal transport = CancellationSignal.createTransport(); + try { + callback.onCancellable(transport); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } mHandler.sendMessage(obtainMessage( CredentialProviderService::onBeginGetCredential, @@ -267,7 +273,6 @@ public abstract class CredentialProviderService extends Service { } } )); - return transport; } private void enforceRemoteEntryPermission() { String permission = @@ -280,12 +285,17 @@ public abstract class CredentialProviderService extends Service { } @Override - public ICancellationSignal onBeginCreateCredential(BeginCreateCredentialRequest request, + public void onBeginCreateCredential(BeginCreateCredentialRequest request, IBeginCreateCredentialCallback callback) { Objects.requireNonNull(request); Objects.requireNonNull(callback); ICancellationSignal transport = CancellationSignal.createTransport(); + try { + callback.onCancellable(transport); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } mHandler.sendMessage(obtainMessage( CredentialProviderService::onBeginCreateCredential, @@ -316,16 +326,20 @@ public abstract class CredentialProviderService extends Service { } } )); - return transport; } @Override - public ICancellationSignal onClearCredentialState(ClearCredentialStateRequest request, + public void onClearCredentialState(ClearCredentialStateRequest request, IClearCredentialStateCallback callback) { Objects.requireNonNull(request); Objects.requireNonNull(callback); ICancellationSignal transport = CancellationSignal.createTransport(); + try { + callback.onCancellable(transport); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } mHandler.sendMessage(obtainMessage( CredentialProviderService::onClearCredentialState, @@ -350,7 +364,6 @@ public abstract class CredentialProviderService extends Service { } } )); - return transport; } }; diff --git a/core/java/android/service/credentials/IBeginCreateCredentialCallback.aidl b/core/java/android/service/credentials/IBeginCreateCredentialCallback.aidl index ab855ef0b13f..4b73cbc77ee3 100644 --- a/core/java/android/service/credentials/IBeginCreateCredentialCallback.aidl +++ b/core/java/android/service/credentials/IBeginCreateCredentialCallback.aidl @@ -1,6 +1,7 @@ package android.service.credentials; import android.service.credentials.BeginCreateCredentialResponse; +import android.os.ICancellationSignal; /** * Interface from the system to a credential provider service. @@ -10,4 +11,5 @@ import android.service.credentials.BeginCreateCredentialResponse; oneway interface IBeginCreateCredentialCallback { void onSuccess(in BeginCreateCredentialResponse request); void onFailure(String errorType, in CharSequence message); + void onCancellable(in ICancellationSignal cancellation); }
\ No newline at end of file diff --git a/core/java/android/service/credentials/IBeginGetCredentialCallback.aidl b/core/java/android/service/credentials/IBeginGetCredentialCallback.aidl index 73e98707d15e..0710fb3a97ea 100644 --- a/core/java/android/service/credentials/IBeginGetCredentialCallback.aidl +++ b/core/java/android/service/credentials/IBeginGetCredentialCallback.aidl @@ -1,6 +1,8 @@ package android.service.credentials; import android.service.credentials.BeginGetCredentialResponse; +import android.os.ICancellationSignal; + /** * Interface from the system to a credential provider service. @@ -10,4 +12,5 @@ import android.service.credentials.BeginGetCredentialResponse; oneway interface IBeginGetCredentialCallback { void onSuccess(in BeginGetCredentialResponse response); void onFailure(String errorType, in CharSequence message); + void onCancellable(in ICancellationSignal cancellation); }
\ No newline at end of file diff --git a/core/java/android/service/credentials/IClearCredentialStateCallback.aidl b/core/java/android/service/credentials/IClearCredentialStateCallback.aidl index ec805d0a1799..57513186fe3d 100644 --- a/core/java/android/service/credentials/IClearCredentialStateCallback.aidl +++ b/core/java/android/service/credentials/IClearCredentialStateCallback.aidl @@ -16,12 +16,16 @@ package android.service.credentials; +import android.os.ICancellationSignal; + + /** * Callback for onClearCredentialState request. * * @hide */ -interface IClearCredentialStateCallback { - oneway void onSuccess(); - oneway void onFailure(String errorType, CharSequence message); +oneway interface IClearCredentialStateCallback { + void onSuccess(); + void onFailure(String errorType, CharSequence message); + void onCancellable(in ICancellationSignal cancellation); }
\ No newline at end of file diff --git a/core/java/android/service/credentials/ICredentialProviderService.aidl b/core/java/android/service/credentials/ICredentialProviderService.aidl index 626dd7858626..ebb4a4ef6cca 100644 --- a/core/java/android/service/credentials/ICredentialProviderService.aidl +++ b/core/java/android/service/credentials/ICredentialProviderService.aidl @@ -30,8 +30,8 @@ import android.os.ICancellationSignal; * * @hide */ -interface ICredentialProviderService { - ICancellationSignal onBeginGetCredential(in BeginGetCredentialRequest request, in IBeginGetCredentialCallback callback); - ICancellationSignal onBeginCreateCredential(in BeginCreateCredentialRequest request, in IBeginCreateCredentialCallback callback); - ICancellationSignal onClearCredentialState(in ClearCredentialStateRequest request, in IClearCredentialStateCallback callback); +oneway interface ICredentialProviderService { + void onBeginGetCredential(in BeginGetCredentialRequest request, in IBeginGetCredentialCallback callback); + void onBeginCreateCredential(in BeginCreateCredentialRequest request, in IBeginCreateCredentialCallback callback); + void onClearCredentialState(in ClearCredentialStateRequest request, in IClearCredentialStateCallback callback); } diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index 5c2b38963005..402da28b3c5c 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -1008,9 +1008,8 @@ public class ZenModeConfig implements Parcelable { .allowAlarms(allowAlarms) .allowMedia(allowMedia) .allowSystem(allowSystem) - .allowConversations(allowConversations - ? ZenModeConfig.getZenPolicySenders(allowConversationsFrom) - : ZenPolicy.PEOPLE_TYPE_NONE); + .allowConversations(allowConversations ? allowConversationsFrom + : ZenPolicy.CONVERSATION_SENDERS_NONE); if (suppressedVisualEffects == 0) { builder.showAllVisualEffects(); } else { diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index d48d566fd860..e6dad27d595b 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -24,12 +24,12 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.icu.text.DateFormatSymbols; import android.icu.text.DateTimePatternGenerator; +import android.icu.util.ULocale; import android.os.Build; import android.provider.Settings; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.SpannedString; -import android.text.TextUtils; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -265,11 +265,13 @@ public class DateFormat { * @return a string pattern suitable for use with {@link java.text.SimpleDateFormat}. */ public static String getBestDateTimePattern(Locale locale, String skeleton) { - DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(locale); + ULocale uLocale = ULocale.forLocale(locale); + DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(uLocale); boolean allowDuplicateFields = !CompatChanges.isChangeEnabled( DISALLOW_DUPLICATE_FIELD_IN_SKELETON); - return dtpg.getBestPattern(skeleton, DateTimePatternGenerator.MATCH_NO_OPTIONS, + String pattern = dtpg.getBestPattern(skeleton, DateTimePatternGenerator.MATCH_NO_OPTIONS, allowDuplicateFields); + return getCompatibleEnglishPattern(uLocale, pattern); } /** @@ -303,10 +305,11 @@ public class DateFormat { */ @UnsupportedAppUsage public static String getTimeFormatString(Context context, int userHandle) { - DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance( - context.getResources().getConfiguration().locale); - return is24HourFormat(context, userHandle) ? dtpg.getBestPattern("Hm") + ULocale uLocale = ULocale.forLocale(context.getResources().getConfiguration().locale); + DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(uLocale); + String pattern = is24HourFormat(context, userHandle) ? dtpg.getBestPattern("Hm") : dtpg.getBestPattern("hm"); + return getCompatibleEnglishPattern(uLocale, pattern); } /** @@ -713,4 +716,21 @@ public class DateFormat { public static DateFormatSymbols getIcuDateFormatSymbols(Locale locale) { return new DateFormatSymbols(android.icu.util.GregorianCalendar.class, locale); } + + /** + * See http://b/266731719. It mirrors the implementation in + * {@link libcore.icu.SimpleDateFormatData.DateTimeFormatStringGenerator#postProcessPattern} + */ + private static String getCompatibleEnglishPattern(ULocale locale, String pattern) { + if (pattern == null || locale == null || !"en".equals(locale.getLanguage())) { + return pattern; + } + + String region = locale.getCountry(); + if (region != null && !region.isEmpty() && !"US".equals(region)) { + return pattern; + } + + return pattern.replace('\u202f', ' '); + } } diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java index eb467e0dcc38..992a5861e077 100644 --- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java +++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java @@ -75,6 +75,11 @@ public class ApkSignatureSchemeV2Verifier { private static final int APK_SIGNATURE_SCHEME_V2_BLOCK_ID = 0x7109871a; /** + * The maximum number of signers supported by the v2 APK signature scheme. + */ + private static final int MAX_V2_SIGNERS = 10; + + /** * Returns {@code true} if the provided APK contains an APK Signature Scheme V2 signature. * * <p><b>NOTE: This method does not verify the signature.</b> @@ -183,6 +188,11 @@ public class ApkSignatureSchemeV2Verifier { } while (signers.hasRemaining()) { signerCount++; + if (signerCount > MAX_V2_SIGNERS) { + throw new SecurityException( + "APK Signature Scheme v2 only supports a maximum of " + MAX_V2_SIGNERS + + " signers"); + } try { ByteBuffer signer = getLengthPrefixedSlice(signers); X509Certificate[] certs = verifySigner(signer, contentDigests, certFactory); diff --git a/core/java/android/util/jar/StrictJarVerifier.java b/core/java/android/util/jar/StrictJarVerifier.java index 45254908c5c9..a6aca330d323 100644 --- a/core/java/android/util/jar/StrictJarVerifier.java +++ b/core/java/android/util/jar/StrictJarVerifier.java @@ -78,6 +78,11 @@ class StrictJarVerifier { "SHA1", }; + /** + * The maximum number of signers supported by the JAR signature scheme. + */ + private static final int MAX_JAR_SIGNERS = 10; + private final String jarName; private final StrictJarManifest manifest; private final HashMap<String, byte[]> metaEntries; @@ -293,10 +298,16 @@ class StrictJarVerifier { return false; } + int signerCount = 0; Iterator<String> it = metaEntries.keySet().iterator(); while (it.hasNext()) { String key = it.next(); if (key.endsWith(".DSA") || key.endsWith(".RSA") || key.endsWith(".EC")) { + if (++signerCount > MAX_JAR_SIGNERS) { + throw new SecurityException( + "APK Signature Scheme v1 only supports a maximum of " + MAX_JAR_SIGNERS + + " signers"); + } verifyCertificate(key); it.remove(); } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 152fa08d2a9d..2f5cd5434b89 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -265,6 +265,7 @@ public final class ViewRootImpl implements ViewParent, private static final boolean DEBUG_KEEP_SCREEN_ON = false || LOCAL_LOGV; private static final boolean DEBUG_CONTENT_CAPTURE = false || LOCAL_LOGV; private static final boolean DEBUG_SCROLL_CAPTURE = false || LOCAL_LOGV; + private static final boolean DEBUG_TOUCH_NAVIGATION = false || LOCAL_LOGV; private static final boolean DEBUG_BLAST = false || LOCAL_LOGV; private static final int LOGTAG_INPUT_FOCUS = 62001; @@ -7122,7 +7123,8 @@ public final class ViewRootImpl implements ViewParent, mJoystick.cancel(); } else if ((source & InputDevice.SOURCE_TOUCH_NAVIGATION) == InputDevice.SOURCE_TOUCH_NAVIGATION) { - mTouchNavigation.cancel(event); + // Touch navigation events cannot be cancelled since they are dispatched + // immediately. } } } @@ -7641,392 +7643,109 @@ public final class ViewRootImpl implements ViewParent, } /** - * Creates dpad events from unhandled touch navigation movements. + * Creates DPAD events from unhandled touch navigation movements. */ final class SyntheticTouchNavigationHandler extends Handler { private static final String LOCAL_TAG = "SyntheticTouchNavigationHandler"; - private static final boolean LOCAL_DEBUG = false; - - // Assumed nominal width and height in millimeters of a touch navigation pad, - // if no resolution information is available from the input system. - private static final float DEFAULT_WIDTH_MILLIMETERS = 48; - private static final float DEFAULT_HEIGHT_MILLIMETERS = 48; - - /* TODO: These constants should eventually be moved to ViewConfiguration. */ - - // The nominal distance traveled to move by one unit. - private static final int TICK_DISTANCE_MILLIMETERS = 12; - - // Minimum and maximum fling velocity in ticks per second. - // The minimum velocity should be set such that we perform enough ticks per - // second that the fling appears to be fluid. For example, if we set the minimum - // to 2 ticks per second, then there may be up to half a second delay between the next - // to last and last ticks which is noticeably discrete and jerky. This value should - // probably not be set to anything less than about 4. - // If fling accuracy is a problem then consider tuning the tick distance instead. - private static final float MIN_FLING_VELOCITY_TICKS_PER_SECOND = 6f; - private static final float MAX_FLING_VELOCITY_TICKS_PER_SECOND = 20f; - - // Fling velocity decay factor applied after each new key is emitted. - // This parameter controls the deceleration and overall duration of the fling. - // The fling stops automatically when its velocity drops below the minimum - // fling velocity defined above. - private static final float FLING_TICK_DECAY = 0.8f; - - /* The input device that we are tracking. */ + // The id of the input device that is being tracked. private int mCurrentDeviceId = -1; private int mCurrentSource; - private boolean mCurrentDeviceSupported; - - /* Configuration for the current input device. */ - // The scaled tick distance. A movement of this amount should generally translate - // into a single dpad event in a given direction. - private float mConfigTickDistance; - - // The minimum and maximum scaled fling velocity. - private float mConfigMinFlingVelocity; - private float mConfigMaxFlingVelocity; - - /* Tracking state. */ - - // The velocity tracker for detecting flings. - private VelocityTracker mVelocityTracker; + private int mPendingKeyMetaState; - // The active pointer id, or -1 if none. - private int mActivePointerId = -1; + private final GestureDetector mGestureDetector = new GestureDetector(mContext, + new GestureDetector.OnGestureListener() { + @Override + public boolean onDown(@NonNull MotionEvent e) { + // This can be ignored since it's not clear what KeyEvent this will + // belong to. + return true; + } - // Location where tracking started. - private float mStartX; - private float mStartY; + @Override + public void onShowPress(@NonNull MotionEvent e) { - // Most recently observed position. - private float mLastX; - private float mLastY; + } - // Accumulated movement delta since the last direction key was sent. - private float mAccumulatedX; - private float mAccumulatedY; + @Override + public boolean onSingleTapUp(@NonNull MotionEvent e) { + dispatchTap(e.getEventTime()); + return true; + } - // Set to true if any movement was delivered to the app. - // Implies that tap slop was exceeded. - private boolean mConsumedMovement; + @Override + public boolean onScroll(@Nullable MotionEvent e1, @NonNull MotionEvent e2, + float distanceX, float distanceY) { + // Scroll doesn't translate to DPAD events so should be ignored. + return true; + } - // The most recently sent key down event. - // The keycode remains set until the direction changes or a fling ends - // so that repeated key events may be generated as required. - private long mPendingKeyDownTime; - private int mPendingKeyCode = KeyEvent.KEYCODE_UNKNOWN; - private int mPendingKeyRepeatCount; - private int mPendingKeyMetaState; + @Override + public void onLongPress(@NonNull MotionEvent e) { + // Long presses don't translate to DPAD events so should be ignored. + } - // The current fling velocity while a fling is in progress. - private boolean mFlinging; - private float mFlingVelocity; + @Override + public boolean onFling(@Nullable MotionEvent e1, @NonNull MotionEvent e2, + float velocityX, float velocityY) { + dispatchFling(velocityX, velocityY, e2.getEventTime()); + return true; + } + }); - public SyntheticTouchNavigationHandler() { + SyntheticTouchNavigationHandler() { super(true); } public void process(MotionEvent event) { + if (event.getDevice() == null) { + // The current device is not supported. + if (DEBUG_TOUCH_NAVIGATION) { + Log.d(LOCAL_TAG, + "Current device not supported so motion event is not processed"); + } + return; + } + mPendingKeyMetaState = event.getMetaState(); // Update the current device information. - final long time = event.getEventTime(); final int deviceId = event.getDeviceId(); final int source = event.getSource(); if (mCurrentDeviceId != deviceId || mCurrentSource != source) { - finishKeys(time); - finishTracking(time); mCurrentDeviceId = deviceId; mCurrentSource = source; - mCurrentDeviceSupported = false; - InputDevice device = event.getDevice(); - if (device != null) { - // In order to support an input device, we must know certain - // characteristics about it, such as its size and resolution. - InputDevice.MotionRange xRange = device.getMotionRange(MotionEvent.AXIS_X); - InputDevice.MotionRange yRange = device.getMotionRange(MotionEvent.AXIS_Y); - if (xRange != null && yRange != null) { - mCurrentDeviceSupported = true; - - // Infer the resolution if it not actually known. - float xRes = xRange.getResolution(); - if (xRes <= 0) { - xRes = xRange.getRange() / DEFAULT_WIDTH_MILLIMETERS; - } - float yRes = yRange.getResolution(); - if (yRes <= 0) { - yRes = yRange.getRange() / DEFAULT_HEIGHT_MILLIMETERS; - } - float nominalRes = (xRes + yRes) * 0.5f; - - // Precompute all of the configuration thresholds we will need. - mConfigTickDistance = TICK_DISTANCE_MILLIMETERS * nominalRes; - mConfigMinFlingVelocity = - MIN_FLING_VELOCITY_TICKS_PER_SECOND * mConfigTickDistance; - mConfigMaxFlingVelocity = - MAX_FLING_VELOCITY_TICKS_PER_SECOND * mConfigTickDistance; - - if (LOCAL_DEBUG) { - Log.d(LOCAL_TAG, "Configured device " + mCurrentDeviceId - + " (" + Integer.toHexString(mCurrentSource) + "): " - + ", mConfigTickDistance=" + mConfigTickDistance - + ", mConfigMinFlingVelocity=" + mConfigMinFlingVelocity - + ", mConfigMaxFlingVelocity=" + mConfigMaxFlingVelocity); - } - } - } - } - if (!mCurrentDeviceSupported) { - return; - } - - // Handle the event. - final int action = event.getActionMasked(); - switch (action) { - case MotionEvent.ACTION_DOWN: { - boolean caughtFling = mFlinging; - finishKeys(time); - finishTracking(time); - mActivePointerId = event.getPointerId(0); - mVelocityTracker = VelocityTracker.obtain(); - mVelocityTracker.addMovement(event); - mStartX = event.getX(); - mStartY = event.getY(); - mLastX = mStartX; - mLastY = mStartY; - mAccumulatedX = 0; - mAccumulatedY = 0; - - // If we caught a fling, then pretend that the tap slop has already - // been exceeded to suppress taps whose only purpose is to stop the fling. - mConsumedMovement = caughtFling; - break; - } - - case MotionEvent.ACTION_MOVE: - case MotionEvent.ACTION_UP: { - if (mActivePointerId < 0) { - break; - } - final int index = event.findPointerIndex(mActivePointerId); - if (index < 0) { - finishKeys(time); - finishTracking(time); - break; - } - - mVelocityTracker.addMovement(event); - final float x = event.getX(index); - final float y = event.getY(index); - mAccumulatedX += x - mLastX; - mAccumulatedY += y - mLastY; - mLastX = x; - mLastY = y; - - // Consume any accumulated movement so far. - final int metaState = event.getMetaState(); - consumeAccumulatedMovement(time, metaState); - - // Detect taps and flings. - if (action == MotionEvent.ACTION_UP) { - if (mConsumedMovement && mPendingKeyCode != KeyEvent.KEYCODE_UNKNOWN) { - // It might be a fling. - mVelocityTracker.computeCurrentVelocity(1000, mConfigMaxFlingVelocity); - final float vx = mVelocityTracker.getXVelocity(mActivePointerId); - final float vy = mVelocityTracker.getYVelocity(mActivePointerId); - if (!startFling(time, vx, vy)) { - finishKeys(time); - } - } - finishTracking(time); - } - break; - } - - case MotionEvent.ACTION_CANCEL: { - finishKeys(time); - finishTracking(time); - break; - } - } - } - - public void cancel(MotionEvent event) { - if (mCurrentDeviceId == event.getDeviceId() - && mCurrentSource == event.getSource()) { - final long time = event.getEventTime(); - finishKeys(time); - finishTracking(time); } - } - - private void finishKeys(long time) { - cancelFling(); - sendKeyUp(time); - } - - private void finishTracking(long time) { - if (mActivePointerId >= 0) { - mActivePointerId = -1; - mVelocityTracker.recycle(); - mVelocityTracker = null; - } - } - private void consumeAccumulatedMovement(long time, int metaState) { - final float absX = Math.abs(mAccumulatedX); - final float absY = Math.abs(mAccumulatedY); - if (absX >= absY) { - if (absX >= mConfigTickDistance) { - mAccumulatedX = consumeAccumulatedMovement(time, metaState, mAccumulatedX, - KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT); - mAccumulatedY = 0; - mConsumedMovement = true; - } - } else { - if (absY >= mConfigTickDistance) { - mAccumulatedY = consumeAccumulatedMovement(time, metaState, mAccumulatedY, - KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN); - mAccumulatedX = 0; - mConsumedMovement = true; - } - } + // Interpret the event. + mGestureDetector.onTouchEvent(event); } - private float consumeAccumulatedMovement(long time, int metaState, - float accumulator, int negativeKeyCode, int positiveKeyCode) { - while (accumulator <= -mConfigTickDistance) { - sendKeyDownOrRepeat(time, negativeKeyCode, metaState); - accumulator += mConfigTickDistance; - } - while (accumulator >= mConfigTickDistance) { - sendKeyDownOrRepeat(time, positiveKeyCode, metaState); - accumulator -= mConfigTickDistance; - } - return accumulator; + private void dispatchTap(long time) { + dispatchEvent(time, KeyEvent.KEYCODE_DPAD_CENTER); } - private void sendKeyDownOrRepeat(long time, int keyCode, int metaState) { - if (mPendingKeyCode != keyCode) { - sendKeyUp(time); - mPendingKeyDownTime = time; - mPendingKeyCode = keyCode; - mPendingKeyRepeatCount = 0; + private void dispatchFling(float x, float y, long time) { + if (Math.abs(x) > Math.abs(y)) { + dispatchEvent(time, + x > 0 ? KeyEvent.KEYCODE_DPAD_RIGHT : KeyEvent.KEYCODE_DPAD_LEFT); } else { - mPendingKeyRepeatCount += 1; - } - mPendingKeyMetaState = metaState; - - // Note: Normally we would pass FLAG_LONG_PRESS when the repeat count is 1 - // but it doesn't quite make sense when simulating the events in this way. - if (LOCAL_DEBUG) { - Log.d(LOCAL_TAG, "Sending key down: keyCode=" + mPendingKeyCode - + ", repeatCount=" + mPendingKeyRepeatCount - + ", metaState=" + Integer.toHexString(mPendingKeyMetaState)); - } - enqueueInputEvent(new KeyEvent(mPendingKeyDownTime, time, - KeyEvent.ACTION_DOWN, mPendingKeyCode, mPendingKeyRepeatCount, - mPendingKeyMetaState, mCurrentDeviceId, - KeyEvent.FLAG_FALLBACK, mCurrentSource)); - } - - private void sendKeyUp(long time) { - if (mPendingKeyCode != KeyEvent.KEYCODE_UNKNOWN) { - if (LOCAL_DEBUG) { - Log.d(LOCAL_TAG, "Sending key up: keyCode=" + mPendingKeyCode - + ", metaState=" + Integer.toHexString(mPendingKeyMetaState)); - } - enqueueInputEvent(new KeyEvent(mPendingKeyDownTime, time, - KeyEvent.ACTION_UP, mPendingKeyCode, 0, mPendingKeyMetaState, - mCurrentDeviceId, 0, KeyEvent.FLAG_FALLBACK, - mCurrentSource)); - mPendingKeyCode = KeyEvent.KEYCODE_UNKNOWN; - } - } - - private boolean startFling(long time, float vx, float vy) { - if (LOCAL_DEBUG) { - Log.d(LOCAL_TAG, "Considering fling: vx=" + vx + ", vy=" + vy - + ", min=" + mConfigMinFlingVelocity); - } - - // Flings must be oriented in the same direction as the preceding movements. - switch (mPendingKeyCode) { - case KeyEvent.KEYCODE_DPAD_LEFT: - if (-vx >= mConfigMinFlingVelocity - && Math.abs(vy) < mConfigMinFlingVelocity) { - mFlingVelocity = -vx; - break; - } - return false; - - case KeyEvent.KEYCODE_DPAD_RIGHT: - if (vx >= mConfigMinFlingVelocity - && Math.abs(vy) < mConfigMinFlingVelocity) { - mFlingVelocity = vx; - break; - } - return false; - - case KeyEvent.KEYCODE_DPAD_UP: - if (-vy >= mConfigMinFlingVelocity - && Math.abs(vx) < mConfigMinFlingVelocity) { - mFlingVelocity = -vy; - break; - } - return false; - - case KeyEvent.KEYCODE_DPAD_DOWN: - if (vy >= mConfigMinFlingVelocity - && Math.abs(vx) < mConfigMinFlingVelocity) { - mFlingVelocity = vy; - break; - } - return false; - } - - // Post the first fling event. - mFlinging = postFling(time); - return mFlinging; - } - - private boolean postFling(long time) { - // The idea here is to estimate the time when the pointer would have - // traveled one tick distance unit given the current fling velocity. - // This effect creates continuity of motion. - if (mFlingVelocity >= mConfigMinFlingVelocity) { - long delay = (long)(mConfigTickDistance / mFlingVelocity * 1000); - postAtTime(mFlingRunnable, time + delay); - if (LOCAL_DEBUG) { - Log.d(LOCAL_TAG, "Posted fling: velocity=" - + mFlingVelocity + ", delay=" + delay - + ", keyCode=" + mPendingKeyCode); - } - return true; + dispatchEvent(time, y > 0 ? KeyEvent.KEYCODE_DPAD_DOWN : KeyEvent.KEYCODE_DPAD_UP); } - return false; } - private void cancelFling() { - if (mFlinging) { - removeCallbacks(mFlingRunnable); - mFlinging = false; + private void dispatchEvent(long time, int keyCode) { + if (DEBUG_TOUCH_NAVIGATION) { + Log.d(LOCAL_TAG, "Dispatching DPAD events DOWN and UP with keycode " + keyCode); } + enqueueInputEvent(new KeyEvent(time, time, + KeyEvent.ACTION_DOWN, keyCode, /* repeat= */ 0, mPendingKeyMetaState, + mCurrentDeviceId, /* scancode= */ 0, KeyEvent.FLAG_FALLBACK, + mCurrentSource)); + enqueueInputEvent(new KeyEvent(time, time, + KeyEvent.ACTION_UP, keyCode, /* repeat= */ 0, mPendingKeyMetaState, + mCurrentDeviceId, /* scancode= */ 0, KeyEvent.FLAG_FALLBACK, + mCurrentSource)); } - - private final Runnable mFlingRunnable = new Runnable() { - @Override - public void run() { - final long time = SystemClock.uptimeMillis(); - sendKeyDownOrRepeat(time, mPendingKeyCode, mPendingKeyMetaState); - mFlingVelocity *= FLING_TICK_DECAY; - if (!postFling(time)) { - mFlinging = false; - finishKeys(time); - } - } - }; } final class SyntheticKeyboardHandler { @@ -9272,7 +8991,7 @@ public final class ViewRootImpl implements ViewParent, } @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - void enqueueInputEvent(InputEvent event) { + public void enqueueInputEvent(InputEvent event) { enqueueInputEvent(event, null, 0, false); } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index cda1f3adb9a4..02b34786e9f2 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -495,64 +495,64 @@ public interface WindowManager extends ViewManager { * Transition flag: Keyguard is going away, but keeping the notification shade open * @hide */ - int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE = 0x1; + int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE = (1 << 0); // 0x1 /** * Transition flag: Keyguard is going away, but doesn't want an animation for it * @hide */ - int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION = 0x2; + int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION = (1 << 1); // 0x2 /** * Transition flag: Keyguard is going away while it was showing the system wallpaper. * @hide */ - int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER = 0x4; + int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER = (1 << 2); // 0x4 /** * Transition flag: Keyguard is going away with subtle animation. * @hide */ - int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION = 0x8; - - /** - * Transition flag: Keyguard is going away to the launcher, and it needs us to clear the task - * snapshot of the launcher because it has changed something in the Launcher window. - * @hide - */ - int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT = 0x16; + int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION = (1 << 3); // 0x8 /** * Transition flag: App is crashed. * @hide */ - int TRANSIT_FLAG_APP_CRASHED = 0x10; + int TRANSIT_FLAG_APP_CRASHED = (1 << 4); // 0x10 /** * Transition flag: A window in a new task is being opened behind an existing one in another * activity's task. * @hide */ - int TRANSIT_FLAG_OPEN_BEHIND = 0x20; + int TRANSIT_FLAG_OPEN_BEHIND = (1 << 5); // 0x20 /** * Transition flag: The keyguard is locked throughout the whole transition. * @hide */ - int TRANSIT_FLAG_KEYGUARD_LOCKED = 0x40; + int TRANSIT_FLAG_KEYGUARD_LOCKED = (1 << 6); // 0x40 /** * Transition flag: Indicates that this transition is for recents animation. * TODO(b/188669821): Remove once special-case logic moves to shell. * @hide */ - int TRANSIT_FLAG_IS_RECENTS = 0x80; + int TRANSIT_FLAG_IS_RECENTS = (1 << 7); // 0x80 /** * Transition flag: Indicates that keyguard should go away with this transition. * @hide */ - int TRANSIT_FLAG_KEYGUARD_GOING_AWAY = 0x100; + int TRANSIT_FLAG_KEYGUARD_GOING_AWAY = (1 << 8); // 0x100 + + /** + * Transition flag: Keyguard is going away to the launcher, and it needs us to clear the task + * snapshot of the launcher because it has changed something in the Launcher window. + * @hide + */ + int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT = (1 << 9); // 0x200 /** * @hide @@ -562,12 +562,12 @@ public interface WindowManager extends ViewManager { TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION, TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER, TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION, - TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT, TRANSIT_FLAG_APP_CRASHED, TRANSIT_FLAG_OPEN_BEHIND, TRANSIT_FLAG_KEYGUARD_LOCKED, TRANSIT_FLAG_IS_RECENTS, - TRANSIT_FLAG_KEYGUARD_GOING_AWAY + TRANSIT_FLAG_KEYGUARD_GOING_AWAY, + TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT }) @Retention(RetentionPolicy.SOURCE) @interface TransitionFlags {} @@ -869,6 +869,42 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION"; /** + * Application level {@link android.content.pm.PackageManager.Property PackageManager.Property} + * for an app to inform the system that the app can be opted-out from the compatibility + * treatment that avoids {@link android.app.Activity#setRequestedOrientation} loops. The loop + * can be trigerred by ignoreRequestedOrientation display setting enabled on the device or + * by the landscape natural orientation of the device. + * + * <p>The system could ignore {@link android.app.Activity#setRequestedOrientation} + * call from an app if both of the following conditions are true: + * <ul> + * <li>Activity has requested orientation more than 2 times within 1-second timer + * <li>Activity is not letterboxed for fixed orientation + * </ul> + * + * <p>Setting this property to {@code false} informs the system that the app must be + * opted-out from the compatibility treatment even if the device manufacturer has opted the app + * into the treatment. + * + * <p>Not setting this property at all, or setting this property to {@code true} has no effect. + * + * <p><b>Syntax:</b> + * <pre> + * <application> + * <property + * android:name= + * "android.window.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED" + * android:value="false"/> + * </application> + * </pre> + * + * @hide + */ + // TODO(b/274924641): Make this public API. + String PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = + "android.window.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED"; + + /** * Application level {@link android.content.pm.PackageManager.Property PackageManager * .Property} for an app to inform the system that it needs to be opted-out from the * compatibility treatment that sandboxes {@link android.view.View} API. diff --git a/core/java/android/view/accessibility/AccessibilityRecord.java b/core/java/android/view/accessibility/AccessibilityRecord.java index 38b564ade07d..d69c781a6ac9 100644 --- a/core/java/android/view/accessibility/AccessibilityRecord.java +++ b/core/java/android/view/accessibility/AccessibilityRecord.java @@ -976,6 +976,7 @@ public class AccessibilityRecord { append(builder, "AddedCount", mAddedCount); append(builder, "RemovedCount", mRemovedCount); append(builder, "ParcelableData", mParcelableData); + append(builder, "DisplayId", mSourceDisplayId); builder.append(" ]"); return builder; } diff --git a/core/java/android/view/autofill/AutofillFeatureFlags.java b/core/java/android/view/autofill/AutofillFeatureFlags.java index 4aa612c526fe..951eeccf4d8a 100644 --- a/core/java/android/view/autofill/AutofillFeatureFlags.java +++ b/core/java/android/view/autofill/AutofillFeatureFlags.java @@ -194,6 +194,14 @@ public class AutofillFeatureFlags { "should_enable_autofill_on_all_view_types"; /** + * Whether to enable multi-line filter when checking if view is autofillable + * + * @hide + */ + public static final String DEVICE_CONFIG_MULTILINE_FILTER_ENABLED = + "multiline_filter_enabled"; + + /** * Whether include all autofill type not none views in assist structure * * @hide @@ -439,6 +447,17 @@ public class AutofillFeatureFlags { } + /** + * Whether should enable multi-line filter + * + * @hide + */ + public static boolean shouldEnableMultilineFilter() { + return DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_AUTOFILL, + DEVICE_CONFIG_MULTILINE_FILTER_ENABLED, false); + } + // START AUTOFILL PCC CLASSIFICATION FUNCTIONS /** diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 801b13a2c69c..f7b7d3387938 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -707,6 +707,9 @@ public final class AutofillManager { // An allowed activity set read from device config private Set<String> mAllowedActivitySet = new ArraySet<>(); + // Whether to enable multi-line check when checking whether view is autofillable + private boolean mShouldEnableMultilineFilter; + // Indicate whether should include all view with autofill type not none in assist structure private boolean mShouldIncludeAllViewsWithAutofillTypeNotNoneInAssistStructure; @@ -889,6 +892,9 @@ public final class AutofillManager { mNonAutofillableImeActionIdSet = AutofillFeatureFlags.getNonAutofillableImeActionIdSetFromFlag(); + mShouldEnableMultilineFilter = + AutofillFeatureFlags.shouldEnableMultilineFilter(); + final String denyListString = AutofillFeatureFlags.getDenylistStringFromFlag(); final String allowlistString = AutofillFeatureFlags.getAllowlistStringFromFlag(); @@ -948,9 +954,8 @@ public final class AutofillManager { /** * Whether view passes the imeAction check * - * @hide */ - public boolean isPassingImeActionCheck(EditText editText) { + private boolean isPassingImeActionCheck(EditText editText) { final int actionId = editText.getImeOptions(); if (mNonAutofillableImeActionIdSet.contains(String.valueOf(actionId))) { Log.d(TAG, "view not autofillable - not passing ime action check"); @@ -959,6 +964,21 @@ public final class AutofillManager { return true; } + /** + * Checks whether the view passed in is not multiline text + * + * @param editText the view that passed to this check + * @return true if the view input is not multiline, false otherwise + */ + private boolean isPassingMultilineCheck(EditText editText) { + // check if min line is set to be greater than 1 + if (editText.getMinLines() > 1) { + Log.d(TAG, "view not autofillable - has multiline input type"); + return false; + } + return true; + } + private boolean isPackageFullyAllowedOrDeniedForAutofill( @NonNull String listString, @NonNull String packageName) { // If "PackageName:;" is in the string, then it the package is fully denied or allowed for @@ -1103,6 +1123,9 @@ public final class AutofillManager { } if (view instanceof EditText) { + if (mShouldEnableMultilineFilter && !isPassingMultilineCheck((EditText) view)) { + return false; + } return isPassingImeActionCheck((EditText) view); } diff --git a/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java index ec50c697ae9a..aa9225b79e41 100644 --- a/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java +++ b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java @@ -418,12 +418,15 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { }); } + @Dispatching(cancellable = false) @Override public void cancelCancellationSignal(IBinder token) { if (mBeamer == null) { return; } - mBeamer.cancel(token); + dispatch(() -> { + mBeamer.cancel(token); + }); } @Override diff --git a/core/java/android/widget/AnalogClock.java b/core/java/android/widget/AnalogClock.java index 3df09c24ca30..1f0e95ea305a 100644 --- a/core/java/android/widget/AnalogClock.java +++ b/core/java/android/widget/AnalogClock.java @@ -49,15 +49,18 @@ import java.util.Formatter; import java.util.Locale; /** - * This widget display an analogic clock with two hands for hours and - * minutes. + * This widget displays an analogic clock with two hands for hours and minutes. * * @attr ref android.R.styleable#AnalogClock_dial * @attr ref android.R.styleable#AnalogClock_hand_hour * @attr ref android.R.styleable#AnalogClock_hand_minute * @attr ref android.R.styleable#AnalogClock_hand_second * @attr ref android.R.styleable#AnalogClock_timeZone - * @deprecated This widget is no longer supported. + * @deprecated This widget is no longer supported; except for + * {@link android.widget.RemoteViews} use cases like + * <a href="https://developer.android.com/develop/ui/views/appwidgets/overview"> + * app widgets</a>. + * */ @RemoteView @Deprecated diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/model/KeyguardSettingsPopupMenuModel.kt b/core/java/android/window/IDumpCallback.aidl index 7c61e7108265..4c825d43add1 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/model/KeyguardSettingsPopupMenuModel.kt +++ b/core/java/android/window/IDumpCallback.aidl @@ -12,19 +12,13 @@ * WITHOUT 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.window; -package com.android.systemui.keyguard.domain.model - -import com.android.systemui.common.shared.model.Position - -/** Models a settings popup menu for the lock screen. */ -data class KeyguardSettingsPopupMenuModel( - /** Where the menu should be anchored, roughly in screen space. */ - val position: Position, - /** Callback to invoke when the menu gets clicked by the user. */ - val onClicked: () -> Unit, - /** Callback to invoke when the menu gets dismissed by the user. */ - val onDismissed: () -> Unit, -) +/** + * Callback for processes which need to feed data to another process when it dumps. + * @hide + */ + interface IDumpCallback { + oneway void onDump(in ParcelFileDescriptor outFd); + }
\ No newline at end of file diff --git a/core/java/android/window/ScreenCapture.java b/core/java/android/window/ScreenCapture.java index 8a7efb93d961..95451a966055 100644 --- a/core/java/android/window/ScreenCapture.java +++ b/core/java/android/window/ScreenCapture.java @@ -272,6 +272,8 @@ public class ScreenCapture { public final long mUid; public final boolean mGrayscale; + final SurfaceControl[] mExcludeLayers; + private CaptureArgs(CaptureArgs.Builder<? extends CaptureArgs.Builder<?>> builder) { mPixelFormat = builder.mPixelFormat; mSourceCrop.set(builder.mSourceCrop); @@ -281,6 +283,7 @@ public class ScreenCapture { mAllowProtected = builder.mAllowProtected; mUid = builder.mUid; mGrayscale = builder.mGrayscale; + mExcludeLayers = builder.mExcludeLayers; } private CaptureArgs(Parcel in) { @@ -292,6 +295,46 @@ public class ScreenCapture { mAllowProtected = in.readBoolean(); mUid = in.readLong(); mGrayscale = in.readBoolean(); + + int excludeLayersLength = in.readInt(); + if (excludeLayersLength > 0) { + mExcludeLayers = new SurfaceControl[excludeLayersLength]; + for (int index = 0; index < excludeLayersLength; index++) { + mExcludeLayers[index] = SurfaceControl.CREATOR.createFromParcel(in); + } + } else { + mExcludeLayers = null; + } + } + + /** Release any layers if set using {@link Builder#setExcludeLayers(SurfaceControl[])}. */ + public void release() { + if (mExcludeLayers == null || mExcludeLayers.length == 0) { + return; + } + + for (SurfaceControl surfaceControl : mExcludeLayers) { + if (surfaceControl != null) { + surfaceControl.release(); + } + } + } + + /** + * Returns an array of {@link SurfaceControl#mNativeObject} corresponding to + * {@link #mExcludeLayers}. Used only in native code. + */ + private long[] getNativeExcludeLayers() { + if (mExcludeLayers == null || mExcludeLayers.length == 0) { + return new long[0]; + } + + long[] nativeExcludeLayers = new long[mExcludeLayers.length]; + for (int index = 0; index < mExcludeLayers.length; index++) { + nativeExcludeLayers[index] = mExcludeLayers[index].mNativeObject; + } + + return nativeExcludeLayers; } /** @@ -308,6 +351,7 @@ public class ScreenCapture { private boolean mAllowProtected; private long mUid = -1; private boolean mGrayscale; + private SurfaceControl[] mExcludeLayers; /** * Construct a new {@link CaptureArgs} with the set parameters. The builder remains @@ -397,6 +441,14 @@ public class ScreenCapture { } /** + * An array of {@link SurfaceControl} layer handles to exclude. + */ + public T setExcludeLayers(@Nullable SurfaceControl[] excludeLayers) { + mExcludeLayers = excludeLayers; + return getThis(); + } + + /** * Each sub class should return itself to allow the builder to chain properly */ T getThis() { @@ -419,6 +471,15 @@ public class ScreenCapture { dest.writeBoolean(mAllowProtected); dest.writeLong(mUid); dest.writeBoolean(mGrayscale); + + if (mExcludeLayers != null) { + dest.writeInt(mExcludeLayers.length); + for (SurfaceControl excludeLayer : mExcludeLayers) { + excludeLayer.writeToParcel(dest, flags); + } + } else { + dest.writeInt(0); + } } public static final Parcelable.Creator<CaptureArgs> CREATOR = @@ -529,21 +590,12 @@ public class ScreenCapture { */ public static class LayerCaptureArgs extends CaptureArgs { private final long mNativeLayer; - private final long[] mNativeExcludeLayers; private final boolean mChildrenOnly; private LayerCaptureArgs(Builder builder) { super(builder); mChildrenOnly = builder.mChildrenOnly; mNativeLayer = builder.mLayer.mNativeObject; - if (builder.mExcludeLayers != null) { - mNativeExcludeLayers = new long[builder.mExcludeLayers.length]; - for (int i = 0; i < builder.mExcludeLayers.length; i++) { - mNativeExcludeLayers[i] = builder.mExcludeLayers[i].mNativeObject; - } - } else { - mNativeExcludeLayers = null; - } } /** @@ -551,7 +603,6 @@ public class ScreenCapture { */ public static class Builder extends CaptureArgs.Builder<Builder> { private SurfaceControl mLayer; - private SurfaceControl[] mExcludeLayers; private boolean mChildrenOnly = true; /** @@ -575,6 +626,7 @@ public class ScreenCapture { setAllowProtected(args.mAllowProtected); setUid(args.mUid); setGrayscale(args.mGrayscale); + setExcludeLayers(args.mExcludeLayers); } public Builder(SurfaceControl layer) { @@ -590,14 +642,6 @@ public class ScreenCapture { } /** - * An array of layer handles to exclude. - */ - public Builder setExcludeLayers(@Nullable SurfaceControl[] excludeLayers) { - mExcludeLayers = excludeLayers; - return this; - } - - /** * Whether to include the layer itself in the screenshot or just the children and their * descendants. */ diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 75e797b4ec9d..44d517ad0c32 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -19,6 +19,7 @@ package com.android.internal.app; import static android.Manifest.permission.INTERACT_ACROSS_USERS; import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL; import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK; +import static android.app.admin.DevicePolicyResources.Strings.Core.MINIRESOLVER_OPEN_IN_WORK; import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY; import static android.content.pm.PackageManager.PERMISSION_GRANTED; @@ -212,9 +213,7 @@ public class IntentForwarderActivity extends Activity { buttonContainer.setPadding(0, 0, 0, buttonContainer.getPaddingBottom()); ((TextView) findViewById(R.id.open_cross_profile)).setText( - getResources().getString( - R.string.miniresolver_open_in_work, - target.loadLabel(packageManagerForTargetUser))); + getOpenInWorkMessage(target.loadLabel(packageManagerForTargetUser))); // The mini-resolver's negative button is reused in this flow to cancel the intent ((Button) findViewById(R.id.use_same_profile_browser)).setText(R.string.cancel); @@ -226,6 +225,13 @@ public class IntentForwarderActivity extends Activity { }); } + private String getOpenInWorkMessage(CharSequence targetLabel) { + return getSystemService(DevicePolicyManager.class).getResources().getString( + MINIRESOLVER_OPEN_IN_WORK, + () -> getString(R.string.miniresolver_open_in_work, targetLabel), + targetLabel); + } + private String getForwardToPersonalMessage() { return getSystemService(DevicePolicyManager.class).getResources().getString( FORWARD_INTENT_TO_PERSONAL, diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 73c5207e6238..499d38c31b59 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -19,6 +19,10 @@ package com.android.internal.app; import static android.Manifest.permission.INTERACT_ACROSS_PROFILES; import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL; import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK; +import static android.app.admin.DevicePolicyResources.Strings.Core.MINIRESOLVER_OPEN_IN_PERSONAL; +import static android.app.admin.DevicePolicyResources.Strings.Core.MINIRESOLVER_OPEN_IN_WORK; +import static android.app.admin.DevicePolicyResources.Strings.Core.MINIRESOLVER_USE_PERSONAL_BROWSER; +import static android.app.admin.DevicePolicyResources.Strings.Core.MINIRESOLVER_USE_WORK_BROWSER; import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_PERSONAL; import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_WORK; import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE; @@ -46,6 +50,7 @@ import android.app.VoiceInteractor.PickOptionRequest.Option; import android.app.VoiceInteractor.Prompt; import android.app.admin.DevicePolicyEventLogger; import android.app.admin.DevicePolicyManager; +import android.app.admin.DevicePolicyResourcesManager; import android.compat.annotation.UnsupportedAppUsage; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -1713,14 +1718,29 @@ public class ResolverActivity extends Activity implements } }.execute(); - ((TextView) findViewById(R.id.open_cross_profile)).setText( - getResources().getString( - inWorkProfile ? R.string.miniresolver_open_in_personal - : R.string.miniresolver_open_in_work, - otherProfileResolveInfo.getDisplayLabel())); - ((Button) findViewById(R.id.use_same_profile_browser)).setText( - inWorkProfile ? R.string.miniresolver_use_work_browser - : R.string.miniresolver_use_personal_browser); + CharSequence targetDisplayLabel = otherProfileResolveInfo.getDisplayLabel(); + + DevicePolicyResourcesManager devicePolicyResourcesManager = getSystemService( + DevicePolicyManager.class).getResources(); + + if (inWorkProfile) { + ((TextView) findViewById(R.id.open_cross_profile)).setText( + devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_WORK, + () -> getString(R.string.miniresolver_open_in_work, targetDisplayLabel), + targetDisplayLabel)); + ((Button) findViewById(R.id.use_same_profile_browser)).setText( + devicePolicyResourcesManager.getString(MINIRESOLVER_USE_WORK_BROWSER, + () -> getString(R.string.miniresolver_use_work_browser))); + } else { + ((TextView) findViewById(R.id.open_cross_profile)).setText( + devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_PERSONAL, + () -> getString(R.string.miniresolver_open_in_personal, + targetDisplayLabel), + targetDisplayLabel)); + ((Button) findViewById(R.id.use_same_profile_browser)).setText( + devicePolicyResourcesManager.getString(MINIRESOLVER_USE_PERSONAL_BROWSER, + () -> getString(R.string.miniresolver_use_personal_browser))); + } findViewById(R.id.use_same_profile_browser).setOnClickListener( v -> { diff --git a/core/java/com/android/internal/app/UnlaunchableAppActivity.java b/core/java/com/android/internal/app/UnlaunchableAppActivity.java index e47c335f9c7e..73914a2a99f6 100644 --- a/core/java/com/android/internal/app/UnlaunchableAppActivity.java +++ b/core/java/com/android/internal/app/UnlaunchableAppActivity.java @@ -16,7 +16,6 @@ package com.android.internal.app; -import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE; import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_TITLE; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; @@ -87,17 +86,13 @@ public class UnlaunchableAppActivity extends Activity mTelecomManager.getDefaultDialerPackage(UserHandle.of(mUserId)))); final AlertDialog.Builder builder; - final String dialogMessage; if (showEmergencyCallButton) { builder = new AlertDialog.Builder(this, R.style.AlertDialogWithEmergencyButton); - dialogMessage = getDialogMessage(R.string.work_mode_dialer_off_message); builder.setNeutralButton(R.string.work_mode_emergency_call_button, this); } else { builder = new AlertDialog.Builder(this); - dialogMessage = getDialogMessage(R.string.work_mode_off_message); } builder.setTitle(getDialogTitle()) - .setMessage(dialogMessage) .setOnDismissListener(this) .setPositiveButton(R.string.work_mode_turn_on, this) .setNegativeButton(R.string.cancel, null); @@ -120,12 +115,6 @@ public class UnlaunchableAppActivity extends Activity UNLAUNCHABLE_APP_WORK_PAUSED_TITLE, () -> getString(R.string.work_mode_off_title)); } - private String getDialogMessage(int dialogMessageString) { - return getSystemService(DevicePolicyManager.class).getResources().getString( - UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE, - () -> getString(dialogMessageString)); - } - @Override public void onDismiss(DialogInterface dialog) { finish(); diff --git a/core/java/com/android/internal/widget/MessagingImageMessage.java b/core/java/com/android/internal/widget/MessagingImageMessage.java index 8e7fe18b222b..098bce14e619 100644 --- a/core/java/com/android/internal/widget/MessagingImageMessage.java +++ b/core/java/com/android/internal/widget/MessagingImageMessage.java @@ -198,6 +198,11 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage @Override public int getMeasuredType() { + if (mDrawable == null) { + Log.e(TAG, "getMeasuredType() after recycle()!"); + return MEASURED_NORMAL; + } + int measuredHeight = getMeasuredHeight(); int minImageHeight; if (mIsIsolated) { diff --git a/core/jni/android_window_ScreenCapture.cpp b/core/jni/android_window_ScreenCapture.cpp index c1929c6535fb..1b67a0da57e1 100644 --- a/core/jni/android_window_ScreenCapture.cpp +++ b/core/jni/android_window_ScreenCapture.cpp @@ -45,6 +45,7 @@ static struct { jfieldID allowProtected; jfieldID uid; jfieldID grayscale; + jmethodID getNativeExcludeLayers; } gCaptureArgsClassInfo; static struct { @@ -56,7 +57,6 @@ static struct { static struct { jfieldID layer; - jfieldID excludeLayers; jfieldID childrenOnly; } gLayerCaptureArgsClassInfo; @@ -168,6 +168,23 @@ static void getCaptureArgs(JNIEnv* env, jobject captureArgsObject, CaptureArgs& captureArgs.uid = env->GetLongField(captureArgsObject, gCaptureArgsClassInfo.uid); captureArgs.grayscale = env->GetBooleanField(captureArgsObject, gCaptureArgsClassInfo.grayscale); + + jlongArray excludeObjectArray = reinterpret_cast<jlongArray>( + env->CallObjectMethod(captureArgsObject, gCaptureArgsClassInfo.getNativeExcludeLayers)); + if (excludeObjectArray != nullptr) { + ScopedLongArrayRO excludeArray(env, excludeObjectArray); + const jsize len = excludeArray.size(); + captureArgs.excludeHandles.reserve(len); + + for (jsize i = 0; i < len; i++) { + auto excludeObject = reinterpret_cast<SurfaceControl*>(excludeArray[i]); + if (excludeObject == nullptr) { + jniThrowNullPointerException(env, "Exclude layer is null"); + return; + } + captureArgs.excludeHandles.emplace(excludeObject->getHandle()); + } + } } static DisplayCaptureArgs displayCaptureArgsFromObject(JNIEnv* env, @@ -207,6 +224,7 @@ static jint nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerCaptureA jlong screenCaptureListenerObject) { LayerCaptureArgs captureArgs; getCaptureArgs(env, layerCaptureArgsObject, captureArgs); + SurfaceControl* layer = reinterpret_cast<SurfaceControl*>( env->GetLongField(layerCaptureArgsObject, gLayerCaptureArgsClassInfo.layer)); if (layer == nullptr) { @@ -217,23 +235,6 @@ static jint nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerCaptureA captureArgs.childrenOnly = env->GetBooleanField(layerCaptureArgsObject, gLayerCaptureArgsClassInfo.childrenOnly); - jlongArray excludeObjectArray = reinterpret_cast<jlongArray>( - env->GetObjectField(layerCaptureArgsObject, gLayerCaptureArgsClassInfo.excludeLayers)); - if (excludeObjectArray != nullptr) { - ScopedLongArrayRO excludeArray(env, excludeObjectArray); - const jsize len = excludeArray.size(); - captureArgs.excludeHandles.reserve(len); - - for (jsize i = 0; i < len; i++) { - auto excludeObject = reinterpret_cast<SurfaceControl*>(excludeArray[i]); - if (excludeObject == nullptr) { - jniThrowNullPointerException(env, "Exclude layer is null"); - return BAD_VALUE; - } - captureArgs.excludeHandles.emplace(excludeObject->getHandle()); - } - } - sp<gui::IScreenCaptureListener> captureListener = reinterpret_cast<gui::IScreenCaptureListener*>(screenCaptureListenerObject); return ScreenshotClient::captureLayers(captureArgs, captureListener); @@ -318,6 +319,9 @@ int register_android_window_ScreenCapture(JNIEnv* env) { gCaptureArgsClassInfo.uid = GetFieldIDOrDie(env, captureArgsClazz, "mUid", "J"); gCaptureArgsClassInfo.grayscale = GetFieldIDOrDie(env, captureArgsClazz, "mGrayscale", "Z"); + gCaptureArgsClassInfo.getNativeExcludeLayers = + GetMethodIDOrDie(env, captureArgsClazz, "getNativeExcludeLayers", "()[J"); + jclass displayCaptureArgsClazz = FindClassOrDie(env, "android/window/ScreenCapture$DisplayCaptureArgs"); gDisplayCaptureArgsClassInfo.displayToken = @@ -333,8 +337,6 @@ int register_android_window_ScreenCapture(JNIEnv* env) { FindClassOrDie(env, "android/window/ScreenCapture$LayerCaptureArgs"); gLayerCaptureArgsClassInfo.layer = GetFieldIDOrDie(env, layerCaptureArgsClazz, "mNativeLayer", "J"); - gLayerCaptureArgsClassInfo.excludeLayers = - GetFieldIDOrDie(env, layerCaptureArgsClazz, "mNativeExcludeLayers", "[J"); gLayerCaptureArgsClassInfo.childrenOnly = GetFieldIDOrDie(env, layerCaptureArgsClazz, "mChildrenOnly", "Z"); diff --git a/core/proto/android/app/notification_channel.proto b/core/proto/android/app/notification_channel.proto index c835b90ec969..d79de5cc4b2e 100644 --- a/core/proto/android/app/notification_channel.proto +++ b/core/proto/android/app/notification_channel.proto @@ -56,7 +56,9 @@ message NotificationChannelProto { optional android.media.AudioAttributesProto audio_attributes = 16; // If this is a blockable system notification channel. optional bool is_blockable_system = 17; - optional bool fg_service_shown = 18; + // On U+, this field will be true if either a foreground service or a user initiated job is + // shown whereas on T-, this field will only be true if a foreground service is shown. + optional bool user_visible_task_shown = 18; // Default is true. // Allows the notifications to appear outside of the shade in floating windows optional bool allow_app_overlay = 19; diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto index e62af74fd439..bab4b6efd49d 100644 --- a/core/proto/android/providers/settings.proto +++ b/core/proto/android/providers/settings.proto @@ -21,6 +21,7 @@ option java_multiple_files = true; option java_outer_classname = "SettingsServiceProto"; import "frameworks/base/core/proto/android/providers/settings/config.proto"; +import "frameworks/base/core/proto/android/providers/settings/generation.proto"; import "frameworks/base/core/proto/android/providers/settings/global.proto"; import "frameworks/base/core/proto/android/providers/settings/secure.proto"; import "frameworks/base/core/proto/android/providers/settings/system.proto"; @@ -37,6 +38,9 @@ message SettingsServiceDumpProto { // Config settings optional ConfigSettingsProto config_settings = 3; + + // Generation registry stats + optional GenerationRegistryProto generation_registry = 4; } message UserSettingsProto { diff --git a/core/proto/android/providers/settings/generation.proto b/core/proto/android/providers/settings/generation.proto new file mode 100644 index 000000000000..9dcbad2c979f --- /dev/null +++ b/core/proto/android/providers/settings/generation.proto @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +syntax = "proto2"; +package android.providers.settings; + +option java_multiple_files = true; + +import "frameworks/base/core/proto/android/privacy.proto"; + +message GenerationRegistryProto { + option (android.msg_privacy).dest = DEST_EXPLICIT; + optional int32 num_backing_stores = 1; + optional int32 num_max_backing_stores = 2; + repeated BackingStoreProto backing_stores = 3; +} + +message BackingStoreProto { + optional int32 key = 1; + optional int32 backing_store_size = 2; + optional int32 num_cached_entries = 3; + repeated CacheEntryProto cache_entries = 4; +} + +message CacheEntryProto { + optional string name = 1; + optional int32 generation = 2; +}
\ No newline at end of file diff --git a/core/proto/android/server/windowmanagertransitiontrace.proto b/core/proto/android/server/windowmanagertransitiontrace.proto index 9e53a9162429..25985ebc551a 100644 --- a/core/proto/android/server/windowmanagertransitiontrace.proto +++ b/core/proto/android/server/windowmanagertransitiontrace.proto @@ -23,7 +23,7 @@ import "frameworks/base/core/proto/android/server/windowmanagerservice.proto"; option java_multiple_files = true; /* Represents a file full of transition entries. - Encoded, it should start with 0x9 0x57 0x49 0x4e 0x54 0x52 0x41 0x43 0x45 (.TRNTRACE), such + Encoded, it should start with 0x09 0x54 0x52 0x4E 0x54 0x52 0x41 0x43 0x45 (TRNTRACE), such that it can be easily identified. */ message TransitionTraceProto { diff --git a/core/res/res/drawable-hdpi/pointer_copy.png b/core/res/res/drawable-hdpi/pointer_copy.png Binary files differindex c5eda2e5b5c4..5d06a8eaa551 100644 --- a/core/res/res/drawable-hdpi/pointer_copy.png +++ b/core/res/res/drawable-hdpi/pointer_copy.png diff --git a/core/res/res/drawable-hdpi/pointer_grab.png b/core/res/res/drawable-hdpi/pointer_grab.png Binary files differindex 26da04de1d12..b76ec16e243b 100644 --- a/core/res/res/drawable-hdpi/pointer_grab.png +++ b/core/res/res/drawable-hdpi/pointer_grab.png diff --git a/core/res/res/drawable-hdpi/pointer_grabbing.png b/core/res/res/drawable-hdpi/pointer_grabbing.png Binary files differindex f4031a9227c7..10013e9a1821 100644 --- a/core/res/res/drawable-hdpi/pointer_grabbing.png +++ b/core/res/res/drawable-hdpi/pointer_grabbing.png diff --git a/core/res/res/drawable-hdpi/pointer_hand.png b/core/res/res/drawable-hdpi/pointer_hand.png Binary files differindex a7ae55fc4b5f..8a7277477ab0 100644 --- a/core/res/res/drawable-hdpi/pointer_hand.png +++ b/core/res/res/drawable-hdpi/pointer_hand.png diff --git a/core/res/res/drawable-hdpi/pointer_nodrop.png b/core/res/res/drawable-hdpi/pointer_nodrop.png Binary files differindex 7043323701dd..9df140c5816b 100644 --- a/core/res/res/drawable-hdpi/pointer_nodrop.png +++ b/core/res/res/drawable-hdpi/pointer_nodrop.png diff --git a/core/res/res/drawable-mdpi/pointer_copy.png b/core/res/res/drawable-mdpi/pointer_copy.png Binary files differindex e731108370d3..7189dada1bf2 100644 --- a/core/res/res/drawable-mdpi/pointer_copy.png +++ b/core/res/res/drawable-mdpi/pointer_copy.png diff --git a/core/res/res/drawable-mdpi/pointer_copy_large.png b/core/res/res/drawable-mdpi/pointer_copy_large.png Binary files differindex 15ccb04b8f76..a3d487df9e5e 100644 --- a/core/res/res/drawable-mdpi/pointer_copy_large.png +++ b/core/res/res/drawable-mdpi/pointer_copy_large.png diff --git a/core/res/res/drawable-mdpi/pointer_grab.png b/core/res/res/drawable-mdpi/pointer_grab.png Binary files differindex d625b55f7066..977b36cd875a 100644 --- a/core/res/res/drawable-mdpi/pointer_grab.png +++ b/core/res/res/drawable-mdpi/pointer_grab.png diff --git a/core/res/res/drawable-mdpi/pointer_grab_large.png b/core/res/res/drawable-mdpi/pointer_grab_large.png Binary files differindex 9d36df0d6d94..80587ceb8aba 100644 --- a/core/res/res/drawable-mdpi/pointer_grab_large.png +++ b/core/res/res/drawable-mdpi/pointer_grab_large.png diff --git a/core/res/res/drawable-mdpi/pointer_grabbing.png b/core/res/res/drawable-mdpi/pointer_grabbing.png Binary files differindex 71bb17ba5592..2bdcbdc7af75 100644 --- a/core/res/res/drawable-mdpi/pointer_grabbing.png +++ b/core/res/res/drawable-mdpi/pointer_grabbing.png diff --git a/core/res/res/drawable-mdpi/pointer_grabbing_large.png b/core/res/res/drawable-mdpi/pointer_grabbing_large.png Binary files differindex 5574b07faf44..a8a599c5ebee 100644 --- a/core/res/res/drawable-mdpi/pointer_grabbing_large.png +++ b/core/res/res/drawable-mdpi/pointer_grabbing_large.png diff --git a/core/res/res/drawable-mdpi/pointer_hand.png b/core/res/res/drawable-mdpi/pointer_hand.png Binary files differindex d7f7beda111c..e94b927cada6 100644 --- a/core/res/res/drawable-mdpi/pointer_hand.png +++ b/core/res/res/drawable-mdpi/pointer_hand.png diff --git a/core/res/res/drawable-mdpi/pointer_hand_large.png b/core/res/res/drawable-mdpi/pointer_hand_large.png Binary files differindex f775464ced18..7d89067b98bd 100644 --- a/core/res/res/drawable-mdpi/pointer_hand_large.png +++ b/core/res/res/drawable-mdpi/pointer_hand_large.png diff --git a/core/res/res/drawable-mdpi/pointer_nodrop.png b/core/res/res/drawable-mdpi/pointer_nodrop.png Binary files differindex 931b74094d79..15764fa4e51b 100644 --- a/core/res/res/drawable-mdpi/pointer_nodrop.png +++ b/core/res/res/drawable-mdpi/pointer_nodrop.png diff --git a/core/res/res/drawable-mdpi/pointer_nodrop_large.png b/core/res/res/drawable-mdpi/pointer_nodrop_large.png Binary files differindex 88f77d300a15..46ff5f779cef 100644 --- a/core/res/res/drawable-mdpi/pointer_nodrop_large.png +++ b/core/res/res/drawable-mdpi/pointer_nodrop_large.png diff --git a/core/res/res/drawable-xhdpi/pointer_copy.png b/core/res/res/drawable-xhdpi/pointer_copy.png Binary files differindex 5b6cc5bc454f..8d889e1ad131 100644 --- a/core/res/res/drawable-xhdpi/pointer_copy.png +++ b/core/res/res/drawable-xhdpi/pointer_copy.png diff --git a/core/res/res/drawable-xhdpi/pointer_copy_large.png b/core/res/res/drawable-xhdpi/pointer_copy_large.png Binary files differindex d78a410a2887..860c85499617 100644 --- a/core/res/res/drawable-xhdpi/pointer_copy_large.png +++ b/core/res/res/drawable-xhdpi/pointer_copy_large.png diff --git a/core/res/res/drawable-xhdpi/pointer_grab.png b/core/res/res/drawable-xhdpi/pointer_grab.png Binary files differindex 46dd3eeb95c6..dd3c6de46be5 100644 --- a/core/res/res/drawable-xhdpi/pointer_grab.png +++ b/core/res/res/drawable-xhdpi/pointer_grab.png diff --git a/core/res/res/drawable-xhdpi/pointer_grab_large.png b/core/res/res/drawable-xhdpi/pointer_grab_large.png Binary files differindex 1c7e63e2e527..bcae2c943d12 100644 --- a/core/res/res/drawable-xhdpi/pointer_grab_large.png +++ b/core/res/res/drawable-xhdpi/pointer_grab_large.png diff --git a/core/res/res/drawable-xhdpi/pointer_grabbing.png b/core/res/res/drawable-xhdpi/pointer_grabbing.png Binary files differindex 2fb8a9c4442f..500fa73f58e4 100644 --- a/core/res/res/drawable-xhdpi/pointer_grabbing.png +++ b/core/res/res/drawable-xhdpi/pointer_grabbing.png diff --git a/core/res/res/drawable-xhdpi/pointer_grabbing_large.png b/core/res/res/drawable-xhdpi/pointer_grabbing_large.png Binary files differindex 3467a03e2a56..c9c6f187e2a8 100644 --- a/core/res/res/drawable-xhdpi/pointer_grabbing_large.png +++ b/core/res/res/drawable-xhdpi/pointer_grabbing_large.png diff --git a/core/res/res/drawable-xhdpi/pointer_hand.png b/core/res/res/drawable-xhdpi/pointer_hand.png Binary files differindex 926310cce74d..e931afe4eec8 100644 --- a/core/res/res/drawable-xhdpi/pointer_hand.png +++ b/core/res/res/drawable-xhdpi/pointer_hand.png diff --git a/core/res/res/drawable-xhdpi/pointer_hand_large.png b/core/res/res/drawable-xhdpi/pointer_hand_large.png Binary files differindex 546b222164b5..39ae1b7438d0 100644 --- a/core/res/res/drawable-xhdpi/pointer_hand_large.png +++ b/core/res/res/drawable-xhdpi/pointer_hand_large.png diff --git a/core/res/res/drawable-xhdpi/pointer_nodrop.png b/core/res/res/drawable-xhdpi/pointer_nodrop.png Binary files differindex fdfc2671255c..4c9fe63136a8 100644 --- a/core/res/res/drawable-xhdpi/pointer_nodrop.png +++ b/core/res/res/drawable-xhdpi/pointer_nodrop.png diff --git a/core/res/res/drawable-xhdpi/pointer_nodrop_large.png b/core/res/res/drawable-xhdpi/pointer_nodrop_large.png Binary files differindex 2b5e8a4b0f59..ae60e77bbc5e 100644 --- a/core/res/res/drawable-xhdpi/pointer_nodrop_large.png +++ b/core/res/res/drawable-xhdpi/pointer_nodrop_large.png diff --git a/core/res/res/drawable-xxhdpi/pointer_copy.png b/core/res/res/drawable-xxhdpi/pointer_copy.png Binary files differindex bef4fb4e8c17..24661a653f42 100644 --- a/core/res/res/drawable-xxhdpi/pointer_copy.png +++ b/core/res/res/drawable-xxhdpi/pointer_copy.png diff --git a/core/res/res/drawable-xxhdpi/pointer_grab.png b/core/res/res/drawable-xxhdpi/pointer_grab.png Binary files differindex 6caa1ba77eb9..1917722fa4fa 100644 --- a/core/res/res/drawable-xxhdpi/pointer_grab.png +++ b/core/res/res/drawable-xxhdpi/pointer_grab.png diff --git a/core/res/res/drawable-xxhdpi/pointer_grabbing.png b/core/res/res/drawable-xxhdpi/pointer_grabbing.png Binary files differindex b52f75174a16..a4cd9e56ba2f 100644 --- a/core/res/res/drawable-xxhdpi/pointer_grabbing.png +++ b/core/res/res/drawable-xxhdpi/pointer_grabbing.png diff --git a/core/res/res/drawable-xxhdpi/pointer_hand.png b/core/res/res/drawable-xxhdpi/pointer_hand.png Binary files differindex f3ee077b5cc9..917529b9aa2a 100644 --- a/core/res/res/drawable-xxhdpi/pointer_hand.png +++ b/core/res/res/drawable-xxhdpi/pointer_hand.png diff --git a/core/res/res/drawable-xxhdpi/pointer_nodrop.png b/core/res/res/drawable-xxhdpi/pointer_nodrop.png Binary files differindex ef54301e4eac..35b4d13bd0be 100644 --- a/core/res/res/drawable-xxhdpi/pointer_nodrop.png +++ b/core/res/res/drawable-xxhdpi/pointer_nodrop.png diff --git a/core/res/res/drawable/pointer_copy_icon.xml b/core/res/res/drawable/pointer_copy_icon.xml index da32939b5b0f..7e7c0caf6d78 100644 --- a/core/res/res/drawable/pointer_copy_icon.xml +++ b/core/res/res/drawable/pointer_copy_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_copy" - android:hotSpotX="7.5dp" + android:hotSpotX="8.5dp" android:hotSpotY="7.5dp" /> diff --git a/core/res/res/drawable/pointer_copy_large_icon.xml b/core/res/res/drawable/pointer_copy_large_icon.xml index 55d47b4f4d63..54e95238f501 100644 --- a/core/res/res/drawable/pointer_copy_large_icon.xml +++ b/core/res/res/drawable/pointer_copy_large_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_copy_large" - android:hotSpotX="22.5dp" - android:hotSpotY="22.5dp" /> + android:hotSpotX="21.25dp" + android:hotSpotY="18.75dp" /> diff --git a/core/res/res/drawable/pointer_grab_icon.xml b/core/res/res/drawable/pointer_grab_icon.xml index b3d4e78828cd..dd1216a2995b 100644 --- a/core/res/res/drawable/pointer_grab_icon.xml +++ b/core/res/res/drawable/pointer_grab_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_grab" - android:hotSpotX="13.5dp" - android:hotSpotY="13.5dp" /> + android:hotSpotX="9.5dp" + android:hotSpotY="4.5dp" /> diff --git a/core/res/res/drawable/pointer_grab_large_icon.xml b/core/res/res/drawable/pointer_grab_large_icon.xml index 343c7d27c749..b5dbd11fb286 100644 --- a/core/res/res/drawable/pointer_grab_large_icon.xml +++ b/core/res/res/drawable/pointer_grab_large_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_grab_large" - android:hotSpotX="33.75dp" - android:hotSpotY="33.75dp" /> + android:hotSpotX="23.75dp" + android:hotSpotY="11.25dp" /> diff --git a/core/res/res/drawable/pointer_grabbing_large_icon.xml b/core/res/res/drawable/pointer_grabbing_large_icon.xml index ac1626530778..b041c8397771 100644 --- a/core/res/res/drawable/pointer_grabbing_large_icon.xml +++ b/core/res/res/drawable/pointer_grabbing_large_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_grabbing_large" - android:hotSpotX="25.5dp" - android:hotSpotY="22.5dp" /> + android:hotSpotX="21.25dp" + android:hotSpotY="18.75dp" /> diff --git a/core/res/res/drawable/pointer_hand_icon.xml b/core/res/res/drawable/pointer_hand_icon.xml index 3f9d1a639ddb..0feccd296406 100644 --- a/core/res/res/drawable/pointer_hand_icon.xml +++ b/core/res/res/drawable/pointer_hand_icon.xml @@ -2,4 +2,4 @@ <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_hand" android:hotSpotX="9.5dp" - android:hotSpotY="1.5dp" /> + android:hotSpotY="2.5dp" /> diff --git a/core/res/res/drawable/pointer_hand_large_icon.xml b/core/res/res/drawable/pointer_hand_large_icon.xml index cd49762bd23f..6257b0ba2fb1 100644 --- a/core/res/res/drawable/pointer_hand_large_icon.xml +++ b/core/res/res/drawable/pointer_hand_large_icon.xml @@ -2,4 +2,4 @@ <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_hand_large" android:hotSpotX="23.75dp" - android:hotSpotY="3.75dp" /> + android:hotSpotY="6.25dp" /> diff --git a/core/res/res/drawable/pointer_nodrop_icon.xml b/core/res/res/drawable/pointer_nodrop_icon.xml index 4dffd23638da..fb78d7469120 100644 --- a/core/res/res/drawable/pointer_nodrop_icon.xml +++ b/core/res/res/drawable/pointer_nodrop_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_nodrop" - android:hotSpotX="7.5dp" + android:hotSpotX="8.5dp" android:hotSpotY="7.5dp" /> diff --git a/core/res/res/drawable/pointer_nodrop_large_icon.xml b/core/res/res/drawable/pointer_nodrop_large_icon.xml index 602c744401a9..2385e11109b0 100644 --- a/core/res/res/drawable/pointer_nodrop_large_icon.xml +++ b/core/res/res/drawable/pointer_nodrop_large_icon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <pointer-icon xmlns:android="http://schemas.android.com/apk/res/android" android:bitmap="@drawable/pointer_nodrop_large" - android:hotSpotX="22.5dp" - android:hotSpotY="22.5dp" /> + android:hotSpotX="21.25dp" + android:hotSpotY="18.75dp" /> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index a1c2a5ac9031..9a065ab7fd97 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Laat die houer toe om die kenmerke-inligting vir \'n program te begin bekyk."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"kry toegang tot sensordata teen \'n hoë monsternemingkoers"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Laat die program toe om monsters van sensordata teen \'n hoër koers as 200 Hz te neem"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"dateer app sonder gebruikerhandeling op"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Laat die houer toe om die app wat dit voorheen sonder gebruikhandeling geïnstalleer het, op te dateer"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Stel wagwoordreëls"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Beheer die lengte en die karakters wat in skermslotwagwoorde en -PIN\'e toegelaat word."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitor pogings om skerm te ontsluit"</string> @@ -1702,11 +1700,11 @@ <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"AAN"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"AF"</string> <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Gee <xliff:g id="SERVICE">%1$s</xliff:g> volle beheer oor jou toestel?"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"Volle beheer is gepas vir programme wat jou help met toeganklikheidsbehoeftes, maar nie vir die meeste programme nie."</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"Volle beheer is gepas vir apps wat jou help met toeganklikheidsbehoeftes, maar nie vir die meeste apps nie."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Bekyk en beheer skerm"</string> - <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Dit kan alle inhoud op die skerm lees en inhoud bo-oor ander programme vertoon."</string> + <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Dit kan alle inhoud op die skerm lees en inhoud bo-oor ander apps vertoon."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Bekyk en voer handelinge uit"</string> - <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Dit kan jou interaksies met \'n program of \'n hardewaresensor naspoor en namens jou met programme interaksie hê."</string> + <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Dit kan jou interaksies met \'n app of \'n hardewaresensor naspoor en namens jou met apps interaksie hê."</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Laat toe"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Weier"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"Tik op \'n kenmerk om dit te begin gebruik:"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 98c2e0d651c6..b79dcf2570e5 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1705,8 +1705,8 @@ <string name="accessibility_shortcut_off" msgid="3651336255403648739">"عدم التفعيل"</string> <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"مفعّل"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"غير مفعّل"</string> - <string name="accessibility_enable_service_title" msgid="3931558336268541484">"هل تريد السماح لخدمة <xliff:g id="SERVICE">%1$s</xliff:g> بالتحكّم الكامل في جهازك؟"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"إنّ التحكّم الكامل ليس ملائمًا لمعظم التطبيقات، باستثناء التطبيقات المعنية بسهولة الاستخدام."</string> + <string name="accessibility_enable_service_title" msgid="3931558336268541484">"هل تريد السماح لـ \"<xliff:g id="SERVICE">%1$s</xliff:g>\" بالتحكّم الكامل في جهازك؟"</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"إنّ التحكّم الكامل ليس ملائمًا لمعظم التطبيقات، باستثناء التطبيقات المعنية بتسهيل الاستخدام."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"قراءة محتوى الشاشة والتحكم به"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"يمكنها قراءة كل المحتوى على الشاشة وعرض المحتوى فوق تطبيقات أخرى."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"عرض الإجراءات وتنفيذها"</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 7a265aad1c59..055078a1aeb2 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -249,13 +249,13 @@ <string name="global_action_emergency" msgid="1387617624177105088">"জৰুৰীকালীন কল"</string> <string name="global_action_bug_report" msgid="5127867163044170003">"বাগ সম্পর্কীয় অভিযোগ"</string> <string name="global_action_logout" msgid="6093581310002476511">"ছেশ্বন সমাপ্ত কৰক"</string> - <string name="global_action_screenshot" msgid="2610053466156478564">"স্ক্ৰীণশ্বট"</string> + <string name="global_action_screenshot" msgid="2610053466156478564">"স্ক্ৰীনশ্বট"</string> <string name="bugreport_title" msgid="8549990811777373050">"বাগ সম্পর্কীয় অভিযোগ"</string> <string name="bugreport_message" msgid="5212529146119624326">"এই কার্যই ইমেইল বাৰ্তা হিচাপে পঠিয়াবলৈ আপোনাৰ ডিভাইচৰ বৰ্তমান অৱস্থাৰ বিষয়ে তথ্য সংগ্ৰহ কৰিব৷ ইয়াক বাগ সম্পর্কীয় অভিযোগ পঠিওৱা কাৰ্য আৰম্ভ কৰোঁতে অলপ সময় লাগিব; অনুগ্ৰহ কৰি ধৈৰ্য ধৰক।"</string> <string name="bugreport_option_interactive_title" msgid="7968287837902871289">"ইণ্টাৰেক্টিভ অভিযোগ"</string> - <string name="bugreport_option_interactive_summary" msgid="8493795476325339542">"বেছিভাগ পৰিস্থিতিত এয়া ব্যৱহাৰ কৰক। ই আপোনাক অভিযোগৰ অগ্ৰগতি ট্ৰেক কৰিবলৈ, সমস্যাটোৰ সম্পর্কে অধিক বিৱৰণ দিবলৈ আৰু স্ক্ৰীণশ্বট ল\'বলৈ অনুমতি দিয়ে। ই কম ব্যৱহাৰ হোৱা সেই শাখাসমূহক অন্তৰ্ভুক্ত নকৰিব পাৰে যিবোৰক অভিযোগ কৰিবলৈ দীৰ্ঘ সময়ৰ প্ৰয়োজন হয়।"</string> + <string name="bugreport_option_interactive_summary" msgid="8493795476325339542">"বেছিভাগ পৰিস্থিতিত এয়া ব্যৱহাৰ কৰক। ই আপোনাক অভিযোগৰ অগ্ৰগতি ট্ৰেক কৰিবলৈ, সমস্যাটোৰ সম্পর্কে অধিক বিৱৰণ দিবলৈ আৰু স্ক্ৰীনশ্বট ল\'বলৈ অনুমতি দিয়ে। ই কম ব্যৱহাৰ হোৱা সেই শাখাসমূহক অন্তৰ্ভুক্ত নকৰিব পাৰে যিবোৰক অভিযোগ কৰিবলৈ দীৰ্ঘ সময়ৰ প্ৰয়োজন হয়।"</string> <string name="bugreport_option_full_title" msgid="7681035745950045690">"সম্পূৰ্ণ অভিযোগ"</string> - <string name="bugreport_option_full_summary" msgid="1975130009258435885">"যেতিয়া আপোনাৰ ডিভাইচটোৱে সঁহাৰি নিদিয়া হয় বা ই অতি লেহেমীয়া হৈ পৰে বা যেতিয়া আপোনাক আটাইবোৰ অভিযোগৰ শাখাৰ প্ৰয়োজন হয় তেতিয়া ছিষ্টেমত কম হস্তক্ষেপৰ বাবে এই বিকল্প ব্যৱহাৰ কৰক। আপোনাক অধিক বিৱৰণ দিবলৈ বা অতিৰিক্ত স্ক্ৰীণশ্বট ল’বলৈ নিদিয়ে।"</string> + <string name="bugreport_option_full_summary" msgid="1975130009258435885">"যেতিয়া আপোনাৰ ডিভাইচটোৱে সঁহাৰি নিদিয়া হয় বা ই অতি লেহেমীয়া হৈ পৰে বা যেতিয়া আপোনাক আটাইবোৰ অভিযোগৰ শাখাৰ প্ৰয়োজন হয় তেতিয়া ছিষ্টেমত কম হস্তক্ষেপৰ বাবে এই বিকল্প ব্যৱহাৰ কৰক। আপোনাক অধিক বিৱৰণ দিবলৈ বা অতিৰিক্ত স্ক্ৰীনশ্বট ল’বলৈ নিদিয়ে।"</string> <string name="bugreport_countdown" msgid="6418620521782120755">"{count,plural, =1{ত্ৰুটি সম্পর্কীয় অভিযোগৰ বাবে # ছেকেণ্ডৰ ভিতৰত স্ক্ৰীনশ্বট লোৱা হ\'ব।}one{ত্ৰুটি সম্পর্কীয় অভিযোগৰ বাবে # ছেকেণ্ডৰ ভিতৰত স্ক্ৰীনশ্বট লোৱা হ\'ব।}other{ত্ৰুটি সম্পর্কীয় অভিযোগৰ বাবে # ছেকেণ্ডৰ ভিতৰত স্ক্ৰীনশ্বট লোৱা হ\'ব।}}"</string> <string name="bugreport_screenshot_success_toast" msgid="7986095104151473745">"বাগ ৰিপ’ৰ্টৰ সৈতে স্ক্ৰীনশ্বট লোৱা হ’ল"</string> <string name="bugreport_screenshot_failure_toast" msgid="6736320861311294294">"বাগ ৰিপ’ৰ্টৰ সৈতে স্ক্ৰীনশ্বট ল’ব পৰা নগ’ল"</string> @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"ধাৰকক কোনো এপৰ সুবিধাসমূহৰ সম্পর্কীয় তথ্য চোৱাটো আৰম্ভ কৰিবলৈ দিয়ে।"</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"এটা উচ্চ ছেম্পলিঙৰ হাৰত ছেন্সৰৰ ডেটা এক্সেছ কৰে"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"এপ্টোক ২০০ হাৰ্টজতকৈ অধিক হাৰত ছেন্সৰৰ ডেটাৰ নমুনা ল’বলৈ অনুমতি দিয়ে"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ব্যৱহাৰকাৰীৰ কাৰ্য অবিহনে এপ্টো আপডে’ট কৰক"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"ব্যৱহাৰকাৰীৰ কাৰ্য অবিহনে ধাৰকক তেওঁ পূৰ্বে ইনষ্টল কৰা এপ্টো আপডে’ট কৰাৰ অনুমতি দিয়ে"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"পাছৱর্ডৰ নিয়ম ছেট কৰক"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"স্ক্ৰীন লক পাছৱৰ্ড আৰু পিনত অনুমোদিত দৈৰ্ঘ্য আৰু বৰ্ণবোৰ নিয়ন্ত্ৰণ কৰক।।"</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"স্ক্ৰীন আনলক কৰা প্ৰয়াসবোৰ নিৰীক্ষণ কৰক"</string> @@ -2139,7 +2137,7 @@ <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"ক্ষিপ্ৰ ছেটিং"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"পাৱাৰ ডায়লগ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"লক স্ক্ৰীন"</string> - <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"স্ক্ৰীণশ্বট"</string> + <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"স্ক্ৰীনশ্বট"</string> <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"হেডছেটৰ হুক"</string> <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"স্ক্ৰীনত সাধ্য সুবিধাৰ শ্বৰ্টকাট"</string> <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"স্ক্ৰীনত সাধ্য সুবিধাসমূহৰ শ্বৰ্টকাট বাছনি কৰাৰ সুবিধা"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 76f136de3524..54f9e0632be2 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Dozvoljava nosiocu dozvole da započne pregledanje informacija o funkcijama aplikacije."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"pristup podacima senzora pri velikoj brzini uzorkovanja"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Dozvoljava aplikaciji da uzima uzorak podataka senzora pri brzini većoj od 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ažuriranje aplikacije bez radnji korisnika"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Dozvoljava vlasniku da ažurira aplikaciju koju je prethodno instalirala bez radnji korisnika"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Podešavanje pravila za lozinku"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontroliše dužinu i znakove dozvoljene u lozinkama i PIN-ovima za zaključavanje ekrana."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Nadgledajte pokušaje otključavanja ekrana"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 2856cf3f9ffb..78f7945b8d5d 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -1703,7 +1703,7 @@ <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"বন্ধ"</string> <string name="accessibility_enable_service_title" msgid="3931558336268541484">"<xliff:g id="SERVICE">%1$s</xliff:g> অ্যাপটিকে আপনার ডিভাইসে সম্পূর্ণ নিয়ন্ত্রণের অনুমতি দিতে চান?"</string> <string name="accessibility_service_warning_description" msgid="291674995220940133">"যে অ্যাপগুলি আপনাকে অ্যাক্সেসিবিলিটির প্রয়োজন মেটাতে সাহায্য করে সেই অ্যাপগুলির জন্য সম্পূর্ণ নিয়ন্ত্রণের বিষয়টি উপযুক্ত, কিন্তু তা বলে সমস্ত অ্যাপের জন্য নয়।"</string> - <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"স্ক্রিন দেখে নিয়ন্ত্রণ করা"</string> + <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"স্ক্রিন দেখা ও নিয়ন্ত্রণ করা"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"এটি স্ক্রিনের সমস্ত কন্টেন্ট পড়তে এবং অন্য অ্যাপেও কন্টেন্ট ডিসপ্লে করতে পারে।"</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"দেখুন এবং কাজটি করুন"</string> <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"এটি কোনও একটি অ্যাপের সাথে অথবা হার্ডওয়্যার সেন্সরের সাথে আপনার ইন্টার্যাকশন ট্র্যাক করতে এবং আপনার হয়ে বিভিন্ন অ্যাপের সাথে ইন্টার্যাক্ট করতে পারে।"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 2fb1029bd502..2787e030328e 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Dozvoljava vlasniku da pokrene pregled informacija o funkcijama za aplikaciju."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"pristup podacima senzora velikom brzinom uzorkovanja"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Dozvoljava aplikaciji da uzorkuje podatke senzora brzinom većom od 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ažuriranje aplikacije bez radnje korisnika"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Nositelju omogućuje ažuriranje aplikacije koju je prethodno instalirao bez radnje korisnika"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Postavljanje pravila za lozinke"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontrolira dužinu i znakove koji su dozvoljeni u lozinkama za zaključavanje ekrana i PIN-ovima."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Prati pokušaje otključavanja ekrana"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 43542b89ca85..fe85c5c43e13 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1705,8 +1705,8 @@ <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Vols permetre que <xliff:g id="SERVICE">%1$s</xliff:g> controli el teu dispositiu per complet?"</string> <string name="accessibility_service_warning_description" msgid="291674995220940133">"El control total és adequat per a les aplicacions que t\'ajuden amb l\'accessibilitat, però no per a la majoria de les aplicacions."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Veure i controlar la pantalla"</string> - <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Pot llegir tot el contingut de la pantalla i mostrar contingut sobre altres aplicacions."</string> - <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Mostrar i dur a terme accions"</string> + <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Pot llegir tot el contingut de la pantalla i mostrar contingut per sobre d\'altres aplicacions."</string> + <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Veure i dur a terme accions"</string> <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Pot fer un seguiment de les teves interaccions amb una aplicació o un sensor de maquinari, i interaccionar amb aplicacions en nom teu."</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Permet"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Denega"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index bd18f4e93dac..629fc2ac4111 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1702,9 +1702,9 @@ <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"AN"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"AUS"</string> <string name="accessibility_enable_service_title" msgid="3931558336268541484">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ die vollständige Kontrolle über dein Gerät geben?"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"Die vollständige Kontrolle sollte nur für Apps aktiviert werden, die dir Zugang zu App-Funktionen erleichtern. Das ist in der Regel nur ein kleiner Teil der Apps."</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"Die vollständige Kontrolle sollte nur für Apps aktiviert werden, die dir bei der Barrierefreiheit helfen. Das ist in der Regel nur ein kleiner Teil der Apps."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Bildschirm aufrufen und steuern"</string> - <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Die Funktion kann alle Inhalte auf dem Bildschirm lesen und diese Inhalte über andere Apps anzeigen."</string> + <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Die Funktion kann alle Inhalte auf dem Bildschirm lesen und diese Inhalte über anderen Apps anzeigen."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Aktionen aufrufen und durchführen"</string> <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Die Funktion kann deine Interaktionen mit einer App oder einem Hardwaresensor verfolgen und in deinem Namen mit Apps interagieren."</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Zulassen"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 441065371c2e..9f6fa747519a 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1705,7 +1705,7 @@ <string name="accessibility_enable_service_title" msgid="3931558336268541484">"¿Deseas permitir que <xliff:g id="SERVICE">%1$s</xliff:g> tenga el control total del dispositivo?"</string> <string name="accessibility_service_warning_description" msgid="291674995220940133">"El control total es apropiado para las apps que te ayudan con las necesidades de accesibilidad, pero no para la mayoría de las apps."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Ver y controlar la pantalla"</string> - <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Puede leer todo el contenido en la pantalla y mostrarlo sobre otras apps."</string> + <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Puede leer todo el contenido en la pantalla y mostrar contenido sobre otras apps."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Ver y realizar acciones"</string> <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Puede realizar el seguimiento de tus interacciones con una app o un sensor de hardware, así como interactuar con las apps por ti."</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Permitir"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index bdf5d52710e3..1dc96c302223 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Võimaldab omanikul alustada rakenduse funktsioonide teabe vaatamist."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"juurdepääs anduri andmetele kõrgel diskreetimissagedusel"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Võimaldab rakendusel anduri andmeid diskreetida sagedusel, mis on suurem kui 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"rakenduse värskendamine ilma kasutaja toiminguta"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Võimaldab hoidjal värskendada varem installitud rakendust ilma kasutaja toiminguta"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Parooli reeglite määramine"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Juhitakse ekraaniluku paroolide ja PIN-koodide pikkusi ning lubatud tähemärkide seadeid."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Ekraani avamiskatsete jälgimine"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index dca160c77280..f65d3e5a7d28 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Permet au détenteur de commencer à afficher les renseignements sur les fonctionnalités d\'une application."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"accéder aux données des capteurs à un taux d’échantillonnage élevé"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Permet à l’application d’échantillonner les données des capteurs à une fréquence supérieure à 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"Mettre à jour l\'application sans intervention de l\'utilisateur"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Permet à une application précédemment installée de se mettre à jour sans intervention de l\'utilisateur"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Définir les règles du mot de passe"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Gérer le nombre et le type de caractères autorisés dans les mots de passe et les NIP de verrouillage de l\'écran."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Gérer les tentatives de déverrouillage de l\'écran"</string> @@ -1283,18 +1281,18 @@ <string name="dump_heap_ready_text" msgid="5849618132123045516">"Une empreinte de mémoire du processus lié à l\'application <xliff:g id="PROC">%1$s</xliff:g> peut être partagée. Attention : Cette empreinte peut contenir des renseignements personnels auxquels le processus a accès, y compris du texte que vous avez entré."</string> <string name="sendText" msgid="493003724401350724">"Sélectionner une action pour le texte"</string> <string name="volume_ringtone" msgid="134784084629229029">"Volume de la sonnerie"</string> - <string name="volume_music" msgid="7727274216734955095">"Volume"</string> + <string name="volume_music" msgid="7727274216734955095">"Volume du contenu multimédia"</string> <string name="volume_music_hint_playing_through_bluetooth" msgid="2614142915948898228">"Lecture via Bluetooth"</string> <string name="volume_music_hint_silent_ringtone_selected" msgid="1514829655029062233">"Sonnerie silencieuse sélectionnée"</string> <string name="volume_call" msgid="7625321655265747433">"Volume des appels entrants"</string> <string name="volume_bluetooth_call" msgid="2930204618610115061">"Volume d\'appels entrants sur Bluetooth"</string> - <string name="volume_alarm" msgid="4486241060751798448">"Volume de l\'alarme"</string> + <string name="volume_alarm" msgid="4486241060751798448">"Volume des alarmes"</string> <string name="volume_notification" msgid="6864412249031660057">"Volume des notifications"</string> <string name="volume_unknown" msgid="4041914008166576293">"Volume"</string> <string name="volume_icon_description_bluetooth" msgid="7540388479345558400">"Volume Bluetooth"</string> <string name="volume_icon_description_ringer" msgid="2187800636867423459">"Volume de la sonnerie"</string> - <string name="volume_icon_description_incall" msgid="4491255105381227919">"Volume d\'appel"</string> - <string name="volume_icon_description_media" msgid="4997633254078171233">"Volume"</string> + <string name="volume_icon_description_incall" msgid="4491255105381227919">"Volume des appels"</string> + <string name="volume_icon_description_media" msgid="4997633254078171233">"Volume du contenu multimédia"</string> <string name="volume_icon_description_notification" msgid="579091344110747279">"Volume des notifications"</string> <string name="ringtone_default" msgid="9118299121288174597">"Sonnerie par défaut"</string> <string name="ringtone_default_with_actual" msgid="2709686194556159773">"Défaut (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 75099ec56a71..ff19bb47cd10 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"ધારકને ઍપ માટેની સુવિધાઓની માહિતી જોવાનું શરૂ કરવાની મંજૂરી આપે છે."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"ઉચ્ચ સેમ્પ્લિંગ રેટ પર સેન્સરનો ડેટા ઍક્સેસ કરો"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"ઍપને 200 Hzથી વધુના દરે સેન્સરના ડેટાના નમૂનાની મંજૂરી આપે છે"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"વપરાશકર્તા દ્વારા કરવામાં આવતી ક્રિયા વિના ઍપને અપડેટ કરો"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"હોલ્ડરને વપરાશકર્તા દ્વારા કરવામાં આવતી ક્રિયા વિના, અગાઉ ઇન્સ્ટૉલ કરેલી ઍપને અપડેટ કરવાની મંજૂરી આપે છે"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"પાસવર્ડ નિયમો સેટ કરો"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"સ્ક્રીન લૉક પાસવર્ડ અને પિનમાં મંજૂર લંબાઈ અને અક્ષરોને નિયંત્રિત કરો."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"સ્ક્રીનને અનલૉક કરવાના પ્રયત્નોનું નિયમન કરો"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index c56d596a17a3..2134598e49a2 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"ऐप्लिकेशन को, किसी ऐप्लिकेशन की सुविधाओं की जानकारी देखने की अनुमति देता है."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"सेंसर डेटा को, नमूने लेने की तेज़ दर पर ऐक्सेस करें"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"यह अनुमति मिलने पर ऐप्लिकेशन, 200 हर्ट्ज़ से ज़्यादा की दर पर सेंसर डेटा का नमूना ले पाएगा"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ऐप्लिकेशन अपने-आप अपडेट होने की अनुमति दें"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"इससे होल्डर उस ऐप्लिकेशन को अपने-आप अपडेट कर पाएगा जो उसने पहले इंस्टॉल किया था"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"पासवर्ड नियम सेट करना"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"स्क्रीन लॉक पासवर्ड और पिन की लंबाई और उनमें स्वीकृत वर्णों को नियंत्रित करना."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"स्क्रीन अनलॉक करने के की कोशिशों पर नज़र रखना"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 4ee5070bca26..595938830eb0 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Dopušta nositelju pokretanje prikaza informacija o značajkama aplikacije."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"pristup podacima senzora pri višoj brzini uzorkovanja"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Aplikaciji omogućuje uzorkovanje podataka senzora pri brzini većoj od 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ažuriranje aplikacije bez radnje korisnika"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Nositelju omogućuje ažuriranje aplikacije koju je prethodno instalirao bez radnje korisnika"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Postavi pravila zaporke"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Upravlja duljinom i znakovima koji su dopušteni u zaporkama i PIN-ovima zaključavanja zaslona."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Nadziri pokušaje otključavanja zaslona"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 52ef8842ca52..ae2134ea2623 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -2134,7 +2134,7 @@ <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Հավելվածը ձայնագրելու թույլտվություն չունի, սակայն կկարողանա գրանցել ձայնն այս USB սարքի միջոցով։"</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Սկիզբ"</string> <string name="accessibility_system_action_back_label" msgid="4205361367345537608">"Հետ"</string> - <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Վերջին օգտագործած հավելվածները"</string> + <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Վերջին հավելվածներ"</string> <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Ծանուցումներ"</string> <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Արագ կարգավորումներ"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Սնուցման պատուհան"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 72b3b0bf96ea..e2bd8db1e1d4 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Consente all\'app che ha questa autorizzazione di iniziare a visualizzare le informazioni relative alle funzionalità di un\'app."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"Accesso ai dati dei sensori a una frequenza di campionamento elevata"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Consente all\'app di campionare i dati dei sensori a una frequenza maggiore di 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"Aggiornamento dell\'app senza l\'intervento dell\'utente"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Consente al titolare di questa autorizzazione di aggiornare l\'app installata in precedenza senza l\'intervento dell\'utente"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Impostare regole per le password"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Controlla la lunghezza e i caratteri ammessi nelle password e nei PIN del blocco schermo."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitorare tentativi di sblocco dello schermo"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 940e12902553..93ef258e0776 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"アプリの機能情報の表示の開始を所有者に許可します。"</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"高サンプリング レートでセンサーデータにアクセスする"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"200 Hz を超えるレートでセンサーデータをサンプリングすることをアプリに許可します"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ユーザーの操作なしでアプリを更新する"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"ユーザーの操作なしで以前にインストールされたアプリの更新をホルダーに許可します"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"パスワードルールの設定"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"画面ロックのパスワードとPINの長さと使用できる文字を制御します。"</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"画面ロック解除試行の監視"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 0e976c788942..f2b9318884ff 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -2134,7 +2134,7 @@ <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Қолданбаға жазу рұқсаты берілмеді, бірақ ол осы USB құрылғысы арқылы дыбыс жаза алады."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Негізгі экран"</string> <string name="accessibility_system_action_back_label" msgid="4205361367345537608">"Артқа"</string> - <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Соңғы пайдаланылған қолданбалар"</string> + <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Соңғы қолданбалар"</string> <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Хабарландырулар"</string> <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Жылдам параметрлер"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Қуат диалогтік терезесі"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index c3fe5b054767..313df923c5f4 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"អនុញ្ញាតឱ្យកម្មវិធីចាប់ផ្ដើមមើលព័ត៌មានមុខងារសម្រាប់កម្មវិធី។"</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"ចូលប្រើទិន្នន័យឧបករណ៍ចាប់សញ្ញានៅអត្រាសំណាកខ្ពស់"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"អនុញ្ញាតឱ្យកម្មវិធីធ្វើសំណាកទិន្នន័យឧបករណ៍ចាប់សញ្ញានៅអត្រាលើសពី 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ដំឡើងកំណែកម្មវិធីដោយមិនចាំបាច់មានសកម្មភាពរបស់អ្នកប្រើប្រាស់"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"អនុញ្ញាតឱ្យម្ចាស់សិទ្ធិដំឡើងកំណែកម្មវិធីដែលខ្លួនបានដំឡើងពីមុនដោយមិនចាំបាច់មានសកម្មភាពរបស់អ្នកប្រើប្រាស់"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"កំណត់ក្បួនពាក្យសម្ងាត់"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"គ្រប់គ្រងប្រវែង និងតួអក្សរដែលអនុញ្ញាតឲ្យប្រើក្នុងពាក្យសម្ងាត់ និងលេខសម្ងាត់ចាក់សោអេក្រង់។"</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"តាមដានការព្យាយាមដោះសោអេក្រង់"</string> @@ -1706,7 +1704,7 @@ <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"មើល និងគ្រប់គ្រងអេក្រង់"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"វាអាចអានខ្លឹមសារទាំងអស់នៅលើអេក្រង់ និងបង្ហាញខ្លឹមសារលើកម្មវិធីផ្សេងទៀត។"</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"មើល និងធ្វើសកម្មភាព"</string> - <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"វាអាចតាមដានអន្តរកម្មរបស់អ្នកជាមួយនឹងកម្មវិធី ឬឧបករណ៍ចាប់សញ្ញាហាតវែរ និងធ្វើអន្តរកម្មជាមួយកម្មវិធីនានាជំនួសឱ្យអ្នក។"</string> + <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"វាអាចតាមដានអន្តរកម្មរបស់អ្នកជាមួយនឹងកម្មវិធី ឬសេនស័រហាតវែរ និងធ្វើអន្តរកម្មជាមួយកម្មវិធីនានាជំនួសឱ្យអ្នក។"</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"អនុញ្ញាត"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"បដិសេធ"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"ចុចមុខងារណាមួយ ដើម្បចាប់ផ្ដើមប្រើ៖"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 7ae603f24037..9800ae1a8efb 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1493,7 +1493,7 @@ <string name="forward_intent_to_work" msgid="3620262405636021151">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ನಲ್ಲಿ ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ"</string> <string name="input_method_binding_label" msgid="1166731601721983656">"ಇನ್ಪುಟ್ ವಿಧಾನ"</string> <string name="sync_binding_label" msgid="469249309424662147">"ಸಿಂಕ್ ಮಾಡು"</string> - <string name="accessibility_binding_label" msgid="1974602776545801715">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string> + <string name="accessibility_binding_label" msgid="1974602776545801715">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string> <string name="wallpaper_binding_label" msgid="1197440498000786738">"ವಾಲ್ಪೇಪರ್"</string> <string name="chooser_wallpaper" msgid="3082405680079923708">"ವಾಲ್ಪೇಪರ್ ಬದಲಿಸಿ"</string> <string name="notification_listener_binding_label" msgid="2702165274471499713">"ಅಧಿಸೂಚನೆ ಕೇಳುಗ"</string> @@ -1690,19 +1690,19 @@ <string name="csd_dose_repeat_warning" product="default" msgid="6765471037071089401">"ಎಚ್ಚರಿಕೆ,\nಒಬ್ಬ ವ್ಯಕ್ತಿ ಒಂದು ವಾರದಲ್ಲಿ ಹೆಡ್ಫೋನ್ಗಳ ಮೂಲಕ ಸುರಕ್ಷಿತವಾಗಿ ಆಲಿಸಬಹುದಾದ ಗಟ್ಟಿಯಾದ ವಾಲ್ಯೂಮ್ನ 5 ಪಟ್ಟು ಮಿತಿಯನ್ನು ನೀವು ಮೀರಿದ್ದೀರಿ.\n\nನಿಮ್ಮ ಆಲಿಸುವ ಸಾಮರ್ಥ್ಯವನ್ನು ರಕ್ಷಿಸುವುದಕ್ಕಾಗಿ ವಾಲ್ಯೂಮ್ ಅನ್ನು ಕಡಿಮೆಗೊಳಿಸಲಾಗಿದೆ."</string> <string name="csd_entering_RS2_warning" product="default" msgid="3699509945325496807">"ನೀವು ಪ್ರಸ್ತುತ ಆಲಿಸುತ್ತಿರುವ ವಾಲ್ಯೂಮ್ನಲ್ಲಿ ಮಾಧ್ಯಮವನ್ನು ಆಲಿಸುವುದನ್ನು ನೀವು ದೀರ್ಘಕಾಲ ಮುಂದುವರಿಸಿದರೆ, ನಿಮ್ಮ ಆಲಿಸುವ ಸಾಮರ್ಥ್ಯಕ್ಕೆ ಹಾನಿಯುಂಟಾಗಬಹುದು.\n\nಇದೇ ವಾಲ್ಯೂಮ್ನಲ್ಲಿ ದೀರ್ಘಕಾಲದವರೆಗೆ ಮಾಧ್ಯಮವನ್ನು ಪ್ಲೇ ಮಾಡುವುದನ್ನು ಮುಂದುವರಿಸಿದರೆ ನಿಮ್ಮ ಆಲಿಸುವ ಸಾಮರ್ಥ್ಯಕ್ಕೆ ಹಾನಿಯುಂಟಾಗಬಹುದು."</string> <string name="csd_momentary_exposure_warning" product="default" msgid="7861896191081176454">"ಎಚ್ಚರಿಕೆ,\nನೀವು ಪ್ರಸ್ತುತ ಅಸುರಕ್ಷಿತ ವಾಲ್ಯೂಮ್ನಲ್ಲಿ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಮಾಧ್ಯಮವನ್ನು ಆಲಿಸುತ್ತಿದ್ದೀರಿ.\n\nಇಷ್ಟು ಗಟ್ಟಿಯಾದ ವಾಲ್ಯೂಮ್ನಲ್ಲಿ ಆಲಿಸುವುದನ್ನು ಮುಂದುವರಿಸಿದರೆ, ನಿಮ್ಮ ಆಲಿಸುವ ಸಾಮರ್ಥ್ಯಕ್ಕೆ ಶಾಶ್ವತ ಹಾನಿಯುಂಟಾಗುತ್ತದೆ."</string> - <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್ ಬಳಸುವುದೇ?"</string> - <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"ಶಾರ್ಟ್ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಬಟನ್ಗಳನ್ನು 3 ಸೆಕೆಂಡುಗಳ ಕಾಲ ಒತ್ತಿದರೆ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯವೊಂದು ಪ್ರಾರಂಭವಾಗುತ್ತದೆ."</string> - <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳಿಗಾಗಿ ಶಾರ್ಟ್ಕಟ್ ಆನ್ ಮಾಡಬೇಕೇ?"</string> - <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"ಎರಡೂ ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಕೆಲವು ಸೆಕೆಂಡುಗಳ ಕಾಲ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಆನ್ ಆಗುತ್ತವೆ. ಇದು ನಿಮ್ಮ ಸಾಧನವು ಹೇಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಬಹುದು.\n\n ಪ್ರಸ್ತುತ ವೈಶಿಷ್ಟ್ಯಗಳು:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿಯಲ್ಲಿ ಆಯ್ದ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನೀವು ಬದಲಾಯಿಸಬಹುದು."</string> + <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಶಾರ್ಟ್ಕಟ್ ಬಳಸುವುದೇ?"</string> + <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"ಶಾರ್ಟ್ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಬಟನ್ಗಳನ್ನು 3 ಸೆಕೆಂಡುಗಳ ಕಾಲ ಒತ್ತಿದರೆ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವೈಶಿಷ್ಟ್ಯವೊಂದು ಪ್ರಾರಂಭವಾಗುತ್ತದೆ."</string> + <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವೈಶಿಷ್ಟ್ಯಗಳಿಗಾಗಿ ಶಾರ್ಟ್ಕಟ್ ಆನ್ ಮಾಡಬೇಕೇ?"</string> + <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"ಎರಡೂ ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಕೆಲವು ಸೆಕೆಂಡುಗಳ ಕಾಲ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವೈಶಿಷ್ಟ್ಯಗಳು ಆನ್ ಆಗುತ್ತವೆ. ಇದು ನಿಮ್ಮ ಸಾಧನವು ಹೇಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಬಹುದು.\n\n ಪ್ರಸ್ತುತ ವೈಶಿಷ್ಟ್ಯಗಳು:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿಯಲ್ಲಿ ಆಯ್ದ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನೀವು ಬದಲಾಯಿಸಬಹುದು."</string> <string name="accessibility_shortcut_multiple_service_list" msgid="2128323171922023762">" • <xliff:g id="SERVICE">%1$s</xliff:g>\n"</string> <string name="accessibility_shortcut_single_service_warning_title" msgid="1909518473488345266">"ಶಾರ್ಟ್ಕಟ್ <xliff:g id="SERVICE">%1$s</xliff:g>ಆನ್ ಮಾಡಬೇಕೇ?"</string> - <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"ಎರಡೂ ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಕೆಲವು ಸೆಕೆಂಡುಗಳ ಕಾಲ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯವಾದ <xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್ ಆಗುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಸಾಧನವು ಹೇಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಬಹುದು.\n\nನೀವು ಈ ಶಾರ್ಟ್ಕಟ್ ಅನ್ನು ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಅಕ್ಸೆಸಿಬಿಲಿಟಿಯಲ್ಲಿನ ಮತ್ತೊಂದು ವೈಶಿಷ್ಟ್ಯಕ್ಕೆ ಬದಲಾಯಿಸಬಹುದು."</string> + <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"ಎರಡೂ ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಕೆಲವು ಸೆಕೆಂಡುಗಳ ಕಾಲ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವೈಶಿಷ್ಟ್ಯವಾದ <xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್ ಆಗುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಸಾಧನವು ಹೇಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಬಹುದು.\n\nನೀವು ಈ ಶಾರ್ಟ್ಕಟ್ ಅನ್ನು ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಅಕ್ಸೆಸಿಬಿಲಿಟಿಯಲ್ಲಿನ ಮತ್ತೊಂದು ವೈಶಿಷ್ಟ್ಯಕ್ಕೆ ಬದಲಾಯಿಸಬಹುದು."</string> <string name="accessibility_shortcut_on" msgid="5463618449556111344">"ಆನ್ ಮಾಡಿ"</string> <string name="accessibility_shortcut_off" msgid="3651336255403648739">"ಆನ್ ಮಾಡಬೇಡಿ"</string> <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"ಆನ್ ಆಗಿದೆ"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"ಆಫ್ ಆಗಿದೆ"</string> - <string name="accessibility_enable_service_title" msgid="3931558336268541484">"ನಿಮ್ಮ ಸಾಧನದ ಪೂರ್ಣ ನಿಯಂತ್ರಣ ಹೊಂದಲು <xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ ಅನುಮತಿಸಬೇಕೆ?"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"ಪ್ರವೇಶಿಸುವಿಕೆಯ ಅವಶ್ಯಕತೆಗಳಿಗೆ ಸಹಾಯ ಮಾಡುವ ಆ್ಯಪ್ಗಳಿಗೆ ಪೂರ್ಣ ನಿಯಂತ್ರಣ ನೀಡುವುದು ಸೂಕ್ತವಾಗಿರುತ್ತದೆ, ಆದರೆ ಬಹುತೇಕ ಆ್ಯಪ್ಗಳಿಗೆ ಇದು ಸೂಕ್ತವಲ್ಲ."</string> + <string name="accessibility_enable_service_title" msgid="3931558336268541484">"ನಿಮ್ಮ ಸಾಧನದ ಸಂಪೂರ್ಣ ನಿಯಂತ್ರಣವನ್ನು ಹೊಂದಲು <xliff:g id="SERVICE">%1$s</xliff:g>ಗೆ ಅನುಮತಿಸಬೇಕೆ?"</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಅವಶ್ಯಕತೆಗಳ ಕುರಿತು ನಿಮಗೆ ಸಹಾಯ ಮಾಡುವ ಆ್ಯಪ್ಗಳಿಗೆ ಸಂಪೂರ್ಣ ನಿಯಂತ್ರಣ ನೀಡುವುದು ಸೂಕ್ತವಾಗಿರುತ್ತದೆ, ಆದರೆ ಬಹುತೇಕ ಆ್ಯಪ್ಗಳಿಗೆ ಇದು ಸೂಕ್ತವಲ್ಲ."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"ಸ್ಕ್ರೀನ್ ವೀಕ್ಷಿಸಿ ಮತ್ತು ನಿಯಂತ್ರಿಸಿ"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"ಇದು ಪರದೆಯ ಮೇಲಿನ ಎಲ್ಲಾ ವಿಷಯವನ್ನು ಓದಬಹುದು ಮತ್ತು ಇತರ ಆ್ಯಪ್ಗಳ ಮೇಲೆ ವಿಷಯವನ್ನು ಪ್ರದರ್ಶಿಸಬಹುದು."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"ಕ್ರಿಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ನಿರ್ವಹಿಸಿ"</string> @@ -1710,7 +1710,7 @@ <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"ಅನುಮತಿಸಿ"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"ನಿರಾಕರಿಸಿ"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"ವೈಶಿಷ್ಟ್ದ ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ಅದನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ:"</string> - <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಜೊತೆಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> + <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಬಟನ್ ಜೊತೆಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="accessibility_edit_shortcut_menu_volume_title" msgid="1077294237378645981">"ವಾಲ್ಯೂಮ್ ಕೀ ಶಾರ್ಟ್ಕಟ್ ಜೊತೆಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="accessibility_uncheck_legacy_item_warning" msgid="8047830891064817447">"<xliff:g id="SERVICE_NAME">%s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="edit_accessibility_shortcut_menu_button" msgid="8885752738733772935">"ಶಾರ್ಟ್ಕಟ್ಗಳನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string> @@ -1725,10 +1725,10 @@ <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಹಿಡಿದುಕೊಳ್ಳಿ. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲಾಗಿದೆ."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳಲಾಗಿದೆ. <xliff:g id="SERVICE_NAME">%1$s</xliff:g>, ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string> <string name="accessibility_shortcut_spoken_feedback" msgid="3760999147597564314">"ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಬಿಡುಗಡೆ ಮಾಡಿ. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲು, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ಮತ್ತೊಮ್ಮೆ 3 ಸೆಕೆಂಡ್ಗಳ ಕಾಲ ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ."</string> - <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"ನೀವು ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ಬಳಸುವುದಕ್ಕಾಗಿ ವೈಶಿಷ್ಟ್ಯವೊಂದನ್ನು ಆರಿಸಿ:"</string> - <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"ಪ್ರವೇಶಿಸುವಿಕೆ ಗೆಸ್ಚರ್ನೊಂದಿಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ (ಎರಡು ಬೆರಳುಗಳನ್ನು ಬಳಸಿ ಪರದೆಯ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ):"</string> - <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"ಪ್ರವೇಶಿಸುವಿಕೆ ಗೆಸ್ಚರ್ನೊಂದಿಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ (ಮೂರು ಬೆರಳುಗಳನ್ನು ಬಳಸಿ ಪರದೆಯ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ):"</string> - <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"ವೈಶಿಷ್ಟ್ಯಗಳ ನಡುವೆ ಬದಲಿಸಲು, ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹೋಲ್ಡ್ ಮಾಡಿ."</string> + <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"ನೀವು ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ಬಳಸುವುದಕ್ಕಾಗಿ ವೈಶಿಷ್ಟ್ಯವೊಂದನ್ನು ಆರಿಸಿ:"</string> + <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಗೆಸ್ಚರ್ನೊಂದಿಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ (ಎರಡು ಬೆರಳುಗಳನ್ನು ಬಳಸಿ ಪರದೆಯ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ):"</string> + <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಗೆಸ್ಚರ್ನೊಂದಿಗೆ ಬಳಸಲು ವೈಶಿಷ್ಟ್ಯವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ (ಮೂರು ಬೆರಳುಗಳನ್ನು ಬಳಸಿ ಪರದೆಯ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ):"</string> + <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"ವೈಶಿಷ್ಟ್ಯಗಳ ನಡುವೆ ಬದಲಿಸಲು, ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಬಟನ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹೋಲ್ಡ್ ಮಾಡಿ."</string> <string name="accessibility_gesture_instructional_text" msgid="9196230728837090497">"ವೈಶಿಷ್ಟ್ಯಗಳ ನಡುವೆ ಬದಲಿಸಲು, ಎರಡು ಬೆರಳುಗಳನ್ನು ಬಳಸಿ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿಯಿರಿ."</string> <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"ವೈಶಿಷ್ಟ್ಯಗಳ ನಡುವೆ ಬದಲಿಸಲು, ಮೂರು ಬೆರಳುಗಳನ್ನು ಬಳಸಿ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿಯಿರಿ."</string> <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"ಹಿಗ್ಗಿಸುವಿಕೆ"</string> @@ -2009,7 +2009,7 @@ <string name="app_category_news" msgid="1172762719574964544">"ಸುದ್ದಿ ಮತ್ತು ನಿಯತಕಾಲಿಕೆಗಳು"</string> <string name="app_category_maps" msgid="6395725487922533156">"Maps ಮತ್ತು ನ್ಯಾವಿಗೇಶನ್"</string> <string name="app_category_productivity" msgid="1844422703029557883">"ಉತ್ಪಾದಕತೆ"</string> - <string name="app_category_accessibility" msgid="6643521607848547683">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string> + <string name="app_category_accessibility" msgid="6643521607848547683">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string> <string name="device_storage_monitor_notification_channel" msgid="5164244565844470758">"ಸಾಧನ ಸಂಗ್ರಹಣೆ"</string> <string name="adb_debugging_notification_channel_tv" msgid="4764046459631031496">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆ"</string> <string name="time_picker_hour_label" msgid="4208590187662336864">"ಗಂಟೆ"</string> @@ -2141,9 +2141,9 @@ <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ಲಾಕ್ ಸ್ಕ್ರೀನ್"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string> <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"ಹೆಡ್ಸೆಟ್ ಹುಕ್"</string> - <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"ಸ್ಕ್ರೀನ್ನಲ್ಲಿನ ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್"</string> - <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"ಸ್ಕ್ರೀನ್ನಲ್ಲಿನ ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್ ಆಯ್ಕೆ"</string> - <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್"</string> + <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"ಸ್ಕ್ರೀನ್ನಲ್ಲಿನ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಶಾರ್ಟ್ಕಟ್"</string> + <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"ಸ್ಕ್ರೀನ್ನಲ್ಲಿನ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಶಾರ್ಟ್ಕಟ್ ಆಯ್ಕೆ"</string> + <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಶಾರ್ಟ್ಕಟ್"</string> <string name="accessibility_system_action_dismiss_notification_shade" msgid="8931637495533770352">"ಅಧಿಸೂಚನೆಯ ಪರದೆಯನ್ನು ವಜಾಗೊಳಿಸಿ"</string> <string name="accessibility_system_action_dpad_up_label" msgid="1029042950229333782">"Dpad ನ ಮೇಲಿನ ಬಟನ್"</string> <string name="accessibility_system_action_dpad_down_label" msgid="3441918448624921461">"Dpad ನ ಕೆಳಗಿನ ಬಟನ್"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index b795fde51e59..8d5bbe4a8e13 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Колдонуучуга функциялары тууралуу маалыматты көрүп баштоо мүмкүнчүлүгүн берет."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"үлгүнү жаздыруу ылдамдыгы жогору болгон сенсор дайындарынын үлгүсүнө мүмкүнчүлүк алуу"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Колдонмолорго сенсор дайындарынын үлгүсү 200 Герцтен жогору болгон үлгүлөрдү алууга уруксат берет"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"колдонмону автоматтык түрдө жаңыртуу"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Буга чейин орнотулган колдонмону автоматтык түрдө жаңыртууга мүмкүндүк берет"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Сырсөз эрежелерин коюу"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Экран кулпусунун сырсөздөрү менен PIN\'дерине уруксат берилген узундук менен белгилерди көзөмөлдөө."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Экран кулпусун ачуу аракеттерин көзөмөлдөө"</string> @@ -2136,7 +2134,7 @@ <string name="accessibility_system_action_back_label" msgid="4205361367345537608">"Артка"</string> <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Акыркы колдонмолор"</string> <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Билдирмелер"</string> - <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Ыкчам жөндөөлөр"</string> + <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Ыкчам параметрлер"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Кубат диалогу"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Кулпуланган экран"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Скриншот"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 39c794b8971c..ca879a3af31a 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"ອະນຸຍາດໃຫ້ຜູ້ຖືເລີ່ມການເບິ່ງຂໍ້ມູນຄຸນສົມບັດສຳລັບແອັບໃດໜຶ່ງ."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"ເຂົ້າເຖິງຂໍ້ມູນເຊັນເຊີໃນອັດຕາຕົວຢ່າງສູງ"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"ອະນຸຍາດໃຫ້ແອັບສຸ່ມຕົວຢ່າງຂໍ້ມູນເຊັນເຊີໃນອັດຕາທີ່ຫຼາຍກວ່າ 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ອັບເດດແອັບໂດຍບໍ່ຕ້ອງມີຄຳສັ່ງຜູ້ໃຊ້"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"ອະນຸຍາດໃຫ້ຜູ້ຖືອັບເດດແອັບທີ່ໄດ້ຕິດຕັ້ງໄວ້ກ່ອນໜ້າໂດຍບໍ່ຕ້ອງມີຄຳສັ່ງຜູ້ໃຊ້"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"ຕັ້ງຄ່າກົດຂອງລະຫັດຜ່ານ"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"ຄວບຄຸມຄວາມຍາວ ແລະຕົວອັກສອນທີ່ອະນຸຍາດໃຫ້ຢູ່ໃນລະຫັດລັອກໜ້າຈໍ ແລະ PIN."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"ຕິດຕາມການພະຍາຍາມປົດລັອກໜ້າຈໍ"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 9133d2aed1c8..b13ce628a92f 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1705,7 +1705,7 @@ <string name="accessibility_service_warning_description" msgid="291674995220940133">"Целосната контрола е соодветна за апликации што ви помагаат со потребите за пристапност, но не и за повеќето апликации."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Приказ и контрола на екранот"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Може да ги чита сите содржини на екранот и да прикажува содржини врз другите апликации."</string> - <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Преглед и вршење на дејствата"</string> + <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Преглед и вршење дејства"</string> <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Може да ја следи вашата интеракција со апликациите или хардверскиот сензор и да врши интеракција со апликациите во ваше име."</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Дозволи"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Одбиј"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 3e1cef62005d..e8f0b52521b9 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"ആപ്പിനുള്ള ഫീച്ചറുകളുടെ വിവരങ്ങൾ കാണാൻ ആരംഭിക്കാൻ ഹോൾഡറിനെ അനുവദിക്കുന്നു."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"ഉയർന്ന സാംപ്ലിംഗ് റേറ്റിൽ സെൻസർ ഡാറ്റ ആക്സസ് ചെയ്യുക"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"200 Hz-നേക്കാൾ ഉയർന്ന റേറ്റിൽ സെൻസർ ഡാറ്റ സാമ്പിൾ ചെയ്യാൻ ആപ്പിനെ അനുവദിക്കുന്നു"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ഉപയോക്താവിന്റെ പ്രവർത്തനമില്ലാതെ തന്നെ ആപ്പ് അപ്ഡേറ്റ് ചെയ്യുക"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"മുമ്പ് ഹോൾഡർ ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പ്, ഉപയോക്താവിന്റെ പ്രവർത്തനമില്ലാതെ തന്നെ അപ്ഡേറ്റ് ചെയ്യാൻ ആ ഹോൾഡറെ അനുവദിക്കുന്നു"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"പാസ്വേഡ് നിയമങ്ങൾ സജ്ജീകരിക്കുക"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"സ്ക്രീൻ ലോക്ക് പാസ്വേഡുകളിലും PIN-കളിലും അനുവദിച്ചിരിക്കുന്ന ദൈർഘ്യവും പ്രതീകങ്ങളും നിയന്ത്രിക്കുക."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"സ്ക്രീൻ അൺലോക്ക് ശ്രമങ്ങൾ നിരീക്ഷിക്കുക"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 1b578976b955..6621f94c15f4 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Аппын онцлогуудын мэдээллийг үзэж эхлэхийг эзэмшигчид зөвшөөрдөг."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"түүврийн өндөр хувиар мэдрэгчийн өгөгдөлд хандах"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Аппад 200 Гц-ээс их хувиар мэдрэгчийн өгөгдлийг түүвэрлэх боломжийг олгодог"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"хэрэглэгчийн үйлдэлгүйгээр аппыг шинэчлэх"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Эзэмшигчид өмнө нь суулгасан аппыг хэрэглэгчийн үйлдэлгүйгээр шинэчлэхийг зөвшөөрнө"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Нууц үгний дүрмийг тохируулах"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Дэлгэц түгжих нууц үг болон ПИН кодны урт болон нийт тэмдэгтийн уртыг хянах."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Дэлгэцийн түгжээг тайлах оролдлогыг хянах"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 2a4b08e67e6c..83e33c563def 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"होल्डरला ॲपसाठी वैशिष्ट्यांची माहिती पाहण्यास सुरू करण्याची अनुमती देते."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"उच्च नमुना दराने सेन्सर डेटा अॅक्सेस करते"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"ॲपला २०० Hz पेक्षा जास्त दराने सेन्सर डेटाचा नमुना तयार करण्याची अनुमती देते"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"वापरकर्त्याच्या कृतीशिवाय अॅप अपडेट करा"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"होल्डरला वापरकर्त्याच्या कृतीशिवाय पूर्वी इंस्टॉल केलेले अॅप अपडेट करण्याची अनुमती देते"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"पासवर्ड नियम सेट करा"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"स्क्रीन लॉक पासवर्ड आणि पिन मध्ये अनुमती दिलेले लांबी आणि वर्ण नियंत्रित करा."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"स्क्रीन अनलॉक प्रयत्नांचे परीक्षण करा"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 61e4c34f70d0..28a8c2602299 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Membenarkan pemegang mula melihat maklumat ciri untuk apl."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"akses data penderia pada data pensampelan yang tinggi"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Membenarkan apl mengambil sampel data penderia pada kadar yang lebih besar daripada 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"kemas kinikan apl tanpa tindakan pengguna"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Benarkan pemegang untuk mengemaskinikan apl yang telah dipasang sebelumnya tanpa tindakan pengguna"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Tetapkan peraturan kata laluan"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Mengawal panjang dan aksara yang dibenarkan dalam kata laluan dan PIN kunci skrin."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Pantau percubaan buka kunci skrin"</string> @@ -1706,7 +1704,7 @@ <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Melihat dan mengawal skrin"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Ciri ini boleh membaca semua kandungan pada skrin dan memaparkan kandungan di atas apl lain."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Lihat dan laksanakan tindakan"</string> - <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Ciri ini boleh menjejak interaksi anda dengan apl atau penderia perkakasan dan berinteraksi dengan apl bagi pihak anda."</string> + <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Ciri ini boleh menjejaki interaksi anda dengan apl atau penderia perkakasan dan berinteraksi dengan apl bagi pihak anda."</string> <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Benarkan"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Tolak"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"Ketik ciri untuk mula menggunakan ciri itu:"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index ddd55728fa08..041fde1d459e 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1702,7 +1702,7 @@ <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"AAN"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"UIT"</string> <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Toestaan dat <xliff:g id="SERVICE">%1$s</xliff:g> volledige controle over je apparaat heeft?"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"Volledige controle is gepast voor apps die je helpen met toegankelijkheid, maar niet voor de meeste apps."</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"Volledige controle is gepast voor apps die je helpen met toegankelijkheid, maar niet voor de meeste andere apps."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Scherm bekijken en bedienen"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Deze functie kan alle content op het scherm lezen en content bovenop andere apps weergeven."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Acties bekijken en uitvoeren"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 1470c19a78d5..d6c0af07c96c 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -249,7 +249,7 @@ <string name="global_action_emergency" msgid="1387617624177105088">"ଜରୁରୀକାଳୀନ"</string> <string name="global_action_bug_report" msgid="5127867163044170003">"ବଗ୍ ରିପୋର୍ଟ"</string> <string name="global_action_logout" msgid="6093581310002476511">"ସେସନ୍ ଶେଷ କରନ୍ତୁ"</string> - <string name="global_action_screenshot" msgid="2610053466156478564">"ସ୍କ୍ରିନସଟ୍"</string> + <string name="global_action_screenshot" msgid="2610053466156478564">"ସ୍କ୍ରିନସଟ"</string> <string name="bugreport_title" msgid="8549990811777373050">"ବଗ୍ ରିପୋର୍ଟ"</string> <string name="bugreport_message" msgid="5212529146119624326">"ଇ-ମେଲ୍ ମେସେଜ୍ ଭାବରେ ପଠାଇବାକୁ, ଆପଣଙ୍କ ବର୍ତ୍ତମାନର ଡିଭାଇସ୍ ବିଷୟରେ ଏହା ସୂଚନା ସଂଗ୍ରହ କରିବ। ବଗ୍ ରିପୋର୍ଟ ଆରମ୍ଭ ହେବାପରଠାରୁ ଏହାକୁ ପଠାଇବା ପାଇଁ କିଛି ସମୟ ଲାଗିବ, ଦୟାକରି ଧୈର୍ଯ୍ୟ ରଖନ୍ତୁ।"</string> <string name="bugreport_option_interactive_title" msgid="7968287837902871289">"ଇଣ୍ଟରାକ୍ଟିଭ୍ ରିପୋର୍ଟ"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 052f9696f045..8dca4062d5d9 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Permite que o sistema comece a ver as informações de recursos de um app."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"acessar os dados do sensor em uma taxa de amostragem elevada"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Permite que o app receba amostras de dados do sensor em uma taxa maior que 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"atualizar o app sem a ação do usuário"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Permite que o titular atualize o app instalado anteriormente sem ação do usuário"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Definir regras para senha"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Controla o tamanho e os caracteres permitidos nos PINs e nas senhas do bloqueio de tela."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitorar tentativas de desbloqueio de tela"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 9dd104c1f575..71b34a213dc0 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Permite que o titular comece a ver as informações das funcionalidades de uma app."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"aceder aos dados de sensores a uma taxa de amostragem elevada"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Permite que a app obtenha uma amostra dos dados de sensores a uma taxa superior a 200 Hz."</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"atualizar a app sem a ação do utilizador"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Permite que o proprietário atualize a app que instalou anteriormente sem a ação do utilizador"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Definir regras de palavra-passe"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Controlar o comprimento e os carateres permitidos nos PINs e nas palavras-passe do bloqueio de ecrã."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitorizar tentativas de desbloqueio do ecrã"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 052f9696f045..8dca4062d5d9 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Permite que o sistema comece a ver as informações de recursos de um app."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"acessar os dados do sensor em uma taxa de amostragem elevada"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Permite que o app receba amostras de dados do sensor em uma taxa maior que 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"atualizar o app sem a ação do usuário"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Permite que o titular atualize o app instalado anteriormente sem ação do usuário"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Definir regras para senha"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Controla o tamanho e os caracteres permitidos nos PINs e nas senhas do bloqueio de tela."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitorar tentativas de desbloqueio de tela"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 168dfcbf18be..88b39ae4efe1 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -802,10 +802,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Позволяет просматривать информацию о функциях приложения."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"Доступ к данным датчиков при высокой частоте дискретизации"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Приложение сможет считывать данные датчиков на частоте более 200 Гц."</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"Обновление приложений без действий со стороны пользователя"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Позволяет обновлять ранее установленные приложения без действий со стороны пользователя."</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Настройка правил для паролей"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Контролировать длину и символы при вводе пароля и PIN-кода."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Отслеживание попыток разблокировать экран"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index bdcf9300d125..32d2170ba972 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"යෙදුමක් සඳහා විශේෂාංග තොරතුරු බැලීම ආරම්භ කිරීමට දරන්නාට ඉඩ දෙන්න."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"ඉහළ නියැදි කිරීමේ වේගයකින් සංවේදක දත්ත වෙත පිවිසෙන්න"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"200 Hz ට වඩා වැඩි වේගයකින් සංවේදක දත්ත නියැදි කිරීමට යෙදුමට ඉඩ දෙයි"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"යෙදුම පරිශීලක ක්රියාවෙන් තොරව යාවත්කාලීන කරන්න"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"පරිශීලක ක්රියාවෙන් තොරව කලින් ස්ථාපිත යෙදුම යාවත්කාලීන කිරීමට දරන්නාට ඉඩ දෙයි"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"මුරපද නීති සකස් කිරීම"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"තිර අගුලු මුරපද සහ PIN තුළ ඉඩ දෙන දිග සහ අනුලකුණු පාලනය කිරීම."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"තිරය අගුළු ඇරීමේ උත්සාහයන් නිරීක්ෂණය කරන්න"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 4d4c084aee41..a5aaf89e14e0 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -802,10 +802,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Umožňuje držiteľovi zobraziť informácie o funkciách aplikácie."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"prístup k dátam senzorom s vysokou vzorkovacou frekvenciou"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Umožňuje aplikácii vzorkovať dáta senzorov s frekvenciou vyššou ako 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"aktualizovať aplikáciu bez akcie používateľa"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Povolí vlastníkovi aktualizovať aplikáciu, ktorá bola nainštalovaná bez akcie používateľa"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Nastaviť pravidlá pre heslo"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Nastavte dĺžku hesiel na odomknutie obrazovky aj kódov PIN a v nich používané znaky."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Sledovanie pokusov o odomknutie obrazovky"</string> @@ -2140,7 +2138,7 @@ <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Upozornenia"</string> <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Rýchle nastavenia"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Dialógové okno napájania"</string> - <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Uzamknúť obrazovku"</string> + <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Zamknúť obrazovku"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Snímka obrazovky"</string> <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"Hák na slúchadlá s mikrofónom"</string> <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"Skratka dostupnosti na obrazovke"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index d8dd26871c20..8a9ff147260e 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -291,7 +291,7 @@ <string name="notification_channel_heavy_weight_app" msgid="17455756500828043">"Aplikacija se izvaja"</string> <string name="notification_channel_foreground_service" msgid="7102189948158885178">"Aplikacije, ki porabljajo energijo baterije"</string> <string name="notification_channel_accessibility_magnification" msgid="1707913872219798098">"Povečava"</string> - <string name="notification_channel_accessibility_security_policy" msgid="1727787021725251912">"Uporaba funkcij za ljudi s posebnimi potrebami"</string> + <string name="notification_channel_accessibility_security_policy" msgid="1727787021725251912">"Uporaba funkcij za dostopnost"</string> <string name="foreground_service_app_in_background" msgid="1439289699671273555">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> porablja energijo baterije"</string> <string name="foreground_service_apps_in_background" msgid="7340037176412387863">"Toliko aplikacij porablja energijo baterije: <xliff:g id="NUMBER">%1$d</xliff:g>"</string> <string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Dotaknite se za prikaz podrobnosti porabe baterije in prenosa podatkov"</string> @@ -1495,7 +1495,7 @@ <string name="forward_intent_to_work" msgid="3620262405636021151">"To aplikacijo uporabljate v delovnem profilu"</string> <string name="input_method_binding_label" msgid="1166731601721983656">"Način vnosa"</string> <string name="sync_binding_label" msgid="469249309424662147">"Sinhronizacija"</string> - <string name="accessibility_binding_label" msgid="1974602776545801715">"Pripomočki za osebe s posebnimi potrebami"</string> + <string name="accessibility_binding_label" msgid="1974602776545801715">"Dostopnost"</string> <string name="wallpaper_binding_label" msgid="1197440498000786738">"Ozadje"</string> <string name="chooser_wallpaper" msgid="3082405680079923708">"Spreminjanje ozadja"</string> <string name="notification_listener_binding_label" msgid="2702165274471499713">"Poslušalec obvestil"</string> @@ -1692,19 +1692,19 @@ <string name="csd_dose_repeat_warning" product="default" msgid="6765471037071089401">"Opozorilo!\nZa petkrat ste prekoračili količino glasnih zvočnih signalov, ki je še varna pri poslušanju prek slušalk v enem tednu.\n\nZaradi zaščite sluha je bila glasnost zmanjšana."</string> <string name="csd_entering_RS2_warning" product="default" msgid="3699509945325496807">"Raven glasnosti, pri kateri poslušate predstavnost, lahko ob dolgotrajnejši izpostavljenosti povzroči poškodbe sluha.\n\nNadaljnje dolgotrajno poslušanje pri takšni glasnosti vam lahko poškoduje sluh."</string> <string name="csd_momentary_exposure_warning" product="default" msgid="7861896191081176454">"Opozorilo!\nTrenutno poslušate glasno vsebino pri ravni glasnosti, ki ni varna.\n\nNadaljnje poslušanje pri takšni glasnosti vam bo povzročilo trajne poškodbe sluha."</string> - <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Želite uporabljati bližnjico funkcij za ljudi s posebnimi potrebami?"</string> - <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"Ko je bližnjica vklopljena, pritisnite gumba za glasnost in ju pridržite tri sekunde, če želite zagnati funkcijo za ljudi s posebnimi potrebami."</string> - <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"Želite vklopiti bližnjico za funkcije za ljudi s posebnimi potrebami?"</string> - <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"Če za nekaj sekund pridržite obe tipki za glasnost, boste vklopili funkcije za ljudi s posebnimi potrebami. To lahko spremeni način delovanja naprave.\n\nTrenutne funkcije:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nIzbrane funkcije lahko spremenite v meniju »Nastavitve« > »Funkcije za ljudi s posebnimi potrebami«."</string> + <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Želite uporabljati bližnjico za dostopnost?"</string> + <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"Ko je bližnjica vklopljena, pritisnite gumba za glasnost in ju pridržite tri sekunde, če želite zagnati funkcijo dostopnosti."</string> + <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"Želite vklopiti bližnjico za funkcije za dostopnost?"</string> + <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"Če za nekaj sekund pridržite obe tipki za glasnost, boste vklopili funkcije za dostopnost. To lahko spremeni način delovanja naprave.\n\nTrenutne funkcije:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nIzbrane funkcije lahko spremenite v meniju »Nastavitve« > »Funkcije dostopnosti«."</string> <string name="accessibility_shortcut_multiple_service_list" msgid="2128323171922023762">" • <xliff:g id="SERVICE">%1$s</xliff:g>\n"</string> <string name="accessibility_shortcut_single_service_warning_title" msgid="1909518473488345266">"Želite vklopiti bližnjico za <xliff:g id="SERVICE">%1$s</xliff:g>?"</string> - <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"Če za nekaj sekund pridržite obe tipki za glasnost, boste vklopili storitev <xliff:g id="SERVICE">%1$s</xliff:g>, ki je funkcija za ljudi s posebnimi potrebami. To lahko spremeni način delovanja naprave.\n\nTo bližnjico lahko v meniju »Nastavitve« > »Funkcije za ljudi s posebnimi potrebami« spremenite, da bo uporabljena za drugo funkcijo."</string> + <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"Če za nekaj sekund pridržite obe tipki za glasnost, boste vklopili storitev <xliff:g id="SERVICE">%1$s</xliff:g>, ki je funkcija dostopnosti. To lahko spremeni način delovanja naprave.\n\nTo bližnjico lahko v meniju »Nastavitve« > »Funkcije dostopnosti« spremenite, da bo uporabljena za drugo funkcijo."</string> <string name="accessibility_shortcut_on" msgid="5463618449556111344">"Vklopi"</string> <string name="accessibility_shortcut_off" msgid="3651336255403648739">"Ne vklopi"</string> <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"VKLOPLJENO"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"IZKLOPLJ."</string> <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Ali storitvi <xliff:g id="SERVICE">%1$s</xliff:g> dovolite popoln nadzor nad svojo napravo?"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"Popoln nadzor je ustrezen za aplikacije, ki vam pomagajo pri funkcijah za ljudi s posebnimi potrebami, vendar ne za večino aplikacij."</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"Popoln nadzor je ustrezen za aplikacije, ki vam pomagajo pri dostopnosti, vendar ne za večino aplikacij."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Ogledovanje in upravljanje zaslona"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Bere lahko vso vsebino na zaslonu ter prikaže vsebino prek drugih aplikacij."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Ogledovanje in izvajanje dejanj"</string> @@ -1712,7 +1712,7 @@ <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Dovoli"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Zavrni"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"Če želite začeti uporabljati funkcijo, se je dotaknite:"</string> - <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"Izberite funkcije, ki jih želite uporabljati z gumbom za funkcije za ljudi s posebnimi potrebami"</string> + <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"Izberite funkcije, ki jih želite uporabljati z gumbom za dostopnost"</string> <string name="accessibility_edit_shortcut_menu_volume_title" msgid="1077294237378645981">"Izberite funkcije, ki jih želite uporabljati z bližnjico na tipki za glasnost"</string> <string name="accessibility_uncheck_legacy_item_warning" msgid="8047830891064817447">"Storitev <xliff:g id="SERVICE_NAME">%s</xliff:g> je izklopljena"</string> <string name="edit_accessibility_shortcut_menu_button" msgid="8885752738733772935">"Uredi bližnjice"</string> @@ -1727,10 +1727,10 @@ <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Tipki za glasnost sta pridržani. Storitev <xliff:g id="SERVICE_NAME">%1$s</xliff:g> je vklopljena."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"Tipki za glasnost sta pridržani. Storitev <xliff:g id="SERVICE_NAME">%1$s</xliff:g> je izklopljena."</string> <string name="accessibility_shortcut_spoken_feedback" msgid="3760999147597564314">"Spustite gumba za glasnost. Če želite vklopiti storitev <xliff:g id="SERVICE_NAME">%1$s</xliff:g>, znova pritisnite in 3 sekunde pridržite oba gumba za glasnost."</string> - <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"Izberite funkcijo, ki jo želite uporabljati, ko se dotaknete gumba za funkcije za ljudi s posebnimi potrebami:"</string> - <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"Izberite funkcijo, ki jo želite zagnati s potezo za ljudi s posebnimi potrebami (vlečenje z dvema prstoma z dna zaslona navzgor):"</string> - <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"Izberite funkcijo, ki jo želite zagnati s potezo za ljudi s posebnimi potrebami (vlečenje s tremi prsti z dna zaslona navzgor):"</string> - <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"Če želite preklopiti med funkcijami, pridržite gumb za funkcije za ljudi s posebnimi potrebami."</string> + <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"Izberite funkcijo, ki jo želite uporabljati, ko se dotaknete gumba za dostopnost:"</string> + <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"Izberite funkcijo, ki jo želite zagnati s potezo za dostopnost (vlečenje z dvema prstoma z dna zaslona navzgor):"</string> + <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"Izberite funkcijo, ki jo želite zagnati s potezo za dostopnost (vlečenje s tremi prsti z dna zaslona navzgor):"</string> + <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"Če želite preklopiti med funkcijami, pridržite gumb za dostopnost."</string> <string name="accessibility_gesture_instructional_text" msgid="9196230728837090497">"Če želite preklopiti med funkcijami, z dvema prstoma povlecite navzgor in pridržite."</string> <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"Če želite preklopiti med funkcijami, s tremi prsti povlecite navzgor in pridržite."</string> <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"Povečava"</string> @@ -2011,7 +2011,7 @@ <string name="app_category_news" msgid="1172762719574964544">"Novice in revije"</string> <string name="app_category_maps" msgid="6395725487922533156">"Zemljevidi in navigacija"</string> <string name="app_category_productivity" msgid="1844422703029557883">"Storilnost"</string> - <string name="app_category_accessibility" msgid="6643521607848547683">"Funkc. za ljudi s poseb. potreb."</string> + <string name="app_category_accessibility" msgid="6643521607848547683">"Dostopnost"</string> <string name="device_storage_monitor_notification_channel" msgid="5164244565844470758">"Shramba naprave"</string> <string name="adb_debugging_notification_channel_tv" msgid="4764046459631031496">"Odpravljanje težav prek povezave USB"</string> <string name="time_picker_hour_label" msgid="4208590187662336864">"ura"</string> @@ -2143,9 +2143,9 @@ <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Zaklenjen zaslon"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Posnetek zaslona"</string> <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"Kavelj za slušalke z mikrofonom"</string> - <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"Zaslonska bližnjica funkcij za ljudi s posebnimi potrebami"</string> - <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"Izbirnik zaslonske bližnjice funkcij za ljudi s posebnimi potrebami"</string> - <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"Bližnjica funkcij za ljudi s posebnimi potrebami"</string> + <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"Zaslonska bližnjica za dostopnost"</string> + <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"Izbirnik zaslonske bližnjice za dostopnost"</string> + <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"Bližnjica za dostopnost"</string> <string name="accessibility_system_action_dismiss_notification_shade" msgid="8931637495533770352">"Opusti zaslon z obvestili"</string> <string name="accessibility_system_action_dpad_up_label" msgid="1029042950229333782">"Smerni gumb gor"</string> <string name="accessibility_system_action_dpad_down_label" msgid="3441918448624921461">"Smerni gumb dol"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index c97713ee30b1..eed531afc524 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Lejon që zotëruesi të fillojë të shikojë informacionin e veçorive për një aplikacion."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"qasu te të dhënat e sensorit me një shpejtësi kampionimi më të lartë"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Lejon aplikacionin të mbledhë shembujt e të dhënave të sensorit me shpejtësi më të lartë se 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"përditëso aplikacionin pa veprimin e përdoruesit"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Lejon zotëruesin të përditësojë aplikacionin që e ka instaluar më parë pa veprimin e përdoruesit"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Cakto rregullat e fjalëkalimit"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontrollo gjatësinë dhe karakteret e lejuara në fjalëkalimet dhe kodet PIN të kyçjes së ekranit."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitoro tentativat e shkyçjes së ekranit"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 91ea24ab21ab..179707d08cd2 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -801,10 +801,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Дозвољава носиоцу дозволе да започне прегледање информација о функцијама апликације."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"приступ подацима сензора при великој брзини узорковања"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Дозвољава апликацији да узима узорак података сензора при брзини већој од 200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"ажурирање апликације без радњи корисника"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Дозвољава власнику да ажурира апликацију коју је претходно инсталирала без радњи корисника"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Подешавање правила за лозинку"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Контролише дужину и знакове дозвољене у лозинкама и PIN-овима за закључавање екрана."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Надгледајте покушаје откључавања екрана"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index ec5f4f778c1c..6eb07808ee2c 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Huruhusu mmiliki kuanza kuangalia maelezo ya vipengele vya programu."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"fikia data ya vitambuzi kwa kasi ya juu ya sampuli"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Huruhusu programu kujaribu sampuli ya data ya vitambuzi kwa kasi inayozidi Hz 200"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"sakinisha programu bila mtumiaji kuchukua hatua yoyote"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Huruhusu mmiliki kusasisha programu iliyosakinisha awali bila mtumiaji kuchukua hatua yoyote"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Kuweka kanuni za nenosiri"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Dhibiti urefu na maandishi yanayokubalika katika nenosiri la kufunga skrini na PIN."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Kuhesabu mara ambazo skrini inajaribu kufunguliwa"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 211066707da4..e333a4826757 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -175,10 +175,10 @@ <string name="contentServiceSync" msgid="2341041749565687871">"సింక్"</string> <string name="contentServiceSyncNotificationTitle" msgid="5766411446676388623">"సింక్ చేయడం సాధ్యపడదు"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="4562226280528716090">"చాలా ఎక్కువ <xliff:g id="CONTENT_TYPE">%s</xliff:g> తొలగించడానికి ప్రయత్నించారు."</string> - <string name="low_memory" product="tablet" msgid="5557552311566179924">"టాబ్లెట్ నిల్వ నిండింది. స్థలాన్ని ఖాళీ చేయడానికి కొన్ని ఫైళ్లను తొలగించండి."</string> - <string name="low_memory" product="watch" msgid="3479447988234030194">"వాచ్ నిల్వ నిండింది. స్థలాన్ని ఖాళీ చేయడానికి కొన్ని ఫైళ్లను తొలగించండి."</string> - <string name="low_memory" product="tv" msgid="6663680413790323318">"Android TV పరికరం నిల్వ నిండింది. కొంత ప్రదేశాన్ని ఖాళీ చేయడానికి కొన్ని ఫైల్లను తొలగించండి."</string> - <string name="low_memory" product="default" msgid="2539532364144025569">"ఫోన్ నిల్వ నిండింది. స్థలాన్ని ఖాళీ చేయడానికి కొన్ని ఫైళ్లను తొలగించండి."</string> + <string name="low_memory" product="tablet" msgid="5557552311566179924">"టాబ్లెట్ స్టోరేజ్ నిండింది. స్థలాన్ని ఖాళీ చేయడానికి కొన్ని ఫైళ్లను తొలగించండి."</string> + <string name="low_memory" product="watch" msgid="3479447988234030194">"వాచ్ స్టోరేజ్ నిండింది. స్థలాన్ని ఖాళీ చేయడానికి కొన్ని ఫైళ్లను తొలగించండి."</string> + <string name="low_memory" product="tv" msgid="6663680413790323318">"Android TV పరికరం స్టోరేజ్ నిండింది. కొంత ప్రదేశాన్ని ఖాళీ చేయడానికి కొన్ని ఫైల్లను తొలగించండి."</string> + <string name="low_memory" product="default" msgid="2539532364144025569">"ఫోన్ స్టోరేజ్ నిండింది. స్థలాన్ని ఖాళీ చేయడానికి కొన్ని ఫైళ్లను తొలగించండి."</string> <string name="ssl_ca_cert_warning" msgid="7233573909730048571">"{count,plural, =1{సర్టిఫికెట్ అధికార యంత్రాంగం ఇన్స్టాల్ చేయబడింది}other{సర్టిఫికెట్ అధికార యంత్రాంగాలు ఇన్స్టాల్ చేయబడ్డాయి}}"</string> <string name="ssl_ca_cert_noti_by_unknown" msgid="4961102218216815242">"తెలియని మూడవ పక్షం ద్వారా"</string> <string name="ssl_ca_cert_noti_by_administrator" msgid="4564941950768783879">"మీ కార్యాలయ ప్రొఫైల్ నిర్వాహకుల ద్వారా"</string> @@ -376,7 +376,7 @@ <string name="permlab_readSms" msgid="5164176626258800297">"మీ టెక్స్ట్ మెసేజ్లు (SMS లేదా MMS) చదవడం"</string> <string name="permdesc_readSms" product="tablet" msgid="7912990447198112829">"ఈ యాప్ మీ టాబ్లెట్లో స్టోర్ చేసిన అన్ని SMS (టెక్స్ట్) మెసేజ్లను చదవగలదు."</string> <string name="permdesc_readSms" product="tv" msgid="3054753345758011986">"ఈ యాప్ మీ Android TV పరికరంలో స్టోర్ అయిన SMS (టెక్స్ట్) మెసేజ్లు అన్నింటిని చదవగలదు."</string> - <string name="permdesc_readSms" product="default" msgid="774753371111699782">"ఈ యాప్ మీ ఫోన్లో నిల్వ చేసిన అన్ని SMS (టెక్స్ట్) మెసేజ్లను చదవగలదు."</string> + <string name="permdesc_readSms" product="default" msgid="774753371111699782">"ఈ యాప్ మీ ఫోన్లో స్టోరేజ్ చేసిన అన్ని SMS (టెక్స్ట్) మెసేజ్లను చదవగలదు."</string> <string name="permlab_receiveWapPush" msgid="4223747702856929056">"టెక్స్ట్ మెసేజ్లను (WAP) స్వీకరించడం"</string> <string name="permdesc_receiveWapPush" msgid="1638677888301778457">"WAP మెసేజ్లను స్వీకరించడానికి, ప్రాసెస్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి మీకు వచ్చిన మెసేజ్లను మీకు చూపకుండానే పర్యవేక్షించగల లేదా తొలగించగల సామర్థ్యాన్ని కలిగి ఉంటుంది."</string> <string name="permlab_getTasks" msgid="7460048811831750262">"అమలవుతున్న యాప్లను పునరుద్ధరించడం"</string> @@ -433,7 +433,7 @@ <string name="permdesc_foregroundServiceFileManagement" msgid="417103601269698508">"\"fileManagement\" అనే రకంతో ఫోర్గ్రౌండ్ సర్వీస్లను ఉపయోగించుకోవడానికి యాప్ను అనుమతిస్తుంది"</string> <string name="permlab_foregroundServiceSpecialUse" msgid="7973536745876645082">"\"specialUse\" రకంతో ఫోర్గ్రౌండ్ సర్వీస్ను రన్ చేయండి"</string> <string name="permdesc_foregroundServiceSpecialUse" msgid="646713654541885919">"\"specialUse\" అనే రకంతో ఫోర్గ్రౌండ్ సర్వీస్లను ఉపయోగించడానికి యాప్ను అనుమతిస్తుంది"</string> - <string name="permlab_getPackageSize" msgid="375391550792886641">"యాప్ నిల్వ స్థలాన్ని అంచనా వేయడం"</string> + <string name="permlab_getPackageSize" msgid="375391550792886641">"యాప్ స్టోరేజ్ స్థలాన్ని అంచనా వేయడం"</string> <string name="permdesc_getPackageSize" msgid="742743530909966782">"యాప్ కోడ్, డేటా మరియు కాష్ పరిమాణాలను తిరిగి పొందడానికి దాన్ని అనుమతిస్తుంది"</string> <string name="permlab_writeSettings" msgid="8057285063719277394">"సిస్టమ్ సెట్టింగ్లను మార్చడం"</string> <string name="permdesc_writeSettings" msgid="8293047411196067188">"సిస్టమ్ యొక్క సెట్టింగ్ల డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. హానికరమైన యాప్లు మీ సిస్టమ్ యొక్క కాన్ఫిగరేషన్ను నాశనం చేయవచ్చు."</string> @@ -446,13 +446,13 @@ <string name="permdesc_broadcastSticky" product="tv" msgid="2338185920171000650">"ప్రసారం ముగిసిన తర్వాత భద్రపరచబడే ప్రసారాలను పంపడానికి యాప్ని అనుమతిస్తుంది. ఎక్కువగా వినియోగిస్తే అధిక పరిమాణంలో మెమరీని ఉపయోగించడం వలన టీవీ నెమ్మదిగా పని చేయవచ్చు లేదా అస్థిరంగా మారవచ్చు."</string> <string name="permdesc_broadcastSticky" product="default" msgid="134529339678913453">"ప్రసారం ముగిసిన తర్వాత భద్రపరచబడే ప్రసారాలను పంపడానికి యాప్ను అనుమతిస్తుంది. అత్యధిక వినియోగం వలన ఫోన్ నెమ్మదిగా పని చేయవచ్చు లేదా అధిక పరిమాణంలో మెమరీని ఉపయోగించడం వలన అస్థిరంగా మారవచ్చు."</string> <string name="permlab_readContacts" msgid="8776395111787429099">"మీ కాంటాక్ట్లను చదవడం"</string> - <string name="permdesc_readContacts" product="tablet" msgid="6430093481659992692">"టాబ్లెట్లో నిల్వ చేసిన మీ కాంటాక్ట్లకు సంబంధించిన డేటాను చదవడానికి యాప్ను అనుమతిస్తుంది. కాంటాక్ట్లను క్రియేట్ చేసిన మీ టాబ్లెట్లోని ఖాతాలకు కూడా యాప్లకు యాక్సెస్ ఉంటుంది. ఇందులో మీరు ఇన్స్టాల్ చేసిన యాప్ల ద్వారా క్రియేట్ చేయబడిన ఖాతాలు ఉండవచ్చు. ఈ అనుమతి, మీ కాంటాక్ట్ డేటాను సేవ్ చేయడానికి యాప్లను అనుమతిస్తుంది, హానికరమైన యాప్లు మీకు తెలియకుండానే కాంటాక్ట్ డేటాను షేర్ చేయవచ్చు."</string> - <string name="permdesc_readContacts" product="tv" msgid="8400138591135554789">"మీ Android TV పరికరంలో నిల్వ చేసిన కాంటాక్ట్లకు సంబంధించిన డేటాను చదవడానికి యాప్ను అనుమతిస్తుంది. కాంటాక్ట్లను క్రియేట్ చేసిన మీ Android TV పరికరంలోని ఖాతాలకు కూడా యాప్లకు యాక్సెస్ ఉంటుంది. ఇందులో మీరు ఇన్స్టాల్ చేసిన యాప్ల ద్వారా క్రియేట్ చేయబడిన ఖాతాలు ఉండవచ్చు. ఈ అనుమతి, మీ కాంటాక్ట్ డేటాను సేవ్ చేయడానికి యాప్లను అనుమతిస్తుంది, హానికరమైన యాప్లు మీకు తెలియకుండానే కాంటాక్ట్ డేటాను షేర్ చేయవచ్చు."</string> - <string name="permdesc_readContacts" product="default" msgid="4911989776203207644">"ఫోన్లో నిల్వ చేసిన మీ కాంటాక్ట్లకు సంబంధించిన డేటాను చదవడానికి యాప్ను అనుమతిస్తుంది. కాంటాక్ట్లను క్రియేట్ చేసిన మీ ఫోన్లోని ఖాతాలను కూడా యాప్లు యాక్సెస్ చేయగలవు. ఇందులో మీరు ఇన్స్టాల్ చేసిన యాప్ల ద్వారా క్రియేట్ చేయబడిన ఖాతాలు ఉండవచ్చు. ఈ అనుమతి, మీ కాంటాక్ట్ డేటాను సేవ్ చేయడానికి యాప్లను అనుమతిస్తుంది, హానికరమైన యాప్లు మీకు తెలియకుండానే కాంటాక్ట్ డేటాను షేర్ చేయవచ్చు."</string> + <string name="permdesc_readContacts" product="tablet" msgid="6430093481659992692">"టాబ్లెట్లో స్టోరేజ్ చేసిన మీ కాంటాక్ట్లకు సంబంధించిన డేటాను చదవడానికి యాప్ను అనుమతిస్తుంది. కాంటాక్ట్లను క్రియేట్ చేసిన మీ టాబ్లెట్లోని ఖాతాలకు కూడా యాప్లకు యాక్సెస్ ఉంటుంది. ఇందులో మీరు ఇన్స్టాల్ చేసిన యాప్ల ద్వారా క్రియేట్ చేయబడిన ఖాతాలు ఉండవచ్చు. ఈ అనుమతి, మీ కాంటాక్ట్ డేటాను సేవ్ చేయడానికి యాప్లను అనుమతిస్తుంది, హానికరమైన యాప్లు మీకు తెలియకుండానే కాంటాక్ట్ డేటాను షేర్ చేయవచ్చు."</string> + <string name="permdesc_readContacts" product="tv" msgid="8400138591135554789">"మీ Android TV పరికరంలో స్టోరేజ్ చేసిన కాంటాక్ట్లకు సంబంధించిన డేటాను చదవడానికి యాప్ను అనుమతిస్తుంది. కాంటాక్ట్లను క్రియేట్ చేసిన మీ Android TV పరికరంలోని ఖాతాలకు కూడా యాప్లకు యాక్సెస్ ఉంటుంది. ఇందులో మీరు ఇన్స్టాల్ చేసిన యాప్ల ద్వారా క్రియేట్ చేయబడిన ఖాతాలు ఉండవచ్చు. ఈ అనుమతి, మీ కాంటాక్ట్ డేటాను సేవ్ చేయడానికి యాప్లను అనుమతిస్తుంది, హానికరమైన యాప్లు మీకు తెలియకుండానే కాంటాక్ట్ డేటాను షేర్ చేయవచ్చు."</string> + <string name="permdesc_readContacts" product="default" msgid="4911989776203207644">"ఫోన్లో స్టోరేజ్ చేసిన మీ కాంటాక్ట్లకు సంబంధించిన డేటాను చదవడానికి యాప్ను అనుమతిస్తుంది. కాంటాక్ట్లను క్రియేట్ చేసిన మీ ఫోన్లోని ఖాతాలను కూడా యాప్లు యాక్సెస్ చేయగలవు. ఇందులో మీరు ఇన్స్టాల్ చేసిన యాప్ల ద్వారా క్రియేట్ చేయబడిన ఖాతాలు ఉండవచ్చు. ఈ అనుమతి, మీ కాంటాక్ట్ డేటాను సేవ్ చేయడానికి యాప్లను అనుమతిస్తుంది, హానికరమైన యాప్లు మీకు తెలియకుండానే కాంటాక్ట్ డేటాను షేర్ చేయవచ్చు."</string> <string name="permlab_writeContacts" msgid="8919430536404830430">"మీ కాంటాక్ట్లను ఎడిట్ చేయడం"</string> - <string name="permdesc_writeContacts" product="tablet" msgid="6422419281427826181">"మీ టాబ్లెట్లో నిల్వ చేసి ఉన్న కాంటాక్ట్లకు సంబంధించిన డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి, కాంటాక్ట్ డేటాను తొలగించడానికి యాప్లను అనుమతిస్తుంది."</string> - <string name="permdesc_writeContacts" product="tv" msgid="6488872735379978935">"మీ Android TV పరికరంలో నిల్వ చేసి ఉన్న కాంటాక్ట్లకు సంబంధించిన డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి, కాంటాక్ట్ డేటాను తొలగించడానికి యాప్లను అనుమతిస్తుంది."</string> - <string name="permdesc_writeContacts" product="default" msgid="8304795696237065281">"మీ ఫోన్లో నిల్వ చేసి ఉన్న కాంటాక్ట్లకు సంబంధించిన డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి, కాంటాక్ట్ డేటాను తొలగించడానికి యాప్లను అనుమతిస్తుంది."</string> + <string name="permdesc_writeContacts" product="tablet" msgid="6422419281427826181">"మీ టాబ్లెట్లో స్టోరేజ్ చేసి ఉన్న కాంటాక్ట్లకు సంబంధించిన డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి, కాంటాక్ట్ డేటాను తొలగించడానికి యాప్లను అనుమతిస్తుంది."</string> + <string name="permdesc_writeContacts" product="tv" msgid="6488872735379978935">"మీ Android TV పరికరంలో స్టోరేజ్ చేసి ఉన్న కాంటాక్ట్లకు సంబంధించిన డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి, కాంటాక్ట్ డేటాను తొలగించడానికి యాప్లను అనుమతిస్తుంది."</string> + <string name="permdesc_writeContacts" product="default" msgid="8304795696237065281">"మీ ఫోన్లో స్టోరేజ్ చేసి ఉన్న కాంటాక్ట్లకు సంబంధించిన డేటాను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఈ అనుమతి, కాంటాక్ట్ డేటాను తొలగించడానికి యాప్లను అనుమతిస్తుంది."</string> <string name="permlab_readCallLog" msgid="1739990210293505948">"కాల్ లాగ్ను చదవడం"</string> <string name="permdesc_readCallLog" msgid="8964770895425873433">"ఈ యాప్ మీ కాల్ హిస్టరీని చదవగలదు."</string> <string name="permlab_writeCallLog" msgid="670292975137658895">"కాల్ లాగ్ను రాయడం"</string> @@ -468,9 +468,9 @@ <string name="permlab_bodySensors_wristTemperature_background" msgid="7692772783509074356">"యాప్ బ్యాక్గ్రౌండ్లో ఉన్నప్పుడు, శరీర సెన్సార్ మణికట్టు ఉష్ణోగ్రత డేటాను యాక్సెస్ చేయండి."</string> <string name="permdesc_bodySensors_wristTemperature_background" product="default" msgid="3170369705518699219">"యాప్ బ్యాక్గ్రౌండ్లో ఉన్నప్పుడు, శరీర సెన్సార్ మణికట్టు ఉష్ణోగ్రత డేటాను యాక్సెస్ చేయడానికి యాప్ను అనుమతిస్తుంది."</string> <string name="permlab_readCalendar" msgid="6408654259475396200">"క్యాలెండర్ ఈవెంట్లు మరియు వివరాలను చదవడం"</string> - <string name="permdesc_readCalendar" product="tablet" msgid="515452384059803326">"ఈ యాప్ మీ టాబ్లెట్లో నిల్వ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను షేర్ చేయగలదు లేదా సేవ్ చేయగలదు."</string> - <string name="permdesc_readCalendar" product="tv" msgid="5811726712981647628">"ఈ యాప్ మీ Android TV పరికరంలో నిల్వ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు, మీ క్యాలెండర్ డేటాను షేర్ చేయగలదు లేదా సేవ్ చేయగలదు."</string> - <string name="permdesc_readCalendar" product="default" msgid="9118823807655829957">"ఈ యాప్ మీ ఫోన్లో నిల్వ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను షేర్ చేయగలదు లేదా సేవ్ చేయగలదు."</string> + <string name="permdesc_readCalendar" product="tablet" msgid="515452384059803326">"ఈ యాప్ మీ టాబ్లెట్లో స్టోరేజ్ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను షేర్ చేయగలదు లేదా సేవ్ చేయగలదు."</string> + <string name="permdesc_readCalendar" product="tv" msgid="5811726712981647628">"ఈ యాప్ మీ Android TV పరికరంలో స్టోరేజ్ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు, మీ క్యాలెండర్ డేటాను షేర్ చేయగలదు లేదా సేవ్ చేయగలదు."</string> + <string name="permdesc_readCalendar" product="default" msgid="9118823807655829957">"ఈ యాప్ మీ ఫోన్లో స్టోరేజ్ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను షేర్ చేయగలదు లేదా సేవ్ చేయగలదు."</string> <string name="permlab_writeCalendar" msgid="6422137308329578076">"యజమానికి తెలియకుండానే క్యాలెండర్ ఈవెంట్లను జోడించి లేదా ఎడిట్ చేసి, అతిథులకు ఈమెయిల్ పంపడం"</string> <string name="permdesc_writeCalendar" product="tablet" msgid="8722230940717092850">"ఈ యాప్ మీ టాబ్లెట్లో క్యాలెండర్ ఈవెంట్లను జోడించగలదు, తీసివేయగలదు లేదా మార్చగలదు. ఈ యాప్ క్యాలెండర్ ఓనర్ల నుండి వచ్చినట్లుగా మెసేజ్లను పంపగలదు లేదా ఈవెంట్లను వాటి ఓనర్లకు తెలియకుండానే మార్చగలదు."</string> <string name="permdesc_writeCalendar" product="tv" msgid="951246749004952706">"ఈ యాప్ మీ Android TV పరికరంలో క్యాలెండర్ ఈవెంట్లను జోడించగలదు, తీసివేయగలదు లేదా మార్చగలదు. ఈ యాప్ క్యాలెండర్ ఓనర్ల నుండి వచ్చినట్లుగా మెసేజ్లను పంపగలదు లేదా ఈవెంట్లను వాటి ఓనర్లకు తెలియకుండానే మార్చగలదు."</string> @@ -595,7 +595,7 @@ <string name="permlab_disableKeyguard" msgid="3605253559020928505">"మీ స్క్రీన్ లాక్ను నిలిపివేయడం"</string> <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"కీలాక్ను, అలాగే ఏదైనా అనుబంధించబడిన పాస్వర్డ్ సెక్యూరిటీని డిజేబుల్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఉదాహరణకు, ఇన్కమింగ్ ఫోన్ కాల్ వస్తున్నప్పుడు ఫోన్ కీలాక్ను డిజేబుల్ చేస్తుంది, ఆపై కాల్ ముగిసిన తర్వాత కీలాక్ను మళ్లీ ఎనేబుల్ చేస్తుంది."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"స్క్రీన్ లాక్ సంక్లిష్టత రిక్వెస్ట్"</string> - <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"ఇది మీ స్క్రీన్ లాక్ పాస్వర్డ్ సంక్లిష్టత స్థాయి (తీవ్రంగా ఉండాలా, ఓ మోస్తరుగా ఉండాలా, తక్కువ తీవ్రంగా ఉండాలా లేదా అస్సలు తీవ్రత ఉండకూడదా) తెలుసుకోవడానికి యాప్ను అనుమతిస్తుంది, అంటే పొడుగు ఎంత ఉండాలి, ఏ రకమైన స్క్రీన్ లాక్ పధ్ధతి అనుసరించాలో సూచిస్తుంది. అలాగే, స్క్రీన్ లాక్ పాస్వర్డ్ సంక్లిష్టతను ఏ స్థాయికి సెట్ చేసుకుంటే బాగుంటుందో కూడా వినియోగదారులకు యాప్ సూచించగలదు, కానీ వినియోగదారులు నిరభ్యంతరంగా ఆ సూచనలను పట్టించుకోకుండా వారి ఇష్టం మేరకు చక్కగా సెట్ చేసుకోవచ్చు. ఇంకో ముఖ్య విషయం, స్క్రీన్ లాక్ అన్నది సాదా వచన రూపంలో నిల్వ చేయబడదు, కనుక ఖచ్చితమైన పాస్వర్డ్ ఏమిటనేది యాప్కు తెలియదు."</string> + <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"ఇది మీ స్క్రీన్ లాక్ పాస్వర్డ్ సంక్లిష్టత స్థాయి (తీవ్రంగా ఉండాలా, ఓ మోస్తరుగా ఉండాలా, తక్కువ తీవ్రంగా ఉండాలా లేదా అస్సలు తీవ్రత ఉండకూడదా) తెలుసుకోవడానికి యాప్ను అనుమతిస్తుంది, అంటే పొడుగు ఎంత ఉండాలి, ఏ రకమైన స్క్రీన్ లాక్ పధ్ధతి అనుసరించాలో సూచిస్తుంది. అలాగే, స్క్రీన్ లాక్ పాస్వర్డ్ సంక్లిష్టతను ఏ స్థాయికి సెట్ చేసుకుంటే బాగుంటుందో కూడా వినియోగదారులకు యాప్ సూచించగలదు, కానీ వినియోగదారులు నిరభ్యంతరంగా ఆ సూచనలను పట్టించుకోకుండా వారి ఇష్టం మేరకు చక్కగా సెట్ చేసుకోవచ్చు. ఇంకో ముఖ్య విషయం, స్క్రీన్ లాక్ అన్నది సాదా వచన రూపంలో స్టోరేజ్ చేయబడదు, కనుక ఖచ్చితమైన పాస్వర్డ్ ఏమిటనేది యాప్కు తెలియదు."</string> <string name="permlab_postNotification" msgid="4875401198597803658">"నోటిఫికేషన్లను చూపండి"</string> <string name="permdesc_postNotification" msgid="5974977162462877075">"నోటిఫికేషన్లను చూపించడానికి యాప్ను అనుమతించండి"</string> <string name="permlab_turnScreenOn" msgid="219344053664171492">"స్క్రీన్ను ఆన్ చేయండి"</string> @@ -709,7 +709,7 @@ </string-array> <string name="face_error_hw_not_available" msgid="5085202213036026288">"ముఖం ధృవీకరించలేరు. హార్డ్వేర్ అందుబాటులో లేదు."</string> <string name="face_error_timeout" msgid="2598544068593889762">"ఫేస్ అన్లాక్ను మళ్లీ ట్రై చేయండి"</string> - <string name="face_error_no_space" msgid="5649264057026021723">"కొత్త ముఖం డేటాను నిల్వ చేయడం కాదు. మొదట పాతది తొలిగించండి."</string> + <string name="face_error_no_space" msgid="5649264057026021723">"కొత్త ముఖం డేటాను స్టోరేజ్ చేయడం కాదు. మొదట పాతది తొలిగించండి."</string> <string name="face_error_canceled" msgid="2164434737103802131">"ముఖ యాక్టివిటీ రద్దయింది."</string> <string name="face_error_user_canceled" msgid="5766472033202928373">"ఫేస్ అన్లాక్ను యూజర్ రద్దు చేశారు"</string> <string name="face_error_lockout" msgid="7864408714994529437">"చాలా ఎక్కువ ప్రయత్నాలు చేశారు. తర్వాత మళ్లీ ప్రయత్నించండి."</string> @@ -734,8 +734,8 @@ <string name="permdesc_writeSyncSettings" msgid="6029151549667182687">"ఖాతా యొక్క సింక్ సెట్టింగ్లను ఎడిట్ చేయడానికి యాప్ను అనుమతిస్తుంది. ఉదాహరణకు, ఇది ఒక ఖాతాతో వ్యక్తుల యాప్ యొక్క సింక్ను ప్రారంభించడానికి ఉపయోగించబడవచ్చు."</string> <string name="permlab_readSyncStats" msgid="3747407238320105332">"సింక్ గణాంకాలను చదవగలగడం"</string> <string name="permdesc_readSyncStats" msgid="3867809926567379434">"ఖాతా యొక్క సింక్ గణాంకాలను అలాగే సింక్ ఈవెంట్ల హిస్టరీని మరియు ఎంత డేటా సింక్ చేయబడింది అనేవాటిని చదవడానికి యాప్ను అనుమతిస్తుంది."</string> - <string name="permlab_sdcardRead" msgid="5791467020950064920">"మీ షేర్ చేసిన నిల్వ యొక్క కంటెంట్లను చదువుతుంది"</string> - <string name="permdesc_sdcardRead" msgid="6872973242228240382">"మీ షేర్ చేసిన నిల్వ యొక్క కంటెంట్లను చదవడానికి యాప్ను అనుమతిస్తుంది."</string> + <string name="permlab_sdcardRead" msgid="5791467020950064920">"మీ షేర్ చేసిన స్టోరేజ్ యొక్క కంటెంట్లను చదువుతుంది"</string> + <string name="permdesc_sdcardRead" msgid="6872973242228240382">"మీ షేర్ చేసిన స్టోరేజ్ యొక్క కంటెంట్లను చదవడానికి యాప్ను అనుమతిస్తుంది."</string> <string name="permlab_readMediaAudio" msgid="8723513075731763810">"షేర్ చేయబడిన స్టోరేజ్ నుండి ఆడియో ఫైల్లను చదవండి"</string> <string name="permdesc_readMediaAudio" msgid="5299772574434619399">"మీ షేర్ చేయబడిన స్టోరేజ్ నుండి ఆడియో ఫైల్లను చదవడానికి యాప్ను అనుమతిస్తుంది."</string> <string name="permlab_readMediaVideo" msgid="7768003311260655007">"షేర్ చేయబడిన స్టోరేజ్ నుండి వీడియో ఫైల్లను చదవండి"</string> @@ -744,8 +744,8 @@ <string name="permdesc_readMediaImages" msgid="5836219373138469259">"మీ షేర్ చేయబడిన స్టోరేజ్ నుండి ఇమేజ్ ఫైల్లను చదవడానికి యాప్ను అనుమతిస్తుంది."</string> <string name="permlab_readVisualUserSelect" msgid="5516204215354667586">"షేర్ చేయబడిన స్టోరేజ్ నుండి యూజర్ ఎంచుకున్న ఇమేజ్ ఫైల్స్ను, వీడియో ఫైల్స్ను చదువుతుంది"</string> <string name="permdesc_readVisualUserSelect" msgid="8027174717714968217">"మీరు మీ షేర్ చేయబడిన స్టోరేజ్ నుండి ఎంచుకున్న ఇమేజ్, వీడియో ఫైల్స్ను చదవడానికి యాప్ను అనుమతిస్తుంది."</string> - <string name="permlab_sdcardWrite" msgid="4863021819671416668">"మీ షేర్ చేసిన నిల్వ యొక్క కంటెంట్లను ఎడిట్ చేయండి లేదా తొలగించండి"</string> - <string name="permdesc_sdcardWrite" msgid="8376047679331387102">"మీ షేర్ చేసిన నిల్వ యొక్క కంటెంట్లను రాయడానికి యాప్ను అనుమతిస్తుంది."</string> + <string name="permlab_sdcardWrite" msgid="4863021819671416668">"మీ షేర్ చేసిన స్టోరేజ్ యొక్క కంటెంట్లను ఎడిట్ చేయండి లేదా తొలగించండి"</string> + <string name="permdesc_sdcardWrite" msgid="8376047679331387102">"మీ షేర్ చేసిన స్టోరేజ్ యొక్క కంటెంట్లను రాయడానికి యాప్ను అనుమతిస్తుంది."</string> <string name="permlab_use_sip" msgid="8250774565189337477">"SIP కాల్స్ను చేయడానికి/స్వీకరించడానికి"</string> <string name="permdesc_use_sip" msgid="3590270893253204451">"SIP కాల్స్ను చేయడానికి మరియు స్వీకరించడానికి యాప్ను అనుమతిస్తుంది."</string> <string name="permlab_register_sim_subscription" msgid="1653054249287576161">"కొత్త టెలికామ్ SIM కనెక్షన్లను నమోదు చేయడం"</string> @@ -834,8 +834,8 @@ <string name="policydesc_setGlobalProxy" msgid="7149665222705519604">"విధానాన్ని ప్రారంభించినప్పుడు ఉపయోగించడానికి పరికర గ్లోబల్ ప్రాక్సీని సెట్ చేస్తుంది. పరికర యజమాని మాత్రమే గ్లోబల్ ప్రాక్సీని సెట్ చేయగలరు."</string> <string name="policylab_expirePassword" msgid="6015404400532459169">"స్క్రీన్ లాక్ పాస్వర్డ్ గడువు ముగింపుని సెట్ చేయండి"</string> <string name="policydesc_expirePassword" msgid="9136524319325960675">"స్క్రీన్ లాక్ పాస్వర్డ్, పిన్ లేదా నమూనాని తప్పనిసరిగా ఎంత తరచుగా మార్చాలనే దాన్ని మారుస్తుంది."</string> - <string name="policylab_encryptedStorage" msgid="9012936958126670110">"నిల్వ ఎన్క్రిప్షన్ను సెట్ చేయండి"</string> - <string name="policydesc_encryptedStorage" msgid="1102516950740375617">"నిల్వ చేయబడిన యాప్ డేటా గుప్తీకరించబడి ఉండటం అవసరం."</string> + <string name="policylab_encryptedStorage" msgid="9012936958126670110">"స్టోరేజ్ ఎన్క్రిప్షన్ను సెట్ చేయండి"</string> + <string name="policydesc_encryptedStorage" msgid="1102516950740375617">"స్టోరేజ్ చేయబడిన యాప్ డేటా గుప్తీకరించబడి ఉండటం అవసరం."</string> <string name="policylab_disableCamera" msgid="5749486347810162018">"కెమెరాలను నిలిపివేయండి"</string> <string name="policydesc_disableCamera" msgid="3204405908799676104">"అన్ని పరికర కెమెరాల వినియోగాన్ని నిరోధించండి."</string> <string name="policylab_disableKeyguardFeatures" msgid="5071855750149949741">"కొన్ని స్క్రీన్ లాక్ ఫీచర్లు నిలిపివేయండి"</string> @@ -1164,9 +1164,9 @@ <string name="editTextMenuTitle" msgid="857666911134482176">"వచనానికి సంబంధించిన చర్యలు"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"వెనుకకు"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ఇన్పుట్ విధానాన్ని మార్చండి"</string> - <string name="low_internal_storage_view_title" msgid="9024241779284783414">"నిల్వ ఖాళీ అయిపోతోంది"</string> + <string name="low_internal_storage_view_title" msgid="9024241779284783414">"స్టోరేజ్ ఖాళీ అయిపోతోంది"</string> <string name="low_internal_storage_view_text" msgid="8172166728369697835">"కొన్ని సిస్టమ్ కార్యాచరణలు పని చేయకపోవచ్చు"</string> - <string name="low_internal_storage_view_text_no_boot" msgid="7368968163411251788">"సిస్టమ్ కోసం తగినంత నిల్వ లేదు. మీకు 250MB ఖాళీ స్థలం ఉందని నిర్ధారించుకుని, పునఃప్రారంభించండి."</string> + <string name="low_internal_storage_view_text_no_boot" msgid="7368968163411251788">"సిస్టమ్ కోసం తగినంత స్టోరేజ్ లేదు. మీకు 250MB ఖాళీ స్థలం ఉందని నిర్ధారించుకుని, పునఃప్రారంభించండి."</string> <string name="app_running_notification_title" msgid="8985999749231486569">"<xliff:g id="APP_NAME">%1$s</xliff:g> అమలులో ఉంది"</string> <string name="app_running_notification_text" msgid="5120815883400228566">"మరింత సమాచారం కోసం లేదా యాప్ను ఆపివేయడం కోసం నొక్కండి."</string> <string name="ok" msgid="2646370155170753815">"సరే"</string> @@ -1431,7 +1431,7 @@ <string name="ext_media_badremoval_notification_title" msgid="4114625551266196872">"<xliff:g id="NAME">%s</xliff:g> ఊహించని విధంగా తీసివేయబడింది"</string> <string name="ext_media_badremoval_notification_message" msgid="1986514704499809244">"కంటెంట్ని కోల్పోవడాన్ని నివారించాలంటే తీసివేయబోయే ముందు మీడియాని తొలగించండి"</string> <string name="ext_media_nomedia_notification_title" msgid="742671636376975890">"<xliff:g id="NAME">%s</xliff:g> తీసివేయబడింది"</string> - <string name="ext_media_nomedia_notification_message" msgid="2832724384636625852">"కొంత నిర్వాహక ప్రక్రియ సరిగ్గా పని చేయకపోవచ్చు. కొత్త నిల్వని చొప్పించండి."</string> + <string name="ext_media_nomedia_notification_message" msgid="2832724384636625852">"కొంత నిర్వాహక ప్రక్రియ సరిగ్గా పని చేయకపోవచ్చు. కొత్త స్టోరేజ్ను చొప్పించండి."</string> <string name="ext_media_unmounting_notification_title" msgid="4147986383917892162">"<xliff:g id="NAME">%s</xliff:g>ని తొలగిస్తోంది"</string> <string name="ext_media_unmounting_notification_message" msgid="5717036261538754203">"తీసివేయవద్దు"</string> <string name="ext_media_init_action" msgid="2312974060585056709">"సెటప్ చేయండి"</string> @@ -1582,7 +1582,7 @@ <string name="storage_sd_card_label" msgid="7526153141147470509">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD కార్డ్"</string> <string name="storage_usb_drive" msgid="448030813201444573">"USB డ్రైవ్"</string> <string name="storage_usb_drive_label" msgid="6631740655876540521">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB డ్రైవ్"</string> - <string name="storage_usb" msgid="2391213347883616886">"USB నిల్వ"</string> + <string name="storage_usb" msgid="2391213347883616886">"USB స్టోరేజ్"</string> <string name="extract_edit_menu_button" msgid="63954536535863040">"ఎడిట్ చేయండి"</string> <string name="data_usage_warning_title" msgid="9034893717078325845">"డేటా హెచ్చరిక"</string> <string name="data_usage_warning_body" msgid="1669325367188029454">"మీరు డేటాలో <xliff:g id="APP">%s</xliff:g> ఉపయోగించారు"</string> @@ -2010,7 +2010,7 @@ <string name="app_category_maps" msgid="6395725487922533156">"మ్యాప్స్ & నావిగేషన్"</string> <string name="app_category_productivity" msgid="1844422703029557883">"ఉత్పాదకత"</string> <string name="app_category_accessibility" msgid="6643521607848547683">"యాక్సెసిబిలిటీ"</string> - <string name="device_storage_monitor_notification_channel" msgid="5164244565844470758">"పరికర నిల్వ"</string> + <string name="device_storage_monitor_notification_channel" msgid="5164244565844470758">"పరికర స్టోరేజ్"</string> <string name="adb_debugging_notification_channel_tv" msgid="4764046459631031496">"USB డీబగ్గింగ్"</string> <string name="time_picker_hour_label" msgid="4208590187662336864">"గంట"</string> <string name="time_picker_minute_label" msgid="8307452311269824553">"నిమిషం"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index edf482ed8e34..8ad1c693b92e 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1495,7 +1495,7 @@ <string name="forward_intent_to_work" msgid="3620262405636021151">"Ви використовуєте цей додаток у своєму робочому профілі"</string> <string name="input_method_binding_label" msgid="1166731601721983656">"Метод введення"</string> <string name="sync_binding_label" msgid="469249309424662147">"Синхр."</string> - <string name="accessibility_binding_label" msgid="1974602776545801715">"Спеціальні можливості"</string> + <string name="accessibility_binding_label" msgid="1974602776545801715">"Доступність"</string> <string name="wallpaper_binding_label" msgid="1197440498000786738">"Фоновий мал."</string> <string name="chooser_wallpaper" msgid="3082405680079923708">"Змінити фоновий малюнок"</string> <string name="notification_listener_binding_label" msgid="2702165274471499713">"Сервіс читання сповіщень"</string> @@ -1703,8 +1703,8 @@ <string name="accessibility_shortcut_off" msgid="3651336255403648739">"Не вмикати"</string> <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"УВІМК."</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"ВИМК."</string> - <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Надати сервісу <xliff:g id="SERVICE">%1$s</xliff:g> повний доступ до вашого пристрою?"</string> - <string name="accessibility_service_warning_description" msgid="291674995220940133">"Повний доступ доречний для додатків, які надають спеціальні можливості, але його не варто відкривати для більшості інших додатків."</string> + <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Надати сервісу \"<xliff:g id="SERVICE">%1$s</xliff:g>\" повний доступ до вашого пристрою?"</string> + <string name="accessibility_service_warning_description" msgid="291674995220940133">"Повний доступ потрібен додаткам, які підтримують функції доступності, але його не варто відкривати для більшості інших додатків."</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Перегляд і контроль екрана"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Цей сервіс може переглядати всі дані на екрані й показувати контент поверх інших додатків."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Перегляд і виконання дій"</string> @@ -2011,7 +2011,7 @@ <string name="app_category_news" msgid="1172762719574964544">"Новини та журнали"</string> <string name="app_category_maps" msgid="6395725487922533156">"Карти й навігація"</string> <string name="app_category_productivity" msgid="1844422703029557883">"Продуктивність"</string> - <string name="app_category_accessibility" msgid="6643521607848547683">"Спеціальні можливості"</string> + <string name="app_category_accessibility" msgid="6643521607848547683">"Доступність"</string> <string name="device_storage_monitor_notification_channel" msgid="5164244565844470758">"Пам’ять пристрою"</string> <string name="adb_debugging_notification_channel_tv" msgid="4764046459631031496">"Налагодження USB"</string> <string name="time_picker_hour_label" msgid="4208590187662336864">"години"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 9a1e5c1188fc..09b3f49d038c 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"ہولڈر کو ایپ کے لیے خصوصیات کی معلومات دیکھنے کی اجازت دیتا ہے۔"</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"نمونہ کاری کی اعلی شرح پر سینسر کے ڈیٹا تک رسائی حاصل کریں"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"ایپ کو Hz200 سے زیادہ شرح پر سینسر ڈیٹا کا نمونہ لینے کی اجازت دیتی ہے"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"صارف کی کارروائی کے بغیر ایپ کو اپ ڈیٹ کرنا"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"ہولڈر کو صارف کی کارروائی کے بغیر اپنی پہلے انسٹال کردہ ایپ کو اپ ڈیٹ کرنے کی اجازت دیتا ہے"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"پاس ورڈ کے اصول سیٹ کریں"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"اسکرین لاک پاس ورڈز اور PINs میں اجازت یافتہ لمبائی اور حروف کو کنٹرول کریں۔"</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"اسکرین غیر مقفل کرنے کی کوششیں مانیٹر کریں"</string> @@ -962,12 +960,12 @@ <string name="keyguard_password_enter_password_code" msgid="2751130557661643482">"غیر مقفل کرنے کیلئے پاس ورڈ ٹائپ کریں"</string> <string name="keyguard_password_enter_pin_password_code" msgid="7792964196473964340">"غیر مقفل کرنے کیلئے PIN ٹائپ کریں"</string> <string name="keyguard_password_wrong_pin_code" msgid="8583732939138432793">"غلط PIN کوڈ۔"</string> - <string name="keyguard_label_text" msgid="3841953694564168384">"غیر مقفل کرنے کیلئے، مینو پھر 0 دبائیں۔"</string> + <string name="keyguard_label_text" msgid="3841953694564168384">"غیر مقفل کرنے کیلئے، مینیو پھر 0 دبائیں۔"</string> <string name="emergency_call_dialog_number_for_display" msgid="2978165477085612673">"ہنگامی نمبر"</string> <string name="lockscreen_carrier_default" msgid="6192313772955399160">"کوئی سروس نہیں ہے"</string> <string name="lockscreen_screen_locked" msgid="7364905540516041817">"اسکرین مقفل ہے۔"</string> - <string name="lockscreen_instructions_when_pattern_enabled" msgid="7982445492532123308">"غیر مقفل کرنے کیلئے مینو دبائیں یا ہنگامی کال کریں۔"</string> - <string name="lockscreen_instructions_when_pattern_disabled" msgid="7434061749374801753">"غیر مقفل کرنے کیلئے مینو دبائیں۔"</string> + <string name="lockscreen_instructions_when_pattern_enabled" msgid="7982445492532123308">"غیر مقفل کرنے کیلئے مینیو دبائیں یا ہنگامی کال کریں۔"</string> + <string name="lockscreen_instructions_when_pattern_disabled" msgid="7434061749374801753">"غیر مقفل کرنے کیلئے مینیو دبائیں۔"</string> <string name="lockscreen_pattern_instructions" msgid="3169991838169244941">"غیر مقفل کرنے کیلئے پیٹرن کو ڈرا کریں"</string> <string name="lockscreen_emergency_call" msgid="7500692654885445299">"ہنگامی"</string> <string name="lockscreen_return_to_call" msgid="3156883574692006382">"کال پر واپس جائیں"</string> @@ -1076,7 +1074,7 @@ <string name="permdesc_addVoicemail" msgid="5470312139820074324">"ایپ کو آپ کے صوتی میل کے ان باکس میں پیغامات شامل کرنے کی اجازت دیتا ہے۔"</string> <string name="pasted_from_clipboard" msgid="7355790625710831847">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> نے آپ کے کلپ بورڈ سے پپیسٹ کر دیا"</string> <string name="more_item_label" msgid="7419249600215749115">"مزید"</string> - <string name="prepend_shortcut_label" msgid="1743716737502867951">"مینو+"</string> + <string name="prepend_shortcut_label" msgid="1743716737502867951">"مینیو+"</string> <string name="menu_meta_shortcut_label" msgid="1623390163674762478">"Meta+"</string> <string name="menu_ctrl_shortcut_label" msgid="131911133027196485">"Ctrl+"</string> <string name="menu_alt_shortcut_label" msgid="343761069945250991">"Alt+"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index e18e7b1bd38d..27f6329d0a60 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -141,7 +141,7 @@ <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="7178561009225028264">"Wi-Fi chaqiruv"</string> <string name="wfcSpnFormat_vowifi" msgid="8371335230890725606">"VoWi-Fi"</string> <string name="wfcSpnFormat_wifi_call" msgid="434016592539090004">"Wi-Fi chaqiruv"</string> - <string name="wifi_calling_off_summary" msgid="5626710010766902560">"Yoqilmagan"</string> + <string name="wifi_calling_off_summary" msgid="5626710010766902560">"Oʻchiq"</string> <string name="wfc_mode_wifi_preferred_summary" msgid="1035175836270943089">"Wi-Fi orqali chaqiruv"</string> <string name="wfc_mode_cellular_preferred_summary" msgid="4958965609212575619">"Mobil tarmoq orqali chaqiruv"</string> <string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Faqat Wi-Fi"</string> @@ -1493,7 +1493,7 @@ <string name="forward_intent_to_work" msgid="3620262405636021151">"Siz ushbu ilovadan ishchi profilingizda foydalanmoqdasiz"</string> <string name="input_method_binding_label" msgid="1166731601721983656">"Kiritish uslubi"</string> <string name="sync_binding_label" msgid="469249309424662147">"Sinx"</string> - <string name="accessibility_binding_label" msgid="1974602776545801715">"Maxsus imkoniyatlar"</string> + <string name="accessibility_binding_label" msgid="1974602776545801715">"Qulayliklar"</string> <string name="wallpaper_binding_label" msgid="1197440498000786738">"Fon rasmi"</string> <string name="chooser_wallpaper" msgid="3082405680079923708">"Fon rasmini almashtirish"</string> <string name="notification_listener_binding_label" msgid="2702165274471499713">"Bildirishnoma tinglovchisi"</string> @@ -1691,12 +1691,12 @@ <string name="csd_entering_RS2_warning" product="default" msgid="3699509945325496807">"Uzoq vaqt davomida bunday balandlikda media fayllarni tinglash eshitish qobiliyatingiz buzilishiga olib kelishi mumkin.\n\nUzoq vaqt davomida bu darajada ijroni davom ettirish eshitishingizga zarar yetkazishi mumkin."</string> <string name="csd_momentary_exposure_warning" product="default" msgid="7861896191081176454">"Ogohlantirish\nHozir xavfli darajada baland ovozli kontentni tinglayapsiz.\n\nBu baland tovushda tinglashda davom etsangiz, eshitish qobiliyatingiz butunlay buziladi."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Tezkor ishga tushirishdan foydalanilsinmi?"</string> - <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"Maxsus imkoniyatlar funksiyasidan foydalanish uchun u yoniqligida ikkala tovush tugmasini 3 soniya bosib turing."</string> - <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"Maxsus imkoniyatlar uchun tezkor tugma yoqilsinmi?"</string> - <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"Maxsus imkoniyatlarni yoqish uchun ikkala tovush tugmalarini bir necha soniya bosib turing. Qurilmangiz ishlashida oʻzgarish yuz berishi mumkin.\n\nJoriy funksiyalar:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nTanlangan funksiyalarni Sozlamalar ichidagi Maxsus imkoniyatlar ustiga bosib oʻzgartirishingiz mumkin."</string> + <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"Qulayliklar funksiyasidan foydalanish uchun u yoniqligida ikkala tovush tugmasini 3 soniya bosib turing."</string> + <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"Qulayliklar uchun tezkor tugma yoqilsinmi?"</string> + <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"Qulayliklarni yoqish uchun ikkala tovush tugmalarini bir necha soniya bosib turing. Qurilmangiz ishlashida oʻzgarish yuz berishi mumkin.\n\nJoriy funksiyalar:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nTanlangan funksiyalarni Sozlamalar ichidagi Qulayliklar ustiga bosib oʻzgartirishingiz mumkin."</string> <string name="accessibility_shortcut_multiple_service_list" msgid="2128323171922023762">" • <xliff:g id="SERVICE">%1$s</xliff:g>\n"</string> <string name="accessibility_shortcut_single_service_warning_title" msgid="1909518473488345266">"<xliff:g id="SERVICE">%1$s</xliff:g> tezkor tugmasi yoqilsinmi?"</string> - <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"<xliff:g id="SERVICE">%1$s</xliff:g> funksiyasini yoqish uchun ikkala tovush tugmalarini bir necha soniya bosib turing. Qurilmangiz ishlashida oʻzgarish yuz berishi mumkin.\n\nBu tezkor tugmalarni boshqa funksiyaga Sozlamalar ichidagi Maxsus imkoniyatlar orqali tayinlash mumkin."</string> + <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"<xliff:g id="SERVICE">%1$s</xliff:g> funksiyasini yoqish uchun ikkala tovush tugmalarini bir necha soniya bosib turing. Qurilmangiz ishlashida oʻzgarish yuz berishi mumkin.\n\nBu tezkor tugmalarni boshqa funksiyaga Sozlamalar ichidagi Qulayliklar orqali tayinlash mumkin."</string> <string name="accessibility_shortcut_on" msgid="5463618449556111344">"Yoqilsin"</string> <string name="accessibility_shortcut_off" msgid="3651336255403648739">"Yoqilmasin"</string> <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"YONIQ"</string> @@ -1710,7 +1710,7 @@ <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Ruxsat"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Rad etish"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"Kerakli funksiyani tanlang"</string> - <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"Maxsus imkoniyatlar tugmasi bilan foydalanish uchun funksiyalarni tanlang"</string> + <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"Qulayliklar tugmasi bilan foydalanish uchun funksiyalarni tanlang"</string> <string name="accessibility_edit_shortcut_menu_volume_title" msgid="1077294237378645981">"Tovush tugmasi bilan ishga tushiriladigan funksiyalarni tanlang"</string> <string name="accessibility_uncheck_legacy_item_warning" msgid="8047830891064817447">"<xliff:g id="SERVICE_NAME">%s</xliff:g> faolsizlantirildi"</string> <string name="edit_accessibility_shortcut_menu_button" msgid="8885752738733772935">"Tezkor tugmalarni tahrirlash"</string> @@ -1725,9 +1725,9 @@ <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Tovush tugmalari bosib turildi. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> yoqildi."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"Tovush tugmalari bosib turildi. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> faolsizlantirildi."</string> <string name="accessibility_shortcut_spoken_feedback" msgid="3760999147597564314">"Tovush tugmalarini qoʻyib yuboring. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> xizmatini yoqish uchun ikkala tovush tugmasini 3 soniya bosib turing."</string> - <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"Maxsus imkoniyatlar tugmasi bosilganda ishga tushadigan funksiyani tanlang:"</string> - <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"Maxsus imkoniyatlar ishorasi bilan ishga tushadigan funksiyani tanlang (ikkita barmoq bilan ekranning pastidan tepaga surib tortilganda):"</string> - <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"Maxsus imkoniyatlar ishorasi bilan ishga tushadigan funksiyani tanlang (uchta barmoq bilan ekranning pastidan tepaga surib tortilganda):"</string> + <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"Qulayliklar tugmasi bosilganda ishga tushadigan funksiyani tanlang:"</string> + <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"Qulayliklar ishorasi bilan ishga tushadigan funksiyani tanlang (ikkita barmoq bilan ekranning pastidan tepaga surib tortilganda):"</string> + <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"Qulayliklar ishorasi bilan ishga tushadigan funksiyani tanlang (uchta barmoq bilan ekranning pastidan tepaga surib tortilganda):"</string> <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"Funksiyalarni almashtirish uchun maxsus imkoniyatlar tugmasini bosib turing."</string> <string name="accessibility_gesture_instructional_text" msgid="9196230728837090497">"Funksiyalarni almashtirish uchun ikkita barmoq bilan tepaga suring va ushlab turing."</string> <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"Funksiyalarni almashtirish uchun uchta barmoq bilan tepaga suring va ushlab turing."</string> @@ -2009,7 +2009,7 @@ <string name="app_category_news" msgid="1172762719574964544">"Yangiliklar va jurnallar"</string> <string name="app_category_maps" msgid="6395725487922533156">"Xaritalar va navigatsiya"</string> <string name="app_category_productivity" msgid="1844422703029557883">"Ish va unumdorlik"</string> - <string name="app_category_accessibility" msgid="6643521607848547683">"Maxsus imkoniyatlar"</string> + <string name="app_category_accessibility" msgid="6643521607848547683">"Qulayliklar"</string> <string name="device_storage_monitor_notification_channel" msgid="5164244565844470758">"Qurilma xotirasi"</string> <string name="adb_debugging_notification_channel_tv" msgid="4764046459631031496">"USB orqali nosozliklarni aniqlash"</string> <string name="time_picker_hour_label" msgid="4208590187662336864">"soat"</string> @@ -2134,7 +2134,7 @@ <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Bu ilovaga yozib olish ruxsati berilmagan, lekin shu USB orqali ovozlarni yozib olishi mumkin."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Bosh sahifa"</string> <string name="accessibility_system_action_back_label" msgid="4205361367345537608">"Orqaga"</string> - <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Yaqinda ishlatilgan ilovalar"</string> + <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Oxirgi ilovalar"</string> <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Bildirishnomalar"</string> <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Tezkor sozlamalar"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Quvvat muloqot oynasi"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 60fcea8178cc..c7311bda3220 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"允許擁有者開始查看應用程式的功能資料。"</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"以高取樣率存取感應器資料"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"允許應用程式以大於 200 Hz 的頻率對感應器資料進行取樣"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"更新應用程式，無需使用者操作"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"允許擁有者更新先前安裝的應用程式，無需使用者操作"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"設定密碼規則"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"控制螢幕鎖定密碼和 PIN 所允許的長度和字元。"</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"監控螢幕解鎖嘗試次數"</string> @@ -1701,7 +1699,7 @@ <string name="accessibility_shortcut_off" msgid="3651336255403648739">"不要開啟"</string> <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"開啟"</string> <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"關閉"</string> - <string name="accessibility_enable_service_title" msgid="3931558336268541484">"允許 <xliff:g id="SERVICE">%1$s</xliff:g> 完全控制您的裝置？"</string> + <string name="accessibility_enable_service_title" msgid="3931558336268541484">"要授予「<xliff:g id="SERVICE">%1$s</xliff:g>」裝置的完整控制權？"</string> <string name="accessibility_service_warning_description" msgid="291674995220940133">"對於為您提供無障礙功能的應用程式，您可授予完整控制權，但大部分應用程式都不應獲授予此權限。"</string> <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"查看和控制螢幕"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"這項功能可以讀出螢幕上的所有內容，並透過其他應用程式顯示內容。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 0a93c82f728b..ca8ac36fcc10 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"允許具有這項權限的應用程式開始查看其他應用程式的功能資訊。"</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"以高取樣率存取感應器資料"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"允許應用程式以高於 200 Hz 的頻率對感應器資料進行取樣"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"自動更新應用程式 (使用者不必操作)"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"允許容器更新先前安裝的應用程式，使用者不必操作"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"設定密碼規則"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"管理螢幕鎖定密碼和 PIN 碼支援的字元和長度上限。"</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"監控螢幕解鎖嘗試次數"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index b8f4e14d6ce6..fe38bd2223c3 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -800,10 +800,8 @@ <string name="permdesc_startViewAppFeatures" msgid="7207240860165206107">"Vumela isibambi ukuthi siqale ukubuka ulwazi lwezakhi lwe-app."</string> <string name="permlab_highSamplingRateSensors" msgid="3941068435726317070">"finyelela idatha yenzwa ngenani eliphezulu lokwenza isampuli"</string> <string name="permdesc_highSamplingRateSensors" msgid="8430061978931155995">"Ivumela uhlelo lokusebenza lusampule idatha yenzwa ngenani elikhulu kuno-200 Hz"</string> - <!-- no translation found for permlab_updatePackagesWithoutUserAction (3363272609642618551) --> - <skip /> - <!-- no translation found for permdesc_updatePackagesWithoutUserAction (4567739631260526366) --> - <skip /> + <string name="permlab_updatePackagesWithoutUserAction" msgid="3363272609642618551">"buyekeza i-app ngaphandle kwesenzo somsebenzisi"</string> + <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Ivumela obambile ukuthi abuyekeze i-app ayifake ngaphambilini ngaphandle kwesenzo somsebenzisi"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Misa imithetho yephasiwedi"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Lawula ubude nezinhlamvu ezivunyelwe kumaphasiwedi wokukhiya isikrini nama-PIN."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Qapha imizamo yokuvula isikrini sakho"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ef19fc1f5360..e4d74b5373e0 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -680,6 +680,20 @@ rotation. --> <bool name="config_windowManagerHalfFoldAutoRotateOverride">false</bool> + <!-- Indicates whether the window manager pauses autorotation when folding or unfolding + a foldable device based on hinge angle sensor events and physical display switch events. --> + <bool name="config_windowManagerPauseRotationWhenUnfolding">false</bool> + + <!-- Amount of time during which autorotation will be disabled since last hinge angle event --> + <integer name="config_pauseRotationWhenUnfolding_maxHingeAngle">0</integer> + + <!-- Maximum hinge angle event to be considered to disable autorotation when folding or + unfolding --> + <integer name="config_pauseRotationWhenUnfolding_hingeEventTimeout">0</integer> + + <!-- Amount of time during which autorotation will be disabled since last display switch --> + <integer name="config_pauseRotationWhenUnfolding_displaySwitchTimeout">0</integer> + <!-- When a device enters any of these states, it should be woken up. States are defined in device_state_configuration.xml. --> <integer-array name="config_deviceStatesOnWhichToWakeUp"> @@ -4447,7 +4461,8 @@ See android.credentials.CredentialManager --> - <string name="config_defaultCredentialProviderService" translatable="false"></string> + <string-array name="config_defaultCredentialProviderService" translatable="false"> + </string-array> <!-- The package name for the system's smartspace service. This service returns smartspace results. @@ -6052,6 +6067,12 @@ <!-- Wear OS: the name of the main activity of the device's sysui. --> <string name="config_wearSysUiMainActivity" translatable="false"/> + <!-- Wear OS: the name of the package containing the Media Controls Activity. --> + <string name="config_wearMediaControlsPackage" translatable="false"/> + + <!-- Wear OS: the name of the package containing the Media Sessions APK. --> + <string name="config_wearMediaSessionsPackage" translatable="false"/> + <bool name="config_secondaryBuiltInDisplayIsRound">@bool/config_windowIsRound</bool> <!-- The display round config for each display in a multi-display device. --> @@ -6296,10 +6317,6 @@ --> <integer name="config_deviceStateRearDisplay">-1</integer> - <!-- Whether the lock screen is allowed to run its own live wallpaper, - different from the home screen wallpaper. --> - <bool name="config_independentLockscreenLiveWallpaper">false</bool> - <!-- Device state that corresponds to concurrent display mode where the default display is the internal display. Public API for the feature is provided through Jetpack WindowManager. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 3ee8af2842bf..82314072fbac 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5369,15 +5369,11 @@ <string name="app_suspended_unsuspend_message">Unpause app</string> <!-- Title of a dialog. This text is confirming that the user wants to turn on access to their work apps, which the user had previously paused. "Work" is an adjective. [CHAR LIMIT=30] --> - <string name="work_mode_off_title">Turn on work apps?</string> - <!-- Text in a dialog. This text is confirming that the user wants to turn on access to their work apps and notifications, which the user had previously paused. "Work" is an adjective. [CHAR LIMIT=NONE] --> - <string name="work_mode_off_message">Get access to your work apps and notifications</string> - <!-- Title for button to turn on work profile. [CHAR LIMIT=NONE] --> - <string name="work_mode_turn_on">Turn on</string> + <string name="work_mode_off_title">Unpause work apps?</string> + <!-- Title for button to unpause on work profile. [CHAR LIMIT=NONE] --> + <string name="work_mode_turn_on">Unpause</string> <!-- Title for button to launch the personal safety app to make an emergency call --> <string name="work_mode_emergency_call_button">Emergency</string> - <!-- Text shown in a dialog when the user tries to launch a disabled work profile app when work apps are paused--> - <string name="work_mode_dialer_off_message">Get access to your work apps and calls</string> <!-- Title of the dialog that is shown when the user tries to launch a blocked application [CHAR LIMIT=50] --> <string name="app_blocked_title">App is not available</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 8855d5b3de25..c6c1c8f120d7 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3138,7 +3138,6 @@ <!-- Work profile unlaunchable app alert dialog--> <java-symbol type="style" name="AlertDialogWithEmergencyButton"/> - <java-symbol type="string" name="work_mode_dialer_off_message" /> <java-symbol type="string" name="work_mode_emergency_call_button" /> <java-symbol type="string" name="work_mode_off_title" /> <java-symbol type="string" name="work_mode_off_message" /> @@ -3754,7 +3753,7 @@ <java-symbol type="string" name="config_defaultAppPredictionService" /> <java-symbol type="string" name="config_defaultContentSuggestionsService" /> <java-symbol type="string" name="config_defaultCredentialManagerHybridService" /> - <java-symbol type="string" name="config_defaultCredentialProviderService" /> + <java-symbol type="array" name="config_defaultCredentialProviderService" /> <java-symbol type="string" name="config_defaultSearchUiService" /> <java-symbol type="string" name="config_defaultSmartspaceService" /> <java-symbol type="string" name="config_defaultWallpaperEffectsGenerationService" /> @@ -4017,6 +4016,10 @@ <java-symbol type="array" name="config_halfFoldedDeviceStates" /> <java-symbol type="array" name="config_rearDisplayDeviceStates" /> <java-symbol type="bool" name="config_windowManagerHalfFoldAutoRotateOverride" /> + <java-symbol type="bool" name="config_windowManagerPauseRotationWhenUnfolding" /> + <java-symbol type="integer" name="config_pauseRotationWhenUnfolding_hingeEventTimeout" /> + <java-symbol type="integer" name="config_pauseRotationWhenUnfolding_maxHingeAngle" /> + <java-symbol type="integer" name="config_pauseRotationWhenUnfolding_displaySwitchTimeout" /> <java-symbol type="array" name="config_deviceStatesOnWhichToWakeUp" /> <java-symbol type="array" name="config_deviceStatesOnWhichToSleep" /> <java-symbol type="string" name="config_foldedArea" /> @@ -4861,6 +4864,8 @@ <java-symbol type="string" name="config_wearSysUiPackage"/> <java-symbol type="string" name="config_wearSysUiMainActivity"/> + <java-symbol type="string" name="config_wearMediaControlsPackage"/> + <java-symbol type="string" name="config_wearMediaSessionsPackage"/> <java-symbol type="string" name="config_defaultQrCodeComponent"/> <java-symbol type="dimen" name="secondary_rounded_corner_radius" /> @@ -4956,7 +4961,6 @@ <java-symbol type="string" name="concurrent_display_notification_power_save_content"/> <java-symbol type="string" name="device_state_notification_turn_off_button"/> <java-symbol type="string" name="device_state_notification_settings_button"/> - <java-symbol type="bool" name="config_independentLockscreenLiveWallpaper"/> <java-symbol type="integer" name="config_deviceStateConcurrentRearDisplay" /> <java-symbol type="string" name="config_rearDisplayPhysicalAddress" /> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index a64bb21ad53a..e59b2597722f 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -4034,47 +4034,47 @@ easier. <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> + <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> - <item name="materialColorErrorContainer">@color/system_error_container_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorErrorContainer">@color/system_error_container_light</item> <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> + <item name="materialColorPrimaryInverse">@color/system_primary_light</item> <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorSurfaceInverse">@color/system_surface_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> - <item name="materialColorOnBackground">@color/system_on_background_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorOnBackground">@color/system_on_background_light</item> <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> - <item name="materialColorSecondary">@color/system_secondary_dark</item> - <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> - <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> - <item name="materialColorOutline">@color/system_outline_dark</item> - <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorOnError">@color/system_on_error_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOutline">@color/system_outline_light</item> + <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> </style> @@ -4114,47 +4114,47 @@ easier. <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> + <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> - <item name="materialColorErrorContainer">@color/system_error_container_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorErrorContainer">@color/system_error_container_light</item> <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> + <item name="materialColorPrimaryInverse">@color/system_primary_light</item> <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorSurfaceInverse">@color/system_surface_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> - <item name="materialColorOnBackground">@color/system_on_background_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorOnBackground">@color/system_on_background_light</item> <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> - <item name="materialColorSecondary">@color/system_secondary_dark</item> - <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> - <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> - <item name="materialColorOutline">@color/system_outline_dark</item> - <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorOnError">@color/system_on_error_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOutline">@color/system_outline_light</item> + <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> </style> @@ -4186,47 +4186,47 @@ easier. <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> + <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> - <item name="materialColorErrorContainer">@color/system_error_container_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorErrorContainer">@color/system_error_container_light</item> <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> + <item name="materialColorPrimaryInverse">@color/system_primary_light</item> <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorSurfaceInverse">@color/system_surface_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> - <item name="materialColorOnBackground">@color/system_on_background_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorOnBackground">@color/system_on_background_light</item> <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> - <item name="materialColorSecondary">@color/system_secondary_dark</item> - <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> - <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> - <item name="materialColorOutline">@color/system_outline_dark</item> - <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorOnError">@color/system_on_error_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOutline">@color/system_outline_light</item> + <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> </style> @@ -4357,47 +4357,47 @@ easier. <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> + <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> - <item name="materialColorErrorContainer">@color/system_error_container_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorErrorContainer">@color/system_error_container_light</item> <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> + <item name="materialColorPrimaryInverse">@color/system_primary_light</item> <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorSurfaceInverse">@color/system_surface_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> - <item name="materialColorOnBackground">@color/system_on_background_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorOnBackground">@color/system_on_background_light</item> <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> - <item name="materialColorSecondary">@color/system_secondary_dark</item> - <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> - <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> - <item name="materialColorOutline">@color/system_outline_dark</item> - <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorOnError">@color/system_on_error_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOutline">@color/system_outline_light</item> + <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> </style> diff --git a/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java b/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java index 980211fe4cc8..316c70c45fb4 100644 --- a/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java +++ b/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java @@ -25,7 +25,8 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Activity; import android.compat.testing.PlatformCompatChangeRule; import android.os.Bundle; -import android.platform.test.annotations.Presubmit; +import android.platform.test.annotations.IwTest; +import android.platform.test.annotations.Postsubmit; import android.provider.Settings; import android.util.PollingCheck; import android.view.View; @@ -59,7 +60,7 @@ import java.util.concurrent.atomic.AtomicReference; */ @RunWith(AndroidJUnit4.class) @LargeTest -@Presubmit +@Postsubmit public class FontScaleConverterActivityTest { @Rule public ActivityScenarioRule<TestActivity> rule = new ActivityScenarioRule<>(TestActivity.class); @@ -84,6 +85,7 @@ public class FontScaleConverterActivityTest { } } + @IwTest(focusArea = "accessibility") @Test public void testFontsScaleNonLinearly() { final ActivityScenario<TestActivity> scenario = rule.getScenario(); @@ -114,6 +116,7 @@ public class FontScaleConverterActivityTest { ))); } + @IwTest(focusArea = "accessibility") @Test public void testOnConfigurationChanged_doesNotCrash() { final ActivityScenario<TestActivity> scenario = rule.getScenario(); @@ -127,6 +130,7 @@ public class FontScaleConverterActivityTest { }); } + @IwTest(focusArea = "accessibility") @Test public void testUpdateConfiguration_doesNotCrash() { final ActivityScenario<TestActivity> scenario = rule.getScenario(); diff --git a/core/tests/coretests/src/android/content/res/TEST_MAPPING b/core/tests/coretests/src/android/content/res/TEST_MAPPING index 4ea6e40a7225..ab14950891c3 100644 --- a/core/tests/coretests/src/android/content/res/TEST_MAPPING +++ b/core/tests/coretests/src/android/content/res/TEST_MAPPING @@ -39,5 +39,18 @@ } ] } + ], + "ironwood-postsubmit": [ + { + "name": "FrameworksCoreTests", + "options":[ + { + "include-annotation": "android.platform.test.annotations.IwTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } ] } diff --git a/core/tests/coretests/src/android/provider/DeviceConfigServiceManagerTest.java b/core/tests/coretests/src/android/provider/DeviceConfigServiceManagerTest.java new file mode 100644 index 000000000000..e20258a625dd --- /dev/null +++ b/core/tests/coretests/src/android/provider/DeviceConfigServiceManagerTest.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.provider; + +import static com.google.common.truth.Truth.assertThat; + +import static org.junit.Assert.assertThrows; +import static org.junit.Assume.assumeTrue; + +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Class that tests the APIs of DeviceConfigServiceManager.ServiceRegisterer. + */ +@Presubmit +@RunWith(AndroidJUnit4.class) +@SmallTest +public class DeviceConfigServiceManagerTest { + + private static final String SERVICE_NAME = "device_config_updatable"; + private DeviceConfigServiceManager.ServiceRegisterer mRegisterer; + + @Before + public void setUp() { + mRegisterer = new DeviceConfigServiceManager.ServiceRegisterer(SERVICE_NAME); + } + + @Test + public void testGetOrThrow() throws DeviceConfigServiceManager.ServiceNotFoundException { + if (UpdatableDeviceConfigServiceReadiness.shouldStartUpdatableService()) { + assertThat(mRegisterer.getOrThrow()).isNotNull(); + } else { + assertThrows(DeviceConfigServiceManager.ServiceNotFoundException.class, + mRegisterer::getOrThrow); + } + } + + @Test + public void testGet() { + assumeTrue(UpdatableDeviceConfigServiceReadiness.shouldStartUpdatableService()); + assertThat(mRegisterer.get()).isNotNull(); + } + + @Test + public void testTryGet() { + if (UpdatableDeviceConfigServiceReadiness.shouldStartUpdatableService()) { + assertThat(mRegisterer.tryGet()).isNotNull(); + } else { + assertThat(mRegisterer.tryGet()).isNull(); + } + } +} diff --git a/core/tests/coretests/src/android/text/format/DateFormatTest.java b/core/tests/coretests/src/android/text/format/DateFormatTest.java index 8459330cc07b..212cc44eefab 100644 --- a/core/tests/coretests/src/android/text/format/DateFormatTest.java +++ b/core/tests/coretests/src/android/text/format/DateFormatTest.java @@ -156,8 +156,8 @@ public class DateFormatTest { @DisableCompatChanges({DateFormat.DISALLOW_DUPLICATE_FIELD_IN_SKELETON}) public void testGetBestDateTimePattern_enableDuplicateField() { // en-US uses 12-hour format by default. - assertEquals("h:mm\u202fa", DateFormat.getBestDateTimePattern(Locale.US, "jmma")); - assertEquals("h:mm\u202fa", DateFormat.getBestDateTimePattern(Locale.US, "ahmma")); + assertEquals("h:mm a", DateFormat.getBestDateTimePattern(Locale.US, "jmma")); + assertEquals("h:mm a", DateFormat.getBestDateTimePattern(Locale.US, "ahmma")); } private static void assertIllegalArgumentException(Locale l, String skeleton) { diff --git a/core/tests/coretests/src/android/text/format/DateUtilsTest.java b/core/tests/coretests/src/android/text/format/DateUtilsTest.java index 39ed82ef40f3..381c0512c532 100644 --- a/core/tests/coretests/src/android/text/format/DateUtilsTest.java +++ b/core/tests/coretests/src/android/text/format/DateUtilsTest.java @@ -139,16 +139,16 @@ public class DateUtilsTest { fixedTime, java.text.DateFormat.SHORT, java.text.DateFormat.FULL)); final long hourDuration = 2 * 60 * 60 * 1000; - assertEquals("5:30:15\u202fAM Greenwich Mean Time", DateUtils.formatSameDayTime( + assertEquals("5:30:15 AM Greenwich Mean Time", DateUtils.formatSameDayTime( fixedTime + hourDuration, fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.FULL)); - assertEquals("5:30:15\u202fAM", DateUtils.formatSameDayTime(fixedTime + hourDuration, + assertEquals("5:30:15 AM", DateUtils.formatSameDayTime(fixedTime + hourDuration, fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.DEFAULT)); - assertEquals("5:30:15\u202fAM GMT", DateUtils.formatSameDayTime(fixedTime + hourDuration, + assertEquals("5:30:15 AM GMT", DateUtils.formatSameDayTime(fixedTime + hourDuration, fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.LONG)); - assertEquals("5:30:15\u202fAM", DateUtils.formatSameDayTime(fixedTime + hourDuration, + assertEquals("5:30:15 AM", DateUtils.formatSameDayTime(fixedTime + hourDuration, fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.MEDIUM)); - assertEquals("5:30\u202fAM", DateUtils.formatSameDayTime(fixedTime + hourDuration, + assertEquals("5:30 AM", DateUtils.formatSameDayTime(fixedTime + hourDuration, fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.SHORT)); } diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 2afd54b984a4..4d858bd72f30 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -883,6 +883,12 @@ "group": "WM_SHOW_TRANSACTIONS", "at": "com\/android\/server\/wm\/WindowSurfaceController.java" }, + "-1258739769": { + "message": "onTransactionReady, opening: %s, closing: %s, animating: %s, match: %b", + "level": "DEBUG", + "group": "WM_DEBUG_BACK_PREVIEW", + "at": "com\/android\/server\/wm\/BackNavigationController.java" + }, "-1257821162": { "message": "OUT SURFACE %s: copied", "level": "INFO", @@ -1297,6 +1303,12 @@ "group": "WM_DEBUG_BOOT", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, + "-874087484": { + "message": "SyncGroup %d: Set ready %b", + "level": "VERBOSE", + "group": "WM_DEBUG_SYNC_ENGINE", + "at": "com\/android\/server\/wm\/BLASTSyncEngine.java" + }, "-869242375": { "message": "Content Recording: Unable to start recording due to invalid region for display %d", "level": "VERBOSE", @@ -4003,12 +4015,6 @@ "group": "WM_DEBUG_CONFIGURATION", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, - "1689989893": { - "message": "SyncGroup %d: Set ready", - "level": "VERBOSE", - "group": "WM_DEBUG_SYNC_ENGINE", - "at": "com\/android\/server\/wm\/BLASTSyncEngine.java" - }, "1699269281": { "message": "Don't organize or trigger events for untrusted displayId=%d", "level": "WARN", diff --git a/libs/WindowManager/Shell/OWNERS b/libs/WindowManager/Shell/OWNERS index 852edef544b8..f0ed6ee5cb67 100644 --- a/libs/WindowManager/Shell/OWNERS +++ b/libs/WindowManager/Shell/OWNERS @@ -1,4 +1,4 @@ xutan@google.com # Give submodule owners in shell resource approval -per-file res*/*/*.xml = hwwang@google.com, jorgegil@google.com, lbill@google.com, madym@google.com +per-file res*/*/*.xml = atsjenk@google.com, hwwang@google.com, jorgegil@google.com, lbill@google.com, madym@google.com diff --git a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml index c400dc676325..029d83881165 100644 --- a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml +++ b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml @@ -14,686 +14,15 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt"> - <aapt:attr name="android:drawable"> - <vector android:height="30dp" android:width="30dp" android:viewportHeight="30" - android:viewportWidth="30"> - <group android:name="_R_G" android:scaleX="-1" android:translateX="30"> - <group android:name="_R_G_L_0_G" android:translateX="-135" android:translateY="-135" - android:pivotX="150" android:pivotY="150" android:scaleX="0.1" - android:scaleY="0.1"> - <group android:name="_R_G_L_0_G_L_1_G" android:translateX="134.624" - android:translateY="87.514" android:pivotX="11.625" android:pivotY="6.39" - android:scaleX="10" android:scaleY="10"> - <group android:name="_R_G_L_0_G_L_1_G_D_0_P_0_G_0_T_0" - android:translateX="11.625" android:translateY="6.464" - android:scaleX="1" android:scaleY="1"> - <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" - android:fillColor="@color/letterbox_reachability_education_item_color" - android:fillAlpha="1" - android:fillType="nonZero" - android:pathData=" M-1.54 5.39 C-3.87,4.71 -5.49,2.54 -5.49,0.11 C-5.49,-2.92 -3.03,-5.38 0,-5.38 C3.03,-5.38 5.49,-2.92 5.49,0.11 C5.49,2.11 4.41,3.95 2.66,4.92 C2.66,4.92 1.69,3.17 1.69,3.17 C2.8,2.55 3.49,1.38 3.49,0.11 C3.49,-1.82 1.93,-3.38 0,-3.38 C-1.93,-3.38 -3.49,-1.82 -3.49,0.11 C-3.49,1.65 -2.46,3.03 -0.98,3.47 C-0.98,3.47 -1.54,5.39 -1.54,5.39c "/> - </group> - </group> - <group android:name="_R_G_L_0_G_L_0_G" android:translateX="138" - android:translateY="138" android:pivotX="12" android:pivotY="12" - android:scaleX="10" android:scaleY="10"> - <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" - android:fillColor="@color/letterbox_reachability_education_item_color" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c "/> - </group> - </group> - </group> - <group android:name="time_group"/> - </vector> - </aapt:attr> - <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="fillAlpha" android:duration="500" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="500" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="750" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="833" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="1083" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="833" - android:startOffset="1167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="2000" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="2250" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="2333" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="2583" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="833" - android:startOffset="2667" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="3500" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="3750" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="3833" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="4083" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="833" - android:startOffset="4167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="5000" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="5250" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="5333" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="5583" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="500" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="500" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="1083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="1083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="833" - android:startOffset="1167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="833" - android:startOffset="1167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="2000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="2000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="2250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="2250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="2333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="2333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="2583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="2583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="833" - android:startOffset="2667" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="833" - android:startOffset="2667" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="3500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="3500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="3750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="3750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="3833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="3833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="4083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="4083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="833" - android:startOffset="4167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="833" - android:startOffset="4167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="5000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="5000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="5250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="5250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="5333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="5333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="5583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="5583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="pathData" android:duration="500" - android:startOffset="0" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="500" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="750" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="833" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="1083" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="833" - android:startOffset="1167" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="2000" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="2250" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="2333" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="2583" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="833" - android:startOffset="2667" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="3500" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="3750" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="3833" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="4083" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="833" - android:startOffset="4167" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="5000" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="5250" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="5333" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="5583" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="time_group"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="translateX" android:duration="6000" - android:startOffset="0" android:valueFrom="0" android:valueTo="1" - android:valueType="floatType"/> - </set> - </aapt:attr> - </target> -</animated-vector> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="20dp" + android:height="20dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + <group android:scaleX="-1" android:translateX="960"> + <path + android:fillColor="?android:attr/textColorSecondary" + android:pathData="M432.46,48Q522,48 585,110.92Q648,173.83 648,264Q648,314 627.5,358.5Q607,403 566,432L528,432L528,370Q551,349 563.5,321.5Q576,294 576,263.78Q576,204.39 534,162.2Q492,120 432,120Q372,120 330,162Q288,204 288,264.31Q288,295 300,323Q312,351 336,370L336,456Q280,430 248,378Q216,326 216,264Q216,173.83 278.97,110.92Q341.94,48 432.46,48ZM414,864Q399.53,864 386.77,859Q374,854 363,843L144,624L211,557Q225,543 243,538Q261,533 279,538L336,552L336,288Q337,248 364.57,220Q392.14,192 432.07,192Q472,192 500,219.84Q528,247.68 528,288L528,432L576,432Q576,432 576,432Q576,432 576,432L715,497Q744,511 758,538Q772,565 767,596L737,802Q732,828 711.76,846Q691.52,864 666,864L414,864ZM414,792L666,792L698,569Q698,569 698,569Q698,569 698,569L559,504L456,504L456,288Q456,278 449,271Q442,264 432,264Q422,264 415,271Q408,278 408,288L408,644L262,608L246,624L414,792ZM666,792L414,792L414,792L414,792L414,792L414,792Q414,792 422,792Q430,792 439.5,792Q449,792 454.43,792Q459.86,792 459.86,792L459.86,792L529,792L666,792Q666,792 666,792Q666,792 666,792L666,792Z"/> + </group> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml index a807a770aa22..592f899d2ecc 100644 --- a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml +++ b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml @@ -14,686 +14,13 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt"> - <aapt:attr name="android:drawable"> - <vector android:height="30dp" android:width="30dp" android:viewportHeight="30" - android:viewportWidth="30"> - <group android:name="_R_G"> - <group android:name="_R_G_L_0_G" android:translateX="-135" android:translateY="-135" - android:pivotX="150" android:pivotY="150" android:scaleX="0.1" - android:scaleY="0.1"> - <group android:name="_R_G_L_0_G_L_1_G" android:translateX="134.624" - android:translateY="87.514" android:pivotX="11.625" android:pivotY="6.39" - android:scaleX="10" android:scaleY="10"> - <group android:name="_R_G_L_0_G_L_1_G_D_0_P_0_G_0_T_0" - android:translateX="11.625" android:translateY="6.464" - android:scaleX="1" android:scaleY="1"> - <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" - android:fillColor="@color/letterbox_reachability_education_item_color" - android:fillAlpha="1" - android:fillType="nonZero" - android:pathData=" M-1.54 5.39 C-3.87,4.71 -5.49,2.54 -5.49,0.11 C-5.49,-2.92 -3.03,-5.38 0,-5.38 C3.03,-5.38 5.49,-2.92 5.49,0.11 C5.49,2.11 4.41,3.95 2.66,4.92 C2.66,4.92 1.69,3.17 1.69,3.17 C2.8,2.55 3.49,1.38 3.49,0.11 C3.49,-1.82 1.93,-3.38 0,-3.38 C-1.93,-3.38 -3.49,-1.82 -3.49,0.11 C-3.49,1.65 -2.46,3.03 -0.98,3.47 C-0.98,3.47 -1.54,5.39 -1.54,5.39c "/> - </group> - </group> - <group android:name="_R_G_L_0_G_L_0_G" android:translateX="138" - android:translateY="138" android:pivotX="12" android:pivotY="12" - android:scaleX="10" android:scaleY="10"> - <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" - android:fillColor="@color/letterbox_reachability_education_item_color" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c "/> - </group> - </group> - </group> - <group android:name="time_group"/> - </vector> - </aapt:attr> - <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="fillAlpha" android:duration="500" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="500" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="750" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="833" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="1083" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="833" - android:startOffset="1167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="2000" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="2250" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="2333" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="2583" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="833" - android:startOffset="2667" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="3500" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="3750" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="3833" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="4083" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="833" - android:startOffset="4167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="5000" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="5250" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="250" - android:startOffset="5333" android:valueFrom="1" - android:valueTo="0.1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="fillAlpha" android:duration="83" - android:startOffset="5583" android:valueFrom="0.1" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="500" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="500" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="1083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="1083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="833" - android:startOffset="1167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="833" - android:startOffset="1167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="2000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="2000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="2250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="2250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="2333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="2333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="2583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="2583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="833" - android:startOffset="2667" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="833" - android:startOffset="2667" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="3500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="3500" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="3750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="3750" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="3833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="3833" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="4083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="4083" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="833" - android:startOffset="4167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="833" - android:startOffset="4167" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="5000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="5000" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="5250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="5250" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="5333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="5333" android:valueFrom="1" - android:valueTo="1.4000000000000001" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="5583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="5583" android:valueFrom="1.4000000000000001" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.999,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="pathData" android:duration="500" - android:startOffset="0" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="500" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="750" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="833" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="1083" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="833" - android:startOffset="1167" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="2000" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="2250" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="2333" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="2583" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="833" - android:startOffset="2667" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="3500" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="3750" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="3833" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="4083" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="833" - android:startOffset="4167" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="5000" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="5250" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="5333" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="83" - android:startOffset="5583" - android:valueFrom="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,8 14.13,8 C14.13,7.3 13.88,6.71 13.4,6.23 C12.92,5.74 12.33,5.5 11.63,5.5 C10.93,5.5 10.33,5.74 9.85,6.23 C9.37,6.71 9.13,7.3 9.13,8 C9.13,8 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,8 11.13,8 C11.13,7.85 11.17,7.73 11.26,7.64 C11.35,7.55 11.48,7.5 11.63,7.5 C11.78,7.5 11.9,7.55 11.99,7.64 C12.08,7.73 12.13,7.85 12.13,8 C12.13,8 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueTo="M19.81 13.64 C19.62,13.23 19.33,12.93 18.93,12.75 C18.93,12.75 15.23,10.95 15.23,10.95 C15.16,10.9 15.09,10.86 15.01,10.84 C14.99,10.83 14.96,10.83 14.94,10.83 C14.88,10.81 14.83,10.8 14.78,10.8 C14.78,10.8 14.13,10.8 14.13,10.8 C14.13,10.8 14.13,8.9 14.13,8.9 C14.13,8.9 14.13,6.5 14.13,6.5 C14.13,5.8 13.88,5.21 13.4,4.72 C12.92,4.24 12.33,4 11.63,4 C10.93,4 10.33,4.24 9.85,4.72 C9.37,5.21 9.13,5.8 9.13,6.5 C9.13,6.5 9.13,8.95 9.13,8.95 C9.13,8.95 9.13,11.4 9.13,11.4 C9.13,11.4 9.13,14.65 9.13,14.65 C9.13,14.65 7.18,14.2 7.18,14.2 C6.86,14.12 6.56,14.14 6.26,14.26 C5.97,14.39 5.71,14.57 5.48,14.8 C5.48,14.8 4.08,16.25 4.08,16.25 C4.08,16.25 9.23,21.4 9.23,21.4 C9.41,21.58 9.63,21.73 9.88,21.84 C10.13,21.95 10.39,22 10.68,22 C10.68,22 17.08,22 17.08,22 C17.56,22 17.99,21.85 18.38,21.54 C18.76,21.23 18.99,20.83 19.08,20.35 C19.08,20.35 19.98,14.9 19.98,14.9 C20.06,14.47 20,14.05 19.81,13.64c M17.08 20 C17.08,20 10.68,20 10.68,20 C10.68,20 6.88,16.2 6.88,16.2 C6.88,16.2 11.13,17.1 11.13,17.1 C11.13,17.1 11.13,6.5 11.13,6.5 C11.13,6.35 11.17,6.23 11.26,6.14 C11.35,6.05 11.48,6 11.63,6 C11.78,6 11.9,6.05 11.99,6.14 C12.08,6.23 12.13,6.35 12.13,6.5 C12.13,6.5 12.13,12.5 12.13,12.5 C12.13,12.5 13.88,12.5 13.88,12.5 C13.88,12.5 18.02,14.55 18.02,14.55 C18.02,14.55 17.08,20 17.08,20c " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="time_group"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="translateX" android:duration="6000" - android:startOffset="0" android:valueFrom="0" android:valueTo="1" - android:valueType="floatType"/> - </set> - </aapt:attr> - </target> -</animated-vector> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="20dp" + android:height="20dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="?android:attr/textColorSecondary" + android:pathData="M432.46,48Q522,48 585,110.92Q648,173.83 648,264Q648,314 627.5,358.5Q607,403 566,432L528,432L528,370Q551,349 563.5,321.5Q576,294 576,263.78Q576,204.39 534,162.2Q492,120 432,120Q372,120 330,162Q288,204 288,264.31Q288,295 300,323Q312,351 336,370L336,456Q280,430 248,378Q216,326 216,264Q216,173.83 278.97,110.92Q341.94,48 432.46,48ZM414,864Q399.53,864 386.77,859Q374,854 363,843L144,624L211,557Q225,543 243,538Q261,533 279,538L336,552L336,288Q337,248 364.57,220Q392.14,192 432.07,192Q472,192 500,219.84Q528,247.68 528,288L528,432L576,432Q576,432 576,432Q576,432 576,432L715,497Q744,511 758,538Q772,565 767,596L737,802Q732,828 711.76,846Q691.52,864 666,864L414,864ZM414,792L666,792L698,569Q698,569 698,569Q698,569 698,569L559,504L456,504L456,288Q456,278 449,271Q442,264 432,264Q422,264 415,271Q408,278 408,288L408,644L262,608L246,624L414,792ZM666,792L414,792L414,792L414,792L414,792L414,792Q414,792 422,792Q430,792 439.5,792Q449,792 454.43,792Q459.86,792 459.86,792L459.86,792L529,792L666,792Q666,792 666,792Q666,792 666,792L666,792Z"/> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml b/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml new file mode 100644 index 000000000000..681a52bea2b2 --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<com.android.wm.shell.bubbles.bar.BubbleBarExpandedView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:orientation="vertical" + android:id="@+id/bubble_bar_expanded_view"> + +</com.android.wm.shell.bubbles.bar.BubbleBarExpandedView> diff --git a/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml b/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml index 1e36fb62f8da..49491a7b572c 100644 --- a/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml +++ b/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml @@ -22,48 +22,44 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.wm.shell.compatui.ReachabilityEduHandLayout + <androidx.appcompat.widget.AppCompatTextView style="@style/ReachabilityEduHandLayout" android:text="@string/letterbox_reachability_reposition_text" app:drawableTopCompat="@drawable/reachability_education_ic_right_hand" android:layout_gravity="center_horizontal|top" android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin" android:id="@+id/reachability_move_up_button" - android:maxWidth="@dimen/letterbox_reachability_education_item_width" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - <com.android.wm.shell.compatui.ReachabilityEduHandLayout + <androidx.appcompat.widget.AppCompatTextView style="@style/ReachabilityEduHandLayout" android:text="@string/letterbox_reachability_reposition_text" app:drawableTopCompat="@drawable/reachability_education_ic_right_hand" android:layout_gravity="center_vertical|right" android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin" android:id="@+id/reachability_move_right_button" - android:maxWidth="@dimen/letterbox_reachability_education_item_width" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - <com.android.wm.shell.compatui.ReachabilityEduHandLayout + <androidx.appcompat.widget.AppCompatTextView style="@style/ReachabilityEduHandLayout" android:text="@string/letterbox_reachability_reposition_text" app:drawableTopCompat="@drawable/reachability_education_ic_left_hand" android:layout_gravity="center_vertical|left" android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin" android:id="@+id/reachability_move_left_button" - android:maxWidth="@dimen/letterbox_reachability_education_item_width" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - <com.android.wm.shell.compatui.ReachabilityEduHandLayout + <androidx.appcompat.widget.AppCompatTextView style="@style/ReachabilityEduHandLayout" android:text="@string/letterbox_reachability_reposition_text" app:drawableTopCompat="@drawable/reachability_education_ic_right_hand" android:layout_gravity="center_horizontal|bottom" android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin" android:id="@+id/reachability_move_down_button" - android:maxWidth="@dimen/letterbox_reachability_education_item_width" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/libs/WindowManager/Shell/res/values-af/strings.xml b/libs/WindowManager/Shell/res/values-af/strings.xml index 40c35be9200f..d158cec18ce6 100644 --- a/libs/WindowManager/Shell/res/values-af/strings.xml +++ b/libs/WindowManager/Shell/res/values-af/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Verander grootte"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Hou vas"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Laat los"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"App sal dalk nie met verdeelde skerm werk nie"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"App steun nie verdeelde skerm nie"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Hierdie app kan net in 1 venster oopgemaak word."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Program sal dalk nie op \'n sekondêre skerm werk nie."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Program steun nie begin op sekondêre skerms nie."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Skermverdeler"</string> + <string name="divider_title" msgid="1963391955593749442">"Skermverdeler"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Volskerm links"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Links 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Links 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nie opgelos nie?\nTik om terug te stel"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Geen kamerakwessies nie? Tik om toe te maak."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Sien en doen meer"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Sleep ’n ander app in vir verdeelde skerm"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dubbeltik buite ’n program om dit te herposisioneer"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Het dit"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Vou uit vir meer inligting."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Skermskoot"</string> <string name="close_text" msgid="4986518933445178928">"Maak toe"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Maak kieslys toe"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-am/strings.xml b/libs/WindowManager/Shell/res/values-am/strings.xml index 2559c6fe148d..7831c3022917 100644 --- a/libs/WindowManager/Shell/res/values-am/strings.xml +++ b/libs/WindowManager/Shell/res/values-am/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"መጠን ይቀይሩ"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"መተግበሪያ ከተከፈለ ማያ ገጽ ጋር ላይሠራ ይችላል"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"መተግበሪያው የተከፈለ ማያ ገጽን አይደግፍም"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ይህ መተግበሪያ መከፈት የሚችለው በ1 መስኮት ብቻ ነው።"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"መተግበሪያ በሁለተኛ ማሳያ ላይ ላይሠራ ይችላል።"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"መተግበሪያ በሁለተኛ ማሳያዎች ላይ ማስጀመርን አይደግፍም።"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"የተከፈለ የማያ ገጽ ከፋይ"</string> + <string name="divider_title" msgid="1963391955593749442">"የተከፈለ የማያ ገጽ ከፋይ"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"የግራ ሙሉ ማያ ገጽ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ግራ 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ግራ 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"አልተስተካከለም?\nለማህደር መታ ያድርጉ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ምንም የካሜራ ችግሮች የሉም? ለማሰናበት መታ ያድርጉ።"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ተጨማሪ ይመልከቱ እና ያድርጉ"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ለተከፈለ ማያ ገጽ ሌላ መተግበሪያ ይጎትቱ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ቦታውን ለመቀየር ከመተግበሪያው ውጪ ሁለቴ መታ ያድርጉ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ገባኝ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ለተጨማሪ መረጃ ይዘርጉ።"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ይቅር"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"እንደገና ያስጀምሩ"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ዳግም አታሳይ"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"ይህን መተግበሪያ ለማንቀሳቀስ ሁለቴ መታ ያድርጉ"</string> <string name="maximize_button_text" msgid="1650859196290301963">"አስፋ"</string> <string name="minimize_button_text" msgid="271592547935841753">"አሳንስ"</string> <string name="close_button_text" msgid="2913281996024033299">"ዝጋ"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ቅጽበታዊ ገጽ እይታ"</string> <string name="close_text" msgid="4986518933445178928">"ዝጋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ምናሌ ዝጋ"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ar/strings.xml b/libs/WindowManager/Shell/res/values-ar/strings.xml index 2cbeb7cd9eff..09781c71eb61 100644 --- a/libs/WindowManager/Shell/res/values-ar/strings.xml +++ b/libs/WindowManager/Shell/res/values-ar/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"تغيير الحجم"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"إخفاء"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"إظهار"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"قد لا يعمل التطبيق بشكل سليم في وضع تقسيم الشاشة."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"لا يعمل التطبيق في وضع تقسيم الشاشة."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"لا يمكن فتح هذا التطبيق إلا في نافذة واحدة."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"قد لا يعمل التطبيق على شاشة عرض ثانوية."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"لا يمكن تشغيل التطبيق على شاشات عرض ثانوية."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"أداة تقسيم الشاشة"</string> + <string name="divider_title" msgid="1963391955593749442">"أداة تقسيم الشاشة"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"عرض النافذة اليسرى بملء الشاشة"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ضبط حجم النافذة اليسرى ليكون ٧٠%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ضبط حجم النافذة اليسرى ليكون ٥٠%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ألم يتم حل المشكلة؟\nانقر للعودة"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"أليس هناك مشاكل في الكاميرا؟ انقر للإغلاق."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"استخدام تطبيقات متعدّدة في وقت واحد"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"اسحب تطبيقًا آخر لاستخدام وضع تقسيم الشاشة."</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"انقر مرّتين خارج تطبيق لتغيير موضعه."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"حسنًا"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"التوسيع للحصول على مزيد من المعلومات"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"إلغاء"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"إعادة التشغيل"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"عدم عرض مربّع حوار التأكيد مجددًا"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"انقر مرّتَين لنقل هذا التطبيق."</string> <string name="maximize_button_text" msgid="1650859196290301963">"تكبير"</string> <string name="minimize_button_text" msgid="271592547935841753">"تصغير"</string> <string name="close_button_text" msgid="2913281996024033299">"إغلاق"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"لقطة شاشة"</string> <string name="close_text" msgid="4986518933445178928">"إغلاق"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"إغلاق القائمة"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-as/strings.xml b/libs/WindowManager/Shell/res/values-as/strings.xml index 160c5a623771..856a1321ef8e 100644 --- a/libs/WindowManager/Shell/res/values-as/strings.xml +++ b/libs/WindowManager/Shell/res/values-as/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"আকাৰ সলনি কৰক"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"লুকুৱাওক"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"দেখুৱাওক"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"এপ্টোৱে বিভাজিত স্ক্ৰীনৰ সৈতে কাম নকৰিব পাৰে"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"এপ্টোৱে বিভাজিত স্ক্ৰীন সমৰ্থন নকৰে"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"এই এপ্টো কেৱল ১ খন ৱিণ্ড’ত খুলিব পাৰি।"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"গৌণ ডিছপ্লেত এপে সঠিকভাৱে কাম নকৰিব পাৰে।"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"গৌণ ডিছপ্লেত এপ্ লঞ্চ কৰিব নোৱাৰি।"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"স্প্লিট স্ক্ৰীনৰ বিভাজক"</string> + <string name="divider_title" msgid="1963391955593749442">"স্প্লিট স্ক্ৰীনৰ বিভাজক"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"বাওঁফালৰ স্ক্ৰীনখন সম্পূৰ্ণ স্ক্ৰীন কৰক"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"বাওঁফালৰ স্ক্ৰীনখন ৭০% কৰক"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"বাওঁফালৰ স্ক্ৰীনখন ৫০% কৰক"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"এইটো সমাধান কৰা নাই নেকি?\nপূৰ্বাৱস্থালৈ নিবলৈ টিপক"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"কেমেৰাৰ কোনো সমস্যা নাই নেকি? অগ্ৰাহ্য কৰিবলৈ টিপক।"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"চাওক আৰু অধিক কৰক"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"বিভাজিত স্ক্ৰীনৰ বাবে অন্য এটা এপ্ টানি আনি এৰক"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"এপ্টোৰ স্থান সলনি কৰিবলৈ ইয়াৰ বাহিৰত দুবাৰ টিপক"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"বুজি পালোঁ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"অধিক তথ্যৰ বাবে বিস্তাৰ কৰক।"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"স্ক্ৰীনশ্বট"</string> <string name="close_text" msgid="4986518933445178928">"বন্ধ কৰক"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"মেনু বন্ধ কৰক"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-az/strings.xml b/libs/WindowManager/Shell/res/values-az/strings.xml index 6e2fd53d1e0a..1efeb4abef8c 100644 --- a/libs/WindowManager/Shell/res/values-az/strings.xml +++ b/libs/WindowManager/Shell/res/values-az/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Ölçüsünü dəyişin"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Güvənli məkanda saxlayın"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Güvənli məkandan çıxarın"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Tətbiq bölünmüş ekranda işləməyə bilər"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Tətbiq bölünmüş ekranı dəstəkləmir"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Bu tətbiq yalnız 1 pəncərədə açıla bilər."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Tətbiq ikinci ekranda işləməyə bilər."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Tətbiq ikinci ekranda başlamağı dəstəkləmir."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Bölünmüş ekran ayırıcısı"</string> + <string name="divider_title" msgid="1963391955593749442">"Bölünmüş ekran ayırıcısı"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Sol tam ekran"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Sol 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Sol 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Düzəltməmisiniz?\nGeri qaytarmaq üçün toxunun"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kamera problemi yoxdur? Qapatmaq üçün toxunun."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Ardını görün və edin"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Bölünmüş ekran üçün başqa tətbiq sürüşdürün"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tətbiqin yerini dəyişmək üçün kənarına iki dəfə toxunun"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Anladım"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Ətraflı məlumat üçün genişləndirin."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Ləğv edin"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Yenidən başladın"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Yenidən göstərməyin"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Tətbiqi köçürmək üçün iki dəfə toxunun"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Böyüdün"</string> <string name="minimize_button_text" msgid="271592547935841753">"Kiçildin"</string> <string name="close_button_text" msgid="2913281996024033299">"Bağlayın"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Skrinşot"</string> <string name="close_text" msgid="4986518933445178928">"Bağlayın"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyunu bağlayın"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml index f0bfbad156ef..6c507667c085 100644 --- a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml +++ b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Promenite veličinu"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stavite u tajnu memoriju"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Uklonite iz tajne memorije"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikacija možda neće raditi sa podeljenim ekranom."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikacija ne podržava podeljeni ekran."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ova aplikacija može da se otvori samo u jednom prozoru."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikacija možda neće funkcionisati na sekundarnom ekranu."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikacija ne podržava pokretanje na sekundarnim ekranima."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Razdelnik podeljenog ekrana"</string> + <string name="divider_title" msgid="1963391955593749442">"Razdelnik podeljenog ekrana"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Režim celog ekrana za levi ekran"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Levi ekran 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Levi ekran 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problem nije rešen?\nDodirnite da biste vratili"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nemate problema sa kamerom? Dodirnite da biste odbacili."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Vidite i uradite više"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Prevucite drugu aplikaciju da biste koristili podeljeni ekran"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvaput dodirnite izvan aplikacije da biste promenili njenu poziciju"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Važi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Proširite za još informacija."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Snimak ekrana"</string> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite meni"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-be/strings.xml b/libs/WindowManager/Shell/res/values-be/strings.xml index 65bd7b3585f7..88d9793b78ab 100644 --- a/libs/WindowManager/Shell/res/values-be/strings.xml +++ b/libs/WindowManager/Shell/res/values-be/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Змяніць памер"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Схаваць"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Паказаць"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Праграма можа не працаваць у рэжыме падзеленага экрана"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Праграма не падтрымлівае рэжым падзеленага экрана"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Гэту праграму можна адкрыць толькі ў адным акне."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Праграма можа не працаваць на дадатковых экранах."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Праграма не падтрымлівае запуск на дадатковых экранах."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Раздзяляльнік падзеленага экрана"</string> + <string name="divider_title" msgid="1963391955593749442">"Раздзяляльнік падзеленага экрана"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Левы экран – поўнаэкранны рэжым"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Левы экран – 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Левы экран – 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не ўдалося выправіць?\nНацісніце, каб аднавіць"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ніякіх праблем з камерай? Націсніце, каб адхіліць."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Адначасова выконвайце розныя задачы"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Перацягніце іншую праграму, каб выкарыстоўваць падзелены экран"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Двойчы націсніце экран па-за праграмай, каб перамясціць яе"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Зразумела"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Разгарнуць для дадатковай інфармацыі"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Скасаваць"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Перазапусціць"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Больш не паказваць"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Каб перамясціць праграму, націсніце двойчы"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Разгарнуць"</string> <string name="minimize_button_text" msgid="271592547935841753">"Згарнуць"</string> <string name="close_button_text" msgid="2913281996024033299">"Закрыць"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Здымак экрана"</string> <string name="close_text" msgid="4986518933445178928">"Закрыць"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыць меню"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-bg/strings.xml b/libs/WindowManager/Shell/res/values-bg/strings.xml index 0de565058d0f..bf061b2dbb13 100644 --- a/libs/WindowManager/Shell/res/values-bg/strings.xml +++ b/libs/WindowManager/Shell/res/values-bg/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Преоразмеряване"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Съхраняване"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Отмяна на съхраняването"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Приложението може да не работи в режим на разделен екран"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Приложението не поддържа разделен екран"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Това приложение може да се отвори само в 1 прозорец."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Възможно е приложението да не работи на алтернативни дисплеи."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Приложението не поддържа използването на алтернативни дисплеи."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Разделител в режима за разделен екран"</string> + <string name="divider_title" msgid="1963391955593749442">"Разделител в режима за разделен екран"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ляв екран: Показване на цял екран"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Ляв екран: 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Ляв екран: 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблемът не се отстрани?\nДокоснете за връщане в предишното състояние"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нямате проблеми с камерата? Докоснете, за да отхвърлите."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Преглеждайте и правете повече неща"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Преместете друго приложение с плъзгане, за да преминете в режим за разделен екран"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Докоснете два пъти извън дадено приложение, за да промените позицията му"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Разбрах"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Разгъване за още информация."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Отказ"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Рестартиране"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Да не се показва отново"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Докоснете двукратно, за да преместите това приложение"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Увеличаване"</string> <string name="minimize_button_text" msgid="271592547935841753">"Намаляване"</string> <string name="close_button_text" msgid="2913281996024033299">"Затваряне"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Екранна снимка"</string> <string name="close_text" msgid="4986518933445178928">"Затваряне"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затваряне на менюто"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-bn/strings.xml b/libs/WindowManager/Shell/res/values-bn/strings.xml index da206d69090d..453a2fc8472f 100644 --- a/libs/WindowManager/Shell/res/values-bn/strings.xml +++ b/libs/WindowManager/Shell/res/values-bn/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"রিসাইজ করুন"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"স্ট্যাস করুন"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"আনস্ট্যাস করুন"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"স্প্লিট স্ক্রিনে এই অ্যাপ নাও কাজ করতে পারে"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"স্প্লিট স্ক্রিনে এই অ্যাপ কাজ করে না"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"এই অ্যাপটি শুধু ১টি উইন্ডোয় খোলা যেতে পারে।"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"সেকেন্ডারি ডিসপ্লেতে অ্যাপটি কাজ নাও করতে পারে।"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"সেকেন্ডারি ডিসপ্লেতে অ্যাপ লঞ্চ করা যাবে না।"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"স্প্লিট স্ক্রিন বিভাজক"</string> + <string name="divider_title" msgid="1963391955593749442">"স্প্লিট স্ক্রিন বিভাজক"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"বাঁ দিকের অংশ নিয়ে পূর্ণ স্ক্রিন"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"৭০% বাকি আছে"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"৫০% বাকি আছে"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"এখনও সমাধান হয়নি?\nরিভার্ট করার জন্য ট্যাপ করুন"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ক্যামেরা সংক্রান্ত সমস্যা নেই? বাতিল করতে ট্যাপ করুন।"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"দেখুন ও আরও অনেক কিছু করুন"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"স্প্লিট স্ক্রিনের ক্ষেত্রে অন্য কোনও অ্যাপ টেনে আনুন"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"কোনও অ্যাপের স্থান পরিবর্তন করতে তার বাইরে ডবল ট্যাপ করুন"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"বুঝেছি"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"আরও তথ্যের জন্য বড় করুন।"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"বাতিল করুন"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"রিস্টার্ট করুন"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"আর দেখতে চাই না"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"এই অ্যাপ সরাতে ডবল ট্যাপ করুন"</string> <string name="maximize_button_text" msgid="1650859196290301963">"বড় করুন"</string> <string name="minimize_button_text" msgid="271592547935841753">"ছোট করুন"</string> <string name="close_button_text" msgid="2913281996024033299">"বন্ধ করুন"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"স্ক্রিনশট"</string> <string name="close_text" msgid="4986518933445178928">"বন্ধ করুন"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"\'মেনু\' বন্ধ করুন"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index 26ea7cc3f804..987f0a75a3da 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Promjena veličine"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stavljanje u stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Vađenje iz stasha"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikacija možda neće funkcionirati na podijeljenom ekranu"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikacija ne podržava podijeljeni ekran"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ova aplikacija se može otvoriti samo u 1 prozoru."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikacija možda neće raditi na sekundarnom ekranu."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikacija ne podržava pokretanje na sekundarnim ekranima."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Razdjelnik podijeljenog ekrana"</string> + <string name="divider_title" msgid="1963391955593749442">"Razdjelnik podijeljenog ekrana"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Lijevo cijeli ekran"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Lijevo 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Lijevo 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nije popravljeno?\nDodirnite da vratite"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nema problema s kamerom? Dodirnite da odbacite."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Pogledajte i učinite više"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Prevucite još jednu aplikaciju za podijeljeni ekran"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvaput dodirnite izvan aplikacije da promijenite njen položaj"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Razumijem"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Proširite za više informacija."</string> @@ -99,7 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Otkaži"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Ponovo pokreni"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne prikazuj ponovo"</string> - <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Dvaput dodirnite da biste premjestili ovu aplikaciju"</string> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Dodirnite dvaput da pomjerite aplikaciju"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimiziranje"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimiziranje"</string> <string name="close_button_text" msgid="2913281996024033299">"Zatvaranje"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Snimak ekrana"</string> <string name="close_text" msgid="4986518933445178928">"Zatvaranje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvaranje menija"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ca/strings.xml b/libs/WindowManager/Shell/res/values-ca/strings.xml index e086adf8357a..499f2d73409a 100644 --- a/libs/WindowManager/Shell/res/values-ca/strings.xml +++ b/libs/WindowManager/Shell/res/values-ca/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Canvia la mida"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Amaga"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Deixa d\'amagar"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"És possible que l\'aplicació no funcioni amb la pantalla dividida"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"L\'aplicació no admet la pantalla dividida"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Aquesta aplicació només pot obrir-se en 1 finestra."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"És possible que l\'aplicació no funcioni en una pantalla secundària."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"L\'aplicació no es pot obrir en pantalles secundàries."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Separador de pantalla dividida"</string> + <string name="divider_title" msgid="1963391955593749442">"Separador de pantalla dividida"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Pantalla esquerra completa"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Pantalla esquerra al 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Pantalla esquerra al 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"El problema no s\'ha resolt?\nToca per desfer els canvis"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No tens cap problema amb la càmera? Toca per ignorar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Consulta i fes més coses"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrossega una altra aplicació per utilitzar la pantalla dividida"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Fes doble toc fora d\'una aplicació per canviar-ne la posició"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entesos"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Desplega per obtenir més informació."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancel·la"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reinicia"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"No ho tornis a mostrar"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Fes doble toc per moure aquesta aplicació"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximitza"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimitza"</string> <string name="close_button_text" msgid="2913281996024033299">"Tanca"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> <string name="close_text" msgid="4986518933445178928">"Tanca"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tanca el menú"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-cs/strings.xml b/libs/WindowManager/Shell/res/values-cs/strings.xml index abefd9f1cf6c..8d80b9ab3c76 100644 --- a/libs/WindowManager/Shell/res/values-cs/strings.xml +++ b/libs/WindowManager/Shell/res/values-cs/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Změnit velikost"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Uložit"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Zrušit uložení"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikace v režimu rozdělené obrazovky nemusí fungovat"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikace nepodporuje režim rozdělené obrazovky"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Tuto aplikaci lze otevřít jen na jednom okně."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikace na sekundárním displeji nemusí fungovat."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikace nepodporuje spuštění na sekundárních displejích."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Čára rozdělující obrazovku"</string> + <string name="divider_title" msgid="1963391955593749442">"Čára rozdělující obrazovku"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Levá část na celou obrazovku"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"70 % vlevo"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"50 % vlevo"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nepomohlo to?\nKlepnutím se vrátíte"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Žádné problémy s fotoaparátem? Klepnutím zavřete."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Lepší zobrazení a více možností"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Přetáhnutím druhé aplikace použijete rozdělenou obrazovku"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvojitým klepnutím mimo aplikaci změníte její umístění"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Rozbalením zobrazíte další informace."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Zrušit"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restartovat"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Tuto zprávu příště nezobrazovat"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Dvojitým klepnutím přesunete aplikaci"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximalizovat"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimalizovat"</string> <string name="close_button_text" msgid="2913281996024033299">"Zavřít"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Snímek obrazovky"</string> <string name="close_text" msgid="4986518933445178928">"Zavřít"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavřít nabídku"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-da/strings.xml b/libs/WindowManager/Shell/res/values-da/strings.xml index adf29cad1b2f..86d702100b02 100644 --- a/libs/WindowManager/Shell/res/values-da/strings.xml +++ b/libs/WindowManager/Shell/res/values-da/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Rediger størrelse"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Skjul"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Vis"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Appen fungerer muligvis ikke i opdelt skærm"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Appen understøtter ikke opdelt skærm"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Denne app kan kun åbnes i 1 vindue."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Appen fungerer muligvis ikke på sekundære skærme."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Appen kan ikke åbnes på sekundære skærme."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Adskiller til opdelt skærm"</string> + <string name="divider_title" msgid="1963391955593749442">"Adskiller til opdelt skærm"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Vis venstre del i fuld skærm"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Venstre 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Venstre 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Løste det ikke problemet?\nTryk for at fortryde"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Har du ingen problemer med dit kamera? Tryk for at afvise."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Se og gør mere"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Træk en anden app hertil for at bruge opdelt skærm"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tryk to gange uden for en app for at justere dens placering"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Udvid for at få flere oplysninger."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Luk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Luk menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml index 46101570caa2..9d0882822963 100644 --- a/libs/WindowManager/Shell/res/values-de/strings.xml +++ b/libs/WindowManager/Shell/res/values-de/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Größe anpassen"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"In Stash legen"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Aus Stash entfernen"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Die App funktioniert bei geteiltem Bildschirm unter Umständen nicht"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"„Geteilter Bildschirm“ wird in dieser App nicht unterstützt"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Diese App kann nur in einem einzigen Fenster geöffnet werden."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Die App funktioniert auf einem sekundären Display möglicherweise nicht."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Die App unterstützt den Start auf sekundären Displays nicht."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Bildschirmteiler"</string> + <string name="divider_title" msgid="1963391955593749442">"Bildschirmteiler"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Vollbild links"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"70 % links"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"50 % links"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Das Problem ist nicht behoben?\nZum Rückgängigmachen tippen."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Keine Probleme mit der Kamera? Zum Schließen tippen."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Mehr sehen und erledigen"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Weitere App hineinziehen, um den Bildschirm zu teilen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Außerhalb einer App doppeltippen, um die Position zu ändern"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ok"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Für weitere Informationen maximieren."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Abbrechen"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Neu starten"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Nicht mehr anzeigen"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Doppeltippen, um die App zu verschieben"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximieren"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimieren"</string> <string name="close_button_text" msgid="2913281996024033299">"Schließen"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Schließen"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü schließen"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-el/strings.xml b/libs/WindowManager/Shell/res/values-el/strings.xml index 4ac9f7f63865..5f6a2930ff9d 100644 --- a/libs/WindowManager/Shell/res/values-el/strings.xml +++ b/libs/WindowManager/Shell/res/values-el/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Αλλαγή μεγέθους"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Απόκρυψη"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Κατάργηση απόκρυψης"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Η εφαρμογή ενδέχεται να μην λειτουργεί με διαχωρισμό οθόνης."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Η εφαρμογή δεν υποστηρίζει διαχωρισμό οθόνης."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Αυτή η εφαρμογή μπορεί να ανοιχθεί μόνο σε 1 παράθυρο."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Η εφαρμογή ίσως να μην λειτουργήσει σε δευτερεύουσα οθόνη."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Η εφαρμογή δεν υποστηρίζει την εκκίνηση σε δευτερεύουσες οθόνες."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Διαχωριστικό οθόνης"</string> + <string name="divider_title" msgid="1963391955593749442">"Διαχωριστικό οθόνης"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Αριστερή πλήρης οθόνη"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Αριστερή 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Αριστερή 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Δεν διορθώθηκε;\nΠατήστε για επαναφορά."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Δεν αντιμετωπίζετε προβλήματα με την κάμερα; Πατήστε για παράβλεψη."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Δείτε και κάντε περισσότερα"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Σύρετε σε μια άλλη εφαρμογή για διαχωρισμό οθόνης."</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Πατήστε δύο φορές έξω από μια εφαρμογή για να αλλάξετε τη θέση της"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Το κατάλαβα"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Ανάπτυξη για περισσότερες πληροφορίες."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Στιγμιότυπο οθόνης"</string> <string name="close_text" msgid="4986518933445178928">"Κλείσιμο"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Κλείσιμο μενού"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml index 8dee9ae82c5f..346089414cef 100644 --- a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Resize"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"App may not work with split screen"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"App does not support split screen"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"This app can only be opened in one window."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"App may not work on a secondary display."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"App does not support launch on secondary displays."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Split screen divider"</string> + <string name="divider_title" msgid="1963391955593749442">"Split screen divider"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Left full screen"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Left 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Left 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml index 137ebe47c0b5..8cba053c4a6a 100644 --- a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml @@ -110,4 +110,5 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close Menu"</string> + <string name="expand_menu_text" msgid="3847736164494181168">"Open Menu"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml index 8dee9ae82c5f..346089414cef 100644 --- a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Resize"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"App may not work with split screen"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"App does not support split screen"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"This app can only be opened in one window."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"App may not work on a secondary display."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"App does not support launch on secondary displays."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Split screen divider"</string> + <string name="divider_title" msgid="1963391955593749442">"Split screen divider"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Left full screen"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Left 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Left 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml index 8dee9ae82c5f..346089414cef 100644 --- a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Resize"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"App may not work with split screen"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"App does not support split screen"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"This app can only be opened in one window."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"App may not work on a secondary display."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"App does not support launch on secondary displays."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Split screen divider"</string> + <string name="divider_title" msgid="1963391955593749442">"Split screen divider"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Left full screen"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Left 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Left 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rXC/strings.xml b/libs/WindowManager/Shell/res/values-en-rXC/strings.xml index b63af4c69cdd..696e714d3411 100644 --- a/libs/WindowManager/Shell/res/values-en-rXC/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rXC/strings.xml @@ -110,4 +110,5 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close Menu"</string> + <string name="expand_menu_text" msgid="3847736164494181168">"Open Menu"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml index 6faae3c1b83c..fff274913296 100644 --- a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml +++ b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Cambiar el tamaño"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Almacenar de manera segura"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Dejar de almacenar de manera segura"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Es posible que la app no funcione en el modo de pantalla dividida"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"La app no es compatible con la función de pantalla dividida"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Esta app solo puede estar abierta en 1 ventana."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Es posible que la app no funcione en una pantalla secundaria."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"La app no puede iniciarse en pantallas secundarias."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divisor de pantalla dividida"</string> + <string name="divider_title" msgid="1963391955593749442">"Divisor de pantalla dividida"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Pantalla izquierda completa"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Izquierda: 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Izquierda: 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"¿No se resolvió?\nPresiona para revertir los cambios"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"¿No tienes problemas con la cámara? Presionar para descartar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Aprovecha más"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrastra otra app para el modo de pantalla dividida"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Presiona dos veces fuera de una app para cambiar su ubicación"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendido"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expande para obtener más información."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancelar"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reiniciar"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"No volver a mostrar"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Presiona dos veces para mover esta app"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Cerrar"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index 8ec63b9bc23c..5fcd12de2fab 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Cambiar tamaño"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Esconder"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"No esconder"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Puede que la aplicación no funcione con la pantalla dividida"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"La aplicación no es compatible con la pantalla dividida"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Esta aplicación solo puede abrirse en una ventana."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Es posible que la aplicación no funcione en una pantalla secundaria."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"La aplicación no se puede abrir en pantallas secundarias."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divisor de pantalla dividida"</string> + <string name="divider_title" msgid="1963391955593749442">"Divisor de pantalla dividida"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Pantalla izquierda completa"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Izquierda 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Izquierda 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"¿No se ha solucionado?\nToca para revertir"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"¿No hay problemas con la cámara? Toca para cerrar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Consulta más información y haz más"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrastra otra aplicación para activar la pantalla dividida"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toca dos veces fuera de una aplicación para cambiarla de posición"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendido"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Mostrar más información"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancelar"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reiniciar"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"No volver a mostrar"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Toca dos veces para mover esta aplicación"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Cerrar"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-et/strings.xml b/libs/WindowManager/Shell/res/values-et/strings.xml index 5323bb5eec22..07fd6838e5dd 100644 --- a/libs/WindowManager/Shell/res/values-et/strings.xml +++ b/libs/WindowManager/Shell/res/values-et/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Suuruse muutmine"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Pane hoidlasse"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Eemalda hoidlast"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Rakendus ei pruugi jagatud ekraanikuvaga töötada."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Rakendus ei toeta jagatud ekraanikuva."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Selle rakenduse saab avada ainult ühes aknas."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Rakendus ei pruugi teisesel ekraanil töötada."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Rakendus ei toeta teisestel ekraanidel käivitamist."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Jagatud ekraanikuva jaotur"</string> + <string name="divider_title" msgid="1963391955593749442">"Jagatud ekraanikuva jaotur"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Vasak täisekraan"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Vasak: 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Vasak: 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Kas probleemi ei lahendatud?\nPuudutage ennistamiseks."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kas kaameraprobleeme pole? Puudutage loobumiseks."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Vaadake ja tehke rohkem"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Lohistage muusse rakendusse, et jagatud ekraanikuva kasutada"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Topeltpuudutage rakendusest väljaspool, et selle asendit muuta"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Selge"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Laiendage lisateabe saamiseks."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Tühista"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Taaskäivita"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ära kuva uuesti"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Rakenduse teisaldamiseks topeltpuudutage"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimeeri"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimeeri"</string> <string name="close_button_text" msgid="2913281996024033299">"Sule"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Ekraanipilt"</string> <string name="close_text" msgid="4986518933445178928">"Sule"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sule menüü"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-eu/strings.xml b/libs/WindowManager/Shell/res/values-eu/strings.xml index e7bdd8010727..be972d9d8120 100644 --- a/libs/WindowManager/Shell/res/values-eu/strings.xml +++ b/libs/WindowManager/Shell/res/values-eu/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Aldatu tamaina"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Gorde"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Ez gorde"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Baliteke aplikazioak ez funtzionatzea pantaila zatituan"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikazioak ez du onartzen pantaila zatitua"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Leiho bakar batean ireki daiteke aplikazioa."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Baliteke aplikazioak ez funtzionatzea bigarren mailako pantailetan."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikazioa ezin da abiarazi bigarren mailako pantailatan."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Pantaila-zatitzailea"</string> + <string name="divider_title" msgid="1963391955593749442">"Pantaila-zatitzailea"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ezarri ezkerraldea pantaila osoan"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Ezarri ezkerraldea % 70en"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Ezarri ezkerraldea % 50en"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Ez al da konpondu?\nLeheneratzeko, sakatu hau."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ez daukazu arazorik kamerarekin? Baztertzeko, sakatu hau."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Ikusi eta egin gauza gehiago"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Pantaila zatitua ikusteko, arrastatu beste aplikazio bat"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Aplikazioaren posizioa aldatzeko, sakatu birritan haren kanpoaldea"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ados"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Informazio gehiago lortzeko, zabaldu hau."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Pantaila-argazkia"</string> <string name="close_text" msgid="4986518933445178928">"Itxi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Itxi menua"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fa/strings.xml b/libs/WindowManager/Shell/res/values-fa/strings.xml index c6ad275e5b18..26f5fcf364be 100644 --- a/libs/WindowManager/Shell/res/values-fa/strings.xml +++ b/libs/WindowManager/Shell/res/values-fa/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"تغییر اندازه"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"مخفیسازی"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"لغو مخفیسازی"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"ممکن است برنامه با صفحهٔ دونیمه کار نکند"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"برنامه از صفحهٔ دونیمه پشتیبانی نمیکند"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"این برنامه فقط در ۱ پنجره میتواند باز شود."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ممکن است برنامه در نمایشگر ثانویه کار نکند."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"برنامه از راهاندازی در نمایشگرهای ثانویه پشتیبانی نمیکند."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"تقسیمکننده صفحهٔ دونیمه"</string> + <string name="divider_title" msgid="1963391955593749442">"تقسیمکننده صفحهٔ دونیمه"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"تمامصفحه چپ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"٪۷۰ چپ"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"٪۵۰ چپ"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"مشکل برطرف نشد؟\nبرای برگرداندن ضربه بزنید"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"دوربین مشکلی ندارد؟ برای بستن ضربه بزنید."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"از چندین برنامه بهطور همزمان استفاده کنید"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"برای حالت صفحهٔ دونیمه، در برنامهای دیگر بکشید"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"برای جابهجا کردن برنامه، بیرون از آن دوضربه بزنید"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"متوجهام"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"برای اطلاعات بیشتر، گسترده کنید."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"نماگرفت"</string> <string name="close_text" msgid="4986518933445178928">"بستن"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"بستن منو"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fi/strings.xml b/libs/WindowManager/Shell/res/values-fi/strings.xml index b9f72721d4ed..5686d9a7a440 100644 --- a/libs/WindowManager/Shell/res/values-fi/strings.xml +++ b/libs/WindowManager/Shell/res/values-fi/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Muuta kokoa"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Lisää turvasäilytykseen"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Poista turvasäilytyksestä"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Sovellus ei ehkä toimi jaetulla näytöllä"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Sovellus ei tue jaetun näytön tilaa"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Tämän sovelluksen voi avata vain yhdessä ikkunassa."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Sovellus ei ehkä toimi toissijaisella näytöllä."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Sovellus ei tue käynnistämistä toissijaisilla näytöillä."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Näytönjakaja"</string> + <string name="divider_title" msgid="1963391955593749442">"Näytönjakaja"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Vasen koko näytölle"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Vasen 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Vasen 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Eikö ongelma ratkennut?\nKumoa napauttamalla"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ei ongelmia kameran kanssa? Hylkää napauttamalla."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Näe ja tee enemmän"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Käytä jaettua näyttöä vetämällä tähän toinen sovellus"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Kaksoisnapauta sovelluksen ulkopuolella, jos haluat siirtää sitä"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Katso lisätietoja laajentamalla."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Peru"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Käynnistä uudelleen"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Älä näytä uudelleen"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Siirrä sovellus kaksoisnapauttamalla"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Suurenna"</string> <string name="minimize_button_text" msgid="271592547935841753">"Pienennä"</string> <string name="close_button_text" msgid="2913281996024033299">"Sulje"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Kuvakaappaus"</string> <string name="close_text" msgid="4986518933445178928">"Sulje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sulje valikko"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml index 8db7790c72b1..2788de690817 100644 --- a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml @@ -99,8 +99,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Annuler"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Redémarrer"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne plus afficher"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Toucher deux fois pour déplacer cette application"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Agrandir"</string> <string name="minimize_button_text" msgid="271592547935841753">"Réduire"</string> <string name="close_button_text" msgid="2913281996024033299">"Fermer"</string> @@ -116,4 +115,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Capture d\'écran"</string> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fr/strings.xml b/libs/WindowManager/Shell/res/values-fr/strings.xml index 8d4bccab9d9f..6e1a583983b2 100644 --- a/libs/WindowManager/Shell/res/values-fr/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Redimensionner"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"L\'appli peut ne pas fonctionner en mode Écran partagé"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Appli incompatible avec l\'écran partagé"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Cette appli ne peut être ouverte que dans 1 fenêtre."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Il est possible que l\'application ne fonctionne pas sur un écran secondaire."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"L\'application ne peut pas être lancée sur des écrans secondaires."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Séparateur d\'écran partagé"</string> + <string name="divider_title" msgid="1963391955593749442">"Séparateur d\'écran partagé"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Écran de gauche en plein écran"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Écran de gauche à 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Écran de gauche à 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problème non résolu ?\nAppuyez pour rétablir"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Aucun problème d\'appareil photo ? Appuyez pour ignorer."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Voir et interagir plus"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Faites glisser une autre appli pour utiliser l\'écran partagé"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Appuyez deux fois en dehors d\'une appli pour la repositionner"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Développez pour obtenir plus d\'informations"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Annuler"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Redémarrer"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne plus afficher"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Appuyez deux fois pour déplacer cette appli"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Agrandir"</string> <string name="minimize_button_text" msgid="271592547935841753">"Réduire"</string> <string name="close_button_text" msgid="2913281996024033299">"Fermer"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Capture d\'écran"</string> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index 7c09c76f3185..aaaf3bdd0dbb 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Cambiar tamaño"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Esconder"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Non esconder"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"É posible que a aplicación non funcione coa pantalla dividida"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"A aplicación non admite a función de pantalla dividida"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Esta aplicación só se pode abrir en 1 ventá."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"É posible que a aplicación non funcione nunha pantalla secundaria."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"A aplicación non se pode iniciar en pantallas secundarias."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divisor de pantalla dividida"</string> + <string name="divider_title" msgid="1963391955593749442">"Divisor de pantalla dividida"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Pantalla completa á esquerda"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"70 % á esquerda"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"50 % á esquerda"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Non se solucionaron os problemas?\nToca para reverter o seu tratamento"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Non hai problemas coa cámara? Tocar para ignorar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Ver e facer máis"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrastra outra aplicación para usar a pantalla dividida"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toca dúas veces fóra da aplicación para cambiala de posición"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendido"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Despregar para obter máis información."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancelar"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reiniciar"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Non mostrar outra vez"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Toca dúas veces para mover esta aplicación"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Pechar"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> <string name="close_text" msgid="4986518933445178928">"Pechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Pechar o menú"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-gu/strings.xml b/libs/WindowManager/Shell/res/values-gu/strings.xml index f968bd5be1a8..ee5a335af706 100644 --- a/libs/WindowManager/Shell/res/values-gu/strings.xml +++ b/libs/WindowManager/Shell/res/values-gu/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"કદ બદલો"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"છુપાવો"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"બતાવો"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"વિભાજિત સ્ક્રીન સાથે ઍપ કદાચ કામ ન કરે"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ઍપ વિભાજિત સ્ક્રીનને સપોર્ટ કરતી નથી"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"આ ઍપ માત્ર 1 વિન્ડોમાં ખોલી શકાય છે."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ઍપ્લિકેશન ગૌણ ડિસ્પ્લે પર કદાચ કામ ન કરે."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ઍપ્લિકેશન ગૌણ ડિસ્પ્લે પર લૉન્ચનું સમર્થન કરતી નથી."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"સ્ક્રીનને વિભાજિત કરતું વિભાજક"</string> + <string name="divider_title" msgid="1963391955593749442">"સ્ક્રીનને વિભાજિત કરતું વિભાજક"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ડાબી પૂર્ણ સ્ક્રીન"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ડાબે 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ડાબે 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"સુધારો નથી થયો?\nપહેલાંના પર પાછું ફેરવવા માટે ટૅપ કરો"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"કૅમેરામાં કોઈ સમસ્યા નથી? છોડી દેવા માટે ટૅપ કરો."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"જુઓ અને બીજું ઘણું કરો"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"વિભાજિત સ્ક્રીન માટે કોઈ અન્ય ઍપમાં ખેંચો"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"કોઈ ઍપની જગ્યા બદલવા માટે, તેની બહાર બે વાર ટૅપ કરો"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"સમજાઈ ગયું"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"વધુ માહિતી માટે મોટું કરો."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"રદ કરો"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"ફરી શરૂ કરો"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ફરીથી બતાવશો નહીં"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"આ ઍપને ખસેડવા માટે બે વાર ટૅપ કરો"</string> <string name="maximize_button_text" msgid="1650859196290301963">"મોટું કરો"</string> <string name="minimize_button_text" msgid="271592547935841753">"નાનું કરો"</string> <string name="close_button_text" msgid="2913281996024033299">"બંધ કરો"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"સ્ક્રીનશૉટ"</string> <string name="close_text" msgid="4986518933445178928">"બંધ કરો"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"મેનૂ બંધ કરો"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hi/strings.xml b/libs/WindowManager/Shell/res/values-hi/strings.xml index 805a8813844b..258862a7b37d 100644 --- a/libs/WindowManager/Shell/res/values-hi/strings.xml +++ b/libs/WindowManager/Shell/res/values-hi/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"आकार बदलें"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"छिपाएं"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"दिखाएं"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"मुमकिन है कि ऐप्लिकेशन, स्प्लिट स्क्रीन मोड में काम न करे"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"यह ऐप्लिकेशन, स्प्लिट स्क्रीन मोड पर काम नहीं करता"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"इस ऐप्लिकेशन को सिर्फ़ एक विंडो में खोला जा सकता है."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"हो सकता है कि ऐप प्राइमरी (मुख्य) डिस्प्ले के अलावा बाकी दूसरे डिस्प्ले पर काम न करे."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"प्राइमरी (मुख्य) डिस्प्ले के अलावा बाकी दूसरे डिस्प्ले पर ऐप लॉन्च नहीं किया जा सकता."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"स्प्लिट स्क्रीन डिवाइडर मोड"</string> + <string name="divider_title" msgid="1963391955593749442">"स्प्लिट स्क्रीन डिवाइडर मोड"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"बाईं स्क्रीन को फ़ुल स्क्रीन बनाएं"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"बाईं स्क्रीन को 70% बनाएं"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"बाईं स्क्रीन को 50% बनाएं"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"क्या समस्या ठीक नहीं हुई?\nपहले जैसा करने के लिए टैप करें"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"क्या कैमरे से जुड़ी कोई समस्या नहीं है? खारिज करने के लिए टैप करें."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"पूरी जानकारी लेकर, बेहतर तरीके से काम करें"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"स्प्लिट स्क्रीन का इस्तेमाल करने के लिए, किसी अन्य ऐप्लिकेशन को खींचें और छोड़ें"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"किसी ऐप्लिकेशन की जगह बदलने के लिए, उसके बाहर दो बार टैप करें"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ठीक है"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ज़्यादा जानकारी के लिए बड़ा करें."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"रद्द करें"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"रीस्टार्ट करें"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"फिर से न दिखाएं"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"ऐप्लिकेशन की जगह बदलने के लिए दो बार टैप करें"</string> <string name="maximize_button_text" msgid="1650859196290301963">"बड़ा करें"</string> <string name="minimize_button_text" msgid="271592547935841753">"विंडो छोटी करें"</string> <string name="close_button_text" msgid="2913281996024033299">"बंद करें"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"स्क्रीनशॉट"</string> <string name="close_text" msgid="4986518933445178928">"बंद करें"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेन्यू बंद करें"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hr/strings.xml b/libs/WindowManager/Shell/res/values-hr/strings.xml index 69373348b41e..21fdf5dc462e 100644 --- a/libs/WindowManager/Shell/res/values-hr/strings.xml +++ b/libs/WindowManager/Shell/res/values-hr/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Promjena veličine"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Sakrijte"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Poništite sakrivanje"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikacija možda neće funkcionirati s podijeljenim zaslonom"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikacija ne podržava podijeljeni zaslon"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ova se aplikacija može otvoriti samo u jednom prozoru."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikacija možda neće funkcionirati na sekundarnom zaslonu."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikacija ne podržava pokretanje na sekundarnim zaslonima."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Razdjelnik podijeljenog zaslona"</string> + <string name="divider_title" msgid="1963391955593749442">"Razdjelnik podijeljenog zaslona"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Lijevi zaslon u cijeli zaslon"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Lijevi zaslon na 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Lijevi zaslon na 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problem nije riješen?\nDodirnite za vraćanje"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nemate problema s fotoaparatom? Dodirnite za odbacivanje."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Gledajte i učinite više"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Povucite drugu aplikaciju unutra da biste podijelili zaslon"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvaput dodirnite izvan aplikacije da biste je premjestili"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Shvaćam"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Proširite da biste saznali više."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Snimka zaslona"</string> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite izbornik"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hu/strings.xml b/libs/WindowManager/Shell/res/values-hu/strings.xml index 4ef9f465dc41..a0928d36117e 100644 --- a/libs/WindowManager/Shell/res/values-hu/strings.xml +++ b/libs/WindowManager/Shell/res/values-hu/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Átméretezés"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Félretevés"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Félretevés megszüntetése"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Lehet, hogy az alkalmazás nem működik osztott képernyős nézetben"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Az alkalmazás nem támogatja az osztott képernyőt"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ez az alkalmazás csak egy ablakban nyitható meg."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Előfordulhat, hogy az alkalmazás nem működik másodlagos kijelzőn."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Az alkalmazást nem lehet másodlagos kijelzőn elindítani."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Elválasztó az osztott képernyős nézetben"</string> + <string name="divider_title" msgid="1963391955593749442">"Elválasztó az osztott képernyős nézetben"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Bal oldali teljes képernyőre"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Bal oldali 70%-ra"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Bal oldali 50%-ra"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nem sikerült a hiba kijavítása?\nKoppintson a visszaállításhoz."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nincsenek problémái kamerával? Koppintson az elvetéshez."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Több mindent láthat és tehet"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Húzzon ide egy másik alkalmazást az osztott képernyő használatához"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Koppintson duplán az alkalmazáson kívül az áthelyezéséhez"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Értem"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Kibontással további információkhoz juthat."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Mégse"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Újraindítás"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne jelenjen meg többé"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Koppintson duplán az alkalmazás áthelyezéséhez"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Teljes méret"</string> <string name="minimize_button_text" msgid="271592547935841753">"Kis méret"</string> <string name="close_button_text" msgid="2913281996024033299">"Bezárás"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Képernyőkép"</string> <string name="close_text" msgid="4986518933445178928">"Bezárás"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü bezárása"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hy/strings.xml b/libs/WindowManager/Shell/res/values-hy/strings.xml index d01ff713c7c3..f5c2e4bdb457 100644 --- a/libs/WindowManager/Shell/res/values-hy/strings.xml +++ b/libs/WindowManager/Shell/res/values-hy/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Փոխել չափը"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Թաքցնել"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Ցուցադրել"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Հավելվածը չի կարող աշխատել տրոհված էկրանի ռեժիմում"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Հավելվածը չի աջակցում էկրանի տրոհումը"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Այս հավելվածը հնարավոր է բացել միայն մեկ պատուհանում։"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Հավելվածը կարող է չաշխատել լրացուցիչ էկրանի վրա"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Հավելվածը չի աջակցում գործարկումը լրացուցիչ էկրանների վրա"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Տրոհված էկրանի բաժանիչ"</string> + <string name="divider_title" msgid="1963391955593749442">"Տրոհված էկրանի բաժանիչ"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ձախ էկրանը՝ լիաէկրան"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Ձախ էկրանը՝ 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Ձախ էկրանը՝ 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Չհաջողվե՞ց շտկել։\nՀպեք՝ փոփոխությունները չեղարկելու համար։"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Տեսախցիկի հետ կապված խնդիրներ չկա՞ն։ Փակելու համար հպեք։"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Միաժամանակ կատարեք մի քանի առաջադրանք"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Քաշեք մյուս հավելվածի մեջ՝ էկրանի տրոհումն օգտագործելու համար"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Կրկնակի հպեք հավելվածի կողքին՝ այն տեղափոխելու համար"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Եղավ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Ծավալեք՝ ավելին իմանալու համար։"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Չեղարկել"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Վերագործարկել"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Այլևս ցույց չտալ"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Կրկնակի հպեք՝ հավելվածը տեղափոխելու համար"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Ծավալել"</string> <string name="minimize_button_text" msgid="271592547935841753">"Ծալել"</string> <string name="close_button_text" msgid="2913281996024033299">"Փակել"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Սքրինշոթ"</string> <string name="close_text" msgid="4986518933445178928">"Փակել"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Փակել ընտրացանկը"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-in/strings.xml b/libs/WindowManager/Shell/res/values-in/strings.xml index 123e5b9ef7de..3a7d4b3dd524 100644 --- a/libs/WindowManager/Shell/res/values-in/strings.xml +++ b/libs/WindowManager/Shell/res/values-in/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Ubah ukuran"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Batalkan stash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikasi mungkin tidak berfungsi dengan layar terpisah"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikasi tidak mendukung layar terpisah"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Aplikasi ini hanya dapat dibuka di 1 jendela."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikasi mungkin tidak berfungsi pada layar sekunder."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikasi tidak mendukung peluncuran pada layar sekunder."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Pembagi layar terpisah"</string> + <string name="divider_title" msgid="1963391955593749442">"Pembagi layar terpisah"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Layar penuh di kiri"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Kiri 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Kiri 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Tidak dapat diperbaiki?\nKetuk untuk mengembalikan"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Tidak ada masalah kamera? Ketuk untuk menutup."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Lihat dan lakukan lebih banyak hal"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Tarik aplikasi lain untuk menggunakan layar terpisah"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Ketuk dua kali di luar aplikasi untuk mengubah posisinya"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Oke"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Luaskan untuk melihat informasi selengkapnya."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Batal"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Mulai ulang"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Jangan tampilkan lagi"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Ketuk dua kali untuk memindahkan aplikasi ini"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimalkan"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimalkan"</string> <string name="close_button_text" msgid="2913281996024033299">"Tutup"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-is/strings.xml b/libs/WindowManager/Shell/res/values-is/strings.xml index bd80936781d0..f745305c6faf 100644 --- a/libs/WindowManager/Shell/res/values-is/strings.xml +++ b/libs/WindowManager/Shell/res/values-is/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Breyta stærð"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Geymsla"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Taka úr geymslu"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Forritið virkar hugsanlega ekki með skjáskiptingu"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Forritið styður ekki skjáskiptingu"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Aðeins er hægt að opna þetta forrit í 1 glugga."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Hugsanlegt er að forritið virki ekki á öðrum skjá."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Forrit styður ekki opnun á öðrum skjá."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Skilrúm skjáskiptingar"</string> + <string name="divider_title" msgid="1963391955593749442">"Skilrúm skjáskiptingar"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Vinstri á öllum skjánum"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Vinstri 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Vinstri 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Ennþá vesen?\nÝttu til að afturkalla"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ekkert myndavélavesen? Ýttu til að hunsa."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Sjáðu og gerðu meira"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Dragðu annað forrit inn til að nota skjáskiptingu"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Ýttu tvisvar utan við forrit til að færa það"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ég skil"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Stækka til að sjá frekari upplýsingar."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Hætta við"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Endurræsa"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ekki sýna þetta aftur"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Ýttu tvisvar til að færa þetta forrit"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Stækka"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minnka"</string> <string name="close_button_text" msgid="2913281996024033299">"Loka"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Skjámynd"</string> <string name="close_text" msgid="4986518933445178928">"Loka"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Loka valmynd"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-it/strings.xml b/libs/WindowManager/Shell/res/values-it/strings.xml index 90e6a6feedf0..f1edcedef18c 100644 --- a/libs/WindowManager/Shell/res/values-it/strings.xml +++ b/libs/WindowManager/Shell/res/values-it/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Ridimensiona"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Accantona"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Annulla accantonamento"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"L\'app potrebbe non funzionare con lo schermo diviso"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"L\'app non supporta la modalità schermo diviso"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Questa app può essere aperta soltanto in 1 finestra."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"L\'app potrebbe non funzionare su un display secondario."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"L\'app non supporta l\'avvio su display secondari."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Strumento per schermo diviso"</string> + <string name="divider_title" msgid="1963391955593749442">"Strumento per schermo diviso"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Schermata sinistra a schermo intero"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Schermata sinistra al 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Schermata sinistra al 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Il problema non si è risolto?\nTocca per ripristinare"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nessun problema con la fotocamera? Tocca per ignorare."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Visualizza più contenuti e fai di più"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Trascina in un\'altra app per usare lo schermo diviso"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tocca due volte fuori da un\'app per riposizionarla"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Espandi per avere ulteriori informazioni."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Chiudi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Chiudi il menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-iw/strings.xml b/libs/WindowManager/Shell/res/values-iw/strings.xml index 8d5c4a4cad9f..d07c91fe14c3 100644 --- a/libs/WindowManager/Shell/res/values-iw/strings.xml +++ b/libs/WindowManager/Shell/res/values-iw/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"שינוי גודל"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"הסתרה זמנית"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ביטול ההסתרה הזמנית"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"יכול להיות שהאפליקציה לא תפעל עם מסך מפוצל"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"האפליקציה לא תומכת במסך מפוצל"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ניתן לפתוח את האפליקציה הזו רק בחלון אחד."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ייתכן שהאפליקציה לא תפעל במסך משני."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"האפליקציה אינה תומכת בהפעלה במסכים משניים."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"מחלק מסך מפוצל"</string> + <string name="divider_title" msgid="1963391955593749442">"מחלק מסך מפוצל"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"מסך שמאלי מלא"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"שמאלה 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"שמאלה 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"הבעיה לא נפתרה?\nאפשר להקיש כדי לחזור לגרסה הקודמת"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"אין בעיות במצלמה? אפשר להקיש כדי לסגור."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"רוצה לראות ולעשות יותר?"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"צריך לגרור אפליקציה אחרת כדי להשתמש במסך המפוצל"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"צריך להקיש הקשה כפולה מחוץ לאפליקציה כדי למקם אותה מחדש"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"הבנתי"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"מרחיבים כדי לקבל מידע נוסף."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"צילום מסך"</string> <string name="close_text" msgid="4986518933445178928">"סגירה"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"סגירת התפריט"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ja/strings.xml b/libs/WindowManager/Shell/res/values-ja/strings.xml index 6b1f6991afc5..ea42aa50e177 100644 --- a/libs/WindowManager/Shell/res/values-ja/strings.xml +++ b/libs/WindowManager/Shell/res/values-ja/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"サイズ変更"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"非表示"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"表示"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"アプリは分割画面では動作しないことがあります"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"アプリで分割画面がサポートされていません"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"このアプリはウィンドウが 1 つの場合のみ開くことができます。"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"アプリはセカンダリ ディスプレイでは動作しないことがあります。"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"アプリはセカンダリ ディスプレイでの起動に対応していません。"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"分割画面の分割線"</string> + <string name="divider_title" msgid="1963391955593749442">"分割画面の分割線"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"左全画面"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"左 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"左 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"修正されなかった場合は、\nタップすると元に戻ります"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"カメラに関する問題でない場合は、タップすると閉じます。"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"表示を拡大して機能を強化"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"分割画面にするにはもう 1 つのアプリをドラッグしてください"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"位置を変えるにはアプリの外側をダブルタップしてください"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"開くと詳細が表示されます。"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"スクリーンショット"</string> <string name="close_text" msgid="4986518933445178928">"閉じる"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"メニューを閉じる"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ka/strings.xml b/libs/WindowManager/Shell/res/values-ka/strings.xml index 05430e10f45f..16ba1aa5f5b6 100644 --- a/libs/WindowManager/Shell/res/values-ka/strings.xml +++ b/libs/WindowManager/Shell/res/values-ka/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ზომის შეცვლა"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"გადანახვა"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"გადანახვის გაუქმება"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"აპმა შეიძლება არ იმუშაოს გაყოფილი ეკრანის რეჟიმში"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ეკრანის გაყოფა არ არის მხარდაჭერილი აპის მიერ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ამ აპის გახსნა შესაძლებელია მხოლოდ 1 ფანჯარაში."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"აპმა შეიძლება არ იმუშაოს მეორეულ ეკრანზე."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"აპს არ გააჩნია მეორეული ეკრანის მხარდაჭერა."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"ეკრანის გაყოფის გამყოფი"</string> + <string name="divider_title" msgid="1963391955593749442">"ეკრანის გაყოფის გამყოფი"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"მარცხენა ნაწილის სრულ ეკრანზე გაშლა"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"მარცხენა ეკრანი — 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"მარცხენა ეკრანი — 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"არ გამოსწორდა?\nშეეხეთ წინა ვერსიის დასაბრუნებლად"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"კამერას პრობლემები არ აქვს? შეეხეთ უარყოფისთვის."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"მეტის ნახვა და გაკეთება"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ეკრანის გასაყოფად ჩავლებით გადაიტანეთ სხვა აპში"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ორმაგად შეეხეთ აპის გარშემო სივრცეს, რათა ის სხვაგან გადაიტანოთ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"გასაგებია"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"დამატებითი ინფორმაციისთვის გააფართოეთ."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ეკრანის ანაბეჭდი"</string> <string name="close_text" msgid="4986518933445178928">"დახურვა"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"მენიუს დახურვა"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-kk/strings.xml b/libs/WindowManager/Shell/res/values-kk/strings.xml index 7f006abbd0f5..f42cdc322f7d 100644 --- a/libs/WindowManager/Shell/res/values-kk/strings.xml +++ b/libs/WindowManager/Shell/res/values-kk/strings.xml @@ -99,8 +99,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Бас тарту"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Өшіріп қосу"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Қайта көрсетілмесін"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Бұл қолданбаны басқа орынға жылжыту үшін екі рет түртіңіз."</string> <string name="maximize_button_text" msgid="1650859196290301963">"Жаю"</string> <string name="minimize_button_text" msgid="271592547935841753">"Кішірейту"</string> <string name="close_button_text" msgid="2913281996024033299">"Жабу"</string> @@ -116,4 +115,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Скриншот"</string> <string name="close_text" msgid="4986518933445178928">"Жабу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Мәзірді жабу"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-km/strings.xml b/libs/WindowManager/Shell/res/values-km/strings.xml index c1a3abd150e0..be5047ea46f8 100644 --- a/libs/WindowManager/Shell/res/values-km/strings.xml +++ b/libs/WindowManager/Shell/res/values-km/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ប្ដូរទំហំ"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"លាក់ជាបណ្ដោះអាសន្ន"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ឈប់លាក់ជាបណ្ដោះអាសន្ន"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"កម្មវិធីអាចមិនដំណើរការជាមួយមុខងារបំបែកអេក្រង់ទេ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"កម្មវិធីមិនអាចប្រើមុខងារបំបែកអេក្រង់បានទេ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"កម្មវិធីនេះអាចបើកនៅក្នុងវិនដូតែ 1 ប៉ុណ្ណោះ។"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"កម្មវិធីនេះប្រហែលជាមិនដំណើរការនៅលើអេក្រង់បន្ទាប់បន្សំទេ។"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"កម្មវិធីនេះមិនអាចចាប់ផ្តើមនៅលើអេក្រង់បន្ទាប់បន្សំបានទេ។"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"បន្ទាត់ខណ្ឌចែកក្នុងមុខងារបំបែកអេក្រង់"</string> + <string name="divider_title" msgid="1963391955593749442">"បន្ទាត់ខណ្ឌចែកក្នុងមុខងារបំបែកអេក្រង់"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"អេក្រង់ពេញខាងឆ្វេង"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ឆ្វេង 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ឆ្វេង 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"មិនបានដោះស្រាយបញ្ហានេះទេឬ?\nចុចដើម្បីត្រឡប់"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"មិនមានបញ្ហាពាក់ព័ន្ធនឹងកាមេរ៉ាទេឬ? ចុចដើម្បីច្រានចោល។"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"មើលឃើញ និងធ្វើបានកាន់តែច្រើន"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"អូសកម្មវិធីមួយទៀតចូល ដើម្បីប្រើមុខងារបំបែកអេក្រង់"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ចុចពីរដងនៅក្រៅកម្មវិធី ដើម្បីប្ដូរទីតាំងកម្មវិធីនោះ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"យល់ហើយ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ពង្រីកដើម្បីទទួលបានព័ត៌មានបន្ថែម។"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"រូបថតអេក្រង់"</string> <string name="close_text" msgid="4986518933445178928">"បិទ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"បិទម៉ឺនុយ"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-kn/strings.xml b/libs/WindowManager/Shell/res/values-kn/strings.xml index e04f00e55b17..8b0fae89534d 100644 --- a/libs/WindowManager/Shell/res/values-kn/strings.xml +++ b/libs/WindowManager/Shell/res/values-kn/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ಮರುಗಾತ್ರಗೊಳಿಸಿ"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"ಸ್ಟ್ಯಾಶ್ ಮಾಡಿ"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ಅನ್ಸ್ಟ್ಯಾಶ್ ಮಾಡಿ"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ಆ್ಯಪ್ ಕೆಲಸ ಮಾಡದೇ ಇರಬಹುದು"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆ್ಯಪ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ಈ ಆ್ಯಪ್ ಅನ್ನು 1 ವಿಂಡೋದಲ್ಲಿ ಮಾತ್ರ ತೆರೆಯಬಹುದು."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ಸೆಕೆಂಡರಿ ಡಿಸ್ಪ್ಲೇಗಳಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ ಕಾರ್ಯ ನಿರ್ವಹಿಸದೇ ಇರಬಹುದು."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ಸೆಕೆಂಡರಿ ಡಿಸ್ಪ್ಲೇಗಳಲ್ಲಿ ಪ್ರಾರಂಭಿಸುವಿಕೆಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ ಡಿವೈಡರ್"</string> + <string name="divider_title" msgid="1963391955593749442">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ ಡಿವೈಡರ್"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ಎಡ ಪೂರ್ಣ ಪರದೆ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"70% ಎಡಕ್ಕೆ"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"50% ಎಡಕ್ಕೆ"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ಅದನ್ನು ಸರಿಪಡಿಸಲಿಲ್ಲವೇ?\nಹಿಂತಿರುಗಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ಕ್ಯಾಮರಾ ಸಮಸ್ಯೆಗಳಿಲ್ಲವೇ? ವಜಾಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ನೋಡಿ ಮತ್ತು ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಿ"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ಗಾಗಿ ಮತ್ತೊಂದು ಆ್ಯಪ್ನಲ್ಲಿ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ಆ್ಯಪ್ ಒಂದರ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಲು ಅದರ ಹೊರಗೆ ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ಸರಿ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ಇನ್ನಷ್ಟು ಮಾಹಿತಿಗಾಗಿ ವಿಸ್ತೃತಗೊಳಿಸಿ."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string> <string name="close_text" msgid="4986518933445178928">"ಮುಚ್ಚಿ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ಮೆನು ಮುಚ್ಚಿ"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml index 0ebeef1befa1..19789899df6d 100644 --- a/libs/WindowManager/Shell/res/values-ko/strings.xml +++ b/libs/WindowManager/Shell/res/values-ko/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"크기 조절"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"숨기기"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"숨기기 취소"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"앱이 화면 분할 모드로는 작동하지 않을 수 있습니다"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"앱이 화면 분할을 지원하지 않습니다"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"이 앱은 창 1개에서만 열 수 있습니다."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"앱이 보조 디스플레이에서 작동하지 않을 수도 있습니다."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"앱이 보조 디스플레이에서의 실행을 지원하지 않습니다."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"화면 분할기"</string> + <string name="divider_title" msgid="1963391955593749442">"화면 분할기"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"왼쪽 화면 전체화면"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"왼쪽 화면 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"왼쪽 화면 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"해결되지 않았나요?\n되돌리려면 탭하세요."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"카메라에 문제가 없나요? 닫으려면 탭하세요."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"더 많은 정보를 보고 더 많은 작업을 처리하세요"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"화면 분할을 사용하려면 다른 앱을 드래그해 가져옵니다."</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"앱 위치를 조정하려면 앱 외부를 두 번 탭합니다."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"확인"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"추가 정보는 펼쳐서 확인하세요."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"취소"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"다시 시작"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"다시 표시 안함"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"두 번 탭하여 이 앱 이동"</string> <string name="maximize_button_text" msgid="1650859196290301963">"최대화"</string> <string name="minimize_button_text" msgid="271592547935841753">"최소화"</string> <string name="close_button_text" msgid="2913281996024033299">"닫기"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"스크린샷"</string> <string name="close_text" msgid="4986518933445178928">"닫기"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"메뉴 닫기"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index d20f21060ad7..745cea3f49f5 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Өлчөмүн өзгөртүү"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Сейфке салуу"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Сейфтен чыгаруу"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Колдонмодо экран бөлүнбөшү мүмкүн"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Колдонмодо экран бөлүнбөйт"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Бул колдонмону 1 терезеде гана ачууга болот."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Колдонмо кошумча экранда иштебей коюшу мүмкүн."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Колдонмону кошумча экрандарда иштетүүгө болбойт."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Экранды бөлгүч"</string> + <string name="divider_title" msgid="1963391955593749442">"Экранды бөлгүч"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Сол жактагы экранды толук экран режимине өткөрүү"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Сол жактагы экранды 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Сол жактагы экранды 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Оңдолгон жокпу?\nАртка кайтаруу үчүн таптаңыз"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерада маселе жокпу? Этибарга албоо үчүн таптаңыз."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Көрүп, көбүрөөк нерселерди жасаңыз"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Экранды бөлүү үчүн башка колдонмону сүйрөңүз"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Колдонмону жылдыруу үчүн сырт жагын эки жолу таптаңыз"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Түшүндүм"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Толук маалымат алуу үчүн жайып көрүңүз."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Токтотуу"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Өчүрүп күйгүзүү"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Экинчи көрүнбөсүн"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Бул колдонмону жылдыруу үчүн эки жолу таптаңыз"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Чоңойтуу"</string> <string name="minimize_button_text" msgid="271592547935841753">"Кичирейтүү"</string> <string name="close_button_text" msgid="2913281996024033299">"Жабуу"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Скриншот"</string> <string name="close_text" msgid="4986518933445178928">"Жабуу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Менюну жабуу"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-lo/strings.xml b/libs/WindowManager/Shell/res/values-lo/strings.xml index 064717a8faf0..4dd5ade21f66 100644 --- a/libs/WindowManager/Shell/res/values-lo/strings.xml +++ b/libs/WindowManager/Shell/res/values-lo/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ປ່ຽນຂະໜາດ"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"ເກັບໄວ້ບ່ອນເກັບສ່ວນຕົວ"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ເອົາອອກຈາກບ່ອນເກັບສ່ວນຕົວ"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"ແອັບອາດໃຊ້ບໍ່ໄດ້ກັບໂໝດແບ່ງໜ້າຈໍ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ແອັບບໍ່ຮອງຮັບການແບ່ງໜ້າຈໍ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ແອັບນີ້ສາມາດເປີດໄດ້ໃນ 1 ໜ້າຈໍເທົ່ານັ້ນ."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ແອັບອາດບໍ່ສາມາດໃຊ້ໄດ້ໃນໜ້າຈໍທີສອງ."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ແອັບບໍ່ຮອງຮັບການເປີດໃນໜ້າຈໍທີສອງ."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"ເສັ້ນແບ່ງໜ້າຈໍ"</string> + <string name="divider_title" msgid="1963391955593749442">"ເສັ້ນແບ່ງໜ້າຈໍ"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ເຕັມໜ້າຈໍຊ້າຍ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ຊ້າຍ 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ຊ້າຍ 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ບໍ່ໄດ້ແກ້ໄຂມັນບໍ?\nແຕະເພື່ອແປງກັບຄືນ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ບໍ່ມີບັນຫາກ້ອງຖ່າຍຮູບບໍ? ແຕະເພື່ອປິດໄວ້."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ເບິ່ງ ແລະ ເຮັດຫຼາຍຂຶ້ນ"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ລາກໄປໄວ້ໃນແອັບອື່ນເພື່ອແບ່ງໜ້າຈໍ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ແຕະສອງເທື່ອໃສ່ນອກແອັບໃດໜຶ່ງເພື່ອຈັດຕຳແໜ່ງຂອງມັນຄືນໃໝ່"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ເຂົ້າໃຈແລ້ວ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ຂະຫຍາຍເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມ."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ຮູບໜ້າຈໍ"</string> <string name="close_text" msgid="4986518933445178928">"ປິດ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ປິດເມນູ"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-lt/strings.xml b/libs/WindowManager/Shell/res/values-lt/strings.xml index 12a81b67e9ec..7c1e7e1dfb39 100644 --- a/libs/WindowManager/Shell/res/values-lt/strings.xml +++ b/libs/WindowManager/Shell/res/values-lt/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Pakeisti dydį"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Paslėpti"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Nebeslėpti"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Programa gali neveikti naudojant išskaidyto ekrano režimą"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Programoje nepalaikomas išskaidyto ekrano režimas"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Šią programą galima atidaryti tik viename lange."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Programa gali neveikti antriniame ekrane."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Programa nepalaiko paleisties antriniuose ekranuose."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Išskaidyto ekrano režimo daliklis"</string> + <string name="divider_title" msgid="1963391955593749442">"Išskaidyto ekrano režimo daliklis"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Kairysis ekranas viso ekrano režimu"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Kairysis ekranas 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Kairysis ekranas 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nepavyko pataisyti?\nPalieskite, kad grąžintumėte"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nėra jokių problemų dėl kameros? Palieskite, kad atsisakytumėte."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Daugiau turinio ir funkcijų"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Vilkite kitoje programoje, kad galėtumėte naudoti išskaidyto ekrano režimą"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dukart palieskite už programos ribų, kad pakeistumėte jos poziciją"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Supratau"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Išskleiskite, jei reikia daugiau informacijos."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Ekrano kopija"</string> <string name="close_text" msgid="4986518933445178928">"Uždaryti"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Uždaryti meniu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-lv/strings.xml b/libs/WindowManager/Shell/res/values-lv/strings.xml index 102f3c82dd0a..69db08a2adb6 100644 --- a/libs/WindowManager/Shell/res/values-lv/strings.xml +++ b/libs/WindowManager/Shell/res/values-lv/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Mainīt lielumu"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Paslēpt"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Rādīt"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Iespējams, lietotne nedarbosies ekrāna sadalīšanas režīmā"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Lietotnē netiek atbalstīta ekrāna sadalīšana"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Šo lietotni var atvērt tikai vienā logā."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Lietotne, iespējams, nedarbosies sekundārajā displejā."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Lietotnē netiek atbalstīta palaišana sekundārajos displejos."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Ekrāna sadalītājs"</string> + <string name="divider_title" msgid="1963391955593749442">"Ekrāna sadalītājs"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Kreisā daļa pa visu ekrānu"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Pa kreisi 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Pa kreisi 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Vai problēma netika novērsta?\nPieskarieties, lai atjaunotu."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Vai nav problēmu ar kameru? Pieskarieties, lai nerādītu."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Uzziniet un paveiciet vairāk"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Lai izmantotu sadalītu ekrānu, ievelciet vēl vienu lietotni"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Lai pārvietotu lietotni, veiciet dubultskārienu ārpus lietotnes"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Labi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Izvērsiet, lai iegūtu plašāku informāciju."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Atcelt"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restartēt"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Vairs nerādīt"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Lai pārvietotu šo lietotni, veiciet dubultskārienu"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimizēt"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizēt"</string> <string name="close_button_text" msgid="2913281996024033299">"Aizvērt"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Ekrānuzņēmums"</string> <string name="close_text" msgid="4986518933445178928">"Aizvērt"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Aizvērt izvēlni"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-mk/strings.xml b/libs/WindowManager/Shell/res/values-mk/strings.xml index 1adb7aab2f34..d9479d38537a 100644 --- a/libs/WindowManager/Shell/res/values-mk/strings.xml +++ b/libs/WindowManager/Shell/res/values-mk/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Промени големина"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Сокријте"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Прикажете"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Апликацијата можеби нема да работи со поделен екран"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Апликацијата не поддржува поделен екран"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Апликацијава може да се отвори само во еден прозорец."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Апликацијата може да не функционира на друг екран."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Апликацијата не поддржува стартување на други екрани."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Разделник на поделен екран"</string> + <string name="divider_title" msgid="1963391955593749442">"Разделник на поделен екран"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Левиот на цел екран"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Левиот 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Левиот 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не се поправи?\nДопрете за враќање"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нема проблеми со камерата? Допрете за отфрлање."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Погледнете и направете повеќе"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Повлечете друга апликација за поделен екран"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Допрете двапати надвор од некоја апликација за да ја преместите"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Сфатив"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Проширете за повеќе информации."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Слика од екранот"</string> <string name="close_text" msgid="4986518933445178928">"Затворете"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворете го менито"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ml/strings.xml b/libs/WindowManager/Shell/res/values-ml/strings.xml index 923fbc252f0e..2afde7b21124 100644 --- a/libs/WindowManager/Shell/res/values-ml/strings.xml +++ b/libs/WindowManager/Shell/res/values-ml/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"വലുപ്പം മാറ്റുക"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"സ്റ്റാഷ് ചെയ്യൽ"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"അൺസ്റ്റാഷ് ചെയ്യൽ"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"സ്ക്രീൻ വിഭജന മോഡിൽ ആപ്പ് പ്രവർത്തിച്ചേക്കില്ല"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"സ്ക്രീൻ വിഭജന മോഡിനെ ആപ്പ് പിന്തുണയ്ക്കുന്നില്ല"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ഈ ആപ്പ് ഒരു വിൻഡോയിൽ മാത്രമേ തുറക്കാനാകൂ."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"രണ്ടാം ഡിസ്പ്ലേയിൽ ആപ്പ് പ്രവർത്തിച്ചേക്കില്ല."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"രണ്ടാം ഡിസ്പ്ലേകളിൽ സമാരംഭിക്കുന്നതിനെ ആപ്പ് അനുവദിക്കുന്നില്ല."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"സ്ക്രീൻ വിഭജന മോഡ് ഡിവൈഡർ"</string> + <string name="divider_title" msgid="1963391955593749442">"സ്ക്രീൻ വിഭജന മോഡ് ഡിവൈഡർ"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ഇടത് പൂർണ്ണ സ്ക്രീൻ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ഇടത് 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ഇടത് 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"അത് പരിഹരിച്ചില്ലേ?\nപുനഃസ്ഥാപിക്കാൻ ടാപ്പ് ചെയ്യുക"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ക്യാമറാ പ്രശ്നങ്ങളൊന്നുമില്ലേ? നിരസിക്കാൻ ടാപ്പ് ചെയ്യുക."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"കൂടുതൽ കാണുക, ചെയ്യുക"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"സ്ക്രീൻ വിഭജന മോഡിന്, മറ്റൊരു ആപ്പ് വലിച്ചിടുക"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ആപ്പിന്റെ സ്ഥാനം മാറ്റാൻ അതിന് പുറത്ത് ഡബിൾ ടാപ്പ് ചെയ്യുക"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"മനസ്സിലായി"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"കൂടുതൽ വിവരങ്ങൾക്ക് വികസിപ്പിക്കുക."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"സ്ക്രീൻഷോട്ട്"</string> <string name="close_text" msgid="4986518933445178928">"അടയ്ക്കുക"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"മെനു അടയ്ക്കുക"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-mn/strings.xml b/libs/WindowManager/Shell/res/values-mn/strings.xml index eccbc7e1d001..69bd08e5e63e 100644 --- a/libs/WindowManager/Shell/res/values-mn/strings.xml +++ b/libs/WindowManager/Shell/res/values-mn/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Хэмжээг өөрчлөх"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Нуух"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Ил гаргах"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Апп дэлгэцийг хуваах горимтой ажиллахгүй байж магадгүй"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Апп дэлгэцийг хуваах горимыг дэмждэггүй"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Энэ аппыг зөвхөн 1 цонхонд нээх боломжтой."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Апп хоёрдогч дэлгэцэд ажиллахгүй."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Аппыг хоёрдогч дэлгэцэд эхлүүлэх боломжгүй."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Дэлгэцийг хуваах хуваагч"</string> + <string name="divider_title" msgid="1963391955593749442">"Дэлгэцийг хуваах хуваагч"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Зүүн талын бүтэн дэлгэц"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Зүүн 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Зүүн 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Үүнийг засаагүй юу?\nБуцаахын тулд товшино уу"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерын асуудал байхгүй юу? Хаахын тулд товшино уу."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Харж илүү ихийг хий"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Дэлгэц хуваах горимд ашиглахын тулд өөр аппыг чирнэ үү"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Аппыг дахин байрлуулахын тулд гадна талд нь хоёр товшино"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ойлголоо"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Нэмэлт мэдээлэл авах бол дэлгэнэ үү."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Цуцлах"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Дахин эхлүүлэх"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Дахиж бүү харуул"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Энэ аппыг зөөхийн тулд хоёр товшино уу"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Томруулах"</string> <string name="minimize_button_text" msgid="271592547935841753">"Багасгах"</string> <string name="close_button_text" msgid="2913281996024033299">"Хаах"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Дэлгэцийн агшин"</string> <string name="close_text" msgid="4986518933445178928">"Хаах"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Цэсийг хаах"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-mr/strings.xml b/libs/WindowManager/Shell/res/values-mr/strings.xml index 26cadf6ca5d1..5382b941f4d4 100644 --- a/libs/WindowManager/Shell/res/values-mr/strings.xml +++ b/libs/WindowManager/Shell/res/values-mr/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"आकार बदला"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"स्टॅश करा"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"अनस्टॅश करा"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"अॅप कदाचित स्प्लिट स्क्रीनसह काम करणार नाही"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"अॅप हे स्प्लिट स्क्रीनला सपोर्ट करत नाही"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"हे अॅप फक्त एका विंडोमध्ये उघडले जाऊ शकते."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"दुसऱ्या डिस्प्लेवर अॅप कदाचित चालणार नाही."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"दुसऱ्या डिस्प्लेवर अॅप लाँच होणार नाही."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"स्प्लिट स्क्रीन विभाजक"</string> + <string name="divider_title" msgid="1963391955593749442">"स्प्लिट स्क्रीन विभाजक"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"डावी फुल स्क्रीन"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"डावी 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"डावी 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"निराकरण झाले नाही?\nरिव्हर्ट करण्यासाठी कृपया टॅप करा"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"कॅमेराशी संबंधित कोणत्याही समस्या नाहीत का? डिसमिस करण्यासाठी टॅप करा."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"पहा आणि आणखी बरेच काही करा"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"स्प्लिट स्क्रीन वापरण्यासाठी दुसरे ॲप ड्रॅग करा"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ॲपची स्थिती पुन्हा बदलण्यासाठी, त्याच्या बाहेर दोनदा टॅप करा"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"समजले"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"अधिक माहितीसाठी विस्तार करा."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"स्क्रीनशॉट"</string> <string name="close_text" msgid="4986518933445178928">"बंद करा"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनू बंद करा"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ms/strings.xml b/libs/WindowManager/Shell/res/values-ms/strings.xml index 32524320b1bc..c1b2d497c27a 100644 --- a/libs/WindowManager/Shell/res/values-ms/strings.xml +++ b/libs/WindowManager/Shell/res/values-ms/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Ubah saiz"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Sembunyikan"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Tunjukkan"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Apl mungkin tidak berfungsi dengan skrin pisah"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Apl tidak menyokong skrin pisah"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Apl ini hanya boleh dibuka dalam 1 tetingkap."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Apl mungkin tidak berfungsi pada paparan kedua."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Apl tidak menyokong pelancaran pada paparan kedua."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Pembahagi skrin pisah"</string> + <string name="divider_title" msgid="1963391955593749442">"Pembahagi skrin pisah"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Skrin penuh kiri"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Kiri 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Kiri 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Isu tidak dibetulkan?\nKetik untuk kembali"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Tiada isu kamera? Ketik untuk mengetepikan."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Lihat dan lakukan lebih"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Seret masuk apl lain untuk menggunakan skrin pisah"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Ketik dua kali di luar apl untuk menempatkan semula apl itu"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Kembangkan untuk mendapatkan maklumat lanjut."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Tangkapan skrin"</string> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-my/strings.xml b/libs/WindowManager/Shell/res/values-my/strings.xml index b7b2b87b1e55..f3b7bfc3a9a9 100644 --- a/libs/WindowManager/Shell/res/values-my/strings.xml +++ b/libs/WindowManager/Shell/res/values-my/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"အရွယ်အစားပြောင်းရန်"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"သိုဝှက်ရန်"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"မသိုဝှက်ရန်"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းဖြင့် အက်ပ်သည် အလုပ်မလုပ်ပါ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"အက်ပ်တွင် မျက်နှာပြင် ခွဲ၍ပြသခြင်းကို မပံ့ပိုးပါ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ဤအက်ပ်ကို ဝင်းဒိုး ၁ ခုတွင်သာ ဖွင့်နိုင်သည်။"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ဤအက်ပ်အနေဖြင့် ဒုတိယဖန်သားပြင်ပေါ်တွင် အလုပ်လုပ်မည် မဟုတ်ပါ။"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ဤအက်ပ်အနေဖြင့် ဖွင့်ရန်စနစ်ကို ဒုတိယဖန်သားပြင်မှ အသုံးပြုရန် ပံ့ပိုးမထားပါ။"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"မျက်နှာပြင် ခွဲ၍ပြသခြင်း ပိုင်းခြားစနစ်"</string> + <string name="divider_title" msgid="1963391955593749442">"မျက်နှာပြင် ခွဲ၍ပြသခြင်း ပိုင်းခြားစနစ်"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ဘယ်ဘက် မျက်နှာပြင်အပြည့်"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ဘယ်ဘက်မျက်နှာပြင် ၇၀%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ဘယ်ဘက် မျက်နှာပြင် ၅၀%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ကောင်းမသွားဘူးလား။\nပြန်ပြောင်းရန် တို့ပါ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ကင်မရာပြဿနာ မရှိဘူးလား။ ပယ်ရန် တို့ပါ။"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ကြည့်ပြီး ပိုမိုလုပ်ဆောင်ပါ"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းအတွက် အက်ပ်နောက်တစ်ခုကို ဖိဆွဲပါ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"နေရာပြန်ချရန် အက်ပ်အပြင်ဘက်ကို နှစ်ချက်တို့ပါ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"နားလည်ပြီ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"နောက်ထပ်အချက်အလက်များအတွက် ချဲ့နိုင်သည်။"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"မလုပ်တော့"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"ပြန်စရန်"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"နောက်ထပ်မပြပါနှင့်"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"နှစ်ချက်တို့ပြီး ဤအက်ပ်ကို ရွှေ့ပါ"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ချဲ့ရန်"</string> <string name="minimize_button_text" msgid="271592547935841753">"ချုံ့ရန်"</string> <string name="close_button_text" msgid="2913281996024033299">"ပိတ်ရန်"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ဖန်သားပြင်ဓာတ်ပုံ"</string> <string name="close_text" msgid="4986518933445178928">"ပိတ်ရန်"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"မီနူး ပိတ်ရန်"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-nb/strings.xml b/libs/WindowManager/Shell/res/values-nb/strings.xml index a184e8a7c72c..bf197d5f57fc 100644 --- a/libs/WindowManager/Shell/res/values-nb/strings.xml +++ b/libs/WindowManager/Shell/res/values-nb/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Endre størrelse"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Oppbevar"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Avslutt oppbevaring"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Det kan hende at appen ikke fungerer med delt skjerm"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Appen støtter ikke delt skjerm"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Denne appen kan bare åpnes i ett vindu."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Appen fungerer kanskje ikke på en sekundær skjerm."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Appen kan ikke kjøres på sekundære skjermer."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Skilleelement for delt skjerm"</string> + <string name="divider_title" msgid="1963391955593749442">"Skilleelement for delt skjerm"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Utvid den venstre delen av skjermen til hele skjermen"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Sett størrelsen på den venstre delen av skjermen til 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Sett størrelsen på den venstre delen av skjermen til 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Ble ikke problemet løst?\nTrykk for å gå tilbake"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Har du ingen kameraproblemer? Trykk for å lukke."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Se og gjør mer"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Dra inn en annen app for å bruke delt skjerm"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dobbelttrykk utenfor en app for å flytte den"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Greit"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Vis for å få mer informasjon."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Avbryt"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Start på nytt"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ikke vis dette igjen"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Dobbelttrykk for å flytte denne appen"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimer"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimer"</string> <string name="close_button_text" msgid="2913281996024033299">"Lukk"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Skjermdump"</string> <string name="close_text" msgid="4986518933445178928">"Lukk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Lukk menyen"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ne/strings.xml b/libs/WindowManager/Shell/res/values-ne/strings.xml index 56e421f0e3b9..519a7cb89e8c 100644 --- a/libs/WindowManager/Shell/res/values-ne/strings.xml +++ b/libs/WindowManager/Shell/res/values-ne/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"आकार बदल्नुहोस्"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"स्ट्यास गर्नुहोस्"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"अनस्ट्यास गर्नुहोस्"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"यो एपले स्प्लिट स्क्रिन मोडमा काम नगर्न सक्छ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"यो एप स्प्लिट स्क्रिन मोडमा प्रयोग गर्न मिल्दैन"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"यो एप एउटा विन्डोमा मात्र खोल्न मिल्छ।"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"यो एपले सहायक प्रदर्शनमा काम नगर्नसक्छ।"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"अनुप्रयोगले सहायक प्रदर्शनहरूमा लञ्च सुविधालाई समर्थन गर्दैन।"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"स्प्लिट स्क्रिन डिभाइडर"</string> + <string name="divider_title" msgid="1963391955593749442">"स्प्लिट स्क्रिन डिभाइडर"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"बायाँ भाग फुल स्क्रिन"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"बायाँ भाग ७०%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"बायाँ भाग ५०%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"समस्या हल भएन?\nपहिलेको जस्तै बनाउन ट्याप गर्नुहोस्"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"क्यामेरासम्बन्धी कुनै पनि समस्या छैन? खारेज गर्न ट्याप गर्नुहोस्।"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"थप कुरा हेर्नुहोस् र गर्नुहोस्"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"स्प्लिट स्क्रिन मोड प्रयोग गर्न अर्को एप ड्रयाग एन्ड ड्रप गर्नुहोस्"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"तपाईं जुन एपको स्थिति मिलाउन चाहनुहुन्छ सोही एपको बाहिर डबल ट्याप गर्नुहोस्"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"बुझेँ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"थप जानकारी प्राप्त गर्न चाहनुहुन्छ भने एक्स्पान्ड गर्नुहोस्।"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"स्क्रिनसट"</string> <string name="close_text" msgid="4986518933445178928">"बन्द गर्नुहोस्"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनु बन्द गर्नुहोस्"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index 6347ee6df5d6..7847901a390e 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Formaat aanpassen"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Verbergen"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Niet meer verbergen"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"De app werkt misschien niet met gesplitst scherm"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"App ondersteunt geen gesplitst scherm"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Deze app kan slechts in 1 venster worden geopend."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"App werkt mogelijk niet op een secundair scherm."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"App kan niet op secundaire displays worden gestart."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Scheiding voor gesplitst scherm"</string> + <string name="divider_title" msgid="1963391955593749442">"Scheiding voor gesplitst scherm"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Linkerscherm op volledig scherm"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Linkerscherm 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Linkerscherm 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Is dit geen oplossing?\nTik om terug te zetten."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Geen cameraproblemen? Tik om te sluiten."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Zie en doe meer"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Sleep een andere app hier naartoe om het scherm te splitsen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dubbeltik naast een app om deze opnieuw te positioneren"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Uitvouwen voor meer informatie."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Sluiten"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menu sluiten"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-or/strings.xml b/libs/WindowManager/Shell/res/values-or/strings.xml index f302bf51c180..efc1af335fc3 100644 --- a/libs/WindowManager/Shell/res/values-or/strings.xml +++ b/libs/WindowManager/Shell/res/values-or/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ରିସାଇଜ୍ କରନ୍ତୁ"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"ଲୁଚାନ୍ତୁ"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ଦେଖାନ୍ତୁ"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନରେ ଆପ କାମ କରିନପାରେ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନକୁ ଆପ ସମର୍ଥନ କରେ ନାହିଁ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ଏହି ଆପକୁ କେବଳ 1ଟି ୱିଣ୍ଡୋରେ ଖୋଲାଯାଇପାରିବ।"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ସେକେଣ୍ଡାରୀ ଡିସପ୍ଲେରେ ଆପ୍ କାମ ନକରିପାରେ।"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ସେକେଣ୍ଡାରୀ ଡିସପ୍ଲେରେ ଆପ୍ ଲଞ୍ଚ ସପୋର୍ଟ କରେ ନାହିଁ।"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ଡିଭାଇଡର"</string> + <string name="divider_title" msgid="1963391955593749442">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ଡିଭାଇଡର"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ବାମ ପଟକୁ ପୂର୍ଣ୍ଣ ସ୍କ୍ରୀନ୍ କରନ୍ତୁ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ବାମ ପଟକୁ 70% କରନ୍ତୁ"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ବାମ ପଟକୁ 50% କରନ୍ତୁ"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ଏହାର ସମାଧାନ ହୋଇନାହିଁ?\nଫେରିଯିବା ପାଇଁ ଟାପ କରନ୍ତୁ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"କ୍ୟାମେରାରେ କିଛି ସମସ୍ୟା ନାହିଁ? ଖାରଜ କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ଦେଖନ୍ତୁ ଏବଂ ଆହୁରି ଅନେକ କିଛି କରନ୍ତୁ"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ପାଇଁ ଅନ୍ୟ ଏକ ଆପକୁ ଡ୍ରାଗ କରନ୍ତୁ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ଏକ ଆପକୁ ରିପୋଜିସନ କରିବା ପାଇଁ ଏହାର ବାହାରେ ଦୁଇଥର-ଟାପ କରନ୍ତୁ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ବୁଝିଗଲି"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ଅଧିକ ସୂଚନା ପାଇଁ ବିସ୍ତାର କରନ୍ତୁ।"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ବାତିଲ କରନ୍ତୁ"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ପୁଣି ଦେଖାନ୍ତୁ ନାହିଁ"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"ଏହି ଆପକୁ ମୁଭ କରାଇବାକୁ ଦୁଇଥର-ଟାପ କରନ୍ତୁ"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ବଡ଼ କରନ୍ତୁ"</string> <string name="minimize_button_text" msgid="271592547935841753">"ଛୋଟ କରନ୍ତୁ"</string> <string name="close_button_text" msgid="2913281996024033299">"ବନ୍ଦ କରନ୍ତୁ"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ସ୍କ୍ରିନସଟ"</string> <string name="close_text" msgid="4986518933445178928">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ମେନୁ ବନ୍ଦ କରନ୍ତୁ"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pa/strings.xml b/libs/WindowManager/Shell/res/values-pa/strings.xml index eb32e25c7d08..fbcaf6e9c1c4 100644 --- a/libs/WindowManager/Shell/res/values-pa/strings.xml +++ b/libs/WindowManager/Shell/res/values-pa/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ਆਕਾਰ ਬਦਲੋ"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"ਸਟੈਸ਼"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ਅਣਸਟੈਸ਼"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਐਪ ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਨਾਲ ਕੰਮ ਨਾ ਕਰੇ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ਐਪ ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ਇਹ ਐਪ ਸਿਰਫ਼ 1 ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੀ ਜਾ ਸਕਦੀ ਹੈ।"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਐਪ ਸੈਕੰਡਰੀ ਡਿਸਪਲੇ \'ਤੇ ਕੰਮ ਨਾ ਕਰੇ।"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ਐਪ ਸੈਕੰਡਰੀ ਡਿਸਪਲੇਆਂ \'ਤੇ ਲਾਂਚ ਕਰਨ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਵਿਭਾਜਕ"</string> + <string name="divider_title" msgid="1963391955593749442">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਵਿਭਾਜਕ"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ਖੱਬੇ ਪੂਰੀ ਸਕ੍ਰੀਨ"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ਖੱਬੇ 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ਖੱਬੇ 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ਕੀ ਇਹ ਠੀਕ ਨਹੀਂ ਹੋਈ?\nਵਾਪਸ ਉਹੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ਕੀ ਕੈਮਰੇ ਸੰਬੰਧੀ ਕੋਈ ਸਮੱਸਿਆ ਨਹੀਂ ਹੈ? ਖਾਰਜ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ਦੇਖੋ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ਕਰੋ"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੇ ਲਈ ਕਿਸੇ ਹੋਰ ਐਪ ਵਿੱਚ ਘਸੀਟੋ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ਕਿਸੇ ਐਪ ਦੀ ਜਗ੍ਹਾ ਬਦਲਣ ਲਈ ਉਸ ਦੇ ਬਾਹਰ ਡਬਲ ਟੈਪ ਕਰੋ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ਸਮਝ ਲਿਆ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਵਿਸਤਾਰ ਕਰੋ।"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ਰੱਦ ਕਰੋ"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"ਇਸ ਐਪ ਦੀ ਟਿਕਾਣਾ ਬਦਲਣ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ਵੱਡਾ ਕਰੋ"</string> <string name="minimize_button_text" msgid="271592547935841753">"ਛੋਟਾ ਕਰੋ"</string> <string name="close_button_text" msgid="2913281996024033299">"ਬੰਦ ਕਰੋ"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string> <string name="close_text" msgid="4986518933445178928">"ਬੰਦ ਕਰੋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ਮੀਨੂ ਬੰਦ ਕਰੋ"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pl/strings.xml b/libs/WindowManager/Shell/res/values-pl/strings.xml index d61cbf549a10..9451c6efbad1 100644 --- a/libs/WindowManager/Shell/res/values-pl/strings.xml +++ b/libs/WindowManager/Shell/res/values-pl/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Zmień rozmiar"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Przenieś do schowka"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Zabierz ze schowka"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikacja może nie działać przy podzielonym ekranie"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikacja nie obsługuje podzielonego ekranu"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ta aplikacja może być otwarta tylko w 1 oknie."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikacja może nie działać na dodatkowym ekranie."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikacja nie obsługuje uruchamiania na dodatkowych ekranach."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Linia dzielenia ekranu"</string> + <string name="divider_title" msgid="1963391955593749442">"Linia dzielenia ekranu"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Lewa część ekranu na pełnym ekranie"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"70% lewej części ekranu"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"50% lewej części ekranu"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Naprawa się nie udała?\nKliknij, aby cofnąć"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Brak problemów z aparatem? Kliknij, aby zamknąć"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Zobacz i zrób więcej"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Aby podzielić ekran, przeciągnij drugą aplikację"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Kliknij dwukrotnie poza aplikacją, aby ją przenieść"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Rozwiń, aby wyświetlić więcej informacji."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Zrzut ekranu"</string> <string name="close_text" msgid="4986518933445178928">"Zamknij"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zamknij menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index c431100b2901..6b187193fd7f 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Redimensionar"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Ocultar"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Exibir"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"É possível que o app não funcione com a tela dividida"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"O app não oferece suporte à divisão de tela"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Este app só pode ser aberto em uma única janela."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"É possível que o app não funcione em uma tela secundária."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"O app não é compatível com a inicialização em telas secundárias."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divisor de tela"</string> + <string name="divider_title" msgid="1963391955593749442">"Divisor de tela"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Lado esquerdo em tela cheia"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Esquerda a 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Esquerda a 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"O problema não foi corrigido?\nToque para reverter"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Não tem problemas com a câmera? Toque para dispensar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Veja e faça mais"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arraste outro app para dividir a tela"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toque duas vezes fora de um app para reposicionar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Abra para ver mais informações."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de tela"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml index a8dbb808c073..ede86fa2a18e 100644 --- a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Redimensionar"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Armazenar"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Remover do armazenamento"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"A app pode não funcionar com o ecrã dividido"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"A app não é compatível com o ecrã dividido"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Esta app só pode ser aberta em 1 janela."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"A app pode não funcionar num ecrã secundário."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"A app não é compatível com o início em ecrãs secundários."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divisor do ecrã dividido"</string> + <string name="divider_title" msgid="1963391955593749442">"Divisor do ecrã dividido"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ecrã esquerdo inteiro"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"70% no ecrã esquerdo"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"50% no ecrã esquerdo"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Não foi corrigido?\nToque para reverter"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nenhum problema com a câmara? Toque para ignorar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Veja e faça mais"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arraste outra app para usar o ecrã dividido"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toque duas vezes fora de uma app para a reposicionar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expandir para obter mais informações"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de ecrã"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index c431100b2901..6b187193fd7f 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Redimensionar"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Ocultar"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Exibir"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"É possível que o app não funcione com a tela dividida"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"O app não oferece suporte à divisão de tela"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Este app só pode ser aberto em uma única janela."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"É possível que o app não funcione em uma tela secundária."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"O app não é compatível com a inicialização em telas secundárias."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divisor de tela"</string> + <string name="divider_title" msgid="1963391955593749442">"Divisor de tela"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Lado esquerdo em tela cheia"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Esquerda a 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Esquerda a 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"O problema não foi corrigido?\nToque para reverter"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Não tem problemas com a câmera? Toque para dispensar."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Veja e faça mais"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arraste outro app para dividir a tela"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toque duas vezes fora de um app para reposicionar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Abra para ver mais informações."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captura de tela"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ro/strings.xml b/libs/WindowManager/Shell/res/values-ro/strings.xml index 15682687459b..4aade7f87171 100644 --- a/libs/WindowManager/Shell/res/values-ro/strings.xml +++ b/libs/WindowManager/Shell/res/values-ro/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Redimensionează"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stochează"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Anulează stocarea"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Este posibil ca aplicația să nu funcționeze cu ecranul împărțit"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplicația nu acceptă ecranul împărțit"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Aplicația poate fi deschisă într-o singură fereastră."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Este posibil ca aplicația să nu funcționeze pe un ecran secundar."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplicația nu acceptă lansare pe ecrane secundare."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Separator pentru ecranul împărțit"</string> + <string name="divider_title" msgid="1963391955593749442">"Separator pentru ecranul împărțit"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Partea stângă pe ecran complet"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Partea stângă: 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Partea stângă: 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nu ai remediat problema?\nAtinge pentru a reveni"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nu ai probleme cu camera foto? Atinge pentru a închide."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Vezi și fă mai multe"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Trage în altă aplicație pentru a folosi ecranul împărțit"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Atinge de două ori lângă o aplicație pentru a o repoziționa"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Extinde pentru mai multe informații"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Anulează"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Repornește"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Nu mai afișa"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Atinge de două ori ca să muți aplicația"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizează"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizează"</string> <string name="close_button_text" msgid="2913281996024033299">"Închide"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Captură de ecran"</string> <string name="close_text" msgid="4986518933445178928">"Închide"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Închide meniul"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ru/strings.xml b/libs/WindowManager/Shell/res/values-ru/strings.xml index 83934c476fae..b9733dd00bd1 100644 --- a/libs/WindowManager/Shell/res/values-ru/strings.xml +++ b/libs/WindowManager/Shell/res/values-ru/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Изменить размер"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Скрыть"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Показать"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Когда включено разделение экрана, приложение может работать нестабильно."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Приложение не поддерживает разделение экрана."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Это приложение можно открыть только в одном окне."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Приложение может не работать на дополнительном экране"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Приложение не поддерживает запуск на дополнительных экранах"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Разделитель экрана"</string> + <string name="divider_title" msgid="1963391955593749442">"Разделитель экрана"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Левый во весь экран"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Левый на 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Левый на 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не помогло?\nНажмите, чтобы отменить изменения."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нет проблем с камерой? Нажмите, чтобы закрыть."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Выполняйте несколько задач одновременно"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Перетащите сюда другое приложение, чтобы использовать разделение экрана."</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Чтобы переместить приложение, дважды нажмите рядом с ним."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ОК"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Развернуть, чтобы узнать больше."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Скриншот"</string> <string name="close_text" msgid="4986518933445178928">"Закрыть"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыть меню"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-si/strings.xml b/libs/WindowManager/Shell/res/values-si/strings.xml index 21ae496903c5..3b6769324c17 100644 --- a/libs/WindowManager/Shell/res/values-si/strings.xml +++ b/libs/WindowManager/Shell/res/values-si/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ප්රතිප්රමාණ කරන්න"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"සඟවා තබන්න"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"සඟවා තැබීම ඉවත් කරන්න"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"යෙදුම බෙදීම් තිරය සමග ක්රියා නොකළ හැක"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"යෙදුම බෙදුම් තිරයට සහාය නොදක්වයි"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"මෙම යෙදුම විවෘත කළ හැක්කේ 1 කවුළුවක පමණයි."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"යෙදුම ද්විතියික සංදර්ශකයක ක්රියා නොකළ හැකිය."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"යෙදුම ද්විතීයික සංදර්ශක මත දියත් කිරීම සඳහා සහාය නොදක්වයි."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"බෙදුම් තිර වෙන්කරණය"</string> + <string name="divider_title" msgid="1963391955593749442">"බෙදුම් තිර වෙන්කරණය"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"වම් පූර්ණ තිරය"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"වම් 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"වම් 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"එය විසඳුවේ නැතිද?\nප්රතිවර්තනය කිරීමට තට්ටු කරන්න"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"කැමරා ගැටලු නොමැතිද? ඉවත දැමීමට තට්ටු කරන්න"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"බලන්න සහ තවත් දේ කරන්න"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"බෙදුම් තිරය සඳහා වෙනත් යෙදුමකට අදින්න"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"යෙදුමක් නැවත ස්ථානගත කිරීමට පිටතින් දෙවරක් තට්ටු කරන්න"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"තේරුණා"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"වැඩිදුර තොරතුරු සඳහා දිග හරින්න"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"අවලංගු කරන්න"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"යළි අරඹන්න"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"නැවත නොපෙන්වන්න"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"මෙම යෙදුම ගෙන යාමට දෙවරක් තට්ටු කරන්න"</string> <string name="maximize_button_text" msgid="1650859196290301963">"විහිදන්න"</string> <string name="minimize_button_text" msgid="271592547935841753">"කුඩා කරන්න"</string> <string name="close_button_text" msgid="2913281996024033299">"වසන්න"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"තිර රුව"</string> <string name="close_text" msgid="4986518933445178928">"වසන්න"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"මෙනුව වසන්න"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sk/strings.xml b/libs/WindowManager/Shell/res/values-sk/strings.xml index fb43ba88dfd8..adf582fdf6be 100644 --- a/libs/WindowManager/Shell/res/values-sk/strings.xml +++ b/libs/WindowManager/Shell/res/values-sk/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Zmeniť veľkosť"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Skryť"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Zrušiť skrytie"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikácia nemusí fungovať s rozdelenou obrazovkou"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikácia nepodporuje rozdelenú obrazovku"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Táto aplikácia môže byť otvorená iba v jednom okne."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikácia nemusí fungovať na sekundárnej obrazovke."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikácia nepodporuje spúšťanie na sekundárnych obrazovkách."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Rozdeľovač obrazovky"</string> + <string name="divider_title" msgid="1963391955593749442">"Rozdeľovač obrazovky"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ľavá – na celú obrazovku"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Ľavá – 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Ľavá – 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nevyriešilo sa to?\nKlepnutím sa vráťte."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nemáte problémy s kamerou? Klepnutím zatvoríte."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Zobrazte si a zvládnite toho viac"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Rozdelenú obrazovku môžete použiť presunutím do inej aplikácie"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvojitým klepnutím mimo aplikácie zmeníte jej pozíciu"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Dobre"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Po rozbalení sa dozviete viac."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Snímka obrazovky"</string> <string name="close_text" msgid="4986518933445178928">"Zavrieť"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavrieť ponuku"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sl/strings.xml b/libs/WindowManager/Shell/res/values-sl/strings.xml index 331b3fd0d375..08c1b3811a6e 100644 --- a/libs/WindowManager/Shell/res/values-sl/strings.xml +++ b/libs/WindowManager/Shell/res/values-sl/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Spremeni velikost"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Zakrij"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Razkrij"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikacija morda ne deluje v načinu razdeljenega zaslona."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikacija ne podpira načina razdeljenega zaslona."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"To aplikacijo je mogoče odpreti samo v enem oknu."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikacija morda ne bo delovala na sekundarnem zaslonu."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikacija ne podpira zagona na sekundarnih zaslonih."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Razdelilnik zaslonov"</string> + <string name="divider_title" msgid="1963391955593749442">"Razdelilnik zaslonov"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Levi v celozaslonski način"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Levi 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Levi 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"To ni odpravilo težave?\nDotaknite se za povrnitev"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nimate težav s fotoaparatom? Dotaknite se za opustitev."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Oglejte si in naredite več"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Za razdeljeni zaslon povlecite sem še eno aplikacijo."</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvakrat se dotaknite zunaj aplikacije, če jo želite prestaviti."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"V redu"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Razširitev za več informacij"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Posnetek zaslona"</string> <string name="close_text" msgid="4986518933445178928">"Zapri"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zapri meni"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sq/strings.xml b/libs/WindowManager/Shell/res/values-sq/strings.xml index c7a1d9cec212..e184ee025d83 100644 --- a/libs/WindowManager/Shell/res/values-sq/strings.xml +++ b/libs/WindowManager/Shell/res/values-sq/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Ndrysho përmasat"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Fshih"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Mos e fshih"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Aplikacioni mund të mos funksionojë me ekranin e ndarë"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Aplikacioni nuk mbështet ekranin e ndarë"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ky aplikacion mund të hapet vetëm në 1 dritare."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Aplikacioni mund të mos funksionojë në një ekran dytësor."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Aplikacioni nuk mbështet nisjen në ekrane dytësore."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Ndarësi i ekranit të ndarë"</string> + <string name="divider_title" msgid="1963391955593749442">"Ndarësi i ekranit të ndarë"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ekrani i plotë majtas"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Majtas 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Majtas 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nuk u rregullua?\nTrokit për ta rikthyer"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nuk ka probleme me kamerën? Trokit për ta shpërfillur."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Shiko dhe bëj më shumë"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Zvarrite në një aplikacion tjetër për ekranin e ndarë"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Trokit dy herë jashtë një aplikacioni për ta ripozicionuar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"E kuptova"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Zgjeroje për më shumë informacion."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Pamja e ekranit"</string> <string name="close_text" msgid="4986518933445178928">"Mbyll"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Mbyll menynë"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sr/strings.xml b/libs/WindowManager/Shell/res/values-sr/strings.xml index c4ea1f7a912e..e6be8d34861e 100644 --- a/libs/WindowManager/Shell/res/values-sr/strings.xml +++ b/libs/WindowManager/Shell/res/values-sr/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Промените величину"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Ставите у тајну меморију"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Уклоните из тајне меморије"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Апликација можда неће радити са подељеним екраном."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Апликација не подржава подељени екран."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Ова апликација може да се отвори само у једном прозору."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Апликација можда неће функционисати на секундарном екрану."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Апликација не подржава покретање на секундарним екранима."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Разделник подељеног екрана"</string> + <string name="divider_title" msgid="1963391955593749442">"Разделник подељеног екрана"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Режим целог екрана за леви екран"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Леви екран 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Леви екран 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблем није решен?\nДодирните да бисте вратили"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Немате проблема са камером? Додирните да бисте одбацили."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Видите и урадите више"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Превуците другу апликацију да бисте користили подељени екран"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Двапут додирните изван апликације да бисте променили њену позицију"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Важи"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Проширите за још информација."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Снимак екрана"</string> <string name="close_text" msgid="4986518933445178928">"Затворите"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворите мени"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sv/strings.xml b/libs/WindowManager/Shell/res/values-sv/strings.xml index 5ae673a3340f..a5c4e232347c 100644 --- a/libs/WindowManager/Shell/res/values-sv/strings.xml +++ b/libs/WindowManager/Shell/res/values-sv/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Ändra storlek"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Utför stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Återställ stash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Appen kanske inte fungerar med delad skärm"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Appen har inte stöd för delad skärm"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Denna app kan bara vara öppen i ett fönster."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Appen kanske inte fungerar på en sekundär skärm."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Appen kan inte köras på en sekundär skärm."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Avdelare för delad skärm"</string> + <string name="divider_title" msgid="1963391955593749442">"Avdelare för delad skärm"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Helskärm på vänster skärm"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Vänster 70 %"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Vänster 50 %"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Löstes inte problemet?\nTryck för att återställa"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Inga problem med kameran? Tryck för att ignorera."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Se och gör mer"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Dra till en annan app för att dela upp skärmen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tryck snabbt två gånger utanför en app för att flytta den"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Utöka för mer information."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Avbryt"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Starta om"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Visa inte igen"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Tryck snabbt två gånger för att flytta denna app"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Utöka"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimera"</string> <string name="close_button_text" msgid="2913281996024033299">"Stäng"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Skärmbild"</string> <string name="close_text" msgid="4986518933445178928">"Stäng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Stäng menyn"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sw/strings.xml b/libs/WindowManager/Shell/res/values-sw/strings.xml index 9c79b3bc663a..f25f7db8ab88 100644 --- a/libs/WindowManager/Shell/res/values-sw/strings.xml +++ b/libs/WindowManager/Shell/res/values-sw/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Badilisha ukubwa"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Ficha"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Fichua"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Huenda programu isifanye kazi kwenye skrini iliyogawanywa"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Programu haifanyi kazi kwenye skrini iliyogawanywa"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Programu hii inaweza kufunguliwa katika dirisha 1 pekee."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Huenda programu isifanye kazi kwenye dirisha lingine."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Programu hii haiwezi kufunguliwa kwenye madirisha mengine."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Kitenganishi cha kugawa skrini"</string> + <string name="divider_title" msgid="1963391955593749442">"Kitenganishi cha kugawa skrini"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Skrini nzima ya kushoto"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Kushoto 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Kushoto 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Umeshindwa kurekebisha?\nGusa ili urejeshe nakala ya awali"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Je, hakuna hitilafu za kamera? Gusa ili uondoe."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Angalia na ufanye zaidi"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Buruta katika programu nyingine ili utumie skrini iliyogawanywa"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Gusa mara mbili nje ya programu ili uihamishe"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Nimeelewa"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Panua ili upate maelezo zaidi."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Picha ya skrini"</string> <string name="close_text" msgid="4986518933445178928">"Funga"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Funga Menyu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ta/strings.xml b/libs/WindowManager/Shell/res/values-ta/strings.xml index 3b9c9f3630ba..b150164de82a 100644 --- a/libs/WindowManager/Shell/res/values-ta/strings.xml +++ b/libs/WindowManager/Shell/res/values-ta/strings.xml @@ -99,8 +99,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ரத்துசெய்"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"மீண்டும் தொடங்கு"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"மீண்டும் காட்டாதே"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"இந்த ஆப்ஸை நகர்த்த இருமுறை தட்டவும்"</string> <string name="maximize_button_text" msgid="1650859196290301963">"பெரிதாக்கும்"</string> <string name="minimize_button_text" msgid="271592547935841753">"சிறிதாக்கும்"</string> <string name="close_button_text" msgid="2913281996024033299">"மூடும்"</string> @@ -116,4 +115,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ஸ்கிரீன்ஷாட்"</string> <string name="close_text" msgid="4986518933445178928">"மூடும்"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"மெனுவை மூடும்"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-te/strings.xml b/libs/WindowManager/Shell/res/values-te/strings.xml index 2b0725c93694..c75930b46170 100644 --- a/libs/WindowManager/Shell/res/values-te/strings.xml +++ b/libs/WindowManager/Shell/res/values-te/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"సైజ్ మార్చు"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"స్టాచ్"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"ఆన్స్టాచ్"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"స్ప్లిట్ స్క్రీన్తో యాప్ పని చేయకపోవచ్చు"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"యాప్లో స్ప్లిట్ స్క్రీన్కు సపోర్ట్ లేదు"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"ఈ యాప్ను 1 విండోలో మాత్రమే తెరవవచ్చు."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ప్రత్యామ్నాయ డిస్ప్లేలో యాప్ పని చేయకపోవచ్చు."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ప్రత్యామ్నాయ డిస్ప్లేల్లో ప్రారంభానికి యాప్ మద్దతు లేదు."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"స్ప్లిట్ స్క్రీన్ డివైడర్"</string> + <string name="divider_title" msgid="1963391955593749442">"స్ప్లిట్ స్క్రీన్ డివైడర్"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"ఎడమవైపు ఫుల్-స్క్రీన్"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ఎడమవైపు 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ఎడమవైపు 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"దాని సమస్యను పరిష్కరించలేదా?\nపూర్వస్థితికి మార్చడానికి ట్యాప్ చేయండి"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"కెమెరా సమస్యలు లేవా? తీసివేయడానికి ట్యాప్ చేయండి."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"చూసి, మరిన్ని చేయండి"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"స్ప్లిట్ స్క్రీన్ కోసం మరొక యాప్లోకి లాగండి"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"యాప్ స్థానాన్ని మార్చడానికి దాని వెలుపల డబుల్-ట్యాప్ చేయండి"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"అర్థమైంది"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"మరింత సమాచారం కోసం విస్తరించండి."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"స్క్రీన్షాట్"</string> <string name="close_text" msgid="4986518933445178928">"మూసివేయండి"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"మెనూను మూసివేయండి"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-th/strings.xml b/libs/WindowManager/Shell/res/values-th/strings.xml index a9b8086f4c73..22368c06fde8 100644 --- a/libs/WindowManager/Shell/res/values-th/strings.xml +++ b/libs/WindowManager/Shell/res/values-th/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"ปรับขนาด"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"เก็บเข้าที่เก็บส่วนตัว"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"เอาออกจากที่เก็บส่วนตัว"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"แอปอาจใช้ไม่ได้กับโหมดแยกหน้าจอ"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"แอปไม่รองรับการแยกหน้าจอ"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"แอปนี้เปิดได้ใน 1 หน้าต่างเท่านั้น"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"แอปอาจไม่ทำงานในจอแสดงผลรอง"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"แอปไม่รองรับการเรียกใช้ในจอแสดงผลรอง"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"เส้นแยกหน้าจอ"</string> + <string name="divider_title" msgid="1963391955593749442">"เส้นแยกหน้าจอ"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"เต็มหน้าจอทางซ้าย"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"ซ้าย 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"ซ้าย 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"หากไม่ได้แก้ไข\nแตะเพื่อเปลี่ยนกลับ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"หากไม่พบปัญหากับกล้อง แตะเพื่อปิด"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"รับชมและทำสิ่งต่างๆ ได้มากขึ้น"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ลากไปไว้ในแอปอื่นเพื่อแยกหน้าจอ"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"แตะสองครั้งด้านนอกแอปเพื่อเปลี่ยนตำแหน่ง"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"รับทราบ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ขยายเพื่อดูข้อมูลเพิ่มเติม"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ยกเลิก"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"รีสตาร์ท"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ไม่ต้องแสดงข้อความนี้อีก"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"แตะสองครั้งเพื่อย้ายแอปนี้"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ขยายใหญ่สุด"</string> <string name="minimize_button_text" msgid="271592547935841753">"ย่อ"</string> <string name="close_button_text" msgid="2913281996024033299">"ปิด"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"ภาพหน้าจอ"</string> <string name="close_text" msgid="4986518933445178928">"ปิด"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ปิดเมนู"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-tl/strings.xml b/libs/WindowManager/Shell/res/values-tl/strings.xml index 9cf3576aae74..de253665b3b9 100644 --- a/libs/WindowManager/Shell/res/values-tl/strings.xml +++ b/libs/WindowManager/Shell/res/values-tl/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"I-resize"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"I-stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"I-unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Posibleng hindi gumana sa split screen ang app"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Hindi sinusuportahan ng app ang split-screen"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Sa 1 window lang puwedeng buksan ang app na ito."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Maaaring hindi gumana ang app sa pangalawang display."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Hindi sinusuportahan ng app ang paglulunsad sa mga pangalawang display."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Divider ng split screen"</string> + <string name="divider_title" msgid="1963391955593749442">"Divider ng split screen"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"I-full screen ang nasa kaliwa"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Gawing 70% ang nasa kaliwa"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Gawing 50% ang nasa kaliwa"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Hindi ito naayos?\nI-tap para i-revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Walang isyu sa camera? I-tap para i-dismiss."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Tumingin at gumawa ng higit pa"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Mag-drag ng isa pang app para sa split screen"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Mag-double tap sa labas ng app para baguhin ang posisyon nito"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"I-expand para sa higit pang impormasyon."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> <string name="close_text" msgid="4986518933445178928">"Isara"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Isara ang Menu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-tr/strings.xml b/libs/WindowManager/Shell/res/values-tr/strings.xml index 4e398e57d558..bf4feda83121 100644 --- a/libs/WindowManager/Shell/res/values-tr/strings.xml +++ b/libs/WindowManager/Shell/res/values-tr/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Yeniden boyutlandır"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Depola"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Depolama"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Uygulama bölünmüş ekranda çalışmayabilir"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Uygulama bölünmüş ekranı desteklemiyor."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Bu uygulama yalnızca 1 pencerede açılabilir."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Uygulama ikincil ekranda çalışmayabilir."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Uygulama ikincil ekranlarda başlatılmayı desteklemiyor."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Bölünmüş ekran ayırıcı"</string> + <string name="divider_title" msgid="1963391955593749442">"Bölünmüş ekran ayırıcı"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Solda tam ekran"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Solda %70"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Solda %50"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Bu işlem sorunu düzeltmedi mi?\nİşlemi geri almak için dokunun"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kameranızda sorun yok mu? Kapatmak için dokunun."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Daha fazlasını görün ve yapın"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Bölünmüş ekran için başka bir uygulamayı sürükleyin"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Yeniden konumlandırmak için uygulamanın dışına iki kez dokunun"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Anladım"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Daha fazla bilgi için genişletin."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"İptal"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Yeniden başlat"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Bir daha gösterme"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Bu uygulamayı taşımak için iki kez dokunun"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Ekranı Kapla"</string> <string name="minimize_button_text" msgid="271592547935841753">"Küçült"</string> <string name="close_button_text" msgid="2913281996024033299">"Kapat"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Ekran görüntüsü"</string> <string name="close_text" msgid="4986518933445178928">"Kapat"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menüyü kapat"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-uk/strings.xml b/libs/WindowManager/Shell/res/values-uk/strings.xml index 4ccb0bcbaf07..2800e4cc8ce1 100644 --- a/libs/WindowManager/Shell/res/values-uk/strings.xml +++ b/libs/WindowManager/Shell/res/values-uk/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Змінити розмір"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Сховати"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Показати"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Додаток може не працювати в режимі розділення екрана"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Додаток не підтримує розділення екрана"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Цей додаток можна відкрити лише в одному вікні."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Додаток може не працювати на додатковому екрані."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Додаток не підтримує запуск на додаткових екранах."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Розділювач екрана"</string> + <string name="divider_title" msgid="1963391955593749442">"Розділювач екрана"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Ліве вікно на весь екран"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Ліве вікно на 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Ліве вікно на 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблему не вирішено?\nНатисніть, щоб скасувати зміни"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Немає проблем із камерою? Торкніться, щоб закрити."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Більше простору та можливостей"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Щоб перейти в режим розділення екрана, перетягніть сюди інший додаток"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Щоб перемістити додаток, двічі торкніться області поза ним"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ОK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Розгорніть, щоб дізнатися більше."</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Скасувати"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Перезапустити"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Більше не показувати"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Двічі торкніться, щоб перемістити цей додаток"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Збільшити"</string> <string name="minimize_button_text" msgid="271592547935841753">"Згорнути"</string> <string name="close_button_text" msgid="2913281996024033299">"Закрити"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Знімок екрана"</string> <string name="close_text" msgid="4986518933445178928">"Закрити"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрити меню"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ur/strings.xml b/libs/WindowManager/Shell/res/values-ur/strings.xml index 4aef27c45895..f94ee98d513e 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings.xml @@ -21,8 +21,8 @@ <string name="pip_phone_expand" msgid="2579292903468287504">"پھیلائیں"</string> <string name="pip_phone_settings" msgid="5468987116750491918">"ترتیبات"</string> <string name="pip_phone_enter_split" msgid="7042877263880641911">"اسپلٹ اسکرین تک رسائی"</string> - <string name="pip_menu_title" msgid="5393619322111827096">"مینو"</string> - <string name="pip_menu_accessibility_title" msgid="8129016817688656249">"تصویر میں تصویر کا مینو"</string> + <string name="pip_menu_title" msgid="5393619322111827096">"مینیو"</string> + <string name="pip_menu_accessibility_title" msgid="8129016817688656249">"تصویر میں تصویر کا مینیو"</string> <string name="pip_notification_title" msgid="1347104727641353453">"<xliff:g id="NAME">%s</xliff:g> تصویر میں تصویر میں ہے"</string> <string name="pip_notification_message" msgid="8854051911700302620">"اگر آپ نہیں چاہتے ہیں کہ <xliff:g id="NAME">%s</xliff:g> اس خصوصیت کا استعمال کرے تو ترتیبات کھولنے کے لیے تھپتھپا کر اسے آف کرے۔"</string> <string name="pip_play" msgid="3496151081459417097">"چلائیں"</string> @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"سائز تبدیل کریں"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Stash"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Unstash"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"ممکن ہے کہ ایپ اسپلٹ اسکرین کے ساتھ کام نہ کرے"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"ایپ اسپلٹ اسکرین کو سپورٹ نہیں کرتی ہے"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"یہ ایپ صرف 1 ونڈو میں کھولی جا سکتی ہے۔"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"ممکن ہے ایپ ثانوی ڈسپلے پر کام نہ کرے۔"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"ایپ ثانوی ڈسپلیز پر شروعات کا تعاون نہیں کرتی۔"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"اسپلٹ اسکرین ڈیوائیڈر"</string> + <string name="divider_title" msgid="1963391955593749442">"اسپلٹ اسکرین ڈیوائیڈر"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"بائیں فل اسکرین"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"بائیں %70"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"بائیں %50"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"یہ حل نہیں ہوا؟\nلوٹانے کیلئے تھپتھپائیں"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"کوئی کیمرے کا مسئلہ نہیں ہے؟ برخاست کرنے کیلئے تھپتھپائیں۔"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"دیکھیں اور بہت کچھ کریں"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"اسپلٹ اسکرین کے ليے دوسری ایپ میں گھسیٹیں"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"کسی ایپ کی پوزیشن تبدیل کرنے کے لیے اس ایپ کے باہر دو بار تھپتھپائیں"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"سمجھ آ گئی"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"مزید معلومات کے لیے پھیلائیں۔"</string> @@ -114,5 +109,7 @@ <string name="select_text" msgid="5139083974039906583">"منتخب کریں"</string> <string name="screenshot_text" msgid="1477704010087786671">"اسکرین شاٹ"</string> <string name="close_text" msgid="4986518933445178928">"بند کریں"</string> - <string name="collapse_menu_text" msgid="7515008122450342029">"مینو بند کریں"</string> + <string name="collapse_menu_text" msgid="7515008122450342029">"مینیو بند کریں"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ur/strings_tv.xml b/libs/WindowManager/Shell/res/values-ur/strings_tv.xml index 42b9564ff549..d0f011c0b4cf 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings_tv.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings_tv.xml @@ -25,7 +25,7 @@ <string name="pip_expand" msgid="1051966011679297308">"پھیلائیں"</string> <string name="pip_collapse" msgid="3903295106641385962">"سکیڑیں"</string> <string name="pip_edu_text" msgid="7930546669915337998">"کنٹرولز کے لیے "<annotation icon="home_icon">"ہوم "</annotation>" کو دو بار دبائیں"</string> - <string name="a11y_pip_menu_entered" msgid="5106343214776801614">"تصویر میں تصویر کا مینو۔"</string> + <string name="a11y_pip_menu_entered" msgid="5106343214776801614">"تصویر میں تصویر کا مینیو۔"</string> <string name="a11y_action_pip_move_left" msgid="6612980937817141583">"دائیں منتقل کریں"</string> <string name="a11y_action_pip_move_right" msgid="1119409122645529936">"بائیں منتقل کریں"</string> <string name="a11y_action_pip_move_up" msgid="98502616918621959">"اوپر منتقل کریں"</string> diff --git a/libs/WindowManager/Shell/res/values-uz/strings.xml b/libs/WindowManager/Shell/res/values-uz/strings.xml index 04cc7ee24abc..ac7cc724d459 100644 --- a/libs/WindowManager/Shell/res/values-uz/strings.xml +++ b/libs/WindowManager/Shell/res/values-uz/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Oʻlchamini oʻzgartirish"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Berkitish"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Chiqarish"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Bu ilovada ekranni ikkiga ajratish rejimi ishlamaydi."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"Bu ilovada ekranni ikkiga ajratish ishlamaydi."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Bu ilovani faqat 1 ta oynada ochish mumkin."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Bu ilova qo‘shimcha ekranda ishlamasligi mumkin."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Bu ilova qo‘shimcha ekranlarda ishga tushmaydi."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Ekranni ikkiga ajratish chizigʻi"</string> + <string name="divider_title" msgid="1963391955593749442">"Ekranni ikkiga ajratish chizigʻi"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Chapda to‘liq ekran"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Chapda 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Chapda 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Tuzatilmadimi?\nQaytarish uchun bosing"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kamera muammosizmi? Yopish uchun bosing."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Yana boshqa amallar"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Ekranni ikkiga ajratish uchun boshqa ilovani bu yerga torting"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Qayta joylash uchun ilova tashqarisiga ikki marta bosing"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Batafsil axborot olish uchun kengaytiring."</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Skrinshot"</string> <string name="close_text" msgid="4986518933445178928">"Yopish"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyuni yopish"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-vi/strings.xml b/libs/WindowManager/Shell/res/values-vi/strings.xml index a207471b4f1b..fab5ec162cab 100644 --- a/libs/WindowManager/Shell/res/values-vi/strings.xml +++ b/libs/WindowManager/Shell/res/values-vi/strings.xml @@ -99,8 +99,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Huỷ"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"Khởi động lại"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Không hiện lại"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"Nhấn đúp để di chuyển ứng dụng này"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Phóng to"</string> <string name="minimize_button_text" msgid="271592547935841753">"Thu nhỏ"</string> <string name="close_button_text" msgid="2913281996024033299">"Đóng"</string> @@ -116,4 +115,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Ảnh chụp màn hình"</string> <string name="close_text" msgid="4986518933445178928">"Đóng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Đóng trình đơn"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index f291bf3eb4d5..5cf7ab27b5f1 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"调整大小"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"隐藏"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"取消隐藏"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"应用可能无法在分屏模式下正常运行"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"应用不支持分屏"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"此应用只能在 1 个窗口中打开。"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"应用可能无法在辅显示屏上正常运行。"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"应用不支持在辅显示屏上启动。"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"分屏分隔线"</string> + <string name="divider_title" msgid="1963391955593749442">"分屏分隔线"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"左侧全屏"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"左侧 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"左侧 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"没有解决此问题？\n点按即可恢复"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相机没有问题？点按即可忽略。"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"查看和处理更多任务"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"拖入另一个应用，即可使用分屏模式"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"在某个应用外连续点按两次，即可调整它的位置"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"知道了"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"展开即可了解详情。"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"取消"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"重启"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"不再显示"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"点按两次即可移动此应用"</string> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"关闭"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"屏幕截图"</string> <string name="close_text" msgid="4986518933445178928">"关闭"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"关闭菜单"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml index ade02ba983ce..03a14389b6b7 100644 --- a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"調整大小"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"保護"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"取消保護"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"應用程式可能無法在分割螢幕中運作"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"應用程式不支援分割螢幕"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"此應用程式只可在 1 個視窗中開啟"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"應用程式可能無法在次要顯示屏上運作。"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"應用程式無法在次要顯示屏上啟動。"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"分割螢幕分隔線"</string> + <string name="divider_title" msgid="1963391955593749442">"分割螢幕分隔線"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"左邊全螢幕"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"左邊 70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"左邊 50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"未能修正問題？\n輕按即可還原"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相機冇問題？㩒一下就可以即可閂咗佢。"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"瀏覽更多內容及執行更多操作"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"拖入另一個應用程式即可分割螢幕"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"在應用程式外輕按兩下即可調整位置"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"知道了"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"展開即可查看詳情。"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"取消"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"重新啟動"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"不要再顯示"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"輕按兩下即可移動此應用程式"</string> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"關閉"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"螢幕截圖"</string> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml index a9b3beb84027..d0e52b4e8186 100644 --- a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"調整大小"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"暫時隱藏"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"取消暫時隱藏"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"應用程式可能無法在分割畫面中運作"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"這個應用程式不支援分割畫面"</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"這個應用程式只能在 1 個視窗中開啟。"</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"應用程式可能無法在次要顯示器上運作。"</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"應用程式無法在次要顯示器上啟動。"</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"分割畫面分隔線"</string> + <string name="divider_title" msgid="1963391955593749442">"分割畫面分隔線"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"以全螢幕顯示左側畫面"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"以 70% 的螢幕空間顯示左側畫面"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"以 50% 的螢幕空間顯示左側畫面"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"未修正問題嗎？\n輕觸即可還原"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相機沒問題嗎？輕觸即可關閉。"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"瀏覽更多內容及執行更多操作"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"拖進另一個應用程式即可使用分割畫面模式"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"在應用程式外輕觸兩下即可調整位置"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"我知道了"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"展開即可查看詳細資訊。"</string> @@ -99,8 +94,7 @@ <string name="letterbox_restart_cancel" msgid="1342209132692537805">"取消"</string> <string name="letterbox_restart_restart" msgid="8529976234412442973">"重新啟動"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"不要再顯示"</string> - <!-- no translation found for letterbox_reachability_reposition_text (4507890186297500893) --> - <skip /> + <string name="letterbox_reachability_reposition_text" msgid="4507890186297500893">"輕觸兩下可移動這個應用程式"</string> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"關閉"</string> @@ -116,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"螢幕截圖"</string> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zu/strings.xml b/libs/WindowManager/Shell/res/values-zu/strings.xml index 12a4703656e5..0eb314886055 100644 --- a/libs/WindowManager/Shell/res/values-zu/strings.xml +++ b/libs/WindowManager/Shell/res/values-zu/strings.xml @@ -32,17 +32,13 @@ <string name="accessibility_action_pip_resize" msgid="4623966104749543182">"Shintsha usayizi"</string> <string name="accessibility_action_pip_stash" msgid="4060775037619702641">"Yenza isiteshi"</string> <string name="accessibility_action_pip_unstash" msgid="7467499339610437646">"Susa isiteshi"</string> - <!-- no translation found for dock_forced_resizable (7429086980048964687) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (2733543750291266047) --> - <skip /> + <string name="dock_forced_resizable" msgid="7429086980048964687">"Ama-app okungenzeka angasebenzi ngesikrini esihlukanisiwe"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="2733543750291266047">"I-app ayisekeli isikrini esihlukanisiwe."</string> <string name="dock_multi_instances_not_supported_text" msgid="5242868470666346929">"Le-app ingavulwa kuphela ewindini eli-1."</string> <string name="forced_resizable_secondary_display" msgid="1768046938673582671">"Uhlelo lokusebenza kungenzeka lungasebenzi kusibonisi sesibili."</string> <string name="activity_launch_on_secondary_display_failed_text" msgid="4226485344988071769">"Uhlelo lokusebenza alusekeli ukuqalisa kuzibonisi zesibili."</string> - <!-- no translation found for accessibility_divider (6407584574218956849) --> - <skip /> - <!-- no translation found for divider_title (1963391955593749442) --> - <skip /> + <string name="accessibility_divider" msgid="6407584574218956849">"Isihlukanisi sokuhlukanisa isikrini"</string> + <string name="divider_title" msgid="1963391955593749442">"Isihlukanisi sokuhlukanisa isikrini"</string> <string name="accessibility_action_divider_left_full" msgid="1792313656305328536">"Isikrini esigcwele esingakwesokunxele"</string> <string name="accessibility_action_divider_left_70" msgid="8859845045360659250">"Kwesokunxele ngo-70%"</string> <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"Kwesokunxele ngo-50%"</string> @@ -89,8 +85,7 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Akuyilungisanga?\nThepha ukuze ubuyele"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Azikho izinkinga zekhamera? Thepha ukuze ucashise."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Bona futhi wenze okuningi"</string> - <!-- no translation found for letterbox_education_split_screen_text (449233070804658627) --> - <skip /> + <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Hudula kwenye i-app mayelana nokuhlukanisa isikrini"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Thepha kabili ngaphandle kwe-app ukuze uyimise kabusha"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ngiyezwa"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Nweba ukuze uthole ulwazi olwengeziwe"</string> @@ -115,4 +110,6 @@ <string name="screenshot_text" msgid="1477704010087786671">"Isithombe-skrini"</string> <string name="close_text" msgid="4986518933445178928">"Vala"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Vala Imenyu"</string> + <!-- no translation found for expand_menu_text (3847736164494181168) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml index 4b885c278a7a..c487e4afd678 100644 --- a/libs/WindowManager/Shell/res/values/colors.xml +++ b/libs/WindowManager/Shell/res/values/colors.xml @@ -45,9 +45,6 @@ <!-- Letterbox Dialog --> <color name="letterbox_dialog_background">@android:color/system_neutral1_900</color> - <!-- Reachability Education color for hand icon and text--> - <color name="letterbox_reachability_education_item_color">#BFC8CC</color> - <!-- GM2 colors --> <color name="GM2_grey_200">#E8EAED</color> <color name="GM2_grey_700">#5F6368</color> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 9049ed574ba5..2be34c90a661 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -228,6 +228,8 @@ <dimen name="bubble_user_education_stack_padding">16dp</dimen> <!-- Size of the bubble bar (height), should match transient_taskbar_size in Launcher. --> <dimen name="bubblebar_size">72dp</dimen> + <!-- The size of the drag handle / menu shown along with a bubble bar expanded view. --> + <dimen name="bubblebar_expanded_view_menu_size">16dp</dimen> <!-- Bottom and end margin for compat buttons. --> <dimen name="compat_button_margin">24dp</dimen> @@ -332,9 +334,6 @@ <!-- The margin between the reachability dialog container and its parent. --> <dimen name="letterbox_reachability_education_dialog_margin">16dp</dimen> - <!-- The width of each item in the reachability education --> - <dimen name="letterbox_reachability_education_item_width">118dp</dimen> - <!-- The size of the icon in the item of reachability education --> <dimen name="letterbox_reachability_education_item_image_size">24dp</dimen> diff --git a/libs/WindowManager/Shell/res/values/strings.xml b/libs/WindowManager/Shell/res/values/strings.xml index 563fb4d88941..87a7c3edf826 100644 --- a/libs/WindowManager/Shell/res/values/strings.xml +++ b/libs/WindowManager/Shell/res/values/strings.xml @@ -228,9 +228,10 @@ the screen. This time the double-tap can happen on the top or bottom of the screen. To teach the user about this feature, we display an education explaining how the double-tap works and how the app can be moved on the screen. - This is the text we show to the user below an animated icon visualizing the double-tap - action. [CHAR LIMIT=NONE] --> - <string name="letterbox_reachability_reposition_text">Double-tap to move this app</string> + This is the text we show to the user below an icon visualizing the double-tap + action. The description should be split in two lines separated by "\n" like for this + locale. [CHAR LIMIT=NONE] --> + <string name="letterbox_reachability_reposition_text">Double-tap to\nmove this app</string> <!-- Freeform window caption strings --> <!-- Accessibility text for the maximize window button [CHAR LIMIT=NONE] --> diff --git a/libs/WindowManager/Shell/res/values/styles.xml b/libs/WindowManager/Shell/res/values/styles.xml index 8cad385e1d3f..ee80c4723b8d 100644 --- a/libs/WindowManager/Shell/res/values/styles.xml +++ b/libs/WindowManager/Shell/res/values/styles.xml @@ -151,7 +151,7 @@ </item> </style> - <style name="ReachabilityEduHandLayout" parent="Theme.AppCompat"> + <style name="ReachabilityEduHandLayout"> <item name="android:focusable">false</item> <item name="android:focusableInTouchMode">false</item> <item name="android:background">@android:color/transparent</item> @@ -160,7 +160,7 @@ <item name="android:lineSpacingExtra">-1sp</item> <item name="android:textSize">12sp</item> <item name="android:textAlignment">center</item> - <item name="android:textColor">@color/letterbox_reachability_education_item_color</item> + <item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textAppearance"> @*android:style/TextAppearance.DeviceDefault.Body2 </item> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java index 5f2b63089009..026ea069419d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java @@ -47,6 +47,10 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.InstanceId; +import com.android.launcher3.icons.BubbleBadgeIconFactory; +import com.android.launcher3.icons.BubbleIconFactory; +import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView; +import com.android.wm.shell.bubbles.bar.BubbleBarLayerView; import com.android.wm.shell.common.bubbles.BubbleInfo; import java.io.PrintWriter; @@ -87,8 +91,18 @@ public class Bubble implements BubbleViewProvider { private String mAppName; private ShortcutInfo mShortcutInfo; private String mMetadataShortcutId; + + /** + * If {@link BubbleController#isShowingAsBubbleBar()} is true, the only view that will be + * populated will be {@link #mBubbleBarExpandedView}. If it is false, {@link #mIconView} + * and {@link #mExpandedView} will be populated. + */ + @Nullable private BadgedImageView mIconView; + @Nullable private BubbleExpandedView mExpandedView; + @Nullable + private BubbleBarExpandedView mBubbleBarExpandedView; private BubbleViewInfoTask mInflationTask; private boolean mInflateSynchronously; @@ -327,13 +341,19 @@ public class Bubble implements BubbleViewProvider { return mIconView; } - @Override @Nullable + @Override public BubbleExpandedView getExpandedView() { return mExpandedView; } @Nullable + @Override + public BubbleBarExpandedView getBubbleBarExpandedView() { + return mBubbleBarExpandedView; + } + + @Nullable public String getTitle() { return mTitle; } @@ -364,6 +384,9 @@ public class Bubble implements BubbleViewProvider { mExpandedView.cleanUpExpandedState(); mExpandedView = null; } + if (mBubbleBarExpandedView != null) { + mBubbleBarExpandedView.cleanUpExpandedState(); + } if (mIntent != null) { mIntent.unregisterCancelListener(mIntentCancelListener); } @@ -410,14 +433,16 @@ public class Bubble implements BubbleViewProvider { * @param callback the callback to notify one the bubble is ready to be displayed. * @param context the context for the bubble. * @param controller the bubble controller. - * @param stackView the stackView the bubble is eventually added to. + * @param stackView the view the bubble is added to, iff showing as floating. + * @param layerView the layer the bubble is added to, iff showing in the bubble bar. * @param iconFactory the icon factory use to create images for the bubble. * @param badgeIconFactory the icon factory to create app badges for the bubble. */ void inflate(BubbleViewInfoTask.Callback callback, Context context, BubbleController controller, - BubbleStackView stackView, + @Nullable BubbleStackView stackView, + @Nullable BubbleBarLayerView layerView, BubbleIconFactory iconFactory, BubbleBadgeIconFactory badgeIconFactory, boolean skipInflation) { @@ -428,6 +453,7 @@ public class Bubble implements BubbleViewProvider { context, controller, stackView, + layerView, iconFactory, badgeIconFactory, skipInflation, @@ -445,7 +471,7 @@ public class Bubble implements BubbleViewProvider { } boolean isInflated() { - return mIconView != null && mExpandedView != null; + return (mIconView != null && mExpandedView != null) || mBubbleBarExpandedView != null; } void stopInflation() { @@ -459,6 +485,7 @@ public class Bubble implements BubbleViewProvider { if (!isInflated()) { mIconView = info.imageView; mExpandedView = info.expandedView; + mBubbleBarExpandedView = info.bubbleBarExpandedView; } mShortcutInfo = info.shortcutInfo; @@ -469,7 +496,7 @@ public class Bubble implements BubbleViewProvider { mFlyoutMessage = info.flyoutMessage; mBadgeBitmap = info.badgeBitmap; - mRawBadgeBitmap = info.mRawBadgeBitmap; + mRawBadgeBitmap = info.rawBadgeBitmap; mBubbleBitmap = info.bubbleBitmap; mDotColor = info.dotColor; @@ -478,6 +505,9 @@ public class Bubble implements BubbleViewProvider { if (mExpandedView != null) { mExpandedView.update(this /* bubble */); } + if (mBubbleBarExpandedView != null) { + mBubbleBarExpandedView.update(this /* bubble */); + } if (mIconView != null) { mIconView.setRenderedBubble(this /* bubble */); } @@ -607,6 +637,9 @@ public class Bubble implements BubbleViewProvider { */ @Override public int getTaskId() { + if (mBubbleBarExpandedView != null) { + return mBubbleBarExpandedView.getTaskId(); + } return mExpandedView != null ? mExpandedView.getTaskId() : mTaskId; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleBadgeIconFactory.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleBadgeIconFactory.java deleted file mode 100644 index 56b13b8dcd46..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleBadgeIconFactory.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT 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.wm.shell.bubbles; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Path; -import android.graphics.Rect; -import android.graphics.drawable.AdaptiveIconDrawable; -import android.graphics.drawable.Drawable; - -import com.android.launcher3.icons.BaseIconFactory; -import com.android.launcher3.icons.BitmapInfo; -import com.android.wm.shell.R; - -/** - * Factory for creating app badge icons that are shown on bubbles. - */ -public class BubbleBadgeIconFactory extends BaseIconFactory { - - public BubbleBadgeIconFactory(Context context) { - super(context, context.getResources().getConfiguration().densityDpi, - context.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size)); - } - - /** - * Returns a {@link BitmapInfo} for the app-badge that is shown on top of each bubble. This - * will include the workprofile indicator on the badge if appropriate. - */ - BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon, boolean isImportantConversation) { - if (userBadgedAppIcon instanceof AdaptiveIconDrawable) { - AdaptiveIconDrawable ad = (AdaptiveIconDrawable) userBadgedAppIcon; - userBadgedAppIcon = new CircularAdaptiveIcon(ad.getBackground(), ad.getForeground()); - } - if (isImportantConversation) { - userBadgedAppIcon = new CircularRingDrawable(userBadgedAppIcon); - } - Bitmap userBadgedBitmap = createIconBitmap( - userBadgedAppIcon, 1, MODE_WITH_SHADOW); - return createIconBitmap(userBadgedBitmap); - } - - private class CircularRingDrawable extends CircularAdaptiveIcon { - - final int mImportantConversationColor; - final int mRingWidth; - final Rect mInnerBounds = new Rect(); - - final Drawable mDr; - - CircularRingDrawable(Drawable dr) { - super(null, null); - mDr = dr; - mImportantConversationColor = mContext.getResources().getColor( - R.color.important_conversation, null); - mRingWidth = mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.importance_ring_stroke_width); - } - - @Override - public void draw(Canvas canvas) { - int save = canvas.save(); - canvas.clipPath(getIconMask()); - canvas.drawColor(mImportantConversationColor); - mInnerBounds.set(getBounds()); - mInnerBounds.inset(mRingWidth, mRingWidth); - canvas.translate(mInnerBounds.left, mInnerBounds.top); - mDr.setBounds(0, 0, mInnerBounds.width(), mInnerBounds.height()); - mDr.draw(canvas); - canvas.restoreToCount(save); - } - } - - private static class CircularAdaptiveIcon extends AdaptiveIconDrawable { - - final Path mPath = new Path(); - - CircularAdaptiveIcon(Drawable bg, Drawable fg) { - super(bg, fg); - } - - @Override - public Path getIconMask() { - mPath.reset(); - Rect bounds = getBounds(); - mPath.addOval(bounds.left, bounds.top, bounds.right, bounds.bottom, Path.Direction.CW); - return mPath; - } - - @Override - public void draw(Canvas canvas) { - int save = canvas.save(); - canvas.clipPath(getIconMask()); - - Drawable d; - if ((d = getBackground()) != null) { - d.draw(canvas); - } - if ((d = getForeground()) != null) { - d.draw(canvas); - } - canvas.restoreToCount(save); - } - } -} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index 3dbb745f0c6c..fd66153c24c4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -74,8 +74,10 @@ import android.util.Log; import android.util.Pair; import android.util.SparseArray; import android.view.IWindowManager; +import android.view.SurfaceControl; import android.view.View; import android.view.ViewGroup; +import android.view.ViewRootImpl; import android.view.WindowInsets; import android.view.WindowManager; import android.window.ScreenCapture; @@ -87,8 +89,12 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.IStatusBarService; +import com.android.launcher3.icons.BubbleBadgeIconFactory; +import com.android.launcher3.icons.BubbleIconFactory; +import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.WindowManagerShellWrapper; +import com.android.wm.shell.bubbles.bar.BubbleBarLayerView; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.ExternalInterfaceBinder; import com.android.wm.shell.common.FloatingContentCoordinator; @@ -201,6 +207,7 @@ public class BubbleController implements ConfigurationChangeListener, private BubbleLogger mLogger; private BubbleData mBubbleData; @Nullable private BubbleStackView mStackView; + @Nullable private BubbleBarLayerView mLayerView; private BubbleIconFactory mBubbleIconFactory; private BubbleBadgeIconFactory mBubbleBadgeIconFactory; private BubblePositioner mBubblePositioner; @@ -260,6 +267,9 @@ public class BubbleController implements ConfigurationChangeListener, /** Used to send bubble events to launcher. */ private Bubbles.BubbleStateListener mBubbleStateListener; + /** Used to send updates to the views from {@link #mBubbleDataListener}. */ + private BubbleViewCallback mBubbleViewCallback; + public BubbleController(Context context, ShellInit shellInit, ShellCommandHandler shellCommandHandler, @@ -310,8 +320,13 @@ public class BubbleController implements ConfigurationChangeListener, mBubblePositioner = positioner; mBubbleData = data; mSavedUserBubbleData = new SparseArray<>(); - mBubbleIconFactory = new BubbleIconFactory(context); - mBubbleBadgeIconFactory = new BubbleBadgeIconFactory(context); + mBubbleIconFactory = new BubbleIconFactory(context, + context.getResources().getDimensionPixelSize(R.dimen.bubble_size)); + mBubbleBadgeIconFactory = new BubbleBadgeIconFactory(context, + context.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size), + context.getResources().getColor(R.color.important_conversation), + context.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.importance_ring_stroke_width)); mDisplayController = displayController; mTaskViewTransitions = taskViewTransitions; mOneHandedOptional = oneHandedOptional; @@ -341,6 +356,9 @@ public class BubbleController implements ConfigurationChangeListener, } protected void onInit() { + mBubbleViewCallback = isShowingAsBubbleBar() + ? mBubbleBarViewCallback + : mBubbleStackViewCallback; mBubbleData.setListener(mBubbleDataListener); mBubbleData.setSuppressionChangedListener(this::onBubbleMetadataFlagChanged); mDataRepository.setSuppressionChangedListener(this::onBubbleMetadataFlagChanged); @@ -546,7 +564,7 @@ public class BubbleController implements ConfigurationChangeListener, } private void openBubbleOverflow() { - ensureStackViewCreated(); + ensureBubbleViewsAndWindowCreated(); mBubbleData.setShowingOverflow(true); mBubbleData.setSelectedBubble(mBubbleData.getOverflow()); mBubbleData.setExpanded(true); @@ -586,7 +604,7 @@ public class BubbleController implements ConfigurationChangeListener, expandStackAndSelectBubble(mNotifEntryToExpandOnShadeUnlock); } - updateStack(); + updateBubbleViews(); } @VisibleForTesting @@ -682,39 +700,59 @@ public class BubbleController implements ConfigurationChangeListener, return mBubblePositioner; } - Bubbles.SysuiProxy getSysuiProxy() { + public Bubbles.SysuiProxy getSysuiProxy() { return mSysuiProxy; } /** - * BubbleStackView is lazily created by this method the first time a Bubble is added. This - * method initializes the stack view and adds it to window manager. + * The view and window for bubbles is lazily created by this method the first time a Bubble + * is added. Depending on the device state, this method will: + * - initialize a {@link BubbleStackView} and add it to window manager OR + * - initialize a {@link com.android.wm.shell.bubbles.bar.BubbleBarLayerView} and adds + * it to window manager. */ - private void ensureStackViewCreated() { - if (mStackView == null) { - mStackView = new BubbleStackView( - mContext, this, mBubbleData, mSurfaceSynchronizer, mFloatingContentCoordinator, - mMainExecutor); - mStackView.onOrientationChanged(); - if (mExpandListener != null) { - mStackView.setExpandListener(mExpandListener); + private void ensureBubbleViewsAndWindowCreated() { + mBubblePositioner.setShowingInBubbleBar(isShowingAsBubbleBar()); + if (isShowingAsBubbleBar()) { + // When we're showing in launcher / bubble bar is enabled, we don't have bubble stack + // view, instead we just show the expanded bubble view as necessary. We still need a + // window to show this in, but we use a separate code path. + // TODO(b/273312602): consider foldables where we do need a stack view when folded + if (mLayerView == null) { + mLayerView = new BubbleBarLayerView(mContext, this); + } + } else { + if (mStackView == null) { + mStackView = new BubbleStackView( + mContext, this, mBubbleData, mSurfaceSynchronizer, + mFloatingContentCoordinator, + mMainExecutor); + mStackView.onOrientationChanged(); + if (mExpandListener != null) { + mStackView.setExpandListener(mExpandListener); + } + mStackView.setUnbubbleConversationCallback(mSysuiProxy::onUnbubbleConversation); } - mStackView.setUnbubbleConversationCallback(mSysuiProxy::onUnbubbleConversation); } - addToWindowManagerMaybe(); } - /** Adds the BubbleStackView to the WindowManager if it's not already there. */ + /** Adds the appropriate view to WindowManager if it's not already there. */ private void addToWindowManagerMaybe() { - // If the stack is null, or already added, don't add it. - if (mStackView == null || mAddedToWindowManager) { + // If already added, don't add it. + if (mAddedToWindowManager) { + return; + } + // If the appropriate view is null, don't add it. + if (isShowingAsBubbleBar() && mLayerView == null) { + return; + } else if (!isShowingAsBubbleBar() && mStackView == null) { return; } mWmLayoutParams = new WindowManager.LayoutParams( // Fill the screen so we can use translation animations to position the bubble - // stack. We'll use touchable regions to ignore touches that are not on the bubbles + // views. We'll use touchable regions to ignore touches that are not on the bubbles // themselves. ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, @@ -737,17 +775,30 @@ public class BubbleController implements ConfigurationChangeListener, mAddedToWindowManager = true; registerBroadcastReceiver(); mBubbleData.getOverflow().initialize(this); - mWindowManager.addView(mStackView, mWmLayoutParams); - mStackView.setOnApplyWindowInsetsListener((view, windowInsets) -> { - if (!windowInsets.equals(mWindowInsets)) { - mWindowInsets = windowInsets; - mBubblePositioner.update(); - mStackView.onDisplaySizeChanged(); - } - return windowInsets; - }); + // (TODO: b/273314541) some duplication in the inset listener + if (isShowingAsBubbleBar()) { + mWindowManager.addView(mLayerView, mWmLayoutParams); + mLayerView.setOnApplyWindowInsetsListener((view, windowInsets) -> { + if (!windowInsets.equals(mWindowInsets)) { + mWindowInsets = windowInsets; + mBubblePositioner.update(); + mLayerView.onDisplaySizeChanged(); + } + return windowInsets; + }); + } else { + mWindowManager.addView(mStackView, mWmLayoutParams); + mStackView.setOnApplyWindowInsetsListener((view, windowInsets) -> { + if (!windowInsets.equals(mWindowInsets)) { + mWindowInsets = windowInsets; + mBubblePositioner.update(); + mStackView.onDisplaySizeChanged(); + } + return windowInsets; + }); + } } catch (IllegalStateException e) { - // This means the stack has already been added. This shouldn't happen... + // This means the view has already been added. This shouldn't happen... e.printStackTrace(); } } @@ -770,7 +821,7 @@ public class BubbleController implements ConfigurationChangeListener, } } - /** Removes the BubbleStackView from the WindowManager if it's there. */ + /** Removes any bubble views from the WindowManager that exist. */ private void removeFromWindowManagerMaybe() { if (!mAddedToWindowManager) { return; @@ -791,8 +842,10 @@ public class BubbleController implements ConfigurationChangeListener, if (mStackView != null) { mWindowManager.removeView(mStackView); mBubbleData.getOverflow().cleanUpExpandedState(); - } else { - Log.w(TAG, "StackView added to WindowManager, but was null when removing!"); + } + if (mLayerView != null) { + mWindowManager.removeView(mLayerView); + mBubbleData.getOverflow().cleanUpExpandedState(); } } catch (IllegalArgumentException e) { // This means the stack has already been removed - it shouldn't happen, but ignore if it @@ -882,17 +935,32 @@ public class BubbleController implements ConfigurationChangeListener, if (mStackView != null) { mStackView.onThemeChanged(); } - mBubbleIconFactory = new BubbleIconFactory(mContext); - mBubbleBadgeIconFactory = new BubbleBadgeIconFactory(mContext); + mBubbleIconFactory = new BubbleIconFactory(mContext, + mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size)); + mBubbleBadgeIconFactory = new BubbleBadgeIconFactory(mContext, + mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size), + mContext.getResources().getColor(R.color.important_conversation), + mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.importance_ring_stroke_width)); // Reload each bubble for (Bubble b : mBubbleData.getBubbles()) { - b.inflate(null /* callback */, mContext, this, mStackView, mBubbleIconFactory, + b.inflate(null /* callback */, + mContext, + this, + mStackView, + mLayerView, + mBubbleIconFactory, mBubbleBadgeIconFactory, false /* skipInflation */); } for (Bubble b : mBubbleData.getOverflowBubbles()) { - b.inflate(null /* callback */, mContext, this, mStackView, mBubbleIconFactory, + b.inflate(null /* callback */, + mContext, + this, + mStackView, + mLayerView, + mBubbleIconFactory, mBubbleBadgeIconFactory, false /* skipInflation */); } @@ -909,8 +977,13 @@ public class BubbleController implements ConfigurationChangeListener, mDensityDpi = newConfig.densityDpi; mScreenBounds.set(newConfig.windowConfiguration.getBounds()); mBubbleData.onMaxBubblesChanged(); - mBubbleIconFactory = new BubbleIconFactory(mContext); - mBubbleBadgeIconFactory = new BubbleBadgeIconFactory(mContext); + mBubbleIconFactory = new BubbleIconFactory(mContext, + mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size)); + mBubbleBadgeIconFactory = new BubbleBadgeIconFactory(mContext, + mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size), + mContext.getResources().getColor(R.color.important_conversation), + mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.importance_ring_stroke_width)); mStackView.onDisplaySizeChanged(); } if (newConfig.fontScale != mFontScale) { @@ -959,7 +1032,7 @@ public class BubbleController implements ConfigurationChangeListener, */ @VisibleForTesting public boolean hasBubbles() { - if (mStackView == null) { + if (mStackView == null && mLayerView == null) { return false; } return mBubbleData.hasBubbles() || mBubbleData.isShowingOverflow(); @@ -997,7 +1070,27 @@ public class BubbleController implements ConfigurationChangeListener, * Expands and selects the provided bubble as long as it already exists in the stack or the * overflow. * - * This is currently only used when opening a bubble via clicking on a conversation widget. + * This is used by external callers (launcher). + */ + public void expandStackAndSelectBubbleFromLauncher(String key) { + Bubble b = mBubbleData.getAnyBubbleWithkey(key); + if (b == null) { + return; + } + if (mBubbleData.hasBubbleInStackWithKey(b.getKey())) { + // already in the stack + mBubbleData.setSelectedBubbleFromLauncher(b); + mLayerView.showExpandedView(b); + } else if (mBubbleData.hasOverflowBubbleWithKey(b.getKey())) { + // TODO: (b/271468319) handle overflow + } else { + Log.w(TAG, "didn't add bubble from launcher: " + key); + } + } + + /** + * Expands and selects the provided bubble as long as it already exists in the stack or the + * overflow. This is currently used when opening a bubble via clicking on a conversation widget. */ public void expandStackAndSelectBubble(Bubble b) { if (b == null) { @@ -1133,13 +1226,24 @@ public class BubbleController implements ConfigurationChangeListener, /** * Performs a screenshot that may exclude the bubble layer, if one is present. The screenshot * can be access via the supplied {@link ScreenshotSync#get()} asynchronously. - * - * TODO(b/267324693): Implement the exclude layer functionality in screenshot. */ public void getScreenshotExcludingBubble(int displayId, Pair<ScreenCaptureListener, ScreenshotSync> screenCaptureListener) { try { - mWmService.captureDisplay(displayId, null, screenCaptureListener.first); + ScreenCapture.CaptureArgs args = null; + if (mStackView != null) { + ViewRootImpl viewRoot = mStackView.getViewRootImpl(); + if (viewRoot != null) { + SurfaceControl bubbleLayer = viewRoot.getSurfaceControl(); + if (bubbleLayer != null) { + args = new ScreenCapture.CaptureArgs.Builder<>() + .setExcludeLayers(new SurfaceControl[] {bubbleLayer}) + .build(); + } + } + } + + mWmService.captureDisplay(displayId, args, screenCaptureListener.first); } catch (RemoteException e) { Log.e(TAG, "Failed to capture screenshot"); } @@ -1166,7 +1270,12 @@ public class BubbleController implements ConfigurationChangeListener, } bubble.inflate( (b) -> mBubbleData.overflowBubble(Bubbles.DISMISS_RELOAD_FROM_DISK, bubble), - mContext, this, mStackView, mBubbleIconFactory, mBubbleBadgeIconFactory, + mContext, + this, + mStackView, + mLayerView, + mBubbleIconFactory, + mBubbleBadgeIconFactory, true /* skipInflation */); }); return null; @@ -1238,10 +1347,11 @@ public class BubbleController implements ConfigurationChangeListener, @VisibleForTesting public void inflateAndAdd(Bubble bubble, boolean suppressFlyout, boolean showInShade) { // Lazy init stack view when a bubble is created - ensureStackViewCreated(); + ensureBubbleViewsAndWindowCreated(); bubble.setInflateSynchronously(mInflateSynchronously); bubble.inflate(b -> mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade), - mContext, this, mStackView, mBubbleIconFactory, mBubbleBadgeIconFactory, + mContext, this, mStackView, mLayerView, + mBubbleIconFactory, mBubbleBadgeIconFactory, false /* skipInflation */); } @@ -1406,7 +1516,8 @@ public class BubbleController implements ConfigurationChangeListener, }); } - private final BubbleViewCallback mBubbleViewCallback = new BubbleViewCallback() { + /** When bubbles are floating, this will be used to notify the floating views. */ + private final BubbleViewCallback mBubbleStackViewCallback = new BubbleViewCallback() { @Override public void removeBubble(Bubble removedBubble) { if (mStackView != null) { @@ -1458,6 +1569,62 @@ public class BubbleController implements ConfigurationChangeListener, } }; + /** When bubbles are in the bubble bar, this will be used to notify bubble bar views. */ + private final BubbleViewCallback mBubbleBarViewCallback = new BubbleViewCallback() { + @Override + public void removeBubble(Bubble removedBubble) { + if (mLayerView != null) { + // TODO: need to check if there's something that needs to happen here, e.g. if + // the currently selected & expanded bubble is removed? + } + } + + @Override + public void addBubble(Bubble addedBubble) { + // Nothing to do for adds, these are handled by launcher / in the bubble bar. + } + + @Override + public void updateBubble(Bubble updatedBubble) { + // Nothing to do for updates, these are handled by launcher / in the bubble bar. + } + + @Override + public void bubbleOrderChanged(List<Bubble> bubbleOrder, boolean updatePointer) { + // Nothing to do for order changes, these are handled by launcher / in the bubble bar. + } + + @Override + public void suppressionChanged(Bubble bubble, boolean isSuppressed) { + if (mLayerView != null) { + // TODO (b/273316505) handle suppression changes, although might not need to + // to do anything on the layerview side for this... + } + } + + @Override + public void expansionChanged(boolean isExpanded) { + if (mLayerView != null) { + if (!isExpanded) { + mLayerView.collapse(); + } else { + BubbleViewProvider selectedBubble = mBubbleData.getSelectedBubble(); + if (selectedBubble != null) { + mLayerView.showExpandedView(selectedBubble); + } + } + } + } + + @Override + public void selectionChanged(BubbleViewProvider selectedBubble) { + // Only need to update the layer view if we're currently expanded for selection changes. + if (mLayerView != null && isStackExpanded()) { + mLayerView.showExpandedView(selectedBubble); + } + } + }; + @SuppressWarnings("FieldCanBeLocal") private final BubbleData.Listener mBubbleDataListener = new BubbleData.Listener() { @@ -1475,7 +1642,7 @@ public class BubbleController implements ConfigurationChangeListener, + " unsuppressed=" + (update.unsuppressedBubble != null)); } - ensureStackViewCreated(); + ensureBubbleViewsAndWindowCreated(); // Lazy load overflow bubbles from disk loadOverflowBubblesFromDisk(); @@ -1570,10 +1737,18 @@ public class BubbleController implements ConfigurationChangeListener, } mSysuiProxy.notifyInvalidateNotifications("BubbleData.Listener.applyUpdate"); - updateStack(); + updateBubbleViews(); // Update the cached state for queries from SysUI mImpl.mCachedState.update(update); + + if (isShowingAsBubbleBar() && mBubbleStateListener != null) { + BubbleBarUpdate bubbleBarUpdate = update.toBubbleBarUpdate(); + // Some updates aren't relevant to the bubble bar so check first. + if (bubbleBarUpdate.anythingChanged()) { + mBubbleStateListener.onBubbleStateChange(bubbleBarUpdate); + } + } } }; @@ -1650,28 +1825,42 @@ public class BubbleController implements ConfigurationChangeListener, /** * Updates the visibility of the bubbles based on current state. - * Does not un-bubble, just hides or un-hides. - * Updates stack description for TalkBack focus. - * Updates bubbles' icon views clickable states + * Does not un-bubble, just hides or un-hides the views themselves. + * + * Updates view description for TalkBack focus. + * Updates bubbles' icon views clickable states (when floating). */ - public void updateStack() { - if (mStackView == null) { + public void updateBubbleViews() { + if (mStackView == null && mLayerView == null) { return; } if (!mIsStatusBarShade) { - // Bubbles don't appear over the locked shade. - mStackView.setVisibility(INVISIBLE); + // Bubbles don't appear when the device is locked. + if (mStackView != null) { + mStackView.setVisibility(INVISIBLE); + } + if (mLayerView != null) { + mLayerView.setVisibility(INVISIBLE); + } } else if (hasBubbles()) { // If we're unlocked, show the stack if we have bubbles. If we don't have bubbles, the // stack will be set to INVISIBLE in onAllBubblesAnimatedOut after the bubbles animate // out. - mStackView.setVisibility(VISIBLE); + if (mStackView != null) { + mStackView.setVisibility(VISIBLE); + } + if (mLayerView != null && isStackExpanded()) { + mLayerView.setVisibility(VISIBLE); + } } - mStackView.updateContentDescription(); - - mStackView.updateBubblesAcessibillityStates(); + if (mStackView != null) { + mStackView.updateContentDescription(); + mStackView.updateBubblesAcessibillityStates(); + } else if (mLayerView != null) { + // TODO(b/273313561): handle a11y for BubbleBarLayerView + } } @VisibleForTesting @@ -1829,17 +2018,20 @@ public class BubbleController implements ConfigurationChangeListener, @Override public void showBubble(String key, boolean onLauncherHome) { - // TODO + mMainExecutor.execute(() -> { + mBubblePositioner.setShowingInBubbleBar(onLauncherHome); + mController.expandStackAndSelectBubbleFromLauncher(key); + }); } @Override public void removeBubble(String key, int reason) { - // TODO + // TODO (b/271466616) allow removals from launcher } @Override public void collapseBubbles() { - // TODO + mMainExecutor.execute(() -> mController.collapseStack()); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java index a26c0c487d19..f9cf9d34ec31 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java @@ -334,6 +334,35 @@ public class BubbleData { dispatchPendingChanges(); } + /** + * Sets the selected bubble and expands it, but doesn't dispatch changes + * to {@link BubbleData.Listener}. This is used for updates coming from launcher whose views + * will already be updated so we don't need to notify them again, but BubbleData should be + * updated to have the correct state. + */ + public void setSelectedBubbleFromLauncher(BubbleViewProvider bubble) { + if (DEBUG_BUBBLE_DATA) { + Log.d(TAG, "setSelectedBubbleFromLauncher: " + bubble); + } + mExpanded = true; + if (Objects.equals(bubble, mSelectedBubble)) { + return; + } + boolean isOverflow = bubble != null && BubbleOverflow.KEY.equals(bubble.getKey()); + if (bubble != null + && !mBubbles.contains(bubble) + && !mOverflowBubbles.contains(bubble) + && !isOverflow) { + Log.e(TAG, "Cannot select bubble which doesn't exist!" + + " (" + bubble + ") bubbles=" + mBubbles); + return; + } + if (bubble != null && !isOverflow) { + ((Bubble) bubble).markAsAccessedAt(mTimeSource.currentTimeMillis()); + } + mSelectedBubble = bubble; + } + public void setSelectedBubble(BubbleViewProvider bubble) { if (DEBUG_BUBBLE_DATA) { Log.d(TAG, "setSelectedBubble: " + bubble); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java deleted file mode 100644 index 4ded3ea951e5..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT 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.wm.shell.bubbles; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.content.Context; -import android.content.Intent; -import android.content.pm.LauncherApps; -import android.content.pm.ShortcutInfo; -import android.graphics.Bitmap; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.Icon; - -import androidx.annotation.VisibleForTesting; - -import com.android.launcher3.icons.BaseIconFactory; -import com.android.wm.shell.R; - -/** - * Factory for creating normalized bubble icons. - * We are not using Launcher's IconFactory because bubbles only runs on the UI thread, - * so there is no need to manage a pool across multiple threads. - */ -@VisibleForTesting -public class BubbleIconFactory extends BaseIconFactory { - - public BubbleIconFactory(Context context) { - super(context, context.getResources().getConfiguration().densityDpi, - context.getResources().getDimensionPixelSize(R.dimen.bubble_size)); - } - - /** - * Returns the drawable that the developer has provided to display in the bubble. - */ - Drawable getBubbleDrawable(@NonNull final Context context, - @Nullable final ShortcutInfo shortcutInfo, @Nullable final Icon ic) { - if (shortcutInfo != null) { - LauncherApps launcherApps = - (LauncherApps) context.getSystemService(Context.LAUNCHER_APPS_SERVICE); - int density = context.getResources().getConfiguration().densityDpi; - return launcherApps.getShortcutIconDrawable(shortcutInfo, density); - } else { - if (ic != null) { - if (ic.getType() == Icon.TYPE_URI - || ic.getType() == Icon.TYPE_URI_ADAPTIVE_BITMAP) { - context.grantUriPermission(context.getPackageName(), - ic.getUri(), - Intent.FLAG_GRANT_READ_URI_PERMISSION); - } - return ic.loadDrawable(context); - } - return null; - } - } - - /** - * Creates the bitmap for the provided drawable and returns the scale used for - * drawing the actual drawable. - */ - public Bitmap createIconBitmap(@NonNull Drawable icon, float[] outScale) { - if (outScale == null) { - outScale = new float[1]; - } - icon = normalizeAndWrapToAdaptiveIcon(icon, - true /* shrinkNonAdaptiveIcons */, - null /* outscale */, - outScale); - return createIconBitmap(icon, outScale[0], MODE_WITH_SHADOW); - } -} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt index eb7929b8ca54..c2a05b715f44 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt @@ -28,7 +28,9 @@ import android.util.PathParser import android.util.TypedValue import android.view.LayoutInflater import android.widget.FrameLayout +import com.android.launcher3.icons.BubbleIconFactory import com.android.wm.shell.R +import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView class BubbleOverflow( private val context: Context, @@ -92,7 +94,8 @@ class BubbleOverflow( val shapeColor = res.getColor(android.R.color.system_accent1_1000) overflowBtn?.iconDrawable?.setTint(shapeColor) - val iconFactory = BubbleIconFactory(context) + val iconFactory = BubbleIconFactory(context, + context.getResources().getDimensionPixelSize(R.dimen.bubble_size)) // Update bitmap val fg = InsetDrawable(overflowBtn?.iconDrawable, overflowIconInset) @@ -136,6 +139,10 @@ class BubbleOverflow( return expandedView } + override fun getBubbleBarExpandedView(): BubbleBarExpandedView? { + return null + } + override fun getDotColor(): Int { return dotColor } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java index f437553337ef..d1081de11f30 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java @@ -22,6 +22,7 @@ import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -38,12 +39,14 @@ import android.util.Log; import android.util.PathParser; import android.view.LayoutInflater; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.graphics.ColorUtils; import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.BubbleBadgeIconFactory; +import com.android.launcher3.icons.BubbleIconFactory; import com.android.wm.shell.R; +import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView; +import com.android.wm.shell.bubbles.bar.BubbleBarLayerView; import java.lang.ref.WeakReference; import java.util.Objects; @@ -70,6 +73,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask private WeakReference<Context> mContext; private WeakReference<BubbleController> mController; private WeakReference<BubbleStackView> mStackView; + private WeakReference<BubbleBarLayerView> mLayerView; private BubbleIconFactory mIconFactory; private BubbleBadgeIconFactory mBadgeIconFactory; private boolean mSkipInflation; @@ -83,7 +87,8 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask BubbleViewInfoTask(Bubble b, Context context, BubbleController controller, - BubbleStackView stackView, + @Nullable BubbleStackView stackView, + @Nullable BubbleBarLayerView layerView, BubbleIconFactory factory, BubbleBadgeIconFactory badgeFactory, boolean skipInflation, @@ -93,6 +98,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask mContext = new WeakReference<>(context); mController = new WeakReference<>(controller); mStackView = new WeakReference<>(stackView); + mLayerView = new WeakReference<>(layerView); mIconFactory = factory; mBadgeIconFactory = badgeFactory; mSkipInflation = skipInflation; @@ -102,8 +108,13 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask @Override protected BubbleViewInfo doInBackground(Void... voids) { - return BubbleViewInfo.populate(mContext.get(), mController.get(), mStackView.get(), - mIconFactory, mBadgeIconFactory, mBubble, mSkipInflation); + if (mController.get().isShowingAsBubbleBar()) { + return BubbleViewInfo.populateForBubbleBar(mContext.get(), mController.get(), + mLayerView.get(), mBadgeIconFactory, mBubble, mSkipInflation); + } else { + return BubbleViewInfo.populate(mContext.get(), mController.get(), mStackView.get(), + mIconFactory, mBadgeIconFactory, mBubble, mSkipInflation); + } } @Override @@ -124,16 +135,70 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask */ @VisibleForTesting public static class BubbleViewInfo { - BadgedImageView imageView; - BubbleExpandedView expandedView; + // TODO(b/273312602): for foldables it might make sense to populate all of the views + + // Always populated ShortcutInfo shortcutInfo; String appName; - Bitmap bubbleBitmap; - Bitmap badgeBitmap; - Bitmap mRawBadgeBitmap; + Bitmap rawBadgeBitmap; + + // Only populated when showing in taskbar + BubbleBarExpandedView bubbleBarExpandedView; + + // These are only populated when not showing in taskbar + BadgedImageView imageView; + BubbleExpandedView expandedView; int dotColor; Path dotPath; Bubble.FlyoutMessage flyoutMessage; + Bitmap bubbleBitmap; + Bitmap badgeBitmap; + + @Nullable + public static BubbleViewInfo populateForBubbleBar(Context c, BubbleController controller, + BubbleBarLayerView layerView, BubbleBadgeIconFactory badgeIconFactory, Bubble b, + boolean skipInflation) { + BubbleViewInfo info = new BubbleViewInfo(); + + if (!skipInflation && !b.isInflated()) { + LayoutInflater inflater = LayoutInflater.from(c); + info.bubbleBarExpandedView = (BubbleBarExpandedView) inflater.inflate( + R.layout.bubble_bar_expanded_view, layerView, false /* attachToRoot */); + info.bubbleBarExpandedView.initialize(controller); + } + + if (b.getShortcutInfo() != null) { + info.shortcutInfo = b.getShortcutInfo(); + } + + // App name & app icon + PackageManager pm = BubbleController.getPackageManagerForUser(c, + b.getUser().getIdentifier()); + ApplicationInfo appInfo; + Drawable badgedIcon; + Drawable appIcon; + try { + appInfo = pm.getApplicationInfo( + b.getPackageName(), + PackageManager.MATCH_UNINSTALLED_PACKAGES + | PackageManager.MATCH_DISABLED_COMPONENTS + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE + | PackageManager.MATCH_DIRECT_BOOT_AWARE); + if (appInfo != null) { + info.appName = String.valueOf(pm.getApplicationLabel(appInfo)); + } + appIcon = pm.getApplicationIcon(b.getPackageName()); + badgedIcon = pm.getUserBadgedIcon(appIcon, b.getUser()); + } catch (PackageManager.NameNotFoundException exception) { + // If we can't find package... don't think we should show the bubble. + Log.w(TAG, "Unable to find package: " + b.getPackageName()); + return null; + } + + info.rawBadgeBitmap = badgeIconFactory.getBadgeBitmap(badgedIcon, false).icon; + + return info; + } @VisibleForTesting @Nullable @@ -195,7 +260,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask b.isImportantConversation()); info.badgeBitmap = badgeBitmapInfo.icon; // Raw badge bitmap never includes the important conversation ring - info.mRawBadgeBitmap = b.isImportantConversation() + info.rawBadgeBitmap = b.isImportantConversation() ? badgeIconFactory.getBadgeBitmap(badgedIcon, false).icon : badgeBitmapInfo.icon; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewProvider.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewProvider.java index 3f6d41bb2b68..6bdc3b9f5aec 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewProvider.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewProvider.java @@ -22,18 +22,40 @@ import android.view.View; import androidx.annotation.Nullable; +import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView; + /** * Interface to represent actual Bubbles and UI elements that act like bubbles, like BubbleOverflow. */ public interface BubbleViewProvider { - @Nullable BubbleExpandedView getExpandedView(); + + /** + * Returns the icon view used for a bubble (the click target when collapsed). This is populated + * when bubbles are floating, i.e. when {@link BubbleController#isShowingAsBubbleBar()} is + * false. + */ + @Nullable + View getIconView(); + + /** + * Returns the expanded view used for a bubble. This is populated when bubbles are floating, + * i.e. when {@link BubbleController#isShowingAsBubbleBar()} is false. + */ + @Nullable + BubbleExpandedView getExpandedView(); + + /** + * Returns the expanded view used for a bubble being show in the bubble bar. This is populated + * when {@link BubbleController#isShowingAsBubbleBar()} is true. + */ + @Nullable + BubbleBarExpandedView getBubbleBarExpandedView(); /** * Sets whether the contents of the bubble's TaskView should be visible. */ void setTaskViewVisibility(boolean visible); - @Nullable View getIconView(); String getKey(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java new file mode 100644 index 000000000000..23f65f943aa4 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java @@ -0,0 +1,233 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.wm.shell.bubbles.bar; + +import static android.view.View.VISIBLE; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ValueAnimator; +import android.content.Context; +import android.graphics.PointF; +import android.util.Log; +import android.widget.FrameLayout; + +import com.android.wm.shell.animation.Interpolators; +import com.android.wm.shell.animation.PhysicsAnimator; +import com.android.wm.shell.bubbles.BubblePositioner; +import com.android.wm.shell.bubbles.BubbleViewProvider; +import com.android.wm.shell.bubbles.animation.AnimatableScaleMatrix; + +/** + * Helper class to animate a {@link BubbleBarExpandedView} on a bubble. + */ +public class BubbleBarAnimationHelper { + + private static final String TAG = BubbleBarAnimationHelper.class.getSimpleName(); + + private static final float EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT = 0.1f; + private static final float EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT = .75f; + private static final int EXPANDED_VIEW_ALPHA_ANIMATION_DURATION = 150; + + /** Spring config for the expanded view scale-in animation. */ + private final PhysicsAnimator.SpringConfig mScaleInSpringConfig = + new PhysicsAnimator.SpringConfig(300f, 0.9f); + + /** Spring config for the expanded view scale-out animation. */ + private final PhysicsAnimator.SpringConfig mScaleOutSpringConfig = + new PhysicsAnimator.SpringConfig(900f, 1f); + + /** Matrix used to scale the expanded view container with a given pivot point. */ + private final AnimatableScaleMatrix mExpandedViewContainerMatrix = new AnimatableScaleMatrix(); + + /** Animator for animating the expanded view's alpha (including the TaskView inside it). */ + private final ValueAnimator mExpandedViewAlphaAnimator = ValueAnimator.ofFloat(0f, 1f); + + private final Context mContext; + private final BubbleBarLayerView mLayerView; + private final BubblePositioner mPositioner; + + private BubbleViewProvider mExpandedBubble; + private boolean mIsExpanded = false; + + public BubbleBarAnimationHelper(Context context, + BubbleBarLayerView bubbleBarLayerView, + BubblePositioner positioner) { + mContext = context; + mLayerView = bubbleBarLayerView; + mPositioner = positioner; + + mExpandedViewAlphaAnimator.setDuration(EXPANDED_VIEW_ALPHA_ANIMATION_DURATION); + mExpandedViewAlphaAnimator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED); + mExpandedViewAlphaAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + if (mExpandedBubble != null && mExpandedBubble.getBubbleBarExpandedView() != null) { + // We need to be Z ordered on top in order for alpha animations to work. + mExpandedBubble.getBubbleBarExpandedView().setSurfaceZOrderedOnTop(true); + mExpandedBubble.getBubbleBarExpandedView().setAnimating(true); + } + } + + @Override + public void onAnimationEnd(Animator animation) { + if (mExpandedBubble != null && mExpandedBubble.getBubbleBarExpandedView() != null) { + // The surface needs to be Z ordered on top for alpha values to work on the + // TaskView, and if we're temporarily hidden, we are still on the screen + // with alpha = 0f until we animate back. Stay Z ordered on top so the alpha + // = 0f remains in effect. + if (mIsExpanded) { + mExpandedBubble.getBubbleBarExpandedView().setSurfaceZOrderedOnTop(false); + } + + mExpandedBubble.getBubbleBarExpandedView().setContentVisibility(mIsExpanded); + mExpandedBubble.getBubbleBarExpandedView().setAnimating(false); + } + } + }); + mExpandedViewAlphaAnimator.addUpdateListener(valueAnimator -> { + if (mExpandedBubble != null && mExpandedBubble.getBubbleBarExpandedView() != null) { + float alpha = (float) valueAnimator.getAnimatedValue(); + mExpandedBubble.getBubbleBarExpandedView().setTaskViewAlpha(alpha); + mExpandedBubble.getBubbleBarExpandedView().setAlpha(alpha); + } + }); + } + + /** + * Animates the provided bubble's expanded view to the expanded state. + */ + public void animateExpansion(BubbleViewProvider expandedBubble) { + mExpandedBubble = expandedBubble; + if (mExpandedBubble == null) { + return; + } + BubbleBarExpandedView bev = mExpandedBubble.getBubbleBarExpandedView(); + if (bev == null) { + return; + } + mIsExpanded = true; + + mExpandedViewContainerMatrix.setScaleX(0f); + mExpandedViewContainerMatrix.setScaleY(0f); + + updateExpandedView(); + bev.setAnimating(true); + bev.setContentVisibility(false); + bev.setAlpha(0f); + bev.setTaskViewAlpha(0f); + bev.setVisibility(VISIBLE); + + // Set the pivot point for the scale, so the view animates out from the bubble bar. + PointF bubbleBarPosition = mPositioner.getBubbleBarPosition(); + mExpandedViewContainerMatrix.setScale( + 1f - EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT, + 1f - EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT, + bubbleBarPosition.x, + bubbleBarPosition.y); + + bev.setAnimationMatrix(mExpandedViewContainerMatrix); + + mExpandedViewAlphaAnimator.start(); + + PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel(); + PhysicsAnimator.getInstance(mExpandedViewContainerMatrix) + .spring(AnimatableScaleMatrix.SCALE_X, + AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f), + mScaleInSpringConfig) + .spring(AnimatableScaleMatrix.SCALE_Y, + AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f), + mScaleInSpringConfig) + .addUpdateListener((target, values) -> { + mExpandedBubble.getBubbleBarExpandedView().setAnimationMatrix( + mExpandedViewContainerMatrix); + }) + .withEndActions(() -> { + bev.setAnimationMatrix(null); + updateExpandedView(); + bev.setSurfaceZOrderedOnTop(false); + }) + .start(); + } + + /** + * Collapses the currently expanded bubble. + * + * @param endRunnable a runnable to run at the end of the animation. + */ + public void animateCollapse(Runnable endRunnable) { + mIsExpanded = false; + if (mExpandedBubble == null || mExpandedBubble.getBubbleBarExpandedView() == null) { + Log.w(TAG, "Trying to animate collapse without a bubble"); + return; + } + + mExpandedViewContainerMatrix.setScaleX(1f); + mExpandedViewContainerMatrix.setScaleY(1f); + + PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel(); + PhysicsAnimator.getInstance(mExpandedViewContainerMatrix) + .spring(AnimatableScaleMatrix.SCALE_X, + AnimatableScaleMatrix.getAnimatableValueForScaleFactor( + EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT), + mScaleOutSpringConfig) + .spring(AnimatableScaleMatrix.SCALE_Y, + AnimatableScaleMatrix.getAnimatableValueForScaleFactor( + EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT), + mScaleOutSpringConfig) + .addUpdateListener((target, values) -> { + if (mExpandedBubble != null + && mExpandedBubble.getBubbleBarExpandedView() != null) { + mExpandedBubble.getBubbleBarExpandedView().setAnimationMatrix( + mExpandedViewContainerMatrix); + } + }) + .withEndActions(() -> { + if (mExpandedBubble != null + && mExpandedBubble.getBubbleBarExpandedView() != null) { + mExpandedBubble.getBubbleBarExpandedView().setAnimationMatrix(null); + } + if (endRunnable != null) { + endRunnable.run(); + } + }) + .start(); + mExpandedViewAlphaAnimator.reverse(); + } + + private void updateExpandedView() { + if (mExpandedBubble == null || mExpandedBubble.getBubbleBarExpandedView() == null) { + Log.w(TAG, "Trying to update the expanded view without a bubble"); + return; + } + BubbleBarExpandedView bbev = mExpandedBubble.getBubbleBarExpandedView(); + + final int padding = mPositioner.getBubbleBarExpandedViewPadding(); + final int width = mPositioner.getExpandedViewWidthForBubbleBar(); + final int height = mPositioner.getExpandedViewHeightForBubbleBar(); + FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) bbev.getLayoutParams(); + lp.width = width; + lp.height = height; + bbev.setLayoutParams(lp); + if (mLayerView.isOnLeft()) { + bbev.setX(mPositioner.getInsets().left + padding); + } else { + bbev.setX(mPositioner.getAvailableRect().width() - width - padding); + } + bbev.setY(mPositioner.getInsets().top + padding); + bbev.updateLocation(); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java new file mode 100644 index 000000000000..b8f049becb6f --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -0,0 +1,267 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.wm.shell.bubbles.bar; + +import android.app.ActivityManager; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.Outline; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewOutlineProvider; +import android.widget.FrameLayout; + +import com.android.internal.policy.ScreenDecorationsUtils; +import com.android.wm.shell.R; +import com.android.wm.shell.bubbles.Bubble; +import com.android.wm.shell.bubbles.BubbleController; +import com.android.wm.shell.bubbles.BubbleTaskViewHelper; +import com.android.wm.shell.taskview.TaskView; + +/** + * Expanded view of a bubble when it's part of the bubble bar. + * + * {@link BubbleController#isShowingAsBubbleBar()} + */ +public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskViewHelper.Listener { + + private static final String TAG = BubbleBarExpandedView.class.getSimpleName(); + private static final int INVALID_TASK_ID = -1; + + private BubbleController mController; + private BubbleTaskViewHelper mBubbleTaskViewHelper; + + private HandleView mMenuView; + private TaskView mTaskView; + + private int mMenuHeight; + private int mBackgroundColor; + private float mCornerRadius = 0f; + + /** + * Whether we want the {@code TaskView}'s content to be visible (alpha = 1f). If + * {@link #mIsAnimating} is true, this may not reflect the {@code TaskView}'s actual alpha + * value until the animation ends. + */ + private boolean mIsContentVisible = false; + private boolean mIsAnimating; + + public BubbleBarExpandedView(Context context) { + this(context, null); + } + + public BubbleBarExpandedView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public BubbleBarExpandedView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public BubbleBarExpandedView(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + Context context = getContext(); + setElevation(getResources().getDimensionPixelSize(R.dimen.bubble_elevation)); + mMenuHeight = context.getResources().getDimensionPixelSize( + R.dimen.bubblebar_expanded_view_menu_size); + mMenuView = new HandleView(context); + addView(mMenuView); + + applyThemeAttrs(); + setClipToOutline(true); + setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), mCornerRadius); + } + }); + } + + /** Set the BubbleController on the view, must be called before doing anything else. */ + public void initialize(BubbleController controller) { + mController = controller; + mBubbleTaskViewHelper = new BubbleTaskViewHelper(mContext, mController, + /* listener= */ this, + /* viewParent= */ this); + mTaskView = mBubbleTaskViewHelper.getTaskView(); + addView(mTaskView); + mTaskView.setEnableSurfaceClipping(true); + mTaskView.setCornerRadius(mCornerRadius); + } + + // TODO (b/275087636): call this when theme/config changes + void applyThemeAttrs() { + boolean supportsRoundedCorners = ScreenDecorationsUtils.supportsRoundedCornersOnWindows( + mContext.getResources()); + final TypedArray ta = mContext.obtainStyledAttributes(new int[] { + android.R.attr.dialogCornerRadius, + android.R.attr.colorBackgroundFloating}); + mCornerRadius = supportsRoundedCorners ? ta.getDimensionPixelSize(0, 0) : 0; + mCornerRadius = mCornerRadius / 2f; + mBackgroundColor = ta.getColor(1, Color.WHITE); + + ta.recycle(); + + mMenuView.setCornerRadius(mCornerRadius); + mMenuHeight = getResources().getDimensionPixelSize( + R.dimen.bubblebar_expanded_view_menu_size); + + if (mTaskView != null) { + mTaskView.setCornerRadius(mCornerRadius); + mTaskView.setElevation(150); + updateMenuColor(); + } + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + + // Add corner radius here so that the menu extends behind the rounded corners of TaskView. + int menuViewHeight = Math.min((int) (mMenuHeight + mCornerRadius), height); + measureChild(mMenuView, widthMeasureSpec, MeasureSpec.makeMeasureSpec(menuViewHeight, + MeasureSpec.getMode(heightMeasureSpec))); + + if (mTaskView != null) { + int taskViewHeight = height - menuViewHeight; + measureChild(mTaskView, widthMeasureSpec, MeasureSpec.makeMeasureSpec(taskViewHeight, + MeasureSpec.getMode(heightMeasureSpec))); + } + } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + // Drag handle above + final int dragHandleBottom = t + mMenuView.getMeasuredHeight(); + mMenuView.layout(l, t, r, dragHandleBottom); + if (mTaskView != null) { + // Subtract radius so that the menu extends behind the rounded corners of TaskView. + mTaskView.layout(l, (int) (dragHandleBottom - mCornerRadius), r, + dragHandleBottom + mTaskView.getMeasuredHeight()); + } + } + + @Override + public void onTaskCreated() { + setContentVisibility(true); + updateMenuColor(); + } + + @Override + public void onContentVisibilityChanged(boolean visible) { + setContentVisibility(visible); + } + + @Override + public void onBackPressed() { + mController.collapseStack(); + } + + /** Cleans up task view, should be called when the bubble is no longer active. */ + public void cleanUpExpandedState() { + if (mBubbleTaskViewHelper != null) { + if (mTaskView != null) { + removeView(mTaskView); + } + mBubbleTaskViewHelper.cleanUpTaskView(); + } + } + + /** Updates the bubble shown in this task view. */ + public void update(Bubble bubble) { + mBubbleTaskViewHelper.update(bubble); + } + + /** The task id of the activity shown in the task view, if it exists. */ + public int getTaskId() { + return mBubbleTaskViewHelper != null ? mBubbleTaskViewHelper.getTaskId() : INVALID_TASK_ID; + } + + /** + * Call when the location or size of the view has changed to update TaskView. + */ + public void updateLocation() { + if (mTaskView == null) return; + mTaskView.onLocationChanged(); + } + + /** Sets the alpha of the task view. */ + public void setContentVisibility(boolean visible) { + mIsContentVisible = visible; + + if (mTaskView == null) return; + + if (!mIsAnimating) { + mTaskView.setAlpha(visible ? 1f : 0f); + } + } + + /** Updates the menu bar to be the status bar color specified by the app. */ + private void updateMenuColor() { + if (mTaskView == null) return; + ActivityManager.RunningTaskInfo info = mTaskView.getTaskInfo(); + final int taskBgColor = info.taskDescription.getStatusBarColor(); + final int color = Color.valueOf(taskBgColor == -1 ? Color.WHITE : taskBgColor).toArgb(); + if (color != -1) { + mMenuView.setBackgroundColor(color); + } else { + mMenuView.setBackgroundColor(mBackgroundColor); + } + } + + /** + * Sets the alpha of both this view and the task view. + */ + public void setTaskViewAlpha(float alpha) { + if (mTaskView != null) { + mTaskView.setAlpha(alpha); + } + setAlpha(alpha); + } + + /** + * Sets whether the surface displaying app content should sit on top. This is useful for + * ordering surfaces during animations. When content is drawn on top of the app (e.g. bubble + * being dragged out, the manage menu) this is set to false, otherwise it should be true. + */ + public void setSurfaceZOrderedOnTop(boolean onTop) { + if (mTaskView == null) { + return; + } + mTaskView.setZOrderedOnTop(onTop, true /* allowDynamicChange */); + } + + /** + * Sets whether the view is animating, in this case we won't change the content visibility + * until the animation is done. + */ + public void setAnimating(boolean animating) { + mIsAnimating = animating; + // If we're done animating, apply the correct visibility. + if (!animating) { + setContentVisibility(mIsContentVisible); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java new file mode 100644 index 000000000000..b1a725b6e5c4 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java @@ -0,0 +1,212 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.wm.shell.bubbles.bar; + +import static com.android.wm.shell.animation.Interpolators.ALPHA_IN; +import static com.android.wm.shell.animation.Interpolators.ALPHA_OUT; + +import android.annotation.Nullable; +import android.content.Context; +import android.graphics.Rect; +import android.graphics.Region; +import android.graphics.drawable.ColorDrawable; +import android.view.View; +import android.view.ViewTreeObserver; +import android.widget.FrameLayout; + +import com.android.wm.shell.bubbles.BubbleController; +import com.android.wm.shell.bubbles.BubblePositioner; +import com.android.wm.shell.bubbles.BubbleViewProvider; + +/** + * Similar to {@link com.android.wm.shell.bubbles.BubbleStackView}, this view is added to window + * manager to display bubbles. However, it is only used when bubbles are being displayed in + * launcher in the bubble bar. This view does not show a stack of bubbles that can be moved around + * on screen and instead shows & animates the expanded bubble for the bubble bar. + */ +public class BubbleBarLayerView extends FrameLayout + implements ViewTreeObserver.OnComputeInternalInsetsListener { + + private static final String TAG = BubbleBarLayerView.class.getSimpleName(); + + private static final float SCRIM_ALPHA = 0.2f; + + private final BubbleController mBubbleController; + private final BubblePositioner mPositioner; + private final BubbleBarAnimationHelper mAnimationHelper; + private final View mScrimView; + + @Nullable + private BubbleViewProvider mExpandedBubble; + private BubbleBarExpandedView mExpandedView; + + // TODO(b/273310265) - currently the view is always on the right, need to update for RTL. + /** Whether the expanded view is displaying on the left of the screen or not. */ + private boolean mOnLeft = false; + + /** Whether a bubble is expanded. */ + private boolean mIsExpanded = false; + + private final Region mTouchableRegion = new Region(); + private final Rect mTempRect = new Rect(); + + public BubbleBarLayerView(Context context, BubbleController controller) { + super(context); + mBubbleController = controller; + mPositioner = mBubbleController.getPositioner(); + + mAnimationHelper = new BubbleBarAnimationHelper(context, + this, mPositioner); + + mScrimView = new View(getContext()); + mScrimView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); + mScrimView.setBackgroundDrawable(new ColorDrawable( + getResources().getColor(android.R.color.system_neutral1_1000))); + addView(mScrimView); + mScrimView.setAlpha(0f); + mScrimView.setBackgroundDrawable(new ColorDrawable( + getResources().getColor(android.R.color.system_neutral1_1000))); + + setOnClickListener(view -> { + mBubbleController.collapseStack(); + }); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + mPositioner.update(); + getViewTreeObserver().addOnComputeInternalInsetsListener(this); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + getViewTreeObserver().removeOnComputeInternalInsetsListener(this); + + if (mExpandedView != null) { + removeView(mExpandedView); + mExpandedView = null; + } + } + + @Override + public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) { + inoutInfo.setTouchableInsets(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION); + mTouchableRegion.setEmpty(); + getTouchableRegion(mTouchableRegion); + inoutInfo.touchableRegion.set(mTouchableRegion); + } + + /** Updates the sizes of any displaying expanded view. */ + public void onDisplaySizeChanged() { + if (mIsExpanded && mExpandedView != null) { + updateExpandedView(); + } + } + + /** Whether the stack of bubbles is expanded or not. */ + public boolean isExpanded() { + return mIsExpanded; + } + + // (TODO: b/273310265): BubblePositioner should be source of truth when this work is done. + /** Whether the expanded view is positioned on the left or right side of the screen. */ + public boolean isOnLeft() { + return mOnLeft; + } + + /** Shows the expanded view of the provided bubble. */ + public void showExpandedView(BubbleViewProvider b) { + BubbleBarExpandedView expandedView = b.getBubbleBarExpandedView(); + if (expandedView == null) { + return; + } + if (mExpandedBubble != null && !b.getKey().equals(mExpandedBubble.getKey())) { + removeView(mExpandedView); + mExpandedView = null; + } + if (mExpandedView == null) { + mExpandedBubble = b; + mExpandedView = expandedView; + final int width = mPositioner.getExpandedViewWidthForBubbleBar(); + final int height = mPositioner.getExpandedViewHeightForBubbleBar(); + mExpandedView.setVisibility(GONE); + addView(mExpandedView, new FrameLayout.LayoutParams(width, height)); + } + + mIsExpanded = true; + mBubbleController.getSysuiProxy().onStackExpandChanged(true); + mAnimationHelper.animateExpansion(mExpandedBubble); + showScrim(true); + } + + /** Collapses any showing expanded view */ + public void collapse() { + mIsExpanded = false; + final BubbleBarExpandedView viewToRemove = mExpandedView; + mAnimationHelper.animateCollapse(() -> removeView(viewToRemove)); + mBubbleController.getSysuiProxy().onStackExpandChanged(false); + mExpandedView = null; + showScrim(false); + } + + /** Updates the expanded view size and position. */ + private void updateExpandedView() { + if (mExpandedView == null) return; + final int padding = mPositioner.getBubbleBarExpandedViewPadding(); + final int width = mPositioner.getExpandedViewWidthForBubbleBar(); + final int height = mPositioner.getExpandedViewHeightForBubbleBar(); + FrameLayout.LayoutParams lp = (LayoutParams) mExpandedView.getLayoutParams(); + lp.width = width; + lp.height = height; + mExpandedView.setLayoutParams(lp); + if (mOnLeft) { + mExpandedView.setX(mPositioner.getInsets().left + padding); + } else { + mExpandedView.setX(mPositioner.getAvailableRect().width() - width - padding); + } + mExpandedView.setY(mPositioner.getInsets().top + padding); + mExpandedView.updateLocation(); + } + + private void showScrim(boolean show) { + if (show) { + mScrimView.animate() + .setInterpolator(ALPHA_IN) + .alpha(SCRIM_ALPHA) + .start(); + } else { + mScrimView.animate() + .alpha(0f) + .setInterpolator(ALPHA_OUT) + .start(); + } + } + + /** + * Fills in the touchable region for expanded view. This is used by window manager to + * decide which touch events go to the expanded view. + */ + private void getTouchableRegion(Region outRegion) { + mTempRect.setEmpty(); + if (mIsExpanded) { + getBoundsOnScreen(mTempRect); + outRegion.op(mTempRect, Region.Op.UNION); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/HandleView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/HandleView.java new file mode 100644 index 000000000000..9ee8a9d98aa1 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/HandleView.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.wm.shell.bubbles.bar; + +import android.content.Context; +import android.view.Gravity; +import android.widget.LinearLayout; + +/** + * Handle / menu view to show at the top of a bubble bar expanded view. + */ +public class HandleView extends LinearLayout { + + // TODO(b/273307221): implement the manage menu in this view. + public HandleView(Context context) { + super(context); + setOrientation(LinearLayout.HORIZONTAL); + setGravity(Gravity.CENTER); + } + + /** + * The menu extends past the top of the TaskView because of the rounded corners. This means + * to center content in the menu we must subtract the radius (i.e. the amount of space covered + * by TaskView). + */ + public void setCornerRadius(float radius) { + setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), (int) radius); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java index 4e10ce82f365..09d99b204bdb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java @@ -58,11 +58,18 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi "has_seen_letterbox_education"; /** - * Key prefix for the {@link SharedPreferences} entries related to the reachability + * Key prefix for the {@link SharedPreferences} entries related to the horizontal + * reachability education. + */ + private static final String HAS_SEEN_HORIZONTAL_REACHABILITY_EDUCATION_KEY_PREFIX = + "has_seen_horizontal_reachability_education"; + + /** + * Key prefix for the {@link SharedPreferences} entries related to the vertical reachability * education. */ - private static final String HAS_SEEN_REACHABILITY_EDUCATION_KEY_PREFIX = - "has_seen_reachability_education"; + private static final String HAS_SEEN_VERTICAL_REACHABILITY_EDUCATION_KEY_PREFIX = + "has_seen_vertical_reachability_education"; /** * The {@link SharedPreferences} instance for the restart dialog and the reachability @@ -129,14 +136,6 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi } /** - * @return {@value true} if the reachability education is enabled. - */ - boolean isReachabilityEducationEnabled() { - return mIsReachabilityEducationOverrideEnabled || (mIsReachabilityEducationEnabled - && mIsLetterboxReachabilityEducationAllowed); - } - - /** * Enables/Disables the reachability education */ void setIsReachabilityEducationOverrideEnabled(boolean enabled) { @@ -145,33 +144,48 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi void setDontShowRestartDialogAgain(TaskInfo taskInfo) { mCompatUISharedPreferences.edit().putBoolean( - getDontShowAgainRestartKey(taskInfo.userId, taskInfo.topActivity.getPackageName()), + dontShowAgainRestartKey(taskInfo.userId, taskInfo.topActivity.getPackageName()), true).apply(); } boolean shouldShowRestartDialogAgain(TaskInfo taskInfo) { - return !mCompatUISharedPreferences.getBoolean(getDontShowAgainRestartKey(taskInfo.userId, + return !mCompatUISharedPreferences.getBoolean(dontShowAgainRestartKey(taskInfo.userId, taskInfo.topActivity.getPackageName()), /* default= */ false); } - void setDontShowReachabilityEducationAgain(TaskInfo taskInfo) { + void setUserHasSeenHorizontalReachabilityEducation(TaskInfo taskInfo) { + mCompatUISharedPreferences.edit().putBoolean( + hasSeenHorizontalReachabilityEduKey(taskInfo.userId), true).apply(); + } + + void setUserHasSeenVerticalReachabilityEducation(TaskInfo taskInfo) { mCompatUISharedPreferences.edit().putBoolean( - getDontShowAgainReachabilityEduKey(taskInfo.userId), true).apply(); + hasSeenVerticalReachabilityEduKey(taskInfo.userId), true).apply(); + } + + boolean hasSeenHorizontalReachabilityEducation(@NonNull TaskInfo taskInfo) { + return mCompatUISharedPreferences.getBoolean( + hasSeenHorizontalReachabilityEduKey(taskInfo.userId), /* default= */false); + } + + boolean hasSeenVerticalReachabilityEducation(@NonNull TaskInfo taskInfo) { + return mCompatUISharedPreferences.getBoolean( + hasSeenVerticalReachabilityEduKey(taskInfo.userId), /* default= */false); } boolean shouldShowReachabilityEducation(@NonNull TaskInfo taskInfo) { - return getHasSeenLetterboxEducation(taskInfo.userId) - && !mCompatUISharedPreferences.getBoolean( - getDontShowAgainReachabilityEduKey(taskInfo.userId), /* default= */false); + return isReachabilityEducationEnabled() + && (!hasSeenHorizontalReachabilityEducation(taskInfo) + || !hasSeenVerticalReachabilityEducation(taskInfo)); } boolean getHasSeenLetterboxEducation(int userId) { return mLetterboxEduSharedPreferences - .getBoolean(getDontShowLetterboxEduKey(userId), /* default= */ false); + .getBoolean(dontShowLetterboxEduKey(userId), /* default= */ false); } void setSeenLetterboxEducation(int userId) { - mLetterboxEduSharedPreferences.edit().putBoolean(getDontShowLetterboxEduKey(userId), + mLetterboxEduSharedPreferences.edit().putBoolean(dontShowLetterboxEduKey(userId), true).apply(); } @@ -204,15 +218,24 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi } } - private static String getDontShowAgainReachabilityEduKey(int userId) { - return HAS_SEEN_REACHABILITY_EDUCATION_KEY_PREFIX + "@" + userId; + private boolean isReachabilityEducationEnabled() { + return mIsReachabilityEducationOverrideEnabled || (mIsReachabilityEducationEnabled + && mIsLetterboxReachabilityEducationAllowed); + } + + private static String hasSeenHorizontalReachabilityEduKey(int userId) { + return HAS_SEEN_HORIZONTAL_REACHABILITY_EDUCATION_KEY_PREFIX + "@" + userId; + } + + private static String hasSeenVerticalReachabilityEduKey(int userId) { + return HAS_SEEN_VERTICAL_REACHABILITY_EDUCATION_KEY_PREFIX + "@" + userId; } - private static String getDontShowLetterboxEduKey(int userId) { + private static String dontShowLetterboxEduKey(int userId) { return String.valueOf(userId); } - private String getDontShowAgainRestartKey(int userId, String packageName) { + private String dontShowAgainRestartKey(int userId, String packageName) { return packageName + "@" + userId; } }
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java index 4d83247e5c03..838e37a905db 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java @@ -201,7 +201,9 @@ public class CompatUIController implements OnDisplaysChangedListener, createOrUpdateCompatLayout(taskInfo, taskListener); createOrUpdateLetterboxEduLayout(taskInfo, taskListener); createOrUpdateRestartDialogLayout(taskInfo, taskListener); - createOrUpdateReachabilityEduLayout(taskInfo, taskListener, false); + if (mCompatUIConfiguration.getHasSeenLetterboxEducation(taskInfo.userId)) { + createOrUpdateReachabilityEduLayout(taskInfo, taskListener); + } } @Override @@ -370,7 +372,7 @@ public class CompatUIController implements OnDisplaysChangedListener, Pair<TaskInfo, ShellTaskOrganizer.TaskListener> stateInfo) { mActiveLetterboxEduLayout = null; // We need to update the UI - createOrUpdateReachabilityEduLayout(stateInfo.first, stateInfo.second, true); + createOrUpdateReachabilityEduLayout(stateInfo.first, stateInfo.second); } private void createOrUpdateRestartDialogLayout(TaskInfo taskInfo, @@ -429,9 +431,8 @@ public class CompatUIController implements OnDisplaysChangedListener, } private void createOrUpdateReachabilityEduLayout(TaskInfo taskInfo, - ShellTaskOrganizer.TaskListener taskListener, boolean forceUpdate) { + ShellTaskOrganizer.TaskListener taskListener) { if (mActiveReachabilityEduLayout != null) { - mActiveReachabilityEduLayout.forceUpdate(forceUpdate); // UI already exists, update the UI layout. if (!mActiveReachabilityEduLayout.updateCompatInfo(taskInfo, taskListener, showOnDisplay(mActiveReachabilityEduLayout.getDisplayId()))) { @@ -463,7 +464,7 @@ public class CompatUIController implements OnDisplaysChangedListener, ReachabilityEduWindowManager createReachabilityEduWindowManager(Context context, TaskInfo taskInfo, ShellTaskOrganizer.TaskListener taskListener) { - return new ReachabilityEduWindowManager(context, taskInfo, mSyncQueue, mCallback, + return new ReachabilityEduWindowManager(context, taskInfo, mSyncQueue, taskListener, mDisplayController.getDisplayLayout(taskInfo.displayId), mCompatUIConfiguration, mMainExecutor); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduHandLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduHandLayout.java deleted file mode 100644 index 6081ef1ca307..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduHandLayout.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT 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.wm.shell.compatui; - -import android.content.Context; -import android.graphics.drawable.Animatable; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.view.View; - -import androidx.appcompat.widget.AppCompatTextView; - -/** - * Custom layout for Reachability Education hand. - */ -public class ReachabilityEduHandLayout extends AppCompatTextView { - - private Drawable mHandDrawable; - - public ReachabilityEduHandLayout(Context context) { - this(context, null); - } - - public ReachabilityEduHandLayout(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public ReachabilityEduHandLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - mHandDrawable = getCompoundDrawables()[/* top */ 1]; - } - - void hide() { - stopAnimation(); - setAlpha(0); - setVisibility(View.INVISIBLE); - } - - void startAnimation() { - if (mHandDrawable instanceof Animatable) { - final Animatable animatedBg = (Animatable) mHandDrawable; - animatedBg.start(); - } - } - - void stopAnimation() { - if (mHandDrawable instanceof Animatable) { - final Animatable animatedBg = (Animatable) mHandDrawable; - animatedBg.stop(); - } - } -} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduLayout.java index 6a72d28521b8..dc3d1d35fecb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduLayout.java @@ -16,14 +16,16 @@ package com.android.wm.shell.compatui; +import static android.app.TaskInfo.PROPERTY_VALUE_UNSET; + import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.app.TaskInfo; import android.content.Context; import android.util.AttributeSet; import android.view.View; -import android.view.animation.AlphaAnimation; -import android.view.animation.Animation; import android.widget.FrameLayout; import com.android.wm.shell.R; @@ -40,27 +42,23 @@ public class ReachabilityEduLayout extends FrameLayout { private static final float ALPHA_FULL_OPAQUE = 1f; - private static final long VISIBILITY_SHOW_ANIMATION_DURATION_MS = 167; - - private static final long VISIBILITY_SHOW_ANIMATION_DELAY_MS = 250; - - private static final long VISIBILITY_SHOW_DOUBLE_TAP_ANIMATION_DELAY_MS = 80; + private static final long VISIBILITY_ANIMATION_DURATION_MS = 400; private static final long MARGINS_ANIMATION_DURATION_MS = 250; - private ReachabilityEduWindowManager mWindowManager; + private static final String ALPHA_PROPERTY_NAME = "alpha"; - private ReachabilityEduHandLayout mMoveLeftButton; - private ReachabilityEduHandLayout mMoveRightButton; - private ReachabilityEduHandLayout mMoveUpButton; - private ReachabilityEduHandLayout mMoveDownButton; + private ReachabilityEduWindowManager mWindowManager; - private int mLastLeftMargin = TaskInfo.PROPERTY_VALUE_UNSET; - private int mLastRightMargin = TaskInfo.PROPERTY_VALUE_UNSET; - private int mLastTopMargin = TaskInfo.PROPERTY_VALUE_UNSET; - private int mLastBottomMargin = TaskInfo.PROPERTY_VALUE_UNSET; + private View mMoveLeftButton; + private View mMoveRightButton; + private View mMoveUpButton; + private View mMoveDownButton; - private boolean mIsLayoutActive; + private int mLastLeftMargin = PROPERTY_VALUE_UNSET; + private int mLastRightMargin = PROPERTY_VALUE_UNSET; + private int mLastTopMargin = PROPERTY_VALUE_UNSET; + private int mLastBottomMargin = PROPERTY_VALUE_UNSET; public ReachabilityEduLayout(Context context) { this(context, null); @@ -83,36 +81,29 @@ public class ReachabilityEduLayout extends FrameLayout { mWindowManager = windowManager; } - void handleVisibility(boolean isActivityLetterboxed, int letterboxVerticalPosition, + void handleVisibility(boolean horizontalEnabled, boolean verticalEnabled, + int letterboxVerticalPosition, int letterboxHorizontalPosition, int availableWidth, int availableHeight, - boolean isDoubleTap) { - // If the app is not letterboxed we hide all the buttons. - if (!mIsLayoutActive || !isActivityLetterboxed || ( - letterboxHorizontalPosition == TaskInfo.PROPERTY_VALUE_UNSET - && letterboxVerticalPosition == TaskInfo.PROPERTY_VALUE_UNSET)) { - hideAllImmediately(); - } else if (letterboxHorizontalPosition != TaskInfo.PROPERTY_VALUE_UNSET) { - handleLetterboxHorizontalPosition(availableWidth, letterboxHorizontalPosition, - isDoubleTap); - } else { - handleLetterboxVerticalPosition(availableHeight, letterboxVerticalPosition, - isDoubleTap); + CompatUIConfiguration compatUIConfiguration, TaskInfo taskInfo) { + hideAllImmediately(); + if (horizontalEnabled && letterboxHorizontalPosition != PROPERTY_VALUE_UNSET) { + handleLetterboxHorizontalPosition(availableWidth, letterboxHorizontalPosition); + compatUIConfiguration.setUserHasSeenHorizontalReachabilityEducation(taskInfo); + } else if (verticalEnabled && letterboxVerticalPosition != PROPERTY_VALUE_UNSET) { + handleLetterboxVerticalPosition(availableHeight, letterboxVerticalPosition); + compatUIConfiguration.setUserHasSeenVerticalReachabilityEducation(taskInfo); } } void hideAllImmediately() { - mMoveLeftButton.hide(); - mMoveRightButton.hide(); - mMoveUpButton.hide(); - mMoveDownButton.hide(); - mLastLeftMargin = TaskInfo.PROPERTY_VALUE_UNSET; - mLastRightMargin = TaskInfo.PROPERTY_VALUE_UNSET; - mLastTopMargin = TaskInfo.PROPERTY_VALUE_UNSET; - mLastBottomMargin = TaskInfo.PROPERTY_VALUE_UNSET; - } - - void setIsLayoutActive(boolean isLayoutActive) { - this.mIsLayoutActive = isLayoutActive; + hideImmediately(mMoveLeftButton); + hideImmediately(mMoveRightButton); + hideImmediately(mMoveUpButton); + hideImmediately(mMoveDownButton); + mLastLeftMargin = PROPERTY_VALUE_UNSET; + mLastRightMargin = PROPERTY_VALUE_UNSET; + mLastTopMargin = PROPERTY_VALUE_UNSET; + mLastBottomMargin = PROPERTY_VALUE_UNSET; } @Override @@ -128,6 +119,11 @@ public class ReachabilityEduLayout extends FrameLayout { mMoveDownButton.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); } + private void hideImmediately(View view) { + view.setAlpha(0); + view.setVisibility(View.INVISIBLE); + } + private Animator marginAnimator(View view, Function<LayoutParams, Integer> marginSupplier, BiConsumer<LayoutParams, Integer> marginConsumer, int from, int to) { final LayoutParams layoutParams = ((LayoutParams) view.getLayoutParams()); @@ -141,11 +137,11 @@ public class ReachabilityEduLayout extends FrameLayout { } private void handleLetterboxHorizontalPosition(int availableWidth, - int letterboxHorizontalPosition, boolean isDoubleTap) { - mMoveUpButton.hide(); - mMoveDownButton.hide(); - mLastTopMargin = TaskInfo.PROPERTY_VALUE_UNSET; - mLastBottomMargin = TaskInfo.PROPERTY_VALUE_UNSET; + int letterboxHorizontalPosition) { + hideItem(mMoveUpButton); + hideItem(mMoveDownButton); + mLastTopMargin = PROPERTY_VALUE_UNSET; + mLastBottomMargin = PROPERTY_VALUE_UNSET; // We calculate the available space on the left and right final int horizontalGap = availableWidth / 2; final int leftAvailableSpace = letterboxHorizontalPosition * horizontalGap; @@ -153,7 +149,7 @@ public class ReachabilityEduLayout extends FrameLayout { // We show the button if we have enough space if (leftAvailableSpace >= mMoveLeftButton.getMeasuredWidth()) { int newLeftMargin = (horizontalGap - mMoveLeftButton.getMeasuredWidth()) / 2; - if (mLastLeftMargin == TaskInfo.PROPERTY_VALUE_UNSET) { + if (mLastLeftMargin == PROPERTY_VALUE_UNSET) { mLastLeftMargin = newLeftMargin; } if (mLastLeftMargin != newLeftMargin) { @@ -165,14 +161,14 @@ public class ReachabilityEduLayout extends FrameLayout { leftParams.leftMargin = mLastLeftMargin; mMoveLeftButton.setLayoutParams(leftParams); } - showItem(mMoveLeftButton, isDoubleTap); + showItem(mMoveLeftButton); } else { - mMoveLeftButton.hide(); - mLastLeftMargin = TaskInfo.PROPERTY_VALUE_UNSET; + hideItem(mMoveLeftButton); + mLastLeftMargin = PROPERTY_VALUE_UNSET; } if (rightAvailableSpace >= mMoveRightButton.getMeasuredWidth()) { int newRightMargin = (horizontalGap - mMoveRightButton.getMeasuredWidth()) / 2; - if (mLastRightMargin == TaskInfo.PROPERTY_VALUE_UNSET) { + if (mLastRightMargin == PROPERTY_VALUE_UNSET) { mLastRightMargin = newRightMargin; } if (mLastRightMargin != newRightMargin) { @@ -185,26 +181,26 @@ public class ReachabilityEduLayout extends FrameLayout { rightParams.rightMargin = mLastRightMargin; mMoveRightButton.setLayoutParams(rightParams); } - showItem(mMoveRightButton, isDoubleTap); + showItem(mMoveRightButton); } else { - mMoveRightButton.hide(); - mLastRightMargin = TaskInfo.PROPERTY_VALUE_UNSET; + hideItem(mMoveRightButton); + mLastRightMargin = PROPERTY_VALUE_UNSET; } } private void handleLetterboxVerticalPosition(int availableHeight, - int letterboxVerticalPosition, boolean isDoubleTap) { - mMoveLeftButton.hide(); - mMoveRightButton.hide(); - mLastLeftMargin = TaskInfo.PROPERTY_VALUE_UNSET; - mLastRightMargin = TaskInfo.PROPERTY_VALUE_UNSET; + int letterboxVerticalPosition) { + hideItem(mMoveLeftButton); + hideItem(mMoveRightButton); + mLastLeftMargin = PROPERTY_VALUE_UNSET; + mLastRightMargin = PROPERTY_VALUE_UNSET; // We calculate the available space on the left and right final int verticalGap = availableHeight / 2; final int topAvailableSpace = letterboxVerticalPosition * verticalGap; final int bottomAvailableSpace = availableHeight - topAvailableSpace; if (topAvailableSpace >= mMoveUpButton.getMeasuredHeight()) { int newTopMargin = (verticalGap - mMoveUpButton.getMeasuredHeight()) / 2; - if (mLastTopMargin == TaskInfo.PROPERTY_VALUE_UNSET) { + if (mLastTopMargin == PROPERTY_VALUE_UNSET) { mLastTopMargin = newTopMargin; } if (mLastTopMargin != newTopMargin) { @@ -216,14 +212,14 @@ public class ReachabilityEduLayout extends FrameLayout { topParams.topMargin = mLastTopMargin; mMoveUpButton.setLayoutParams(topParams); } - showItem(mMoveUpButton, isDoubleTap); + showItem(mMoveUpButton); } else { - mMoveUpButton.hide(); - mLastTopMargin = TaskInfo.PROPERTY_VALUE_UNSET; + hideItem(mMoveUpButton); + mLastTopMargin = PROPERTY_VALUE_UNSET; } if (bottomAvailableSpace >= mMoveDownButton.getMeasuredHeight()) { int newBottomMargin = (verticalGap - mMoveDownButton.getMeasuredHeight()) / 2; - if (mLastBottomMargin == TaskInfo.PROPERTY_VALUE_UNSET) { + if (mLastBottomMargin == PROPERTY_VALUE_UNSET) { mLastBottomMargin = newBottomMargin; } if (mLastBottomMargin != newBottomMargin) { @@ -236,43 +232,38 @@ public class ReachabilityEduLayout extends FrameLayout { bottomParams.bottomMargin = mLastBottomMargin; mMoveDownButton.setLayoutParams(bottomParams); } - showItem(mMoveDownButton, isDoubleTap); + showItem(mMoveDownButton); } else { - mMoveDownButton.hide(); - mLastBottomMargin = TaskInfo.PROPERTY_VALUE_UNSET; + hideItem(mMoveDownButton); + mLastBottomMargin = PROPERTY_VALUE_UNSET; } } - private void showItem(ReachabilityEduHandLayout view, boolean fromDoubleTap) { - if (view.getVisibility() == View.VISIBLE) { - // Already visible we just start animation - view.startAnimation(); - return; - } + private void showItem(View view) { view.setVisibility(View.VISIBLE); - final long delay = fromDoubleTap ? VISIBILITY_SHOW_DOUBLE_TAP_ANIMATION_DELAY_MS - : VISIBILITY_SHOW_ANIMATION_DELAY_MS; - AlphaAnimation alphaAnimation = new AlphaAnimation(ALPHA_FULL_TRANSPARENT, - ALPHA_FULL_OPAQUE); - alphaAnimation.setDuration(VISIBILITY_SHOW_ANIMATION_DURATION_MS); - alphaAnimation.setStartOffset(delay); - alphaAnimation.setFillAfter(true); - alphaAnimation.setAnimationListener(new Animation.AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - + ObjectAnimator fadeIn = ObjectAnimator.ofFloat(view, ALPHA_PROPERTY_NAME, + ALPHA_FULL_TRANSPARENT, ALPHA_FULL_OPAQUE); + fadeIn.setDuration(VISIBILITY_ANIMATION_DURATION_MS); + fadeIn.addListener(new AnimatorListenerAdapter() { @Override - public void onAnimationEnd(Animation animation) { - // We trigger the hand animation - view.setAlpha(ALPHA_FULL_OPAQUE); - view.startAnimation(); + public void onAnimationEnd(Animator animation) { + view.setVisibility(View.VISIBLE); } + }); + fadeIn.start(); + } + private void hideItem(View view) { + ObjectAnimator fadeOut = ObjectAnimator.ofFloat(view, ALPHA_PROPERTY_NAME, + ALPHA_FULL_OPAQUE, ALPHA_FULL_TRANSPARENT); + fadeOut.setDuration(VISIBILITY_ANIMATION_DURATION_MS); + fadeOut.addListener(new AnimatorListenerAdapter() { @Override - public void onAnimationRepeat(Animation animation) { + public void onAnimationEnd(Animator animation) { + view.setVisibility(View.INVISIBLE); } }); - view.startAnimation(alphaAnimation); + fadeOut.start(); } + } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduWindowManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduWindowManager.java index f1b098ef27c7..b6e396d12512 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduWindowManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduWindowManager.java @@ -35,7 +35,6 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; -import com.android.wm.shell.compatui.CompatUIController.CompatUICallback; /** * Window manager for the reachability education @@ -50,7 +49,8 @@ class ReachabilityEduWindowManager extends CompatUIWindowManagerAbstract { // The time to wait before hiding the education private static final long DISAPPEAR_DELAY_MS = 4000L; - private final CompatUICallback mCallback; + private static final int REACHABILITY_LEFT_OR_UP_POSITION = 0; + private static final int REACHABILITY_RIGHT_OR_BOTTOM_POSITION = 2; private final CompatUIConfiguration mCompatUIConfiguration; @@ -86,11 +86,10 @@ class ReachabilityEduWindowManager extends CompatUIWindowManagerAbstract { ReachabilityEduLayout mLayout; ReachabilityEduWindowManager(Context context, TaskInfo taskInfo, - SyncTransactionQueue syncQueue, CompatUICallback callback, + SyncTransactionQueue syncQueue, ShellTaskOrganizer.TaskListener taskListener, DisplayLayout displayLayout, CompatUIConfiguration compatUIConfiguration, ShellExecutor mainExecutor) { super(context, taskInfo, syncQueue, taskListener, displayLayout); - mCallback = callback; mTaskInfo = taskInfo; mIsActivityLetterboxed = taskInfo.isLetterboxDoubleTapEnabled; mLetterboxVerticalPosition = taskInfo.topActivityLetterboxVerticalPosition; @@ -118,8 +117,7 @@ class ReachabilityEduWindowManager extends CompatUIWindowManagerAbstract { @Override protected boolean eligibleToShowLayout() { - return mCompatUIConfiguration.isReachabilityEducationEnabled() - && mIsActivityLetterboxed + return mIsActivityLetterboxed && (mLetterboxVerticalPosition != -1 || mLetterboxHorizontalPosition != -1); } @@ -155,12 +153,6 @@ class ReachabilityEduWindowManager extends CompatUIWindowManagerAbstract { mTopActivityLetterboxHeight = taskInfo.topActivityLetterboxHeight; mHasUserDoubleTapped = taskInfo.isFromLetterboxDoubleTap; - if (taskInfo.isFromLetterboxDoubleTap) { - // In this case we disable the reachability for the following launch of - // the current application. Anyway because a double tap event happened, - // the reachability education is displayed - mCompatUIConfiguration.setDontShowReachabilityEducationAgain(taskInfo); - } if (!super.updateCompatInfo(taskInfo, taskListener, canShow)) { return false; } @@ -168,13 +160,12 @@ class ReachabilityEduWindowManager extends CompatUIWindowManagerAbstract { mHasLetterboxSizeChanged = prevTopActivityLetterboxWidth != mTopActivityLetterboxWidth || prevTopActivityLetterboxHeight != mTopActivityLetterboxHeight; - if (mForceUpdate || prevIsActivityLetterboxed != mIsActivityLetterboxed + if (mHasUserDoubleTapped || prevIsActivityLetterboxed != mIsActivityLetterboxed || prevLetterboxVerticalPosition != mLetterboxVerticalPosition || prevLetterboxHorizontalPosition != mLetterboxHorizontalPosition || prevTopActivityLetterboxWidth != mTopActivityLetterboxWidth || prevTopActivityLetterboxHeight != mTopActivityLetterboxHeight) { updateVisibilityOfViews(); - mForceUpdate = false; } return true; @@ -235,41 +226,41 @@ class ReachabilityEduWindowManager extends CompatUIWindowManagerAbstract { if (mLayout == null) { return; } - if (shouldUpdateEducation()) { - if (!mHasLetterboxSizeChanged) { - mLayout.setIsLayoutActive(true); - } + + final boolean eligibleForDisplayHorizontalEducation = mForceUpdate + || !mCompatUIConfiguration.hasSeenHorizontalReachabilityEducation(mTaskInfo) + || (mHasUserDoubleTapped + && (mLetterboxHorizontalPosition == REACHABILITY_LEFT_OR_UP_POSITION + || mLetterboxHorizontalPosition == REACHABILITY_RIGHT_OR_BOTTOM_POSITION)); + final boolean eligibleForDisplayVerticalEducation = mForceUpdate + || !mCompatUIConfiguration.hasSeenVerticalReachabilityEducation(mTaskInfo) + || (mHasUserDoubleTapped + && (mLetterboxVerticalPosition == REACHABILITY_LEFT_OR_UP_POSITION + || mLetterboxVerticalPosition == REACHABILITY_RIGHT_OR_BOTTOM_POSITION)); + + if (mIsActivityLetterboxed && (eligibleForDisplayHorizontalEducation + || eligibleForDisplayVerticalEducation)) { int availableWidth = getTaskBounds().width() - mTopActivityLetterboxWidth; int availableHeight = getTaskBounds().height() - mTopActivityLetterboxHeight; - mLayout.handleVisibility(mIsActivityLetterboxed, mLetterboxVerticalPosition, - mLetterboxHorizontalPosition, availableWidth, availableHeight, - mHasUserDoubleTapped); + mLayout.handleVisibility(eligibleForDisplayHorizontalEducation, + eligibleForDisplayVerticalEducation, + mLetterboxVerticalPosition, mLetterboxHorizontalPosition, availableWidth, + availableHeight, mCompatUIConfiguration, mTaskInfo); if (!mHasLetterboxSizeChanged) { updateHideTime(); mMainExecutor.executeDelayed(this::hideReachability, DISAPPEAR_DELAY_MS); } mHasUserDoubleTapped = false; } else { - hideReachability(); + mLayout.hideAllImmediately(); } } private void hideReachability() { - if (mLayout != null) { - mLayout.setIsLayoutActive(false); - } if (mLayout == null || !shouldHideEducation()) { return; } mLayout.hideAllImmediately(); - // We need this in case the icons disappear after the timeout without an explicit - // double tap of the user. - mCompatUIConfiguration.setDontShowReachabilityEducationAgain(mTaskInfo); - } - - private boolean shouldUpdateEducation() { - return mForceUpdate || mHasUserDoubleTapped || mHasLetterboxSizeChanged - || mCompatUIConfiguration.shouldShowReachabilityEducation(mTaskInfo); } private boolean shouldHideEducation() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java index 015d5c1705e7..fb0a91f17802 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java @@ -16,10 +16,13 @@ package com.android.wm.shell.desktopmode; +import static com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler.FINAL_FREEFORM_SCALE; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.RectEvaluator; import android.animation.ValueAnimator; +import android.annotation.NonNull; import android.app.ActivityManager; import android.content.Context; import android.content.res.Resources; @@ -32,12 +35,12 @@ import android.view.View; import android.view.WindowManager; import android.view.WindowlessWindowManager; import android.view.animation.DecelerateInterpolator; -import android.widget.ImageView; import com.android.wm.shell.R; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; +import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.SyncTransactionQueue; /** @@ -56,6 +59,9 @@ public class DesktopModeVisualIndicator { private final SyncTransactionQueue mSyncQueue; private SurfaceControlViewHost mViewHost; + private View mView; + private boolean mIsFullscreen; + public DesktopModeVisualIndicator(SyncTransactionQueue syncQueue, ActivityManager.RunningTaskInfo taskInfo, DisplayController displayController, Context context, SurfaceControl taskSurface, ShellTaskOrganizer taskOrganizer, @@ -67,21 +73,19 @@ public class DesktopModeVisualIndicator { mTaskSurface = taskSurface; mTaskOrganizer = taskOrganizer; mRootTdaOrganizer = taskDisplayAreaOrganizer; + createView(); } /** - * Create and animate the indicator for the exit desktop mode transition. + * Create a fullscreen indicator with no animation */ - public void createFullscreenIndicator() { + private void createView() { final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); final Resources resources = mContext.getResources(); final DisplayMetrics metrics = resources.getDisplayMetrics(); final int screenWidth = metrics.widthPixels; final int screenHeight = metrics.heightPixels; - final int padding = mDisplayController - .getDisplayLayout(mTaskInfo.displayId).stableInsets().top; - final ImageView v = new ImageView(mContext); - v.setImageResource(R.drawable.desktop_windowing_transition_background); + mView = new View(mContext); final SurfaceControl.Builder builder = new SurfaceControl.Builder(); mRootTdaOrganizer.attachToDisplayArea(mTaskInfo.displayId, builder); mLeash = builder @@ -101,7 +105,7 @@ public class DesktopModeVisualIndicator { mViewHost = new SurfaceControlViewHost(mContext, mDisplayController.getDisplay(mTaskInfo.displayId), windowManager, "FullscreenVisualIndicator"); - mViewHost.setView(v, lp); + mViewHost.setView(mView, lp); // We want this indicator to be behind the dragged task, but in front of all others. t.setRelativeLayer(mLeash, mTaskSurface, -1); @@ -109,17 +113,56 @@ public class DesktopModeVisualIndicator { transaction.merge(t); t.close(); }); - final Rect startBounds = new Rect(padding, padding, - screenWidth - padding, screenHeight - padding); - final VisualIndicatorAnimator animator = VisualIndicatorAnimator.fullscreenIndicator(v, - startBounds); + } + + /** + * Create fullscreen indicator and fades it in. + */ + public void createFullscreenIndicator() { + mIsFullscreen = true; + mView.setBackgroundResource(R.drawable.desktop_windowing_transition_background); + final VisualIndicatorAnimator animator = VisualIndicatorAnimator.toFullscreenAnimator( + mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId)); + animator.start(); + } + + /** + * Create a fullscreen indicator. Animator fades it in while expanding the bounds outwards. + */ + public void createFullscreenIndicatorWithAnimatedBounds() { + mIsFullscreen = true; + mView.setBackgroundResource(R.drawable.desktop_windowing_transition_background); + final VisualIndicatorAnimator animator = VisualIndicatorAnimator + .toFullscreenAnimatorWithAnimatedBounds(mView, + mDisplayController.getDisplayLayout(mTaskInfo.displayId)); + animator.start(); + } + + /** + * Takes existing fullscreen indicator and animates it to freeform bounds + */ + public void transitionFullscreenIndicatorToFreeform() { + mIsFullscreen = false; + final VisualIndicatorAnimator animator = VisualIndicatorAnimator.toFreeformAnimator( + mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId)); + animator.start(); + } + + /** + * Takes the existing freeform indicator and animates it to fullscreen + */ + public void transitionFreeformIndicatorToFullscreen() { + mIsFullscreen = true; + final VisualIndicatorAnimator animator = + VisualIndicatorAnimator.toFullscreenAnimatorWithAnimatedBounds( + mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId)); animator.start(); } /** * Release the indicator and its components when it is no longer needed. */ - public void releaseFullscreenIndicator() { + public void releaseVisualIndicator() { if (mViewHost == null) return; if (mViewHost != null) { mViewHost.release(); @@ -136,20 +179,28 @@ public class DesktopModeVisualIndicator { }); } } + + /** + * Returns true if visual indicator is fullscreen + */ + public boolean isFullscreen() { + return mIsFullscreen; + } + /** * Animator for Desktop Mode transitions which supports bounds and alpha animation. */ private static class VisualIndicatorAnimator extends ValueAnimator { private static final int FULLSCREEN_INDICATOR_DURATION = 200; - private static final float SCALE_ADJUSTMENT_PERCENT = 0.015f; + private static final float FULLSCREEN_SCALE_ADJUSTMENT_PERCENT = 0.015f; private static final float INDICATOR_FINAL_OPACITY = 0.7f; - private final ImageView mView; + private final View mView; private final Rect mStartBounds; private final Rect mEndBounds; private final RectEvaluator mRectEvaluator; - private VisualIndicatorAnimator(ImageView view, Rect startBounds, + private VisualIndicatorAnimator(View view, Rect startBounds, Rect endBounds) { mView = view; mStartBounds = new Rect(startBounds); @@ -161,30 +212,66 @@ public class DesktopModeVisualIndicator { /** * Create animator for visual indicator of fullscreen transition * - * @param view the view for this indicator - * @param startBounds the starting bounds of the fullscreen indicator + * @param view the view for this indicator + * @param displayLayout information about the display the transitioning task is currently on + */ + public static VisualIndicatorAnimator toFullscreenAnimator(@NonNull View view, + @NonNull DisplayLayout displayLayout) { + final Rect bounds = getMaxBounds(displayLayout); + final VisualIndicatorAnimator animator = new VisualIndicatorAnimator( + view, bounds, bounds); + animator.setInterpolator(new DecelerateInterpolator()); + setupIndicatorAnimation(animator); + return animator; + } + + + /** + * Create animator for visual indicator of fullscreen transition + * + * @param view the view for this indicator + * @param displayLayout information about the display the transitioning task is currently on */ - public static VisualIndicatorAnimator fullscreenIndicator(ImageView view, - Rect startBounds) { - view.getDrawable().setBounds(startBounds); - int width = startBounds.width(); - int height = startBounds.height(); - Rect endBounds = new Rect((int) (startBounds.left - (SCALE_ADJUSTMENT_PERCENT * width)), - (int) (startBounds.top - (SCALE_ADJUSTMENT_PERCENT * height)), - (int) (startBounds.right + (SCALE_ADJUSTMENT_PERCENT * width)), - (int) (startBounds.bottom + (SCALE_ADJUSTMENT_PERCENT * height))); - VisualIndicatorAnimator animator = new VisualIndicatorAnimator( - view, startBounds, endBounds); + public static VisualIndicatorAnimator toFullscreenAnimatorWithAnimatedBounds( + @NonNull View view, @NonNull DisplayLayout displayLayout) { + final int padding = displayLayout.stableInsets().top; + Rect startBounds = new Rect(padding, padding, + displayLayout.width() - padding, displayLayout.height() - padding); + view.getBackground().setBounds(startBounds); + + final VisualIndicatorAnimator animator = new VisualIndicatorAnimator( + view, startBounds, getMaxBounds(displayLayout)); + animator.setInterpolator(new DecelerateInterpolator()); + setupIndicatorAnimation(animator); + return animator; + } + + /** + * Create animator for visual indicator of freeform transition + * + * @param view the view for this indicator + * @param displayLayout information about the display the transitioning task is currently on + */ + public static VisualIndicatorAnimator toFreeformAnimator(@NonNull View view, + @NonNull DisplayLayout displayLayout) { + final float adjustmentPercentage = 1f - FINAL_FREEFORM_SCALE; + final int width = displayLayout.width(); + final int height = displayLayout.height(); + Rect endBounds = new Rect((int) (adjustmentPercentage * width / 2), + (int) (adjustmentPercentage * height / 2), + (int) (displayLayout.width() - (adjustmentPercentage * width / 2)), + (int) (displayLayout.height() - (adjustmentPercentage * height / 2))); + final VisualIndicatorAnimator animator = new VisualIndicatorAnimator( + view, getMaxBounds(displayLayout), endBounds); animator.setInterpolator(new DecelerateInterpolator()); - setupFullscreenIndicatorAnimation(animator); + setupIndicatorAnimation(animator); return animator; } /** - * Add necessary listener for animation of fullscreen indicator + * Add necessary listener for animation of indicator */ - private static void setupFullscreenIndicatorAnimation( - VisualIndicatorAnimator animator) { + private static void setupIndicatorAnimation(@NonNull VisualIndicatorAnimator animator) { animator.addUpdateListener(a -> { if (animator.mView != null) { animator.updateBounds(a.getAnimatedFraction(), animator.mView); @@ -196,7 +283,7 @@ public class DesktopModeVisualIndicator { animator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - animator.mView.getDrawable().setBounds(animator.mEndBounds); + animator.mView.getBackground().setBounds(animator.mEndBounds); } }); animator.setDuration(FULLSCREEN_INDICATOR_DURATION); @@ -210,9 +297,12 @@ public class DesktopModeVisualIndicator { * @param fraction fraction to use, compared against previous fraction * @param view the view to update */ - private void updateBounds(float fraction, ImageView view) { + private void updateBounds(float fraction, View view) { + if (mStartBounds.equals(mEndBounds)) { + return; + } Rect currentBounds = mRectEvaluator.evaluate(fraction, mStartBounds, mEndBounds); - view.getDrawable().setBounds(currentBounds); + view.getBackground().setBounds(currentBounds); } /** @@ -223,5 +313,23 @@ public class DesktopModeVisualIndicator { private void updateIndicatorAlpha(float fraction, View view) { view.setAlpha(fraction * INDICATOR_FINAL_OPACITY); } + + /** + * Return the max bounds of a fullscreen indicator + */ + private static Rect getMaxBounds(@NonNull DisplayLayout displayLayout) { + final int padding = displayLayout.stableInsets().top; + final int width = displayLayout.width() - 2 * padding; + final int height = displayLayout.height() - 2 * padding; + Rect endBounds = new Rect((int) (padding + - (FULLSCREEN_SCALE_ADJUSTMENT_PERCENT * width)), + (int) (padding + - (FULLSCREEN_SCALE_ADJUSTMENT_PERCENT * height)), + (int) (displayLayout.width() - padding + + (FULLSCREEN_SCALE_ADJUSTMENT_PERCENT * width)), + (int) (displayLayout.height() - padding + + (FULLSCREEN_SCALE_ADJUSTMENT_PERCENT * height))); + return endBounds; + } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index c35cd5a8be02..670b24c176b5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -122,7 +122,7 @@ class DesktopTasksController( } /** Move a task to desktop */ - fun moveToDesktop(task: ActivityManager.RunningTaskInfo) { + fun moveToDesktop(task: RunningTaskInfo) { ProtoLog.v(WM_SHELL_DESKTOP_MODE, "moveToDesktop: %d", task.taskId) val wct = WindowContainerTransaction() @@ -181,7 +181,7 @@ class DesktopTasksController( } /** Move a task to fullscreen */ - fun moveToFullscreen(task: ActivityManager.RunningTaskInfo) { + fun moveToFullscreen(task: RunningTaskInfo) { ProtoLog.v(WM_SHELL_DESKTOP_MODE, "moveToFullscreen: %d", task.taskId) val wct = WindowContainerTransaction() @@ -206,7 +206,7 @@ class DesktopTasksController( } /** Move a task to the front **/ - fun moveTaskToFront(taskInfo: ActivityManager.RunningTaskInfo) { + fun moveTaskToFront(taskInfo: RunningTaskInfo) { val wct = WindowContainerTransaction() wct.reorder(taskInfo.token, true) if (Transitions.ENABLE_SHELL_TRANSITIONS) { @@ -273,7 +273,7 @@ class DesktopTasksController( request: TransitionRequestInfo ): WindowContainerTransaction? { // Check if we should skip handling this transition - val task: ActivityManager.RunningTaskInfo? = request.triggerTask + val task: RunningTaskInfo? = request.triggerTask val shouldHandleRequest = when { // Only handle open or to front transitions @@ -382,16 +382,15 @@ class DesktopTasksController( taskSurface: SurfaceControl, y: Float ) { - val statusBarHeight = displayController - .getDisplayLayout(taskInfo.displayId)?.stableInsets()?.top ?: 0 if (taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) { + val statusBarHeight = getStatusBarHeight(taskInfo) if (y <= statusBarHeight && visualIndicator == null) { visualIndicator = DesktopModeVisualIndicator(syncQueue, taskInfo, displayController, context, taskSurface, shellTaskOrganizer, rootTaskDisplayAreaOrganizer) - visualIndicator?.createFullscreenIndicator() + visualIndicator?.createFullscreenIndicatorWithAnimatedBounds() } else if (y > statusBarHeight && visualIndicator != null) { - visualIndicator?.releaseFullscreenIndicator() + visualIndicator?.releaseVisualIndicator() visualIndicator = null } } @@ -407,16 +406,73 @@ class DesktopTasksController( taskInfo: RunningTaskInfo, y: Float ) { - val statusBarHeight = displayController - .getDisplayLayout(taskInfo.displayId)?.stableInsets()?.top ?: 0 + val statusBarHeight = getStatusBarHeight(taskInfo) if (y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) { - visualIndicator?.releaseFullscreenIndicator() + visualIndicator?.releaseVisualIndicator() visualIndicator = null moveToFullscreenWithAnimation(taskInfo) } } /** + * Perform checks required on drag move. Create/release fullscreen indicator and transitions + * indicator to freeform or fullscreen dimensions as needed. + * + * @param taskInfo the task being dragged. + * @param taskSurface SurfaceControl of dragged task. + * @param y coordinate of dragged task. Used for checks against status bar height. + */ + fun onDragPositioningMoveThroughStatusBar( + taskInfo: RunningTaskInfo, + taskSurface: SurfaceControl, + y: Float + ) { + if (visualIndicator == null) { + visualIndicator = DesktopModeVisualIndicator(syncQueue, taskInfo, + displayController, context, taskSurface, shellTaskOrganizer, + rootTaskDisplayAreaOrganizer) + visualIndicator?.createFullscreenIndicator() + } + val indicator = visualIndicator ?: return + if (y >= getFreeformTransitionStatusBarDragThreshold(taskInfo)) { + if (indicator.isFullscreen) { + indicator.transitionFullscreenIndicatorToFreeform() + } + } else if (!indicator.isFullscreen) { + indicator.transitionFreeformIndicatorToFullscreen() + } + } + + /** + * Perform checks required when drag ends under status bar area. + * + * @param taskInfo the task being dragged. + * @param y height of drag, to be checked against status bar height. + */ + fun onDragPositioningEndThroughStatusBar( + taskInfo: RunningTaskInfo, + freeformBounds: Rect + ) { + moveToDesktopWithAnimation(taskInfo, freeformBounds) + visualIndicator?.releaseVisualIndicator() + visualIndicator = null + } + + + private fun getStatusBarHeight(taskInfo: RunningTaskInfo): Int { + return displayController.getDisplayLayout(taskInfo.displayId)?.stableInsets()?.top ?: 0 + } + + /** + * Returns the threshold at which we transition a task into freeform when dragging a + * fullscreen task down from the status bar + */ + private fun getFreeformTransitionStatusBarDragThreshold(taskInfo: RunningTaskInfo): Int { + return 2 * getStatusBarHeight(taskInfo) + } + + + /** * Adds a listener to find out about changes in the visibility of freeform tasks. * * @param listener the listener to add. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java index d18e98af0988..248a5fce6884 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java @@ -18,6 +18,8 @@ package com.android.wm.shell.desktopmode; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.app.ActivityManager; import android.content.Context; @@ -146,6 +148,13 @@ public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionH t.setScale(sc, currentScaleX, currentScaleY); t.apply(); }); + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + mTransitions.getMainExecutor().execute( + () -> finishCallback.onTransitionFinished(null, null)); + } + }); animator.start(); return true; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS index 926cfb3b12ef..deb7c6db338f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS @@ -1,2 +1,3 @@ # WM shell sub-module desktop owners +atsjenk@google.com madym@google.com diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/OWNERS b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/OWNERS index 0c2d5c49f830..ccbb9cf298a2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/OWNERS +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/OWNERS @@ -1,2 +1,3 @@ # WM shell sub-module freeform owners +atsjenk@google.com madym@google.com diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java index 318a49a8de31..6d46a9c3d0e7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java @@ -23,6 +23,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE; import static android.view.Display.DEFAULT_DISPLAY; import android.app.ActivityManager; @@ -310,8 +311,11 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer { // TODO(229961548): Remove ignoreOrientationRequest exception for Kids Mode once possible. if (mReverseDefaultRotationEnabled) { setOrientationRequestPolicy(/* isIgnoreOrientationRequestDisabled */ true, - /* fromOrientations */ new int[]{SCREEN_ORIENTATION_REVERSE_LANDSCAPE}, - /* toOrientations */ new int[]{SCREEN_ORIENTATION_LANDSCAPE}); + /* fromOrientations */ + new int[]{SCREEN_ORIENTATION_LANDSCAPE, SCREEN_ORIENTATION_REVERSE_LANDSCAPE}, + /* toOrientations */ + new int[]{SCREEN_ORIENTATION_SENSOR_LANDSCAPE, + SCREEN_ORIENTATION_SENSOR_LANDSCAPE}); } else { setOrientationRequestPolicy(/* isIgnoreOrientationRequestDisabled */ true, /* fromOrientations */ null, /* toOrientations */ null); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java index 4c53f607a5f8..f70df833cf4f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java @@ -188,6 +188,11 @@ public class PipAnimationController { return mCurrentAnimator; } + /** Reset animator state to prevent it from being used after its lifetime. */ + public void resetAnimatorState() { + mCurrentAnimator = null; + } + private PipTransitionAnimator setupPipTransitionAnimator(PipTransitionAnimator animator) { animator.setSurfaceTransactionHelper(mSurfaceTransactionHelper); animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java index 867162be4c6d..24d0b996a3cb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java @@ -198,7 +198,7 @@ public class PipBoundsAlgorithm { /** * @return whether the given {@param aspectRatio} is valid. */ - private boolean isValidPictureInPictureAspectRatio(float aspectRatio) { + public boolean isValidPictureInPictureAspectRatio(float aspectRatio) { return Float.compare(mMinAspectRatio, aspectRatio) <= 0 && Float.compare(aspectRatio, mMaxAspectRatio) <= 0; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index ec0e770002d6..a0bd064149d2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -1259,7 +1259,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, protected void applyNewPictureInPictureParams(@NonNull PictureInPictureParams params) { if (mDeferredTaskInfo != null || PipUtils.aspectRatioChanged(params.getAspectRatioFloat(), mPictureInPictureParams.getAspectRatioFloat())) { - mPipParamsChangedForwarder.notifyAspectRatioChanged(params.getAspectRatioFloat()); + if (mPipBoundsAlgorithm.isValidPictureInPictureAspectRatio( + params.getAspectRatioFloat())) { + mPipParamsChangedForwarder.notifyAspectRatioChanged(params.getAspectRatioFloat()); + } else { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: New aspect ratio is not valid." + + " hasAspectRatio=%b" + + " aspectRatio=%f", + TAG, params.hasSetAspectRatio(), params.getAspectRatioFloat()); + } } if (mDeferredTaskInfo != null || PipUtils.remoteActionsChanged(params.getActions(), @@ -1582,6 +1591,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, @PipAnimationController.TransitionDirection int direction, SurfaceControl.Transaction tx, WindowContainerTransaction wct) { + if (mLeash == null || !mLeash.isValid()) { + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Invalid leash on prepareFinishResizeTransaction: %s", TAG, mLeash); + return; + } final Rect taskBounds; if (isInPipDirection(direction)) { // If we are animating from fullscreen using a bounds animation, then reset the @@ -1854,6 +1868,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, animator::clearContentOverlay); } PipAnimationController.quietCancel(animator); + mPipAnimationController.resetAnimatorState(); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipSizeSpecHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipSizeSpecHandler.java index a7171fd5b220..82fe38ccc7b3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipSizeSpecHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipSizeSpecHandler.java @@ -21,6 +21,7 @@ import static com.android.wm.shell.pip.PipUtils.dpToPx; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; +import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; @@ -366,11 +367,8 @@ public class PipSizeSpecHandler { mContext = context; mPipDisplayLayoutState = pipDisplayLayoutState; - boolean enablePipSizeLargeScreen = SystemProperties - .getBoolean("persist.wm.debug.enable_pip_size_large_screen", true); - // choose between two implementations of size spec logic - if (enablePipSizeLargeScreen) { + if (supportsPipSizeLargeScreen()) { mSizeSpecSourceImpl = new SizeSpecLargeScreenOptimizedImpl(); } else { mSizeSpecSourceImpl = new SizeSpecDefaultImpl(); @@ -515,6 +513,18 @@ public class PipSizeSpecHandler { } } + @VisibleForTesting + boolean supportsPipSizeLargeScreen() { + // TODO(b/271468706): switch Tv to having a dedicated SizeSpecSource once the SizeSpecSource + // can be injected + return SystemProperties + .getBoolean("persist.wm.debug.enable_pip_size_large_screen", true) && !isTv(); + } + + private boolean isTv() { + return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK); + } + /** Dumps internal state. */ public void dump(PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java index be1f800b9d2e..b18e21c03c63 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java @@ -276,15 +276,14 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis Rect pipBounds) { ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: resizePipMenu: %s", TAG, pipBounds.toShortString()); + if (pipBounds.isEmpty()) { return; } - - if (!isMenuReadyToMove()) { + if (!isMenuAttached()) { return; } - final SurfaceControl frontSurface = getSurfaceControl(mPipMenuView); final SurfaceControl backSurface = getSurfaceControl(mPipBackgroundView); final Rect menuBounds = calculateMenuSurfaceBounds(pipBounds); @@ -321,7 +320,7 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis } return; } - if (!isMenuReadyToMove()) { + if (!isMenuAttached()) { return; } @@ -344,12 +343,12 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis syncGroup.markSyncReady(); } - private boolean isMenuReadyToMove() { + private boolean isMenuAttached() { final boolean ready = mPipMenuView != null && mPipMenuView.getViewRootImpl() != null && mPipBackgroundView != null && mPipBackgroundView.getViewRootImpl() != null; if (!ready) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, - "%s: Not going to move PiP, either menu or its parent is not created.", TAG); + "%s: the menu surfaces are not attached.", TAG); } return ready; } @@ -368,6 +367,9 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis @Override public void updateMenuBounds(Rect pipBounds) { + if (!isMenuAttached()) { + return; + } final Rect menuBounds = calculateMenuSurfaceBounds(pipBounds); ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: updateMenuBounds: %s", TAG, menuBounds.toShortString()); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java index ccf65c299613..6eb719ba60a3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java @@ -92,7 +92,6 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L private @TvPipMenuController.TvPipMenuMode int mCurrentMenuMode = MODE_NO_MENU; private final Rect mCurrentPipBounds = new Rect(); private int mCurrentPipGravity; - private boolean mSwitchingOrientation; private final AccessibilityManager mA11yManager; private final Handler mMainHandler; @@ -176,17 +175,12 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L } if (mCurrentMenuMode == MODE_ALL_ACTIONS_MENU) { - mSwitchingOrientation = true; + // Fade out while orientation change is ongoing and fade back in once transition is + // finished. mActionButtonsRecyclerView.animate() .alpha(0) .setInterpolator(TvPipInterpolators.EXIT) - .setDuration(mResizeAnimationDuration / 2) - .withEndAction(() -> { - mButtonLayoutManager.setOrientation(vertical - ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL); - // Only make buttons visible again in onPipTransitionFinished to keep in - // sync with PiP content alpha animation. - }); + .setDuration(mResizeAnimationDuration / 2); } else { mButtonLayoutManager.setOrientation(vertical ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL); @@ -208,13 +202,16 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L mEduTextDrawer.init(); } - if (mSwitchingOrientation) { + mButtonLayoutManager.setOrientation( + mCurrentPipBounds.height() > mCurrentPipBounds.width() + ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL); + if (mCurrentMenuMode == MODE_ALL_ACTIONS_MENU + && mActionButtonsRecyclerView.getAlpha() != 1f) { mActionButtonsRecyclerView.animate() .alpha(1) .setInterpolator(TvPipInterpolators.ENTER) .setDuration(mResizeAnimationDuration / 2); } - mSwitchingOrientation = false; } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/SleepHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/SleepHandler.java index 1879bf721fed..d2795959494a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/SleepHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/SleepHandler.java @@ -41,9 +41,9 @@ class SleepHandler implements Transitions.TransitionHandler { @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, @NonNull Transitions.TransitionFinishCallback finishCallback) { + mSleepTransitions.remove(transition); startTransaction.apply(); finishCallback.onTransitionFinished(null, null); - mSleepTransitions.remove(transition); return true; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index 681fa5177da2..fa4de16b37f1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -986,6 +986,7 @@ public class Transitions implements RemoteCallable<Transitions> { onFinish(forceFinish, null, null); } final SurfaceControl.Transaction dummyT = new SurfaceControl.Transaction(); + final TransitionInfo dummyInfo = new TransitionInfo(TRANSIT_SLEEP, 0 /* flags */); while (!mActiveTransitions.isEmpty() && !mSleepHandler.mSleepTransitions.isEmpty()) { final ActiveTransition playing = mActiveTransitions.get(0); int sleepIdx = findByToken(mReadyTransitions, mSleepHandler.mSleepTransitions.get(0)); @@ -995,7 +996,7 @@ public class Transitions implements RemoteCallable<Transitions> { final ActiveTransition nextSleep = mReadyTransitions.get(sleepIdx); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Attempt to merge SLEEP %s" + " into %s", nextSleep, playing); - playing.mHandler.mergeAnimation(nextSleep.mToken, nextSleep.mInfo, dummyT, + playing.mHandler.mergeAnimation(nextSleep.mToken, dummyInfo, dummyT, playing.mToken, (wct, cb) -> {}); } else { Log.e(TAG, "Couldn't find sleep transition in ready list: " diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index c0dcd0b68c6f..afc573e4fcbb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -79,6 +79,7 @@ import java.util.function.Supplier; public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private static final String TAG = "DesktopModeWindowDecorViewModel"; + private final DesktopModeWindowDecoration.Factory mDesktopModeWindowDecorFactory; private final ActivityTaskManager mActivityTaskManager; private final ShellTaskOrganizer mTaskOrganizer; @@ -196,7 +197,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @Override public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) { - if (mTransitionPausingRelayout.equals(merged)) { + if (merged.equals(mTransitionPausingRelayout)) { mTransitionPausingRelayout = playing; } } @@ -311,8 +312,12 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } else if (id == R.id.back_button) { mTaskOperations.injectBackKey(); } else if (id == R.id.caption_handle || id == R.id.open_menu_button) { - moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId)); - decoration.createHandleMenu(); + if (!decoration.isHandleMenuActive()) { + moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId)); + decoration.createHandleMenu(); + } else { + decoration.closeHandleMenu(); + } } else if (id == R.id.desktop_button) { mDesktopModeController.ifPresent(c -> c.setDesktopModeActive(true)); mDesktopTasksController.ifPresent(c -> c.moveToDesktop(mTaskId)); @@ -542,7 +547,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mTransitionDragActive = false; final int statusBarHeight = getStatusBarHeight( relevantDecor.mTaskInfo.displayId); - if (ev.getY() > statusBarHeight) { + if (ev.getY() > 2 * statusBarHeight) { if (DesktopModeStatus.isProto2Enabled()) { mPauseRelayoutForTask = relevantDecor.mTaskInfo.taskId; centerAndMoveToDesktopWithAnimation(relevantDecor, ev); @@ -567,9 +572,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return; } if (mTransitionDragActive) { - final int statusBarHeight = mDisplayController - .getDisplayLayout( - relevantDecor.mTaskInfo.displayId).stableInsets().top; + mDesktopTasksController.ifPresent( + c -> c.onDragPositioningMoveThroughStatusBar(relevantDecor.mTaskInfo, + relevantDecor.mTaskSurface, ev.getY())); + final int statusBarHeight = getStatusBarHeight( + relevantDecor.mTaskInfo.displayId); if (ev.getY() > statusBarHeight) { if (!mDragToDesktopAnimationStarted) { mDragToDesktopAnimationStarted = true; @@ -644,7 +651,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @Override public void onAnimationEnd(Animator animation) { mDesktopTasksController.ifPresent( - c -> c.moveToDesktopWithAnimation(relevantDecor.mTaskInfo, + c -> c.onDragPositioningEndThroughStatusBar( + relevantDecor.mTaskInfo, calculateFreeformBounds(FINAL_FREEFORM_SCALE))); } }); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index e08d40d76c16..f9c0e600dd38 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -91,6 +91,16 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin private Drawable mAppIcon; private CharSequence mAppName; + private int mMenuWidth; + private int mMarginMenuTop; + private int mMarginMenuStart; + private int mMarginMenuSpacing; + private int mAppInfoPillHeight; + private int mWindowingPillHeight; + private int mMoreActionsPillHeight; + private int mShadowRadius; + private int mCornerRadius; + DesktopModeWindowDecoration( Context context, DisplayController displayController, @@ -107,6 +117,29 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mSyncQueue = syncQueue; loadAppInfo(); + loadHandleMenuDimensions(); + } + + private void loadHandleMenuDimensions() { + final Resources resources = mDecorWindowContext.getResources(); + mMenuWidth = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_width); + mMarginMenuTop = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_margin_top); + mMarginMenuStart = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_margin_start); + mMarginMenuSpacing = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_pill_spacing_margin); + mAppInfoPillHeight = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_app_info_pill_height); + mWindowingPillHeight = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_windowing_pill_height); + mShadowRadius = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_shadow_radius); + mCornerRadius = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_corner_radius); + mMoreActionsPillHeight = loadDimensionPixelSize(resources, + R.dimen.desktop_mode_handle_menu_more_actions_pill_height); } @Override @@ -155,6 +188,22 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM; final boolean isDragResizeable = isFreeform && taskInfo.isResizeable; + if (mHandleMenuAppInfoPill != null) { + updateHandleMenuPillPositions(); + startT.setPosition(mHandleMenuAppInfoPill.mWindowSurface, + mHandleMenuAppInfoPillPosition.x, mHandleMenuAppInfoPillPosition.y); + + // Only show windowing buttons in proto2. Proto1 uses a system-level mode only. + final boolean shouldShowWindowingPill = DesktopModeStatus.isProto2Enabled(); + if (shouldShowWindowingPill) { + startT.setPosition(mHandleMenuWindowingPill.mWindowSurface, + mHandleMenuWindowingPillPosition.x, mHandleMenuWindowingPillPosition.y); + } + + startT.setPosition(mHandleMenuMoreActionsPill.mWindowSurface, + mHandleMenuMoreActionsPillPosition.x, mHandleMenuMoreActionsPillPosition.y); + } + final WindowDecorLinearLayout oldRootView = mResult.mRootView; final SurfaceControl oldDecorationSurface = mDecorationContainerSurface; final WindowContainerTransaction wct = new WindowContainerTransaction(); @@ -271,64 +320,17 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin */ void createHandleMenu() { final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); - final Resources resources = mDecorWindowContext.getResources(); - final int captionWidth = mTaskInfo.getConfiguration() - .windowConfiguration.getBounds().width(); - final int menuWidth = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_width); - final int shadowRadius = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_shadow_radius); - final int cornerRadius = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_corner_radius); - final int marginMenuTop = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_margin_top); - final int marginMenuStart = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_margin_start); - final int marginMenuSpacing = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_pill_spacing_margin); - final int appInfoPillHeight = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_app_info_pill_height); - final int windowingPillHeight = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_windowing_pill_height); - final int moreActionsPillHeight = loadDimensionPixelSize(resources, - R.dimen.desktop_mode_handle_menu_more_actions_pill_height); + updateHandleMenuPillPositions(); - final int menuX, menuY; - if (mRelayoutParams.mLayoutResId - == R.layout.desktop_mode_app_controls_window_decor) { - // Align the handle menu to the left of the caption. - menuX = mRelayoutParams.mCaptionX - mResult.mDecorContainerOffsetX + marginMenuStart; - menuY = mRelayoutParams.mCaptionY - mResult.mDecorContainerOffsetY + marginMenuTop; - } else { - // Position the handle menu at the center of the caption. - menuX = mRelayoutParams.mCaptionX + (captionWidth / 2) - (menuWidth / 2) - - mResult.mDecorContainerOffsetX; - menuY = mRelayoutParams.mCaptionY - mResult.mDecorContainerOffsetY + marginMenuStart; - } - - final int appInfoPillY = menuY; - createAppInfoPill(t, menuX, appInfoPillY, menuWidth, appInfoPillHeight, shadowRadius, - cornerRadius); + createAppInfoPill(t); // Only show windowing buttons in proto2. Proto1 uses a system-level mode only. final boolean shouldShowWindowingPill = DesktopModeStatus.isProto2Enabled(); - final int windowingPillY = appInfoPillY + appInfoPillHeight + marginMenuSpacing; if (shouldShowWindowingPill) { - createWindowingPill(t, menuX, windowingPillY, menuWidth, windowingPillHeight, - shadowRadius, - cornerRadius); + createWindowingPill(t); } - final int moreActionsPillY; - if (shouldShowWindowingPill) { - // Take into account the windowing pill height and margins. - moreActionsPillY = windowingPillY + windowingPillHeight + marginMenuSpacing; - } else { - // Just start after the end of the app info pill + margins. - moreActionsPillY = appInfoPillY + appInfoPillHeight + marginMenuSpacing; - } - createMoreActionsPill(t, menuX, moreActionsPillY, menuWidth, moreActionsPillHeight, - shadowRadius, cornerRadius); + createMoreActionsPill(t); mSyncQueue.runInSync(transaction -> { transaction.merge(t); @@ -337,31 +339,31 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin setupHandleMenu(shouldShowWindowingPill); } - private void createAppInfoPill(SurfaceControl.Transaction t, int x, int y, int width, - int height, int shadowRadius, int cornerRadius) { - mHandleMenuAppInfoPillPosition.set(x, y); + private void createAppInfoPill(SurfaceControl.Transaction t) { + final int x = (int) mHandleMenuAppInfoPillPosition.x; + final int y = (int) mHandleMenuAppInfoPillPosition.y; mHandleMenuAppInfoPill = addWindow( R.layout.desktop_mode_window_decor_handle_menu_app_info_pill, "Menu's app info pill", - t, x, y, width, height, shadowRadius, cornerRadius); + t, x, y, mMenuWidth, mAppInfoPillHeight, mShadowRadius, mCornerRadius); } - private void createWindowingPill(SurfaceControl.Transaction t, int x, int y, int width, - int height, int shadowRadius, int cornerRadius) { - mHandleMenuWindowingPillPosition.set(x, y); + private void createWindowingPill(SurfaceControl.Transaction t) { + final int x = (int) mHandleMenuWindowingPillPosition.x; + final int y = (int) mHandleMenuWindowingPillPosition.y; mHandleMenuWindowingPill = addWindow( R.layout.desktop_mode_window_decor_handle_menu_windowing_pill, "Menu's windowing pill", - t, x, y, width, height, shadowRadius, cornerRadius); + t, x, y, mMenuWidth, mWindowingPillHeight, mShadowRadius, mCornerRadius); } - private void createMoreActionsPill(SurfaceControl.Transaction t, int x, int y, int width, - int height, int shadowRadius, int cornerRadius) { - mHandleMenuMoreActionsPillPosition.set(x, y); + private void createMoreActionsPill(SurfaceControl.Transaction t) { + final int x = (int) mHandleMenuMoreActionsPillPosition.x; + final int y = (int) mHandleMenuMoreActionsPillPosition.y; mHandleMenuMoreActionsPill = addWindow( R.layout.desktop_mode_window_decor_handle_menu_more_actions_pill, "Menu's more actions pill", - t, x, y, width, height, shadowRadius, cornerRadius); + t, x, y, mMenuWidth, mMoreActionsPillHeight, mShadowRadius, mCornerRadius); } private void setupHandleMenu(boolean windowingPillShown) { @@ -413,6 +415,45 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } /** + * Updates the handle menu pills' position variables to reflect their next positions + */ + private void updateHandleMenuPillPositions() { + final int menuX, menuY; + final int captionWidth = mTaskInfo.getConfiguration() + .windowConfiguration.getBounds().width(); + if (mRelayoutParams.mLayoutResId + == R.layout.desktop_mode_app_controls_window_decor) { + // Align the handle menu to the left of the caption. + menuX = mRelayoutParams.mCaptionX - mResult.mDecorContainerOffsetX + mMarginMenuStart; + menuY = mRelayoutParams.mCaptionY - mResult.mDecorContainerOffsetY + mMarginMenuTop; + } else { + // Position the handle menu at the center of the caption. + menuX = mRelayoutParams.mCaptionX + (captionWidth / 2) - (mMenuWidth / 2) + - mResult.mDecorContainerOffsetX; + menuY = mRelayoutParams.mCaptionY - mResult.mDecorContainerOffsetY + mMarginMenuStart; + } + + // App Info pill setup. + final int appInfoPillY = menuY; + mHandleMenuAppInfoPillPosition.set(menuX, appInfoPillY); + + // Only show windowing buttons in proto2. Proto1 uses a system-level mode only. + final boolean shouldShowWindowingPill = DesktopModeStatus.isProto2Enabled(); + + final int windowingPillY, moreActionsPillY; + if (shouldShowWindowingPill) { + windowingPillY = appInfoPillY + mAppInfoPillHeight + mMarginMenuSpacing; + mHandleMenuWindowingPillPosition.set(menuX, windowingPillY); + moreActionsPillY = windowingPillY + mWindowingPillHeight + mMarginMenuSpacing; + mHandleMenuMoreActionsPillPosition.set(menuX, moreActionsPillY); + } else { + // Just start after the end of the app info pill + margins. + moreActionsPillY = appInfoPillY + mAppInfoPillHeight + mMarginMenuSpacing; + mHandleMenuMoreActionsPillPosition.set(menuX, moreActionsPillY); + } + } + + /** * Close the handle menu window */ void closeHandleMenu() { @@ -446,6 +487,14 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin if (mHandleMenuAppInfoPill.mWindowViewHost.getView().getWidth() == 0) return; PointF inputPoint = offsetCaptionLocation(ev); + + // If this is called before open_menu_button's onClick, we don't want to close + // the menu since it will just reopen in onClick. + final boolean pointInOpenMenuButton = pointInView( + mResult.mRootView.findViewById(R.id.open_menu_button), + inputPoint.x, + inputPoint.y); + final boolean pointInAppInfoPill = pointInView( mHandleMenuAppInfoPill.mWindowViewHost.getView(), inputPoint.x - mHandleMenuAppInfoPillPosition.x - mResult.mDecorContainerOffsetX, @@ -465,7 +514,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin - mResult.mDecorContainerOffsetX, inputPoint.y - mHandleMenuMoreActionsPillPosition.y - mResult.mDecorContainerOffsetY); - if (!pointInAppInfoPill && !pointInWindowingPill && !pointInMoreActionsPill) { + if (!pointInAppInfoPill && !pointInWindowingPill + && !pointInMoreActionsPill && !pointInOpenMenuButton) { closeHandleMenu(); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java index 2cd1e1d558ae..8cb575cc96e3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java @@ -42,9 +42,6 @@ import android.view.WindowManagerGlobal; import com.android.internal.view.BaseIWindow; -import java.util.Arrays; -import java.util.List; - /** * An input event listener registered to InputDispatcher to receive input events on task edges and * and corners. Converts them to drag resize requests. @@ -214,10 +211,6 @@ class DragResizeInputListener implements AutoCloseable { PRIVATE_FLAG_TRUSTED_OVERLAY, 0 /* inputFeatures */, touchRegion); - List<Rect> cornersList = Arrays.asList( - mLeftTopCornerBounds, mLeftBottomCornerBounds, - mRightTopCornerBounds, mRightBottomCornerBounds); - mWindowSession.reportSystemGestureExclusionChanged(mFakeWindow, cornersList); } catch (RemoteException e) { e.rethrowFromSystemServer(); } diff --git a/libs/WindowManager/Shell/tests/OWNERS b/libs/WindowManager/Shell/tests/OWNERS index 1c28c3d58ccb..64dfc3ef845d 100644 --- a/libs/WindowManager/Shell/tests/OWNERS +++ b/libs/WindowManager/Shell/tests/OWNERS @@ -7,3 +7,4 @@ lbill@google.com madym@google.com hwwang@google.com chenghsiuchang@google.com +atsjenk@google.com diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt index e986ee127708..c416ad011c4e 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt @@ -137,7 +137,7 @@ fun FlickerTest.splitAppLayerBoundsBecomesVisible( portraitPosTop: Boolean ) { assertLayers { - this.notContains(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component)) + this.notContains(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component), isOptional = true) .then() .isInvisible(SPLIT_SCREEN_DIVIDER_COMPONENT.or(component)) .then() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt index 416315e4b06d..18a3aa79f6e2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.bubble import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Postsubmit +import android.tools.common.datatypes.component.ComponentNameMatcher import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest @@ -29,6 +30,7 @@ import androidx.test.uiautomator.Until import com.android.server.wm.flicker.navBarLayerIsVisibleAtEnd import com.android.server.wm.flicker.navBarLayerPositionAtEnd import org.junit.Assume +import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized @@ -137,4 +139,23 @@ class OpenActivityFromBubbleOnLocksreenTest(flicker: FlickerTest) : BaseBubbleSc Assume.assumeTrue(flicker.scenario.isGesturalNavigation) super.navBarWindowIsAlwaysVisible() } + + /** {@inheritDoc} */ + @Test + @Ignore("Not applicable to this CUJ. Taskbar is not shown on lock screen") + override fun taskBarLayerIsVisibleAtStartAndEnd() {} + + @Test + @Ignore("Not applicable to this CUJ. Taskbar is not shown on lock screen") + override fun taskBarWindowIsAlwaysVisible() {} + + /** + * Checks that the [ComponentNameMatcher.TASK_BAR] is visible at the end of the transition + */ + @Postsubmit + @Test + fun taskBarLayerIsVisibleAtEnd() { + Assume.assumeTrue(flicker.scenario.isTablet) + flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) } + } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnPinchOpenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnPinchOpenTest.kt index 0b73aac02797..d860e00fbfff 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnPinchOpenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnPinchOpenTest.kt @@ -36,7 +36,7 @@ import org.junit.runners.Parameterized @FixMethodOrder(MethodSorters.NAME_ASCENDING) open class ExpandPipOnPinchOpenTest(flicker: FlickerTest) : PipTransition(flicker) { override val transition: FlickerBuilder.() -> Unit - get() = buildTransition { transitions { pipApp.pinchOpenPipWindow(wmHelper, 0.4f, 30) } } + get() = buildTransition { transitions { pipApp.pinchOpenPipWindow(wmHelper, 0.25f, 30) } } /** Checks that the visible region area of [pipApp] always increases during the animation. */ @Presubmit diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipPinchInTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipPinchInTest.kt index 85b2fbce2f21..8eb41b4ac694 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipPinchInTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipPinchInTest.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.flicker.pip +import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Postsubmit import android.tools.common.Rotation import android.tools.device.flicker.junit.FlickerParametersRunnerFactory @@ -34,6 +35,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FlakyTest(bugId = 270677470) class PipPinchInTest(flicker: FlickerTest) : PipTransition(flicker) { override val transition: FlickerBuilder.() -> Unit get() = buildTransition { transitions { pipApp.pinchInPipWindow(wmHelper, 0.4f, 30) } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java index 0be08ba74d86..4f71b83179b1 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java @@ -19,7 +19,12 @@ package com.android.wm.shell.compatui; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +import android.app.TaskInfo; import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; import android.view.LayoutInflater; import android.view.View; @@ -31,6 +36,7 @@ import com.android.wm.shell.ShellTestCase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; /** @@ -41,6 +47,7 @@ import org.mockito.MockitoAnnotations; */ @RunWith(AndroidTestingRunner.class) @SmallTest +@TestableLooper.RunWithLooper(setAsMainLooper = true) public class ReachabilityEduLayoutTest extends ShellTestCase { private ReachabilityEduLayout mLayout; @@ -49,6 +56,12 @@ public class ReachabilityEduLayoutTest extends ShellTestCase { private View mMoveLeftButton; private View mMoveRightButton; + @Mock + private CompatUIConfiguration mCompatUIConfiguration; + + @Mock + private TaskInfo mTaskInfo; + @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -69,13 +82,38 @@ public class ReachabilityEduLayoutTest extends ShellTestCase { } @Test - public void handleVisibility_activityNotLetterboxed_buttonsAreHidden() { - mLayout.handleVisibility(/* isActivityLetterboxed */ false, - /* letterboxVerticalPosition */ -1, /* letterboxHorizontalPosition */ -1, - /* availableWidth */ 0, /* availableHeight */ 0, /* fromDoubleTap */ false); + public void handleVisibility_educationNotEnabled_buttonsAreHidden() { + mLayout.handleVisibility(/* horizontalEnabled */ false, /* verticalEnabled */ + false, /* letterboxVerticalPosition */ + -1, /* letterboxHorizontalPosition */ -1, /* availableWidth */ + 0, /* availableHeight */ 0, mCompatUIConfiguration, mTaskInfo); assertEquals(View.INVISIBLE, mMoveUpButton.getVisibility()); assertEquals(View.INVISIBLE, mMoveDownButton.getVisibility()); assertEquals(View.INVISIBLE, mMoveLeftButton.getVisibility()); assertEquals(View.INVISIBLE, mMoveRightButton.getVisibility()); } + + @Test + public void handleVisibility_horizontalEducationEnableduiConfigurationIsUpdated() { + mLayout.handleVisibility(/* horizontalEnabled */ true, /* verticalEnabled */ + false, /* letterboxVerticalPosition */ -1, /* letterboxHorizontalPosition */ + 1, /* availableWidth */ 500, /* availableHeight */ 0, mCompatUIConfiguration, + mTaskInfo); + + verify(mCompatUIConfiguration).setUserHasSeenHorizontalReachabilityEducation(mTaskInfo); + verify(mCompatUIConfiguration, never()).setUserHasSeenVerticalReachabilityEducation( + mTaskInfo); + } + + @Test + public void handleVisibility_verticalEducationEnabled_uiConfigurationIsUpdated() { + mLayout.handleVisibility(/* horizontalEnabled */ false, /* verticalEnabled */ + true, /* letterboxVerticalPosition */ 0, /* letterboxHorizontalPosition */ + -1, /* availableWidth */ 0, /* availableHeight */ 500, mCompatUIConfiguration, + mTaskInfo); + + verify(mCompatUIConfiguration, never()) + .setUserHasSeenHorizontalReachabilityEducation(mTaskInfo); + verify(mCompatUIConfiguration).setUserHasSeenVerticalReachabilityEducation(mTaskInfo); + } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java index 359ef979a310..5bcc72e73cb9 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java @@ -80,9 +80,8 @@ public class ReachabilityEduWindowManagerTest extends ShellTestCase { } private ReachabilityEduWindowManager createReachabilityEduWindowManager(TaskInfo taskInfo) { - return new ReachabilityEduWindowManager(mContext, taskInfo, - mSyncTransactionQueue, mCallback, mTaskListener, mDisplayLayout, - mCompatUIConfiguration, mExecutor); + return new ReachabilityEduWindowManager(mContext, taskInfo, mSyncTransactionQueue, + mTaskListener, mDisplayLayout, mCompatUIConfiguration, mExecutor); } private static TaskInfo createTaskInfo(int userId, boolean isLetterboxDoubleTapEnabled) { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipSizeSpecHandlerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipSizeSpecHandlerTest.java index 390c830069eb..425bbf056b85 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipSizeSpecHandlerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipSizeSpecHandlerTest.java @@ -18,7 +18,6 @@ package com.android.wm.shell.pip.phone; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; @@ -76,7 +75,7 @@ public class PipSizeSpecHandlerTest extends ShellTestCase { @Mock private Resources mResources; private PipDisplayLayoutState mPipDisplayLayoutState; - private PipSizeSpecHandler mPipSizeSpecHandler; + private TestPipSizeSpecHandler mPipSizeSpecHandler; /** * Sets up static Mockito session for SystemProperties and mocks necessary static methods. @@ -84,8 +83,6 @@ public class PipSizeSpecHandlerTest extends ShellTestCase { private static void setUpStaticSystemPropertiesSession() { sStaticMockitoSession = mockitoSession() .mockStatic(SystemProperties.class).startMocking(); - // make sure the feature flag is on - when(SystemProperties.getBoolean(anyString(), anyBoolean())).thenReturn(true); when(SystemProperties.get(anyString(), anyString())).thenAnswer(invocation -> { String property = invocation.getArgument(0); if (property.equals("com.android.wm.shell.pip.phone.def_percentage")) { @@ -161,7 +158,7 @@ public class PipSizeSpecHandlerTest extends ShellTestCase { mPipDisplayLayoutState.setDisplayLayout(displayLayout); setUpStaticSystemPropertiesSession(); - mPipSizeSpecHandler = new PipSizeSpecHandler(mContext, mPipDisplayLayoutState); + mPipSizeSpecHandler = new TestPipSizeSpecHandler(mContext, mPipDisplayLayoutState); // no overridden min edge size by default mPipSizeSpecHandler.setOverrideMinSize(null); @@ -214,4 +211,16 @@ public class PipSizeSpecHandlerTest extends ShellTestCase { Assert.assertEquals(expectedSize, actualSize); } + + static class TestPipSizeSpecHandler extends PipSizeSpecHandler { + + TestPipSizeSpecHandler(Context context, PipDisplayLayoutState displayLayoutState) { + super(context, displayLayoutState); + } + + @Override + boolean supportsPipSizeLargeScreen() { + return true; + } + } } diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 5d79104200d9..70c36a5803ee 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -55,6 +55,10 @@ cc_defaults { // GCC false-positives on this warning, and since we -Werror that's // a problem "-Wno-free-nonheap-object", + + // Do not de-optimise cold code paths in AFDO. + // Some code paths might be infrequently executed but critical to latency. + "-fno-profile-sample-accurate", ], include_dirs: [ diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index 0b58406516e3..924fbd659824 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -51,6 +51,9 @@ #include "include/gpu/GrDirectContext.h" #include "pipeline/skia/AnimatedDrawables.h" #include "pipeline/skia/FunctorDrawable.h" +#ifdef __ANDROID__ +#include "renderthread/CanvasContext.h" +#endif namespace android { namespace uirenderer { @@ -489,7 +492,19 @@ struct DrawPoints final : Op { size_t count; SkPaint paint; void draw(SkCanvas* c, const SkMatrix&) const { - c->drawPoints(mode, count, pod<SkPoint>(this), paint); + if (paint.isAntiAlias()) { + c->drawPoints(mode, count, pod<SkPoint>(this), paint); + } else { + c->save(); +#ifdef __ANDROID__ + auto pixelSnap = renderthread::CanvasContext::getActiveContext()->getPixelSnapMatrix(); + auto transform = c->getLocalToDevice(); + transform.postConcat(pixelSnap); + c->setMatrix(transform); +#endif + c->drawPoints(mode, count, pod<SkPoint>(this), paint); + c->restore(); + } } }; struct DrawVertices final : Op { diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index 7a1276982d0a..8394c3cd4175 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -50,6 +50,7 @@ #include "Mesh.h" #include "NinePatchUtils.h" #include "VectorDrawable.h" +#include "effects/GainmapRenderer.h" #include "hwui/Bitmap.h" #include "hwui/MinikinUtils.h" #include "hwui/PaintFilter.h" @@ -589,18 +590,25 @@ void SkiaCanvas::drawMesh(const Mesh& mesh, sk_sp<SkBlender> blender, const Pain void SkiaCanvas::drawBitmap(Bitmap& bitmap, float left, float top, const Paint* paint) { auto image = bitmap.makeImage(); + + if (bitmap.hasGainmap()) { + Paint gainmapPaint = paint ? *paint : Paint(); + sk_sp<SkShader> gainmapShader = uirenderer::MakeGainmapShader( + image, bitmap.gainmap()->bitmap->makeImage(), bitmap.gainmap()->info, + SkTileMode::kClamp, SkTileMode::kClamp, gainmapPaint.sampling()); + gainmapPaint.setShader(gainmapShader); + return drawRect(left, top, left + bitmap.width(), top + bitmap.height(), gainmapPaint); + } + applyLooper(paint, [&](const Paint& p) { mCanvas->drawImage(image, left, top, p.sampling(), &p); }); } void SkiaCanvas::drawBitmap(Bitmap& bitmap, const SkMatrix& matrix, const Paint* paint) { - auto image = bitmap.makeImage(); SkAutoCanvasRestore acr(mCanvas, true); mCanvas->concat(matrix); - applyLooper(paint, [&](const Paint& p) { - mCanvas->drawImage(image, 0, 0, p.sampling(), &p); - }); + drawBitmap(bitmap, 0, 0, paint); } void SkiaCanvas::drawBitmap(Bitmap& bitmap, float srcLeft, float srcTop, float srcRight, @@ -610,6 +618,16 @@ void SkiaCanvas::drawBitmap(Bitmap& bitmap, float srcLeft, float srcTop, float s SkRect srcRect = SkRect::MakeLTRB(srcLeft, srcTop, srcRight, srcBottom); SkRect dstRect = SkRect::MakeLTRB(dstLeft, dstTop, dstRight, dstBottom); + if (bitmap.hasGainmap()) { + Paint gainmapPaint = paint ? *paint : Paint(); + sk_sp<SkShader> gainmapShader = uirenderer::MakeGainmapShader( + image, bitmap.gainmap()->bitmap->makeImage(), bitmap.gainmap()->info, + SkTileMode::kClamp, SkTileMode::kClamp, gainmapPaint.sampling()); + gainmapShader = gainmapShader->makeWithLocalMatrix(SkMatrix::RectToRect(srcRect, dstRect)); + gainmapPaint.setShader(gainmapShader); + return drawRect(dstLeft, dstTop, dstRight, dstBottom, gainmapPaint); + } + applyLooper(paint, [&](const Paint& p) { mCanvas->drawImageRect(image, srcRect, dstRect, p.sampling(), &p, SkCanvas::kFast_SrcRectConstraint); diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h index 940d6bfdb83c..f0461bef170c 100644 --- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h @@ -53,6 +53,14 @@ public: bool isSurfaceReady() override; bool isContextReady() override; + const SkM44& getPixelSnapMatrix() const override { + // Small (~1/16th) nudge to ensure that pixel-aligned non-AA'd draws fill the + // desired fragment + static const SkScalar kOffset = 0.063f; + static const SkM44 sSnapMatrix = SkM44::Translate(kOffset, kOffset); + return sSnapMatrix; + } + static void invokeFunctor(const renderthread::RenderThread& thread, Functor* functor); protected: diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index 8ea71f11e2f0..1f929685b62c 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -28,6 +28,7 @@ #include <SkMultiPictureDocument.h> #include <SkOverdrawCanvas.h> #include <SkOverdrawColorFilter.h> +#include <SkPaintFilterCanvas.h> #include <SkPicture.h> #include <SkPictureRecorder.h> #include <SkRect.h> @@ -36,15 +37,15 @@ #include <SkStream.h> #include <SkString.h> #include <SkTypeface.h> -#include "include/gpu/GpuTypes.h" // from Skia #include <android-base/properties.h> +#include <gui/TraceUtils.h> #include <unistd.h> #include <sstream> -#include <gui/TraceUtils.h> #include "LightingInfo.h" #include "VectorDrawable.h" +#include "include/gpu/GpuTypes.h" // from Skia #include "thread/CommonPool.h" #include "tools/SkSharingProc.h" #include "utils/Color.h" @@ -449,6 +450,23 @@ void SkiaPipeline::endCapture(SkSurface* surface) { } } +class ForceDitherCanvas : public SkPaintFilterCanvas { +public: + ForceDitherCanvas(SkCanvas* canvas) : SkPaintFilterCanvas(canvas) {} + +protected: + bool onFilter(SkPaint& paint) const override { + paint.setDither(true); + return true; + } + + void onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) override { + // We unroll the drawable using "this" canvas, so that draw calls contained inside will + // get dithering applied + drawable->draw(this, matrix); + } +}; + void SkiaPipeline::renderFrame(const LayerUpdateQueue& layers, const SkRect& clip, const std::vector<sp<RenderNode>>& nodes, bool opaque, const Rect& contentDrawBounds, sk_sp<SkSurface> surface, @@ -503,6 +521,12 @@ void SkiaPipeline::renderFrameImpl(const SkRect& clip, canvas->clear(SK_ColorTRANSPARENT); } + std::optional<ForceDitherCanvas> forceDitherCanvas; + if (shouldForceDither()) { + forceDitherCanvas.emplace(canvas); + canvas = &forceDitherCanvas.value(); + } + if (1 == nodes.size()) { if (!nodes[0]->nothingToDraw()) { RenderNodeDrawable root(nodes[0].get(), canvas); diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.h b/libs/hwui/pipeline/skia/SkiaPipeline.h index befee8989383..0763b06b53ef 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaPipeline.h @@ -98,6 +98,8 @@ protected: bool isCapturingSkp() const { return mCaptureMode != CaptureMode::None; } + virtual bool shouldForceDither() const { return mColorMode != ColorMode::Default; } + private: void renderFrameImpl(const SkRect& clip, const std::vector<sp<RenderNode>>& nodes, bool opaque, diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp index c8f2e69ae0a4..f22652f92c15 100644 --- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp @@ -203,6 +203,11 @@ sk_sp<Bitmap> SkiaVulkanPipeline::allocateHardwareBitmap(renderthread::RenderThr return nullptr; } +bool SkiaVulkanPipeline::shouldForceDither() const { + if (mVkSurface && mVkSurface->isBeyond8Bit()) return false; + return SkiaPipeline::shouldForceDither(); +} + void SkiaVulkanPipeline::onContextDestroyed() { if (mVkSurface) { vulkanManager().destroySurface(mVkSurface); @@ -210,6 +215,10 @@ void SkiaVulkanPipeline::onContextDestroyed() { } } +const SkM44& SkiaVulkanPipeline::getPixelSnapMatrix() const { + return mVkSurface->getPixelSnapMatrix(); +} + } /* namespace skiapipeline */ } /* namespace uirenderer */ } /* namespace android */ diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h index d921ddb0d0fb..cce5468e68f0 100644 --- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h @@ -53,8 +53,8 @@ public: void onStop() override; bool isSurfaceReady() override; bool isContextReady() override; - bool supportsExtendedRangeHdr() const override { return true; } void setTargetSdrHdrRatio(float ratio) override; + const SkM44& getPixelSnapMatrix() const override; static void invokeFunctor(const renderthread::RenderThread& thread, Functor* functor); static sk_sp<Bitmap> allocateHardwareBitmap(renderthread::RenderThread& thread, @@ -63,6 +63,8 @@ public: protected: void onContextDestroyed() override; + bool shouldForceDither() const override; + private: renderthread::VulkanManager& vulkanManager(); renderthread::VulkanSurface* mVkSurface = nullptr; diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 6b2c99534a4c..f60c1f3c6ad8 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -236,7 +236,6 @@ void CanvasContext::setupPipelineSurface() { if (mNativeSurface && !mNativeSurface->didSetExtraBuffers()) { setBufferCount(mNativeSurface->getNativeWindow()); - } mFrameNumber = 0; @@ -301,10 +300,6 @@ void CanvasContext::setOpaque(bool opaque) { float CanvasContext::setColorMode(ColorMode mode) { if (mode != mColorMode) { - const bool isHdr = mode == ColorMode::Hdr || mode == ColorMode::Hdr10; - if (isHdr && !mRenderPipeline->supportsExtendedRangeHdr()) { - mode = ColorMode::WideColorGamut; - } mColorMode = mode; mRenderPipeline->setSurfaceColorProperties(mode); setupPipelineSurface(); @@ -871,6 +866,10 @@ SkISize CanvasContext::getNextFrameSize() const { return size; } +const SkM44& CanvasContext::getPixelSnapMatrix() const { + return mRenderPipeline->getPixelSnapMatrix(); +} + void CanvasContext::prepareAndDraw(RenderNode* node) { ATRACE_CALL(); diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h index 3f2533959c20..d7215de92375 100644 --- a/libs/hwui/renderthread/CanvasContext.h +++ b/libs/hwui/renderthread/CanvasContext.h @@ -200,6 +200,9 @@ public: SkISize getNextFrameSize() const; + // Returns the matrix to use to nudge non-AA'd points/lines towards the fragment center + const SkM44& getPixelSnapMatrix() const; + // Called when SurfaceStats are available. static void onSurfaceStatsAvailable(void* context, int32_t surfaceControlId, ASurfaceControlStats* stats); diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 4fb114b71bf5..94f35fd9eaf2 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -423,6 +423,7 @@ Result<EGLSurface, EGLint> EglManager::createSurface(EGLNativeWindowType window, EGLint attribs[] = {EGL_NONE, EGL_NONE, EGL_NONE}; EGLConfig config = mEglConfig; + bool overrideWindowDataSpaceForHdr = false; if (colorMode == ColorMode::A8) { // A8 doesn't use a color space if (!mEglConfigA8) { @@ -450,12 +451,13 @@ Result<EGLSurface, EGLint> EglManager::createSurface(EGLNativeWindowType window, case ColorMode::Default: attribs[1] = EGL_GL_COLORSPACE_LINEAR_KHR; break; - // Extended Range HDR requires being able to manipulate the dataspace in ways - // we cannot easily do while going through EGLSurface. Given this requires - // composer3 support, just treat HDR as equivalent to wide color gamut if - // the GLES path is still being hit + // We don't have an EGL colorspace for extended range P3 that's used for HDR + // So override it after configuring the EGL context case ColorMode::Hdr: case ColorMode::Hdr10: + overrideWindowDataSpaceForHdr = true; + attribs[1] = EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT; + break; case ColorMode::WideColorGamut: { skcms_Matrix3x3 colorGamut; LOG_ALWAYS_FATAL_IF(!colorSpace->toXYZD50(&colorGamut), @@ -491,6 +493,16 @@ Result<EGLSurface, EGLint> EglManager::createSurface(EGLNativeWindowType window, (void*)window, eglErrorString()); } + if (overrideWindowDataSpaceForHdr) { + // This relies on knowing that EGL will not re-set the dataspace after the call to + // eglCreateWindowSurface. Since the handling of the colorspace extension is largely + // implemented in libEGL in the platform, we can safely assume this is the case + int32_t err = ANativeWindow_setBuffersDataSpace( + window, + static_cast<android_dataspace>(STANDARD_DCI_P3 | TRANSFER_SRGB | RANGE_EXTENDED)); + LOG_ALWAYS_FATAL_IF(err, "Failed to ANativeWindow_setBuffersDataSpace %d", err); + } + return surface; } diff --git a/libs/hwui/renderthread/IRenderPipeline.h b/libs/hwui/renderthread/IRenderPipeline.h index c68fcdfc76f2..6c2cb9d71c55 100644 --- a/libs/hwui/renderthread/IRenderPipeline.h +++ b/libs/hwui/renderthread/IRenderPipeline.h @@ -95,8 +95,8 @@ public: virtual void setPictureCapturedCallback( const std::function<void(sk_sp<SkPicture>&&)>& callback) = 0; - virtual bool supportsExtendedRangeHdr() const { return false; } virtual void setTargetSdrHdrRatio(float ratio) = 0; + virtual const SkM44& getPixelSnapMatrix() const = 0; virtual ~IRenderPipeline() {} }; diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index 21b6c44e997e..2b7fa0420cef 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -63,6 +63,18 @@ static SkMatrix GetPreTransformMatrix(SkISize windowSize, int transform) { return SkMatrix::I(); } +static SkM44 GetPixelSnapMatrix(SkISize windowSize, int transform) { + // Small (~1/16th) nudge to ensure that pixel-aligned non-AA'd draws fill the + // desired fragment + static const SkScalar kOffset = 0.063f; + SkMatrix preRotation = GetPreTransformMatrix(windowSize, transform); + SkMatrix invert; + LOG_ALWAYS_FATAL_IF(!preRotation.invert(&invert)); + return SkM44::Translate(kOffset, kOffset) + .postConcat(SkM44(preRotation)) + .preConcat(SkM44(invert)); +} + static bool ConnectAndSetWindowDefaults(ANativeWindow* window) { ATRACE_CALL(); @@ -178,6 +190,8 @@ bool VulkanSurface::InitializeWindowInfoStruct(ANativeWindow* window, ColorMode outWindowInfo->preTransform = GetPreTransformMatrix(outWindowInfo->size, outWindowInfo->transform); + outWindowInfo->pixelSnapMatrix = + GetPixelSnapMatrix(outWindowInfo->size, outWindowInfo->transform); err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS, &query_value); if (err != 0 || query_value < 0) { @@ -413,6 +427,7 @@ VulkanSurface::NativeBufferInfo* VulkanSurface::dequeueNativeBuffer() { } mWindowInfo.preTransform = GetPreTransformMatrix(mWindowInfo.size, mWindowInfo.transform); + mWindowInfo.pixelSnapMatrix = GetPixelSnapMatrix(mWindowInfo.size, mWindowInfo.transform); } uint32_t idx; @@ -530,6 +545,16 @@ void VulkanSurface::setColorSpace(sk_sp<SkColorSpace> colorSpace) { } } +bool VulkanSurface::isBeyond8Bit() const { + switch (mWindowInfo.bufferFormat) { + case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: + case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: + return true; + default: + return false; + } +} + } /* namespace renderthread */ } /* namespace uirenderer */ } /* namespace android */ diff --git a/libs/hwui/renderthread/VulkanSurface.h b/libs/hwui/renderthread/VulkanSurface.h index e2ddc6b07768..d3266af81437 100644 --- a/libs/hwui/renderthread/VulkanSurface.h +++ b/libs/hwui/renderthread/VulkanSurface.h @@ -47,6 +47,9 @@ public: const SkMatrix& getCurrentPreTransform() { return mWindowInfo.preTransform; } void setColorSpace(sk_sp<SkColorSpace> colorSpace); + const SkM44& getPixelSnapMatrix() const { return mWindowInfo.pixelSnapMatrix; } + + bool isBeyond8Bit() const; private: /* @@ -105,6 +108,7 @@ private: SkISize actualSize; // transform to be applied to the SkSurface to map the coordinates to the provided transform SkMatrix preTransform; + SkM44 pixelSnapMatrix; }; VulkanSurface(ANativeWindow* window, const WindowInfo& windowInfo, GrDirectContext* grContext); diff --git a/media/TEST_MAPPING b/media/TEST_MAPPING index e8c7ad2cc031..5ae77b5a8e2f 100644 --- a/media/TEST_MAPPING +++ b/media/TEST_MAPPING @@ -15,16 +15,16 @@ ] }, { - "name": "GtsMediaTestCases", + "name": "WvtsDeviceTestCases", "options" : [ { "include-annotation": "android.platform.test.annotations.Presubmit" }, { - "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests" + "include-filter": "com.google.android.media.wvts.WidevineGenericOpsTests" }, { - "include-filter": "com.google.android.media.gts.WidevineH264PlaybackTests" + "include-filter": "com.google.android.media.wvts.WidevineH264PlaybackTests" } ], "file_patterns": ["(?i)drm|crypto"] diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index b4fbc975e53a..b1d2e33df3f7 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -661,7 +661,10 @@ public class AudioManager { */ public static final int ENCODED_SURROUND_OUTPUT_MANUAL = 3; - /** @hide */ + /** + * @hide + * This list contains all the flags that can be used in internal APIs for volume + * related operations */ @IntDef(flag = true, prefix = "FLAG", value = { FLAG_SHOW_UI, FLAG_ALLOW_RINGER_MODES, @@ -681,16 +684,64 @@ public class AudioManager { @Retention(RetentionPolicy.SOURCE) public @interface Flags {} - /** @hide */ + /** + * @hide + * This list contains all the flags that can be used in SDK-visible methods for volume + * related operations. + * See for instance {@link #adjustVolume(int, int)}, + * {@link #adjustStreamVolume(int, int, int)}, + * {@link #adjustSuggestedStreamVolume(int, int, int)}, + * {@link #adjustVolumeGroupVolume(int, int, int)}, + * {@link #setStreamVolume(int, int, int)} + * The list contains all volume flags, but the values commented out of the list are there for + * maintenance reasons (for when adding flags or changing their visibility), + * and to document why some are not in the list (hidden or SystemApi). */ + @IntDef(flag = true, prefix = "FLAG", value = { + FLAG_SHOW_UI, + FLAG_ALLOW_RINGER_MODES, + FLAG_PLAY_SOUND, + FLAG_REMOVE_SOUND_AND_VIBRATE, + FLAG_VIBRATE, + //FLAG_FIXED_VOLUME, removed due to @hide + //FLAG_BLUETOOTH_ABS_VOLUME, removed due to @SystemApi + //FLAG_SHOW_SILENT_HINT, removed due to @hide + //FLAG_HDMI_SYSTEM_AUDIO_VOLUME, removed due to @hide + //FLAG_ACTIVE_MEDIA_ONLY, removed due to @hide + //FLAG_SHOW_UI_WARNINGS, removed due to @hide + //FLAG_SHOW_VIBRATE_HINT, removed due to @hide + //FLAG_FROM_KEY, removed due to @SystemApi + //FLAG_ABSOLUTE_VOLUME, removed due to @hide + }) + @Retention(RetentionPolicy.SOURCE) + public @interface PublicVolumeFlags {} + + /** + * @hide + * Like PublicVolumeFlags, but for all the flags that can be used in @SystemApi methods for + * volume related operations. + * See for instance {@link #setVolumeIndexForAttributes(AudioAttributes, int, int)}, + * {@link #setVolumeGroupVolumeIndex(int, int, int)}, + * {@link #setStreamVolumeForUid(int, int, int, String, int, int, int)}, + * {@link #adjustStreamVolumeForUid(int, int, int, String, int, int, int)}, + * {@link #adjustSuggestedStreamVolumeForUid(int, int, int, String, int, int, int)} + * The list contains all volume flags, but the values commented out of the list are there for + * maintenance reasons (for when adding flags or changing their visibility), + * and to document which hidden values are not in the list. */ @IntDef(flag = true, prefix = "FLAG", value = { FLAG_SHOW_UI, FLAG_ALLOW_RINGER_MODES, FLAG_PLAY_SOUND, FLAG_REMOVE_SOUND_AND_VIBRATE, FLAG_VIBRATE, + //FLAG_FIXED_VOLUME, removed due to @hide FLAG_BLUETOOTH_ABS_VOLUME, - FLAG_HDMI_SYSTEM_AUDIO_VOLUME, + //FLAG_SHOW_SILENT_HINT, removed due to @hide + //FLAG_HDMI_SYSTEM_AUDIO_VOLUME, removed due to @hide + //FLAG_ACTIVE_MEDIA_ONLY, removed due to @hide + //FLAG_SHOW_UI_WARNINGS, removed due to @hide + //FLAG_SHOW_VIBRATE_HINT, removed due to @hide FLAG_FROM_KEY, + //FLAG_ABSOLUTE_VOLUME, removed due to @hide }) @Retention(RetentionPolicy.SOURCE) public @interface SystemVolumeFlags {} @@ -981,13 +1032,13 @@ public class AudioManager { * @param direction The direction to adjust the volume. One of * {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, or * {@link #ADJUST_SAME}. - * @param flags One or more flags. + * @param flags * @see #adjustVolume(int, int) * @see #setStreamVolume(int, int, int) * @throws SecurityException if the adjustment triggers a Do Not Disturb change * and the caller is not granted notification policy access. */ - public void adjustStreamVolume(int streamType, int direction, int flags) { + public void adjustStreamVolume(int streamType, int direction, @PublicVolumeFlags int flags) { final IAudioService service = getService(); try { service.adjustStreamVolumeWithAttribution(streamType, direction, flags, @@ -1014,13 +1065,13 @@ public class AudioManager { * {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, * {@link #ADJUST_SAME}, {@link #ADJUST_MUTE}, * {@link #ADJUST_UNMUTE}, or {@link #ADJUST_TOGGLE_MUTE}. - * @param flags One or more flags. + * @param flags * @see #adjustSuggestedStreamVolume(int, int, int) * @see #adjustStreamVolume(int, int, int) * @see #setStreamVolume(int, int, int) * @see #isVolumeFixed() */ - public void adjustVolume(int direction, int flags) { + public void adjustVolume(int direction, @PublicVolumeFlags int flags) { MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(getContext()); helper.sendAdjustVolumeBy(USE_DEFAULT_STREAM_TYPE, direction, flags); } @@ -1043,13 +1094,14 @@ public class AudioManager { * @param suggestedStreamType The stream type that will be used if there * isn't a relevant stream. {@link #USE_DEFAULT_STREAM_TYPE} is * valid here. - * @param flags One or more flags. + * @param flags * @see #adjustVolume(int, int) * @see #adjustStreamVolume(int, int, int) * @see #setStreamVolume(int, int, int) * @see #isVolumeFixed() */ - public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags) { + public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, + @PublicVolumeFlags int flags) { MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(getContext()); helper.sendAdjustVolumeBy(suggestedStreamType, direction, flags); } @@ -1334,14 +1386,14 @@ public class AudioManager { * @param streamType The stream whose volume index should be set. * @param index The volume index to set. See * {@link #getStreamMaxVolume(int)} for the largest valid value. - * @param flags One or more flags. + * @param flags * @see #getStreamMaxVolume(int) * @see #getStreamVolume(int) * @see #isVolumeFixed() * @throws SecurityException if the volume change triggers a Do Not Disturb change * and the caller is not granted notification policy access. */ - public void setStreamVolume(int streamType, int index, int flags) { + public void setStreamVolume(int streamType, int index, @PublicVolumeFlags int flags) { final IAudioService service = getService(); try { service.setStreamVolumeWithAttribution(streamType, index, flags, @@ -1357,7 +1409,7 @@ public class AudioManager { * @param index The volume index to set. See * {@link #getMaxVolumeIndexForAttributes(AudioAttributes)} for the largest valid value * {@link #getMinVolumeIndexForAttributes(AudioAttributes)} for the lowest valid value. - * @param flags One or more flags. + * @param flags * @see #getMaxVolumeIndexForAttributes(AudioAttributes) * @see #getMinVolumeIndexForAttributes(AudioAttributes) * @see #isVolumeFixed() @@ -1365,7 +1417,8 @@ public class AudioManager { */ @SystemApi @RequiresPermission(Manifest.permission.MODIFY_AUDIO_ROUTING) - public void setVolumeIndexForAttributes(@NonNull AudioAttributes attr, int index, int flags) { + public void setVolumeIndexForAttributes(@NonNull AudioAttributes attr, int index, + @SystemVolumeFlags int flags) { Preconditions.checkNotNull(attr, "attr must not be null"); final IAudioService service = getService(); int groupId = getVolumeGroupIdForAttributes(attr); @@ -1451,7 +1504,7 @@ public class AudioManager { * @param index The volume index to set. See * {@link #getVolumeGroupMaxVolumeIndex(id)} for the largest valid value * {@link #getVolumeGroupMinVolumeIndex(id)} for the lowest valid value. - * @param flags One or more flags. + * @param flags * @hide */ @SystemApi @@ -1552,11 +1605,11 @@ public class AudioManager { * @param direction The direction to adjust the volume. One of * {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, or * {@link #ADJUST_SAME}. - * @param flags One or more flags. + * @param flags * @throws SecurityException if the adjustment triggers a Do Not Disturb change and the caller * is not granted notification policy access. */ - public void adjustVolumeGroupVolume(int groupId, int direction, @SystemVolumeFlags int flags) { + public void adjustVolumeGroupVolume(int groupId, int direction, @PublicVolumeFlags int flags) { IAudioService service = getService(); try { service.adjustVolumeGroupVolume(groupId, direction, flags, @@ -8234,7 +8287,7 @@ public class AudioManager { * {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, * {@link #ADJUST_SAME}, {@link #ADJUST_MUTE}, * {@link #ADJUST_UNMUTE}, or {@link #ADJUST_TOGGLE_MUTE}. - * @param flags One or more flags. + * @param flags * @param packageName the package name of client application * @param uid the uid of client application * @param pid the pid of client application @@ -8247,7 +8300,8 @@ public class AudioManager { * @hide */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) - public void adjustSuggestedStreamVolumeForUid(int suggestedStreamType, int direction, int flags, + public void adjustSuggestedStreamVolumeForUid(int suggestedStreamType, int direction, + @SystemVolumeFlags int flags, @NonNull String packageName, int uid, int pid, int targetSdkVersion) { try { getService().adjustSuggestedStreamVolumeForUid(suggestedStreamType, direction, flags, @@ -8277,7 +8331,7 @@ public class AudioManager { * @param direction The direction to adjust the volume. One of * {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, or * {@link #ADJUST_SAME}. - * @param flags One or more flags. + * @param flags * @param packageName the package name of client application * @param uid the uid of client application * @param pid the pid of client application @@ -8290,7 +8344,8 @@ public class AudioManager { * @hide */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) - public void adjustStreamVolumeForUid(int streamType, int direction, int flags, + public void adjustStreamVolumeForUid(int streamType, int direction, + @SystemVolumeFlags int flags, @NonNull String packageName, int uid, int pid, int targetSdkVersion) { try { getService().adjustStreamVolumeForUid(streamType, direction, flags, packageName, uid, @@ -8314,7 +8369,7 @@ public class AudioManager { * @param streamType The stream whose volume index should be set. * @param index The volume index to set. See * {@link #getStreamMaxVolume(int)} for the largest valid value. - * @param flags One or more flags. + * @param flags * @param packageName the package name of client application * @param uid the uid of client application * @param pid the pid of client application @@ -8328,7 +8383,8 @@ public class AudioManager { * @hide */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) - public void setStreamVolumeForUid(int streamType, int index, int flags, + public void setStreamVolumeForUid(int streamType, int index, + @SystemVolumeFlags int flags, @NonNull String packageName, int uid, int pid, int targetSdkVersion) { try { getService().setStreamVolumeForUid(streamType, index, flags, packageName, uid, pid, diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index f9d4efea57e2..fe5afc5a717e 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -268,7 +268,7 @@ interface IAudioService { boolean isVolumeControlUsingVolumeGroups(); @EnforcePermission("MODIFY_AUDIO_SETTINGS_PRIVILEGED") - oneway void registerStreamAliasingDispatcher(IStreamAliasingDispatcher isad, boolean register); + void registerStreamAliasingDispatcher(IStreamAliasingDispatcher isad, boolean register); @EnforcePermission("MODIFY_AUDIO_SETTINGS_PRIVILEGED") void setNotifAliasRingForTest(boolean alias); diff --git a/media/java/android/media/projection/IMediaProjection.aidl b/media/java/android/media/projection/IMediaProjection.aidl index 5f7d636fdd1e..e3829e6a3021 100644 --- a/media/java/android/media/projection/IMediaProjection.aidl +++ b/media/java/android/media/projection/IMediaProjection.aidl @@ -51,4 +51,26 @@ interface IMediaProjection { @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + ".permission.MANAGE_MEDIA_PROJECTION)") void setLaunchCookie(in IBinder launchCookie); + + /** + * Returns {@code true} if this token is still valid. A token is valid as long as the token + * hasn't timed out before it was used, and the token is only used once. + * + * <p>If the {@link IMediaProjection} is not valid, then either throws an exception if the + * target SDK is at least {@code U}, or returns {@code false} for target SDK below {@code U}. + * + * @throws IllegalStateException If the caller's target SDK is at least {@code U} and the + * projection is not valid. + */ + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.MANAGE_MEDIA_PROJECTION)") + boolean isValid(); + + /** + * Sets that {@link MediaProjection#createVirtualDisplay} has been invoked with this token (it + * should only be called once). + */ + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.MANAGE_MEDIA_PROJECTION)") + void notifyVirtualDisplayCreated(int displayId); } diff --git a/media/java/android/media/projection/IMediaProjectionManager.aidl b/media/java/android/media/projection/IMediaProjectionManager.aidl index c97265d4939d..835e4c3ee4f6 100644 --- a/media/java/android/media/projection/IMediaProjectionManager.aidl +++ b/media/java/android/media/projection/IMediaProjectionManager.aidl @@ -44,6 +44,22 @@ interface IMediaProjectionManager { + ".permission.MANAGE_MEDIA_PROJECTION)") boolean isCurrentProjection(IMediaProjection projection); + /** + * Reshows the permisison dialog for the user to review consent they've already granted in + * the given projection instance. + * + * <p>Preconditions: + * <ul> + * <li>{@link IMediaProjection#isValid} returned false, rather than throwing an exception</li> + * <li>Given projection instance is the current projection instance.</li> + * <ul> + * + * <p>Returns immediately but waits to start recording until user has reviewed their consent. + */ + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.MANAGE_MEDIA_PROJECTION)") + void requestConsentForInvalidProjection(IMediaProjection projection); + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + ".permission.MANAGE_MEDIA_PROJECTION)") MediaProjectionInfo getActiveProjectionInfo(); @@ -69,15 +85,18 @@ interface IMediaProjectionManager { void removeCallback(IMediaProjectionWatcherCallback callback); /** - * Updates the content recording session. If a different session is already in progress, then - * the pre-existing session is stopped, and the new incoming session takes over. Only updates - * the session if the given projection is valid. + * Returns {@code true} if it successfully updates the content recording session. Returns + * {@code false} otherwise, and stops the current projection. + * + * <p>If a different session is already in progress, then the pre-existing session is stopped, + * and the new incoming session takes over. Only updates the session if the given projection is + * valid. * * @param incomingSession the nullable incoming content recording session * @param projection the non-null projection the session describes */ @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + ".permission.MANAGE_MEDIA_PROJECTION)") - void setContentRecordingSession(in ContentRecordingSession incomingSession, + boolean setContentRecordingSession(in ContentRecordingSession incomingSession, in IMediaProjection projection); } diff --git a/media/java/android/media/projection/MediaProjection.java b/media/java/android/media/projection/MediaProjection.java index e040bf496723..f1cffb63af07 100644 --- a/media/java/android/media/projection/MediaProjection.java +++ b/media/java/android/media/projection/MediaProjection.java @@ -164,12 +164,21 @@ public final class MediaProjection { * @param handler The {@link android.os.Handler} on which the callback should be invoked, or * null if the callback should be invoked on the calling thread's main * {@link android.os.Looper}. - * @throws IllegalStateException If the target SDK is - * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE U} and - * up and no {@link Callback} - * is registered. If the target SDK is less than + * @throws IllegalStateException In the following scenarios, if the target SDK is {@link + * android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE U} and up: + * <ol> + * <li>If no {@link Callback} is registered.</li> + * <li>If {@link MediaProjectionManager#getMediaProjection} + * was invoked more than once to get this + * {@code MediaProjection} instance. + * <li>If this instance has already taken a recording through + * {@code #createVirtualDisplay}. + * </ol> + * However, if the target SDK is less than * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE U}, no - * exception is thrown. + * exception is thrown. In case 1, recording begins even without + * the callback. In case 2 & 3, recording doesn't begin + * until the user re-grants consent in the dialog. * @throws SecurityException If attempting to create a new virtual display associated with this * MediaProjection instance after it has been stopped by invoking * {@link #stop()}. @@ -216,8 +225,13 @@ public final class MediaProjection { // Pass in the current session details, so they are guaranteed to only be set in // WindowManagerService AFTER a VirtualDisplay is constructed (assuming there are no // errors during set-up). + // Do not introduce a separate aidl call here to prevent a race + // condition between setting up the VirtualDisplay and checking token validity. virtualDisplayConfig.setWindowManagerMirroringEnabled(true); // Do not declare a display id to mirror; default to the default display. + // DisplayManagerService will ask MediaProjectionManagerService to check if the app + // is re-using consent. Always return the projection instance to keep this call + // non-blocking; no content is sent to the app until the user re-grants consent. final VirtualDisplay virtualDisplay = mDisplayManager.createVirtualDisplay(this, virtualDisplayConfig.build(), callback, handler); if (virtualDisplay == null) { @@ -339,6 +353,7 @@ public final class MediaProjection { private final class MediaProjectionCallback extends IMediaProjectionCallback.Stub { @Override public void onStop() { + Slog.v(TAG, "Dispatch stop to " + mCallbacks.size() + " callbacks."); for (CallbackRecord cbr : mCallbacks.values()) { cbr.onStop(); } diff --git a/media/java/android/media/projection/MediaProjectionManager.java b/media/java/android/media/projection/MediaProjectionManager.java index 30fccf485b24..5703c429c32b 100644 --- a/media/java/android/media/projection/MediaProjectionManager.java +++ b/media/java/android/media/projection/MediaProjectionManager.java @@ -231,6 +231,8 @@ public final class MediaProjectionManager { if (projection == null) { return null; } + // Don't do anything here if app is re-using the token; we check how often + // IMediaProjection#start is invoked. Fail to the app when they start recording. return new MediaProjection(mContext, IMediaProjection.Stub.asInterface(projection)); } diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 031c3fff1e8f..0d9bd6536700 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -1169,7 +1169,7 @@ public final class MediaSessionManager { * @param flags flags containing extra action or information regarding the volume change */ void onVolumeChanged(@NonNull MediaSession.Token sessionToken, - @AudioManager.Flags int flags); + @AudioManager.SystemVolumeFlags int flags); /** * Called when the default remote session is changed where the default remote session diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 9a4aa3344374..dea7f03d369a 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -43,6 +43,8 @@ #include <android_runtime/android_hardware_HardwareBuffer.h> +#include <android-base/stringprintf.h> + #include <binder/MemoryDealer.h> #include <cutils/compiler.h> @@ -1276,7 +1278,8 @@ void JMediaCodec::handleCallback(const sp<AMessage> &msg) { ALOGE("Could not create MediaCodec.BufferInfo."); env->ExceptionClear(); } - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", + "Fatal error: could not create MediaCodec.BufferInfo object"); return; } @@ -1309,7 +1312,8 @@ void JMediaCodec::handleCallback(const sp<AMessage> &msg) { ALOGE("Could not create CodecException object."); env->ExceptionClear(); } - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", + "Fatal error: could not create CodecException object"); return; } @@ -1322,7 +1326,9 @@ void JMediaCodec::handleCallback(const sp<AMessage> &msg) { CHECK(msg->findMessage("format", &format)); if (OK != ConvertMessageToMap(env, format, &obj)) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", + "Fatal error: failed to convert format " + "from native to Java object"); return; } @@ -1353,7 +1359,8 @@ void JMediaCodec::handleFirstTunnelFrameReadyNotification(const sp<AMessage> &ms status_t err = ConvertMessageToMap(env, data, &obj); if (err != OK) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", + "Fatal error: failed to convert format from native to Java object"); return; } @@ -1374,7 +1381,8 @@ void JMediaCodec::handleFrameRenderedNotification(const sp<AMessage> &msg) { status_t err = ConvertMessageToMap(env, data, &obj); if (err != OK) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", + "Fatal error: failed to convert format from native to Java object"); return; } @@ -1385,6 +1393,18 @@ void JMediaCodec::handleFrameRenderedNotification(const sp<AMessage> &msg) { env->DeleteLocalRef(obj); } +std::string JMediaCodec::getExceptionMessage(const char *msg = nullptr) const { + if (mCodec == nullptr) { + return msg ?: ""; + } + std::string prefix = ""; + if (msg && msg[0] != '\0') { + prefix.append(msg); + prefix.append("\n"); + } + return prefix + mCodec->getErrorLog().extract(); +} + void JMediaCodec::onMessageReceived(const sp<AMessage> &msg) { switch (msg->what()) { case kWhatCallbackNotify: @@ -1471,9 +1491,17 @@ static void throwCryptoException(JNIEnv *env, status_t err, const char *msg, env->Throw(exception); } +static std::string GetExceptionMessage(const sp<JMediaCodec> &codec, const char *msg) { + if (codec == NULL) { + return msg ?: "codec is released already"; + } + return codec->getExceptionMessage(msg); +} + static jint throwExceptionAsNecessary( JNIEnv *env, status_t err, int32_t actionCode = ACTION_CODE_FATAL, - const char *msg = NULL, const sp<ICrypto>& crypto = NULL) { + const char *msg = NULL, const sp<ICrypto>& crypto = NULL, + const sp<JMediaCodec> &codec = NULL) { switch (err) { case OK: return 0; @@ -1488,23 +1516,38 @@ static jint throwExceptionAsNecessary( return DEQUEUE_INFO_OUTPUT_BUFFERS_CHANGED; case INVALID_OPERATION: - jniThrowException(env, "java/lang/IllegalStateException", msg); + jniThrowException( + env, "java/lang/IllegalStateException", + GetExceptionMessage(codec, msg).c_str()); return 0; case BAD_VALUE: - jniThrowException(env, "java/lang/IllegalArgumentException", msg); + jniThrowException( + env, "java/lang/IllegalArgumentException", + GetExceptionMessage(codec, msg).c_str()); return 0; default: if (isCryptoError(err)) { - throwCryptoException(env, err, msg, crypto); + throwCryptoException( + env, err, + GetExceptionMessage(codec, msg).c_str(), + crypto); return 0; } - throwCodecException(env, err, actionCode, msg); + throwCodecException( + env, err, actionCode, + GetExceptionMessage(codec, msg).c_str()); return 0; } } +static jint throwExceptionAsNecessary( + JNIEnv *env, status_t err, const sp<JMediaCodec> &codec, + int32_t actionCode = ACTION_CODE_FATAL) { + return throwExceptionAsNecessary(env, err, actionCode, NULL, NULL, codec); +} + static void android_media_MediaCodec_native_enableOnFirstTunnelFrameReadyListener( JNIEnv *env, jobject thiz, @@ -1512,13 +1555,13 @@ static void android_media_MediaCodec_native_enableOnFirstTunnelFrameReadyListene sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->enableOnFirstTunnelFrameReadyListener(enabled); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_native_enableOnFrameRenderedListener( @@ -1528,13 +1571,13 @@ static void android_media_MediaCodec_native_enableOnFrameRenderedListener( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->enableOnFrameRenderedListener(enabled); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_native_setCallback( @@ -1544,13 +1587,13 @@ static void android_media_MediaCodec_native_setCallback( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->setCallback(cb); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_native_configure( @@ -1564,7 +1607,7 @@ static void android_media_MediaCodec_native_configure( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -1602,7 +1645,7 @@ static void android_media_MediaCodec_native_configure( err = codec->configure(format, bufferProducer, crypto, descrambler, flags); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_native_setSurface( @@ -1612,7 +1655,7 @@ static void android_media_MediaCodec_native_setSurface( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -1631,7 +1674,7 @@ static void android_media_MediaCodec_native_setSurface( } status_t err = codec->setSurface(bufferProducer); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } sp<PersistentSurface> android_media_MediaCodec_getPersistentInputSurface( @@ -1735,7 +1778,7 @@ static void android_media_MediaCodec_setInputSurface( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -1749,7 +1792,7 @@ static void android_media_MediaCodec_setInputSurface( } status_t err = codec->setInputSurface(persistentSurface); if (err != NO_ERROR) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } } @@ -1759,7 +1802,7 @@ static jobject android_media_MediaCodec_createInputSurface(JNIEnv* env, sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -1767,7 +1810,7 @@ static jobject android_media_MediaCodec_createInputSurface(JNIEnv* env, sp<IGraphicBufferProducer> bufferProducer; status_t err = codec->createInputSurface(&bufferProducer); if (err != NO_ERROR) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); return NULL; } @@ -1782,13 +1825,13 @@ static void android_media_MediaCodec_start(JNIEnv *env, jobject thiz) { sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->start(); - throwExceptionAsNecessary(env, err, ACTION_CODE_FATAL, "start failed"); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_stop(JNIEnv *env, jobject thiz) { @@ -1797,13 +1840,13 @@ static void android_media_MediaCodec_stop(JNIEnv *env, jobject thiz) { sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->stop(); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_reset(JNIEnv *env, jobject thiz) { @@ -1812,7 +1855,7 @@ static void android_media_MediaCodec_reset(JNIEnv *env, jobject thiz) { sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -1825,7 +1868,7 @@ static void android_media_MediaCodec_reset(JNIEnv *env, jobject thiz) { // trigger an IllegalStateException. err = UNKNOWN_ERROR; } - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_flush(JNIEnv *env, jobject thiz) { @@ -1834,13 +1877,13 @@ static void android_media_MediaCodec_flush(JNIEnv *env, jobject thiz) { sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->flush(); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_queueInputBuffer( @@ -1856,7 +1899,7 @@ static void android_media_MediaCodec_queueInputBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -1866,7 +1909,8 @@ static void android_media_MediaCodec_queueInputBuffer( index, offset, size, timestampUs, flags, &errorDetailMsg); throwExceptionAsNecessary( - env, err, ACTION_CODE_FATAL, errorDetailMsg.empty() ? NULL : errorDetailMsg.c_str()); + env, err, ACTION_CODE_FATAL, + codec->getExceptionMessage(errorDetailMsg.c_str()).c_str()); } struct NativeCryptoInfo { @@ -1890,7 +1934,9 @@ struct NativeCryptoInfo { } else if (jmode == gCryptoModes.AesCbc) { mMode = CryptoPlugin::kMode_AES_CBC; } else { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary( + env, INVALID_OPERATION, ACTION_CODE_FATAL, + base::StringPrintf("unrecognized crypto mode: %d", jmode).c_str()); return; } @@ -2026,7 +2072,7 @@ static void android_media_MediaCodec_queueSecureInputBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -2056,7 +2102,9 @@ static void android_media_MediaCodec_queueSecureInputBuffer( } else if (jmode == gCryptoModes.AesCbc) { mode = CryptoPlugin::kMode_AES_CBC; } else { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary( + env, INVALID_OPERATION, ACTION_CODE_FATAL, + base::StringPrintf("Unrecognized crypto mode: %d", jmode).c_str()); return; } @@ -2175,8 +2223,8 @@ static void android_media_MediaCodec_queueSecureInputBuffer( subSamples = NULL; throwExceptionAsNecessary( - env, err, ACTION_CODE_FATAL, errorDetailMsg.empty() ? NULL : errorDetailMsg.c_str(), - codec->getCrypto()); + env, err, ACTION_CODE_FATAL, + codec->getExceptionMessage(errorDetailMsg.c_str()).c_str(), codec->getCrypto()); } static jobject android_media_MediaCodec_mapHardwareBuffer(JNIEnv *env, jclass, jobject bufferObj) { @@ -2518,14 +2566,16 @@ static void android_media_MediaCodec_native_queueLinearBlock( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == nullptr || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } sp<AMessage> tunings; status_t err = ConvertKeyValueListsToAMessage(env, keys, values, &tunings); if (err != OK) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary( + env, err, ACTION_CODE_FATAL, + "error occurred while converting tunings from Java to native"); return; } @@ -2545,15 +2595,23 @@ static void android_media_MediaCodec_native_queueLinearBlock( } env->MonitorExit(lock.get()); } else { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary( + env, INVALID_OPERATION, ACTION_CODE_FATAL, + "Failed to grab lock for a LinearBlock object"); return; } AString errorDetailMsg; if (codec->hasCryptoOrDescrambler()) { if (!memory) { + // It means there was an unexpected failure in extractMemoryFromContext above ALOGI("queueLinearBlock: no ashmem memory for encrypted content"); - throwExceptionAsNecessary(env, BAD_VALUE); + throwExceptionAsNecessary( + env, BAD_VALUE, ACTION_CODE_FATAL, + "Unexpected error: the input buffer is not compatible with " + "the secure codec, and a fallback logic failed.\n" + "Suggestion: please try including the secure codec when calling " + "MediaCodec.LinearBlock#obtain method to obtain a compatible buffer."); return; } auto cryptoInfo = @@ -2577,14 +2635,22 @@ static void android_media_MediaCodec_native_queueLinearBlock( ALOGI_IF(err != OK, "queueEncryptedLinearBlock returned err = %d", err); } else { if (!buffer) { + // It means there was an unexpected failure in extractBufferFromContext above ALOGI("queueLinearBlock: no C2Buffer found"); - throwExceptionAsNecessary(env, BAD_VALUE); + throwExceptionAsNecessary( + env, BAD_VALUE, ACTION_CODE_FATAL, + "Unexpected error: the input buffer is not compatible with " + "the non-secure codec, and a fallback logic failed.\n" + "Suggestion: please do not include the secure codec when calling " + "MediaCodec.LinearBlock#obtain method to obtain a compatible buffer."); return; } err = codec->queueBuffer( index, buffer, presentationTimeUs, flags, tunings, &errorDetailMsg); } - throwExceptionAsNecessary(env, err, ACTION_CODE_FATAL, errorDetailMsg.c_str()); + throwExceptionAsNecessary( + env, err, ACTION_CODE_FATAL, + codec->getExceptionMessage(errorDetailMsg.c_str()).c_str()); } static void android_media_MediaCodec_native_queueHardwareBuffer( @@ -2595,14 +2661,16 @@ static void android_media_MediaCodec_native_queueHardwareBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } sp<AMessage> tunings; status_t err = ConvertKeyValueListsToAMessage(env, keys, values, &tunings); if (err != OK) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary( + env, err, ACTION_CODE_FATAL, + "error occurred while converting tunings from Java to native"); return; } @@ -2627,7 +2695,9 @@ static void android_media_MediaCodec_native_queueHardwareBuffer( ALOGW("Failed to wrap AHardwareBuffer into C2GraphicAllocation"); native_handle_close(handle); native_handle_delete(handle); - throwExceptionAsNecessary(env, BAD_VALUE); + throwExceptionAsNecessary( + env, BAD_VALUE, ACTION_CODE_FATAL, + "HardwareBuffer not recognized"); return; } std::shared_ptr<C2GraphicBlock> block = _C2BlockFactory::CreateGraphicBlock(alloc); @@ -2636,7 +2706,9 @@ static void android_media_MediaCodec_native_queueHardwareBuffer( AString errorDetailMsg; err = codec->queueBuffer( index, buffer, presentationTimeUs, flags, tunings, &errorDetailMsg); - throwExceptionAsNecessary(env, err, ACTION_CODE_FATAL, errorDetailMsg.c_str()); + throwExceptionAsNecessary( + env, err, ACTION_CODE_FATAL, + codec->getExceptionMessage(errorDetailMsg.c_str()).c_str()); } static void android_media_MediaCodec_native_getOutputFrame( @@ -2646,13 +2718,13 @@ static void android_media_MediaCodec_native_getOutputFrame( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->getOutputFrame(env, frame, index); if (err != OK) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } } @@ -2663,7 +2735,7 @@ static jint android_media_MediaCodec_dequeueInputBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return -1; } @@ -2674,7 +2746,7 @@ static jint android_media_MediaCodec_dequeueInputBuffer( return (jint) index; } - return throwExceptionAsNecessary(env, err); + return throwExceptionAsNecessary(env, err, codec); } static jint android_media_MediaCodec_dequeueOutputBuffer( @@ -2684,7 +2756,7 @@ static jint android_media_MediaCodec_dequeueOutputBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return 0; } @@ -2696,7 +2768,7 @@ static jint android_media_MediaCodec_dequeueOutputBuffer( return (jint) index; } - return throwExceptionAsNecessary(env, err); + return throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_releaseOutputBuffer( @@ -2707,13 +2779,13 @@ static void android_media_MediaCodec_releaseOutputBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->releaseOutputBuffer(index, render, updatePTS, timestampNs); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_signalEndOfInputStream(JNIEnv* env, @@ -2722,13 +2794,13 @@ static void android_media_MediaCodec_signalEndOfInputStream(JNIEnv* env, sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t err = codec->signalEndOfInputStream(); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static jobject android_media_MediaCodec_getFormatNative( @@ -2738,7 +2810,7 @@ static jobject android_media_MediaCodec_getFormatNative( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2749,7 +2821,7 @@ static jobject android_media_MediaCodec_getFormatNative( return format; } - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); return NULL; } @@ -2761,7 +2833,7 @@ static jobject android_media_MediaCodec_getOutputFormatForIndexNative( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2772,7 +2844,7 @@ static jobject android_media_MediaCodec_getOutputFormatForIndexNative( return format; } - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); return NULL; } @@ -2784,7 +2856,7 @@ static jobjectArray android_media_MediaCodec_getBuffers( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2797,7 +2869,7 @@ static jobjectArray android_media_MediaCodec_getBuffers( // if we're out of memory, an exception was already thrown if (err != NO_MEMORY) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } return NULL; @@ -2810,7 +2882,7 @@ static jobject android_media_MediaCodec_getBuffer( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2823,7 +2895,7 @@ static jobject android_media_MediaCodec_getBuffer( // if we're out of memory, an exception was already thrown if (err != NO_MEMORY) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } return NULL; @@ -2836,7 +2908,7 @@ static jobject android_media_MediaCodec_getImage( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2849,7 +2921,7 @@ static jobject android_media_MediaCodec_getImage( // if we're out of memory, an exception was already thrown if (err != NO_MEMORY) { - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } return NULL; @@ -2862,7 +2934,7 @@ static jobject android_media_MediaCodec_getName( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2873,7 +2945,7 @@ static jobject android_media_MediaCodec_getName( return name; } - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); return NULL; } @@ -2885,7 +2957,7 @@ static jobject android_media_MediaCodec_getOwnCodecInfo( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -2896,7 +2968,7 @@ static jobject android_media_MediaCodec_getOwnCodecInfo( return codecInfoObj; } - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); return NULL; } @@ -2908,7 +2980,8 @@ android_media_MediaCodec_native_getMetrics(JNIEnv *env, jobject thiz) sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", + GetExceptionMessage(codec, NULL).c_str()); return 0; } @@ -2937,7 +3010,7 @@ static void android_media_MediaCodec_setParameters( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -2948,7 +3021,7 @@ static void android_media_MediaCodec_setParameters( err = codec->setParameters(params); } - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, codec); } static void android_media_MediaCodec_setVideoScalingMode( @@ -2956,13 +3029,14 @@ static void android_media_MediaCodec_setVideoScalingMode( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } if (mode != NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW && mode != NATIVE_WINDOW_SCALING_MODE_SCALE_CROP) { - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); + jniThrowException(env, "java/lang/IllegalArgumentException", + String8::format("Unrecognized mode: %d", mode)); return; } @@ -2974,7 +3048,7 @@ static void android_media_MediaCodec_setAudioPresentation( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } @@ -2986,14 +3060,14 @@ static jobject android_media_MediaCodec_getSupportedVendorParameters( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } jobject ret = NULL; status_t status = codec->querySupportedVendorParameters(env, &ret); if (status != OK) { - throwExceptionAsNecessary(env, status); + throwExceptionAsNecessary(env, status, codec); } return ret; @@ -3004,7 +3078,7 @@ static jobject android_media_MediaCodec_getParameterDescriptor( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return NULL; } @@ -3021,13 +3095,13 @@ static void android_media_MediaCodec_subscribeToVendorParameters( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t status = codec->subscribeToVendorParameters(env, names); if (status != OK) { - throwExceptionAsNecessary(env, status); + throwExceptionAsNecessary(env, status, codec); } return; } @@ -3037,13 +3111,13 @@ static void android_media_MediaCodec_unsubscribeFromVendorParameters( sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL || codec->initCheck() != OK) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary(env, INVALID_OPERATION, codec); return; } status_t status = codec->unsubscribeFromVendorParameters(env, names); if (status != OK) { - throwExceptionAsNecessary(env, status); + throwExceptionAsNecessary(env, status, codec); } return; } @@ -3440,11 +3514,15 @@ static jobject android_media_MediaCodec_LinearBlock_native_map( if (!context->mReadonlyMapping) { const C2BufferData data = buffer->data(); if (data.type() != C2BufferData::LINEAR) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary( + env, INVALID_OPERATION, ACTION_CODE_FATAL, + "Underlying buffer is not a linear buffer"); return nullptr; } if (data.linearBlocks().size() != 1u) { - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary( + env, INVALID_OPERATION, ACTION_CODE_FATAL, + "Underlying buffer contains more than one block"); return nullptr; } C2ConstLinearBlock block = data.linearBlocks().front(); @@ -3492,7 +3570,9 @@ static jobject android_media_MediaCodec_LinearBlock_native_map( false, // readOnly true /* clearBuffer */); } - throwExceptionAsNecessary(env, INVALID_OPERATION); + throwExceptionAsNecessary( + env, INVALID_OPERATION, ACTION_CODE_FATAL, + "Underlying buffer is empty"); return nullptr; } @@ -3515,7 +3595,9 @@ static void PopulateNamesVector( } const char *cstr = env->GetStringUTFChars(jstr, nullptr); if (cstr == nullptr) { - throwExceptionAsNecessary(env, BAD_VALUE); + throwExceptionAsNecessary( + env, BAD_VALUE, ACTION_CODE_FATAL, + "Error converting Java string to native"); return; } names->emplace_back(cstr); @@ -3567,6 +3649,7 @@ static jboolean android_media_MediaCodec_LinearBlock_checkCompatible( } status_t err = MediaCodec::CanFetchLinearBlock(names, &isCompatible); if (err != OK) { + // TODO: CodecErrorLog throwExceptionAsNecessary(env, err); } return isCompatible; diff --git a/media/jni/android_media_MediaCodec.h b/media/jni/android_media_MediaCodec.h index 616c31b29157..fbaf64fda572 100644 --- a/media/jni/android_media_MediaCodec.h +++ b/media/jni/android_media_MediaCodec.h @@ -176,6 +176,8 @@ struct JMediaCodec : public AHandler { const sp<ICrypto> &getCrypto() { return mCrypto; } + std::string getExceptionMessage(const char *msg) const; + protected: virtual ~JMediaCodec(); diff --git a/media/tests/projection/src/android/media/projection/FakeIMediaProjection.java b/media/tests/projection/src/android/media/projection/FakeIMediaProjection.java index 3cfc0fe5b96e..4952e01ee0ac 100644 --- a/media/tests/projection/src/android/media/projection/FakeIMediaProjection.java +++ b/media/tests/projection/src/android/media/projection/FakeIMediaProjection.java @@ -62,12 +62,10 @@ public final class FakeIMediaProjection extends IMediaProjection.Stub { @Override public void registerCallback(IMediaProjectionCallback callback) throws RemoteException { - } @Override public void unregisterCallback(IMediaProjectionCallback callback) throws RemoteException { - } @Override @@ -79,4 +77,14 @@ public final class FakeIMediaProjection extends IMediaProjection.Stub { public void setLaunchCookie(IBinder launchCookie) throws RemoteException { mLaunchCookie = launchCookie; } + + @Override + public boolean isValid() throws RemoteException { + return true; + } + + + @Override + public void notifyVirtualDisplayCreated(int displayId) throws RemoteException { + } } diff --git a/packages/CarrierDefaultApp/res/values-mk/strings.xml b/packages/CarrierDefaultApp/res/values-mk/strings.xml index 4965d563d9f3..ade68866ac29 100644 --- a/packages/CarrierDefaultApp/res/values-mk/strings.xml +++ b/packages/CarrierDefaultApp/res/values-mk/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="2809080280462257271">"Комуникации со давателот на услугата"</string> + <string name="app_name" msgid="2809080280462257271">"Известувања од операторот"</string> <string name="android_system_label" msgid="2797790869522345065">"Мобилен оператор"</string> <string name="portal_notification_id" msgid="5155057562457079297">"Мобилниот интернет е искористен"</string> <string name="no_data_notification_id" msgid="668400731803969521">"Мобилниот интернет ви е деактивиран"</string> diff --git a/packages/CarrierDefaultApp/res/values-te/strings.xml b/packages/CarrierDefaultApp/res/values-te/strings.xml index 5f86828afd8b..db1de44f322c 100644 --- a/packages/CarrierDefaultApp/res/values-te/strings.xml +++ b/packages/CarrierDefaultApp/res/values-te/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="2809080280462257271">"క్యారియర్ కమ్యూనికేషన్లు"</string> + <string name="app_name" msgid="2809080280462257271">"క్యారియర్ కమ్యూనికేషన్స్"</string> <string name="android_system_label" msgid="2797790869522345065">"మొబైల్ క్యారియర్"</string> <string name="portal_notification_id" msgid="5155057562457079297">"మొబైల్ డేటాను పూర్తిగా ఉపయోగించారు"</string> <string name="no_data_notification_id" msgid="668400731803969521">"మీ మొబైల్ డేటా నిష్క్రియం చేయబడింది"</string> diff --git a/packages/CompanionDeviceManager/res/values-af/strings.xml b/packages/CompanionDeviceManager/res/values-af/strings.xml index bbc600558376..b897f7fe3474 100644 --- a/packages/CompanionDeviceManager/res/values-af/strings.xml +++ b/packages/CompanionDeviceManager/res/values-af/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Metgeseltoestel-bestuurder"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Gee <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> toegang tot <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"horlosie"</string> <string name="chooser_title" msgid="2262294130493605839">"Kies \'n <xliff:g id="PROFILE_NAME">%1$s</xliff:g> om deur <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> bestuur te word"</string> - <string name="summary_watch" msgid="6566922405914995759">"Hierdie app is nodig om jou <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te bestuur. <xliff:g id="APP_NAME">%2$s</xliff:g> sal toegelaat word om inligting te sinkroniseer, soos die naam van iemand wat bel, interaksie met jou kennisgewings te hê, en sal toegang tot jou Foon-, SMS-, Kontakte-, Mikrofoon-, en Toestelle in die Omtrek-toestemmings hê."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Hierdie app is nodig om jou <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te bestuur. <xliff:g id="APP_NAME">%2$s</xliff:g> sal toegelaat word om inligting te sinkroniseer, soos die naam van iemand wat bel, en toegang tot hierdie toestemmings:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Laat <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> toe om <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> te bestuur?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"bril"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Hierdie app is nodig om <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te bestuur. <xliff:g id="APP_NAME">%2$s</xliff:g> sal toegelaat word om interaksie met jou kennisgewings te hê en sal toegang tot jou Foon-, SMS-, Kontakte-, Mikrofoon-, en Toestelle in die Omtrek-toestemmings hê."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Hierdie app sal toegang tot hierdie toestemmings op jou foon hê:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Gee <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> toegang tot hierdie inligting op jou foon"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Oorkruistoestel-dienste"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> versoek tans namens jou <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> toestemming om programme tussen jou toestelle te stroom"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Laat <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> toe om hierdie handeling uit te voer?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> versoek tans namens jou <xliff:g id="DEVICE_NAME">%2$s</xliff:g> toestemming om apps en ander stelselkenmerke na toestelle in die omtrek te stroom"</string> <string name="profile_name_generic" msgid="6851028682723034988">"toestel"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Hierdie app sal inligting kan sinkroniseer, soos die naam van iemand wat bel, tussen jou foon en <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Hierdie app sal inligting kan sinkroniseer, soos die naam van iemand wat bel, tussen jou foon en die gekose toestel."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Laat toe"</string> <string name="consent_no" msgid="2640796915611404382">"Moenie toelaat nie"</string> <string name="consent_back" msgid="2560683030046918882">"Terug"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stroom jou foon se apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stroom apps en ander stelselkenmerke van jou foon af"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-am/strings.xml b/packages/CompanionDeviceManager/res/values-am/strings.xml index 2880fd5ae987..23a6cb0f42db 100644 --- a/packages/CompanionDeviceManager/res/values-am/strings.xml +++ b/packages/CompanionDeviceManager/res/values-am/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"አጃቢ የመሣሪያ አስተዳዳሪ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>ን እንዲደርስ ይፍቀዱለት"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ሰዓት"</string> <string name="chooser_title" msgid="2262294130493605839">"በ<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> የሚተዳደር <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ይምረጡ"</string> - <string name="summary_watch" msgid="6566922405914995759">"የእርስዎን <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ለማስተዳደር መተግበሪያው ያስፈልጋል። <xliff:g id="APP_NAME">%2$s</xliff:g> እንደ የሚደውል ሰው ስም፣ ከማሳወቂያዎችዎ ጋር መስተጋብር እንዲፈጥር እና የእርስዎን ስልክ፣ ኤስኤምኤስ፣ ዕውቅያዎች፣ የቀን መቁጠሪያ፣ የጥሪ ምዝግብ ማስታወሻዎች እና በአቅራቢያ ያሉ መሣሪያዎችን መድረስ ያሉ መረጃዎችን እንዲያሰምር ይፈቀድለታል።"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"የእርስዎን <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ለማስተዳደር መተግበሪያው ያስፈልጋል። <xliff:g id="APP_NAME">%2$s</xliff:g> እንደ የሚደውል ሰው ስም እና እነዚህን ፈቃዶች መድረስ ያሉ መረጃዎችን እንዲያሰምር ይፈቀድለታል፦"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>ን እንዲያስተዳድር ይፈቅዳሉ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"መነጽሮች"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"ይህ መተግበሪያ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን ለማስተዳደር ያስፈልጋል። <xliff:g id="APP_NAME">%2$s</xliff:g> ከማሳወቂያዎችዎ ጋር መስተጋብር እንዲፈጥር እና የእርስዎን ስልክ፣ ኤስኤምኤስ፣ ዕውቂያዎች፣ ማይክሮፎን እና በአቅራቢያ ያሉ መሣሪያዎች ፈቃዶችን እንዲደርስ ይፈቀድለታል።"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ይህ መተግበሪያ በስልክዎ ላይ እነዚህን ፈቃዶች ለመድረስ ፈቃድ ይሰጠዋል፦"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ይህን መረጃ ከስልክዎ እንዲደርስበት ይፍቀዱለት"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"መሣሪያ ተሻጋሪ አገልግሎቶች"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> በእርስዎ መሣሪያዎች መካከል መተግበሪያዎችን በዥረት ለመልቀቅ የእርስዎን <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ወክሎ ፈቃድ እየጠየቀ ነው"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ይህን እርምጃ እንዲወስድ ፈቃድ ይሰጠው?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> የእርስዎን <xliff:g id="DEVICE_NAME">%2$s</xliff:g> በመወከል በአቅራቢያ ላሉ መሣሪያዎች መተግበሪያዎች እና ሌሎች የስርዓት ባህሪያትን በዥረት ለመልቀቅ ፈቃድ እየጠየቀ ነው"</string> <string name="profile_name_generic" msgid="6851028682723034988">"መሣሪያ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ይህ መተግበሪያ እንደ የሚደውል ሰው ስም ያለ መረጃን በስልክዎ እና <xliff:g id="DEVICE_NAME">%1$s</xliff:g> መካከል ማስመር ይችላል።"</string> - <string name="summary_generic" msgid="4988130802522924650">"ይህ መተግበሪያ እንደ የሚደውል ሰው ስም ያለ መረጃን በስልክዎ እና በተመረጠው መሣሪያ መካከል ማስመር ይችላል።"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ፍቀድ"</string> <string name="consent_no" msgid="2640796915611404382">"አትፍቀድ"</string> <string name="consent_back" msgid="2560683030046918882">"ተመለስ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"የስልክዎን መተግበሪያዎች በዥረት ይልቀቁ"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ከስልክዎ ሆነው መተግበሪያዎች እና ሌሎች የስርዓት ባህሪያትን በዥረት ይልቀቁ"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ar/strings.xml b/packages/CompanionDeviceManager/res/values-ar/strings.xml index e015940cad5f..728767e0c0d1 100644 --- a/packages/CompanionDeviceManager/res/values-ar/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ar/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"تطبيق \"مدير الجهاز المصاحب\""</string> - <string name="confirmation_title" msgid="8024993972587946678">"السماح لتطبيق <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> بالوصول إلى <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"الساعة"</string> <string name="chooser_title" msgid="2262294130493605839">"اختَر <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ليديرها تطبيق <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"يجب توفّر التطبيق لإدارة \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". سيتم السماح لتطبيق \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" بمزامنة المعلومات، مثلاً اسم المتصل، والتفاعل مع الإشعارات والوصول إلى هاتفك، والرسائل القصيرة، وجهات الاتصال، والتقويم، وسجلات المكالمات وأذونات الأجهزة المجاورة."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"يجب توفّر التطبيق لإدارة \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". سيتم السماح لتطبيق \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" بمزامنة المعلومات، مثلاً اسم المتصل، والوصول إلى الأذونات التالية:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"السماح لتطبيق <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> بإدارة <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"النظارة"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"يجب توفّر هذا التطبيق لإدارة \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". سيتم السماح لتطبيق \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" بالتفاعل مع الإشعارات والوصول إلى أذونات الهاتف والرسائل القصيرة وجهات الاتصال والميكروفون والأجهزة المجاورة."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"سيتم السماح لهذا التطبيق بالوصول إلى الأذونات التالية على هاتفك:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"السماح لتطبيق <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> بالوصول إلى هذه المعلومات من هاتفك"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"الخدمات التي تعمل بين الأجهزة"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"يطلب تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> الحصول على إذن نيابةً عن <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> لمشاركة التطبيقات بين أجهزتك."</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"هل تريد السماح للتطبيق <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> باتّخاذ هذا الإجراء؟"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"يطلب \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" الحصول على إذن نيابةً عن \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\" لبثّ التطبيقات وميزات النظام الأخرى إلى أجهزتك المجاورة."</string> <string name="profile_name_generic" msgid="6851028682723034988">"جهاز"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"سيتمكن هذا التطبيق من مزامنة المعلومات، مثلاً اسم المتصل، بين هاتفك و\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string> - <string name="summary_generic" msgid="4988130802522924650">"سيتمكن هذا التطبيق من مزامنة المعلومات، مثلاً اسم المتصل، بين هاتفك والجهاز المحدد."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"السماح"</string> <string name="consent_no" msgid="2640796915611404382">"عدم السماح"</string> <string name="consent_back" msgid="2560683030046918882">"رجوع"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"بث تطبيقات هاتفك"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"بثّ التطبيقات وميزات النظام الأخرى من هاتفك"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-as/strings.xml b/packages/CompanionDeviceManager/res/values-as/strings.xml index 81f384f9b825..b651bda75beb 100644 --- a/packages/CompanionDeviceManager/res/values-as/strings.xml +++ b/packages/CompanionDeviceManager/res/values-as/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"কম্পেনিয়ন ডিভাইচ মেনেজাৰ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ক <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> এক্সেছ কৰিবলৈ দিয়ক"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ঘড়ী"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>এ পৰিচালনা কৰিব লগা এটা <xliff:g id="PROFILE_NAME">%1$s</xliff:g> বাছনি কৰক"</string> - <string name="summary_watch" msgid="6566922405914995759">"আপোনাৰ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> পৰিচালনা কৰিবলৈ এপ্টোৰ আৱশ্যক। <xliff:g id="APP_NAME">%2$s</xliff:g>ক কল কৰোঁতাৰ নামৰ দৰে তথ্য ছিংক কৰিবলৈ, আপোনাৰ জাননীৰ সৈতে ভাব-বিনিময় কৰিবলৈ আৰু আপোনাৰ ফ’ন, এছএমএছ, সম্পৰ্ক, কেলেণ্ডাৰ, কল লগ আৰু নিকটৱৰ্তী ডিভাইচৰ অনুমতিসমূহ এক্সেছ কৰিবলৈ দিয়া হ’ব।"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"আপোনাৰ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> পৰিচালনা কৰিবলৈ এপ্টোৰ আৱশ্যক। <xliff:g id="APP_NAME">%2$s</xliff:g>ক কল কৰোঁতাৰ নামৰ দৰে তথ্য ছিংক কৰিবলৈ আৰু এই অনুমতিসমূহ এক্সেছ কৰিবলৈ অনুমতি দিয়া হ’ব:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ক <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> পৰিচালনা কৰিবলৈ দিবনে?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"চছ্মা"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> পৰিচালনা কৰিবলৈ এই এপ্টোৰ আৱশ্যক। <xliff:g id="APP_NAME">%2$s</xliff:g>ক আপোনাৰ অনুমতিসমূহৰ সৈতে ভাব-বিনিময় কৰিবলৈ আৰু আপোনাৰ ফ’ন, এছএমএছ, সম্পৰ্ক, মাইক্ৰ’ফ’ন আৰু নিকটৱৰ্তী ডিভাইচৰ অনুমতিসমূহ এক্সেছ কৰিবলৈ দিয়া হ’ব।"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"এই এপ্টোক আপোনাৰ ফ’নত এই অনুমতিসমূহ এক্সেছ কৰিবলৈ অনুমতি দিয়া হ’ব:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ক আপোনাৰ ফ’নৰ পৰা এই তথ্যখিনি এক্সেছ কৰাৰ অনুমতি দিয়ক"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ক্ৰছ-ডিভাইচ সেৱাসমূহ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ আপোনাৰ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>ৰ হৈ আপোনাৰ ডিভাইচসমূহৰ মাজত এপ্ ষ্ট্ৰীম কৰাৰ বাবে অনুৰোধ জনাইছে"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>ক এই কাৰ্যটো সম্পাদন কৰিবলৈ দিবনে?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ আপোনাৰ <xliff:g id="DEVICE_NAME">%2$s</xliff:g>ৰ হৈ নিকটৱৰ্তী ডিভাইচত এপ্ আৰু ছিষ্টেমৰ অন্য সুবিধাসমূহ ষ্ট্ৰীম কৰাৰ অনুমতি দিবলৈ অনুৰোধ জনাইছে"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ডিভাইচ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"এই এপ্টোৱে আপোনাৰ ফ’ন আৰু <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ৰ মাজত তথ্য ছিংক কৰিব পাৰিব, যেনে, কল কৰোঁতাৰ নাম।"</string> - <string name="summary_generic" msgid="4988130802522924650">"এই এপ্টোৱে আপোনাৰ ফ’ন আৰু বাছনি কৰা ডিভাইচটোৰ মাজত তথ্য ছিংক কৰিব পাৰিব, যেনে, কল কৰোঁতাৰ নাম।"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"অনুমতি দিয়ক"</string> <string name="consent_no" msgid="2640796915611404382">"অনুমতি নিদিব"</string> <string name="consent_back" msgid="2560683030046918882">"উভতি যাওক"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"আপোনাৰ ফ’নৰ এপ্ ষ্ট্ৰীম কৰক"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"আপোনাৰ ফ’নৰ পৰা এপ্ আৰু ছিষ্টেমৰ অন্য সুবিধাসমূহ ষ্ট্ৰীম কৰক"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-az/strings.xml b/packages/CompanionDeviceManager/res/values-az/strings.xml index 007bbc56b0fd..1052c9e0102a 100644 --- a/packages/CompanionDeviceManager/res/values-az/strings.xml +++ b/packages/CompanionDeviceManager/res/values-az/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Kompanyon Cihaz Meneceri"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> tətbiqinə <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> cihazına daxil olmaq icazəsi verin"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"izləyin"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> tərəfindən idarə ediləcək <xliff:g id="PROFILE_NAME">%1$s</xliff:g> seçin"</string> - <string name="summary_watch" msgid="6566922405914995759">"Tətbiq <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazını idarə etmək üçün lazımdır. <xliff:g id="APP_NAME">%2$s</xliff:g> tətbiqinə zəng edənin adı kimi məlumatları sinxronlaşdırmaq, bildirişlərlə qarşılıqlı əlaqəyə girmək, habelə Telefon, SMS, Kontaktlar, Təqvim, Zəng qeydləri və Yaxınlıqdakı cihazlar üzrə icazələrə daxil olmaq imkanı veriləcək."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Tətbiq <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazını idarə etmək üçün lazımdır. <xliff:g id="APP_NAME">%2$s</xliff:g> tətbiqinə zəng edənin adı kimi məlumatları sinxronlaşdırmaq və bu icazələrə daxil olmaq imkanı veriləcək:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> tətbiqinə <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> cihazını idarə etmək icazəsi verilsin?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"eynək"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Bu tətbiq <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazını idarə etmək üçün lazımdır. <xliff:g id="APP_NAME">%2$s</xliff:g> bildirişlərə, Telefon, SMS, Kontaktlar, Mikrofon və Yaxınlıqdakı cihazlar icazələrinə giriş əldə edəcək."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Tətbiq telefonda bu icazələrə daxil ola biləcək:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> tətbiqinə telefonunuzdan bu məlumata giriş icazəsi verin"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cihazlararası xidmətlər"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqi <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> adından cihazlarınız arasında tətbiqləri yayımlamaq üçün icazə istəyir"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> cihazına bu əməliyyatı yerinə yetirmək icazəsi verilsin?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_NAME">%2$s</xliff:g> adından tətbiq və digər sistem funksiyalarını yaxınlıqdakı cihazlara yayımlamaq icazəsi sitəyir"</string> <string name="profile_name_generic" msgid="6851028682723034988">"cihaz"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Bu tətbiq telefon və <xliff:g id="DEVICE_NAME">%1$s</xliff:g> arasında zəng edənin adı kimi məlumatları sinxronlaşdıra biləcək."</string> - <string name="summary_generic" msgid="4988130802522924650">"Bu tətbiq telefon və seçilmiş cihaz arasında zəng edənin adı kimi məlumatları sinxronlaşdıra biləcək."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"İcazə verin"</string> <string name="consent_no" msgid="2640796915611404382">"İcazə verməyin"</string> <string name="consent_back" msgid="2560683030046918882">"Geriyə"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Telefonunuzun tətbiqlərini yayımlayın"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Telefondan tətbiq və digər sistem funksiyalarını yayımlayın"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-b+sr+Latn/strings.xml b/packages/CompanionDeviceManager/res/values-b+sr+Latn/strings.xml index fea0d07f9226..2569a83090c3 100644 --- a/packages/CompanionDeviceManager/res/values-b+sr+Latn/strings.xml +++ b/packages/CompanionDeviceManager/res/values-b+sr+Latn/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Menadžer pridruženog uređaja"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Dozvolite da <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> pristupa uređaju <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"sat"</string> <string name="chooser_title" msgid="2262294130493605839">"Odaberite <xliff:g id="PROFILE_NAME">%1$s</xliff:g> kojim će upravljati aplikacija <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplikacija je potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> će dobiti dozvolu za sinhronizovanje informacija, poput osobe koja upućuje poziv, za interakciju sa obaveštenjima i pristup dozvolama za telefon, SMS, kontakte, kalendar, evidencije poziva i uređaje u blizini."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplikacija je potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> će dobiti dozvolu za sinhronizaciju informacija, poput osobe koja upućuje poziv, kao za pristup sledećim dozvolama:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Želite li da dozvolite da <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> upravlja uređajem <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"naočare"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ova aplikacija je potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> će dobiti dozvolu za interakciju sa obaveštenjima i pristup dozvolama za telefon, SMS, kontakte, mikrofon i uređaje u blizini."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Ovoj aplikaciji će biti dozvoljeno da pristupa ovim dozvolama na telefonu:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Dozvolite da <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> pristupa ovim informacijama sa telefona"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Usluge na više uređaja"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> zahteva dozvolu u ime uređaja <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> za strimovanje aplikacija između uređaja"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Želite li da dozvolite da <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> obavi ovu radnju?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> zahteva dozvolu u ime uređaja <xliff:g id="DEVICE_NAME">%2$s</xliff:g> da strimuje aplikacije i druge sistemske funkcije na uređaje u blizini"</string> <string name="profile_name_generic" msgid="6851028682723034988">"uređaj"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ova aplikacija će moći da sinhronizuje podatke, poput imena osobe koja upućuje poziv, između telefona i uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ova aplikacija će moći da sinhronizuje podatke, poput imena osobe koja upućuje poziv, između telefona i odabranog uređaja."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Dozvoli"</string> <string name="consent_no" msgid="2640796915611404382">"Ne dozvoli"</string> <string name="consent_back" msgid="2560683030046918882">"Nazad"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Strimujte aplikacije na telefonu"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Strimujte aplikacije i druge sistemske funkcije sa telefona"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-be/strings.xml b/packages/CompanionDeviceManager/res/values-be/strings.xml index 9bf51d5cbea3..5cee5c37775d 100644 --- a/packages/CompanionDeviceManager/res/values-be/strings.xml +++ b/packages/CompanionDeviceManager/res/values-be/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Менеджар спадарожнай прылады"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Дазвольце праграме <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> доступ да прылады <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"гадзіннік"</string> <string name="chooser_title" msgid="2262294130493605839">"Выберыце прыладу (<xliff:g id="PROFILE_NAME">%1$s</xliff:g>), якой будзе кіраваць праграма <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Гэта праграма неабходная для кіравання прыладай \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". <xliff:g id="APP_NAME">%2$s</xliff:g> зможа сінхранізаваць інфармацыю (напрыклад, імя таго, хто звоніць), узаемадзейнічаць з вашымі апавяшчэннямі, а таксама атрымае доступ да тэлефона, SMS, кантактаў, календара, журналаў выклікаў і прылад паблізу."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Гэта праграма неабходная для кіравання прыладай \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". <xliff:g id="APP_NAME">%2$s</xliff:g> зможа сінхранізаваць інфармацыю (напрыклад, імя таго, хто звоніць) і атрымае наступныя дазволы:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Дазволіць праграме <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> кіраваць прыладай <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"акуляры"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Гэта праграма неабходная для кіравання прыладай \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". <xliff:g id="APP_NAME">%2$s</xliff:g> зможа ўзаемадзейнічаць з вашымі апавяшчэннямі і атрымае доступ да тэлефона, SMS, кантактаў, мікрафона і прылад паблізу."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Гэта праграма будзе мець на вашым тэлефоне наступныя дазволы:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Дазвольце праграме <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> мець доступ да гэтай інфармацыі з вашага тэлефона"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Сэрвісы для некалькіх прылад"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Праграма \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" запытвае дазвол ад імя вашай прылады \"<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>\" на трансляцыю праграм паміж вашымі прыладамі"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Дазволіць прыладзе <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> выканаць гэта дзеянне?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Праграма \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" запытвае дазвол ад імя вашай прылады \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\" на перадачу плынню змесціва праграм і іншых функцый сістэмы на прылады паблізу"</string> <string name="profile_name_generic" msgid="6851028682723034988">"прылада"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Гэта праграма зможа сінхранізаваць інфармацыю (напрыклад, імя таго, хто звоніць) паміж тэлефонам і прыладай \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string> - <string name="summary_generic" msgid="4988130802522924650">"Гэта праграма зможа сінхранізаваць інфармацыю (напрыклад, імя таго, хто звоніць) паміж тэлефонам і выбранай прыладай."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Дазволіць"</string> <string name="consent_no" msgid="2640796915611404382">"Не дазваляць"</string> <string name="consent_back" msgid="2560683030046918882">"Назад"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Трансляцыя змесціва праграм з вашага тэлефона"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Перадача плынню змесціва праграм і іншых функцый сістэмы з вашага тэлефона"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-bg/strings.xml b/packages/CompanionDeviceManager/res/values-bg/strings.xml index bd2e63ba47bc..34a88ed2e0c6 100644 --- a/packages/CompanionDeviceManager/res/values-bg/strings.xml +++ b/packages/CompanionDeviceManager/res/values-bg/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Разрешаване на <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> да осъществява достъп до устройството <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"часовник"</string> <string name="chooser_title" msgid="2262294130493605839">"Изберете устройство (<xliff:g id="PROFILE_NAME">%1$s</xliff:g>), което да се управлява от <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Това приложение е необходимо за управление на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ще получи право да синхронизира различна информация, като например името на обаждащия се, да взаимодейства с известията ви и достъп до разрешенията за телефона, SMS съобщенията, контактите, календара, списъците с обажданията и устройствата в близост."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Това приложение е необходимо за управление на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ще получи право да синхронизира различна информация, като например името на обаждащия се, и достъп до следните разрешения:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Разрешавате ли на <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> да управлява устройството <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"очилата"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Това приложение е необходимо за управление на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Приложението <xliff:g id="APP_NAME">%2$s</xliff:g> ще получи право да взаимодейства с известията ви, както и достъп до разрешенията за телефона, SMS съобщенията, контактите, микрофона и устройствата в близост."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Това приложение ще има достъп до следните разрешения за телефона ви:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Разрешете на <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> да осъществява достъп до тази информация от телефона ви"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Услуги за различни устройства"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ иска разрешение от името на <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> да предава поточно приложения между устройствата ви"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Разрешавате ли на <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> да предприема това действие?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска разрешение от името на <xliff:g id="DEVICE_NAME">%2$s</xliff:g> да предава поточно приложения и други системни функции към устройства в близост"</string> <string name="profile_name_generic" msgid="6851028682723034988">"устройство"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Това приложение ще може да синхронизира различна информация, като например името на обаждащия се, между телефона ви и <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Това приложение ще може да синхронизира различна информация, като например името на обаждащия се, между телефона ви и избраното устройство."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Разрешаване"</string> <string name="consent_no" msgid="2640796915611404382">"Забраняване"</string> <string name="consent_back" msgid="2560683030046918882">"Назад"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Поточно предаване на приложенията на телефона ви"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Поточно предаване на приложения и други системни функции от телефона ви"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-bn/strings.xml b/packages/CompanionDeviceManager/res/values-bn/strings.xml index c6d364f3d116..0fc220b94da3 100644 --- a/packages/CompanionDeviceManager/res/values-bn/strings.xml +++ b/packages/CompanionDeviceManager/res/values-bn/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"আপনার <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> অ্যাক্সেস করার জন্য <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> অ্যাপকে অনুমতি দিন"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ঘড়ি"</string> <string name="chooser_title" msgid="2262294130493605839">"<xliff:g id="PROFILE_NAME">%1$s</xliff:g> বেছে নিন যেটি <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ম্যানেজ করবে"</string> - <string name="summary_watch" msgid="6566922405914995759">"আপনার <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ম্যানেজ করার জন্য অ্যাপটি প্রয়োজন। <xliff:g id="APP_NAME">%2$s</xliff:g>-কে কলারের নামের মতো তথ্য সিঙ্ক করার অনুমতি দেওয়া হবে, এছাড়াও আপনার বিজ্ঞপ্তির সাথে ইন্টার্যাক্ট করা এবং আপনার ফোন, এসএমএস, পরিচিতি তালিকা, ক্যালেন্ডার, কল লগ এবং আশেপাশের ডিভাইস ব্যবহার করার অনুমতি অ্যাক্সেস করতে দেওয়া হবে।"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"আপনার <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ম্যানেজ করার জন্য অ্যাপটি প্রয়োজন। <xliff:g id="APP_NAME">%2$s</xliff:g>-কে কলারের নামের মতো তথ্য় সিঙ্ক করতে এবং এইসব অনুমতি অ্যাক্সেস করতে দেওয়া হবে:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"আপনি কি <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ম্যানেজ করার জন্য <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>-কে অনুমতি দেবেন?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"চশমা"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ম্যানেজ করতে এই অ্যাপ দরকার। <xliff:g id="APP_NAME">%2$s</xliff:g>-কে আপনার বিজ্ঞপ্তির সাথে ইন্টার্যাক্ট করার এবং ফোন, এসএমএস, পরিচিতি, মাইক্রোফোন ও আশেপাশের ডিভাইসের অনুমতি অ্যাক্সেস করতে দেওয়া হবে।"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"আপনার ফোনের এইসব অনুমতি এই অ্যাপ অ্যাক্সেস করতে পারবে:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"আপনার ফোন থেকে <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> অ্যাপকে এই তথ্য অ্যাক্সেস করার অনুমতি দিন"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ক্রস-ডিভাইস পরিষেবা"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"আপনার ডিভাইসগুলির মধ্যে অ্যাপ স্ট্রিম করার জন্য <xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>-এর হয়ে অনুমতি চাইছে"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>কে এই অ্যাকশন করতে দেবেন?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"আশেপাশের ডিভাইসে অ্যাপ ও অন্যান্য সিস্টেম ফিচার স্ট্রিম করার জন্য আপনার <xliff:g id="DEVICE_NAME">%2$s</xliff:g>-এর হয়ে <xliff:g id="APP_NAME">%1$s</xliff:g> অনুমতি চেয়ে অনুরোধ করছে"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ডিভাইস"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"এই অ্যাপ আপনার ফোন এবং <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ডিভাইসের মধ্যে তথ্য সিঙ্ক করতে পারবে, যেমন কলারের নাম।"</string> - <string name="summary_generic" msgid="4988130802522924650">"এই অ্যাপ আপনার ফোন এবং বেছে নেওয়া ডিভাইসের মধ্যে তথ্য সিঙ্ক করতে পারবে, যেমন কলারের নাম।"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"অনুমতি দিন"</string> <string name="consent_no" msgid="2640796915611404382">"অনুমতি দেবেন না"</string> <string name="consent_back" msgid="2560683030046918882">"ফিরুন"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"আপনার ফোনের অ্যাপ স্ট্রিম করুন"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"আপনার ফোন থেকে অ্যাপ ও অন্যান্য সিস্টেম ফিচার স্ট্রিম করে"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-bs/strings.xml b/packages/CompanionDeviceManager/res/values-bs/strings.xml index ec3be1637654..869e3c62d83d 100644 --- a/packages/CompanionDeviceManager/res/values-bs/strings.xml +++ b/packages/CompanionDeviceManager/res/values-bs/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Prateći upravitelj uređaja"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Dozvolite aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> da pristupa uređaju <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"sat"</string> <string name="chooser_title" msgid="2262294130493605839">"Odaberite uređaj \"<xliff:g id="PROFILE_NAME">%1$s</xliff:g>\" kojim će upravljati aplikacija <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplikacija je potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikaciji <xliff:g id="APP_NAME">%2$s</xliff:g> će biti dozvoljeni sinhroniziranje informacija, kao što je ime osobe koja upućuje poziv, interakcija s obavještenjima i pristup odobrenjima za Telefon, SMS-ove, Kontakte, Kalendar, Zapisnike poziva i Uređaje u blizini."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplikacija je potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikaciji <xliff:g id="APP_NAME">%2$s</xliff:g> će biti dozvoljeni sinhroniziranje informacija, kao što je ime osobe koja upućuje poziv, i pristup ovim odobrenjima:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Dozvoliti aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> da upravlja uređajem <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"naočale"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ova aplikacija je potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikaciji <xliff:g id="APP_NAME">%2$s</xliff:g> će biti dozvoljena interakcija s obavještenjima i pristup odobrenjima za Telefon, SMS, Kontakte, Mikrofon i Uređaje u blizini."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Aplikaciji će biti dozvoljen pristup ovim odobrenjima na telefonu:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Dozvolite da aplikacija <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> pristupa ovim informacijama s telefona"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Usluga na više uređaja"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> u ime uređaja <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> zahtijeva odobrenje da prenosi aplikacije između vaših uređaja"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Dozvoliti uređaju <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> da poduzme ovu radnju?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> u ime uređaja <xliff:g id="DEVICE_NAME">%2$s</xliff:g> traži odobrenje da prenosi aplikacije i druge funkcije sistema na uređajima u blizini"</string> <string name="profile_name_generic" msgid="6851028682723034988">"uređaj"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ova aplikacija će moći sinhronizirati informacije, kao što je ime osobe koja upućuje poziv, između vašeg telefona i uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ova aplikacija će moći sinhronizirati informacije, kao što je ime osobe koja upućuje poziv, između vašeg telefona i odabranog uređaja."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Dozvoli"</string> <string name="consent_no" msgid="2640796915611404382">"Nemoj dozvoliti"</string> <string name="consent_back" msgid="2560683030046918882">"Nazad"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Prenosite aplikacije s telefona"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Prijenos aplikacija i drugih funkcija sistema s vašeg telefona"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ca/strings.xml b/packages/CompanionDeviceManager/res/values-ca/strings.xml index 01c586928d2b..4e89780f2b7a 100644 --- a/packages/CompanionDeviceManager/res/values-ca/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ca/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gestor de dispositius complementaris"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permet que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> accedeixi a <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"rellotge"</string> <string name="chooser_title" msgid="2262294130493605839">"Tria un <xliff:g id="PROFILE_NAME">%1$s</xliff:g> perquè el gestioni <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"L\'aplicació és necessària per gestionar el dispositiu (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>). <xliff:g id="APP_NAME">%2$s</xliff:g> tindrà permís per sincronitzar informació, com ara el nom d\'algú que truca, per interaccionar amb les teves notificacions i accedir al telèfon, als SMS, als contactes, al calendari, als registres de trucades i als dispositius propers."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"L\'aplicació és necessària per gestionar el dispositiu (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>). <xliff:g id="APP_NAME">%2$s</xliff:g> tindrà permís per sincronitzar informació, com ara el nom d\'algú que truca, i accedir a aquests permisos:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Permet que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> gestioni <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ulleres"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Aquesta aplicació es necessita per gestionar el dispositiu (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>). <xliff:g id="APP_NAME">%2$s</xliff:g> tindrà permís per interaccionar amb les teves notificacions i accedir al telèfon, als SMS, als contactes, al micròfon i als dispositius propers."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Aquesta aplicació podrà accedir a aquests permisos del telèfon:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permet que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> accedeixi a aquesta informació del telèfon"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Serveis multidispositiu"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> demana permís en nom del teu <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> per reproduir en continu aplicacions entre els dispositius"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vols permetre que <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> dugui a terme aquesta acció?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> sol·licita permís en nom del teu dispositiu (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) per reproduir en continu aplicacions i altres funcions del sistema en dispositius propers"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositiu"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Aquesta aplicació podrà sincronitzar informació, com ara el nom d\'algú que truca, entre el teu telèfon i el teu dispositiu (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>)."</string> - <string name="summary_generic" msgid="4988130802522924650">"Aquesta aplicació podrà sincronitzar informació, com ara el nom d\'algú que truca, entre el teu telèfon i el dispositiu triat."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permet"</string> <string name="consent_no" msgid="2640796915611404382">"No permetis"</string> <string name="consent_back" msgid="2560683030046918882">"Enrere"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Reprodueix en continu aplicacions del telèfon"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Reprodueix en continu aplicacions i altres funcions del sistema des del telèfon"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-cs/strings.xml b/packages/CompanionDeviceManager/res/values-cs/strings.xml index 09c96a704361..0e6bf0ecd242 100644 --- a/packages/CompanionDeviceManager/res/values-cs/strings.xml +++ b/packages/CompanionDeviceManager/res/values-cs/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Správce doprovodných zařízení"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Povolit aplikaci <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> přístup k zařízení <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"hodinky"</string> <string name="chooser_title" msgid="2262294130493605839">"Vyberte zařízení <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, které chcete spravovat pomocí aplikace <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplikace je nutná ke správě zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> bude moci synchronizovat údaje, jako je jméno volajícího, interagovat s vašimi oznámeními a získat přístup k vašim oprávněním k telefonu, SMS, kontaktům, kalendáři, seznamům hovorů a zařízením v okolí."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplikace je nutná ke správě zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> bude moci synchronizovat údaje, jako je jméno volajícího, a získat přístup k těmto oprávněním:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Povolit aplikaci <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> spravovat zařízení <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"brýle"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Tato aplikace je nutná ke správě zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> bude moci interagovat s vašimi oznámeními a získat přístup k vašim oprávněním k telefonu, SMS, kontaktům, mikrofonu a zařízením v okolí."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Tato aplikace bude mít ve vašem telefonu povolený přístup k těmto oprávněním:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Povolte aplikaci <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> přístup k těmto informacím z vašeho telefonu"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Služby pro více zařízení"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> požaduje za vaše zařízení <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> oprávnění ke streamování aplikací mezi zařízeními"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Povolit zařízení <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> podniknout tuto akci?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> žádá jménem vašeho zařízení <xliff:g id="DEVICE_NAME">%2$s</xliff:g> o oprávnění streamovat aplikace a další systémové funkce do zařízení v okolí"</string> <string name="profile_name_generic" msgid="6851028682723034988">"zařízení"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Tato aplikace bude moci synchronizovat údaje, jako je jméno volajícího, mezi vaším telefonem a zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Tato aplikace bude moci synchronizovat údaje, jako je jméno volajícího, mezi vaším telefonem a vybraným zařízením."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Povolit"</string> <string name="consent_no" msgid="2640796915611404382">"Nepovolovat"</string> <string name="consent_back" msgid="2560683030046918882">"Zpět"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Streamujte aplikace v telefonu"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Streamování aplikací a dalších systémových funkcí z telefonu"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-da/strings.xml b/packages/CompanionDeviceManager/res/values-da/strings.xml index 17ed58680156..b78deee1864a 100644 --- a/packages/CompanionDeviceManager/res/values-da/strings.xml +++ b/packages/CompanionDeviceManager/res/values-da/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Medfølgende enhedsadministrator"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Tillad, at <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> får adgang til <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ur"</string> <string name="chooser_title" msgid="2262294130493605839">"Vælg det <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, som skal administreres af <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Du skal bruge denne app for at administrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tilladelse til at interagere med dine notifikationer og synkronisere oplysninger som f.eks. navnet på en person, der ringer, og appen får adgang til dine tilladelser for Opkald, Sms, Kalender, Opkaldshistorik og Enheder i nærheden."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Du skal bruge denne app for at administrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tilladelse til at synkronisere oplysninger som f.eks. navnet på en person, der ringer, og appen får adgang til følgende tilladelser:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Vil du tillade, at <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> administrerer <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"briller"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Du skal bruge denne app for at administrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tilladelse til at interagere med dine notifikationer og tilgå tilladelserne Telefon, Sms, Kontakter, Mikrofon og Enheder i nærheden."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Denne app får tilladelse til at tilgå disse tilladelser på din telefon:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Giv <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> adgang til disse oplysninger fra din telefon"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Tjenester, som kan tilsluttes en anden enhed"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> anmoder om tilladelse på vegne af din <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> til at streame apps mellem dine enheder"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vil du tillade, at <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> foretager denne handling?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> anmoder om tilladelse på vegne af din <xliff:g id="DEVICE_NAME">%2$s</xliff:g> til at streame apps og andre systemfunktioner til enheder i nærheden"</string> <string name="profile_name_generic" msgid="6851028682723034988">"enhed"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Denne app vil kunne synkronisere oplysninger som f.eks. navnet på en person, der ringer, mellem din telefon og <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Denne app vil kunne synkronisere oplysninger som f.eks. navnet på en person, der ringer, mellem din telefon og den valgte enhed."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Tillad"</string> <string name="consent_no" msgid="2640796915611404382">"Tillad ikke"</string> <string name="consent_back" msgid="2560683030046918882">"Tilbage"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream din telefons apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stream apps og andre systemfunktioner fra din telefon"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-de/strings.xml b/packages/CompanionDeviceManager/res/values-de/strings.xml index bfb750ed2048..1d20a4d1fcfa 100644 --- a/packages/CompanionDeviceManager/res/values-de/strings.xml +++ b/packages/CompanionDeviceManager/res/values-de/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Begleitgerät-Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> erlauben, auf dein Gerät (<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>) zuzugreifen"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"Smartwatch"</string> <string name="chooser_title" msgid="2262294130493605839">"Gerät „<xliff:g id="PROFILE_NAME">%1$s</xliff:g>“ auswählen, das von <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> verwaltet werden soll"</string> - <string name="summary_watch" msgid="6566922405914995759">"Die App wird zur Verwaltung deines Geräts (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) benötigt. <xliff:g id="APP_NAME">%2$s</xliff:g> darf dann Daten wie den Namen eines Anrufers synchronisieren, mit deinen Benachrichtigungen interagieren und auf die Berechtigungen „Telefon“, „SMS“, „Kontakte“, „Kalender“, „Anruflisten“ und „Geräte in der Nähe“ zugreifen."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Die App wird zur Verwaltung deines Geräts (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) benötigt. <xliff:g id="APP_NAME">%2$s</xliff:g> darf dann Daten wie den Namen eines Anrufers synchronisieren und auf folgende Berechtigungen zugreifen:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Zulassen, dass <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> das Gerät <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> verwalten darf"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"Glass-Geräte"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Diese App wird zur Verwaltung deines Geräts (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) benötigt. <xliff:g id="APP_NAME">%2$s</xliff:g> darf mit deinen Benachrichtigungen interagieren und auf die Berechtigungen „Telefon“, „SMS“, „Kontakte“, „Mikrofon“ und „Geräte in der Nähe“ zugreifen."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Diese App darf auf die folgenden Berechtigungen auf deinem Smartphone zugreifen:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> Zugriff auf diese Informationen von deinem Smartphone gewähren"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Geräteübergreifende Dienste"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> bittet für dein <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> um die Berechtigung zum Streamen von Apps zwischen deinen Geräten"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Darf das Gerät <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> diese Aktion ausführen?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> bittet für dein Gerät (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) um die Berechtigung, Apps und andere Systemfunktionen auf Geräte in der Nähe zu streamen"</string> <string name="profile_name_generic" msgid="6851028682723034988">"Gerät"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Diese App kann dann Daten wie den Namen eines Anrufers zwischen deinem Smartphone und deinem Gerät (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) synchronisieren."</string> - <string name="summary_generic" msgid="4988130802522924650">"Diese App kann dann Daten wie den Namen eines Anrufers zwischen deinem Smartphone und dem ausgewählten Gerät synchronisieren."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Zulassen"</string> <string name="consent_no" msgid="2640796915611404382">"Nicht zulassen"</string> <string name="consent_back" msgid="2560683030046918882">"Zurück"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Smartphone-Apps streamen"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Apps und andere Systemfunktionen von deinem Smartphone streamen"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-el/strings.xml b/packages/CompanionDeviceManager/res/values-el/strings.xml index d0b4609b1602..8cb6e6376bf0 100644 --- a/packages/CompanionDeviceManager/res/values-el/strings.xml +++ b/packages/CompanionDeviceManager/res/values-el/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Διαχείριση συνοδευτικής εφαρμογής"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Επιτρέψτε στην εφαρμογή <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> να έχει πρόσβαση στη συσκευή <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ρολόι"</string> <string name="chooser_title" msgid="2262294130493605839">"Επιλέξτε ένα προφίλ <xliff:g id="PROFILE_NAME">%1$s</xliff:g> για διαχείριση από την εφαρμογή <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Η εφαρμογή είναι απαραίτητη για τη διαχείριση της συσκευής <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Η εφαρμογή <xliff:g id="APP_NAME">%2$s</xliff:g> θα μπορεί να συγχρονίζει πληροφορίες, όπως το όνομα ενός ατόμου που σας καλεί, να αλληλεπιδρά με τις ειδοποιήσεις σας και να αποκτά πρόσβαση στις άδειες Τηλέφωνο, SMS, Επαφές, Ημερολόγιο, Αρχεία καταγρ. κλήσ. και Συσκευές σε κοντινή απόσταση."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Η εφαρμογή είναι απαραίτητη για τη διαχείριση της συσκευής <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Η εφαρμογή <xliff:g id="APP_NAME">%2$s</xliff:g> θα μπορεί να συγχρονίζει πληροφορίες, όπως το όνομα ενός ατόμου που σας καλεί, και να αποκτά πρόσβαση σε αυτές τις άδειες:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Να επιτρέπεται στην εφαρμογή <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> να διαχειρίζεται τη συσκευή <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ;"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"γυαλιά"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Αυτή η εφαρμογή είναι απαραίτητη για τη διαχείριση της συσκευής <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Θα επιτρέπεται στην εφαρμογή <xliff:g id="APP_NAME">%2$s</xliff:g> να αλληλεπιδρά με τις ειδοποιήσεις σας και να αποκτά πρόσβαση στις άδειες για το Τηλέφωνο, τα SMS, τις Επαφές, το Μικρόφωνο και τις Συσκευές σε κοντινή απόσταση."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Αυτή η εφαρμογή θα μπορεί να έχει πρόσβαση σε αυτές τις άδειες στο τηλέφωνό σας:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Να επιτρέπεται στο <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> η πρόσβαση σε αυτές τις πληροφορίες από το τηλέφωνό σας."</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Υπηρεσίες πολλών συσκευών"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> ζητά εκ μέρους της συσκευής σας <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> άδεια για ροή εφαρμογών μεταξύ των συσκευών σας"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Να επιτρέπεται στη συσκευή <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> να εκτελεί αυτήν την ενέργεια;"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> ζητά άδεια εκ μέρους της συσκευής σας <xliff:g id="DEVICE_NAME">%2$s</xliff:g> για ροή εφαρμογών και άλλων λειτουργιών του συστήματος σε συσκευές σε κοντινή απόσταση"</string> <string name="profile_name_generic" msgid="6851028682723034988">"συσκευή"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Αυτή η εφαρμογή θα μπορεί να συγχρονίζει πληροφορίες μεταξύ του τηλεφώνου και της συσκευής <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, όπως το όνομα ενός ατόμου που σας καλεί."</string> - <string name="summary_generic" msgid="4988130802522924650">"Αυτή η εφαρμογή θα μπορεί να συγχρονίζει πληροφορίες μεταξύ του τηλεφώνου και της επιλεγμένης συσκευής σας, όπως το όνομα ενός ατόμου που σας καλεί."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Να επιτρέπεται"</string> <string name="consent_no" msgid="2640796915611404382">"Να μην επιτρέπεται"</string> <string name="consent_back" msgid="2560683030046918882">"Πίσω"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Μεταδώστε σε ροή τις εφαρμογές του τηλεφώνου σας"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Ροή εφαρμογών και άλλων λειτουργιών του συστήματος από το τηλέφωνό σας"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-en-rAU/strings.xml b/packages/CompanionDeviceManager/res/values-en-rAU/strings.xml index e4215c63ff7c..ff1394d149ec 100644 --- a/packages/CompanionDeviceManager/res/values-en-rAU/strings.xml +++ b/packages/CompanionDeviceManager/res/values-en-rAU/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"watch"</string> <string name="chooser_title" msgid="2262294130493605839">"Choose a <xliff:g id="PROFILE_NAME">%1$s</xliff:g> to be managed by <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, and access these permissions:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to manage <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"This app is needed to manage <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to interact with your notifications and access your phone, SMS, contacts, microphone and Nearby devices permissions."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"This app will be allowed to access these permissions on your phone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access this information from your phone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> to stream apps between your devices"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Allow <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> to take this action?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_NAME">%2$s</xliff:g> to stream apps and other system features to nearby devices"</string> <string name="profile_name_generic" msgid="6851028682723034988">"device"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Allow"</string> <string name="consent_no" msgid="2640796915611404382">"Don\'t allow"</string> <string name="consent_back" msgid="2560683030046918882">"Back"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream your phone’s apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stream apps and other system features from your phone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-en-rCA/strings.xml b/packages/CompanionDeviceManager/res/values-en-rCA/strings.xml index 4b864d3614f7..21255751bdfd 100644 --- a/packages/CompanionDeviceManager/res/values-en-rCA/strings.xml +++ b/packages/CompanionDeviceManager/res/values-en-rCA/strings.xml @@ -17,15 +17,18 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"watch"</string> <string name="chooser_title" msgid="2262294130493605839">"Choose a <xliff:g id="PROFILE_NAME">%1$s</xliff:g> to be managed by <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, and access these permissions:"</string> + <string name="summary_watch" msgid="898569637110705523">"This app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to manage <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"This app is needed to manage <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"This app will be allowed to access these permissions on your phone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access this information from your phone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> to stream apps between your devices"</string> @@ -38,8 +41,8 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Allow <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> to take this action?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_NAME">%2$s</xliff:g> to stream apps and other system features to nearby devices"</string> <string name="profile_name_generic" msgid="6851028682723034988">"device"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device."</string> + <string name="summary_generic_single_device" msgid="4181180669689590417">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="summary_generic" msgid="1761976003668044801">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device"</string> <string name="consent_yes" msgid="8344487259618762872">"Allow"</string> <string name="consent_no" msgid="2640796915611404382">"Don\'t allow"</string> <string name="consent_back" msgid="2560683030046918882">"Back"</string> @@ -69,4 +72,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream your phone’s apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stream apps and other system features from your phone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-en-rGB/strings.xml b/packages/CompanionDeviceManager/res/values-en-rGB/strings.xml index e4215c63ff7c..ff1394d149ec 100644 --- a/packages/CompanionDeviceManager/res/values-en-rGB/strings.xml +++ b/packages/CompanionDeviceManager/res/values-en-rGB/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"watch"</string> <string name="chooser_title" msgid="2262294130493605839">"Choose a <xliff:g id="PROFILE_NAME">%1$s</xliff:g> to be managed by <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, and access these permissions:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to manage <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"This app is needed to manage <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to interact with your notifications and access your phone, SMS, contacts, microphone and Nearby devices permissions."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"This app will be allowed to access these permissions on your phone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access this information from your phone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> to stream apps between your devices"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Allow <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> to take this action?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_NAME">%2$s</xliff:g> to stream apps and other system features to nearby devices"</string> <string name="profile_name_generic" msgid="6851028682723034988">"device"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Allow"</string> <string name="consent_no" msgid="2640796915611404382">"Don\'t allow"</string> <string name="consent_back" msgid="2560683030046918882">"Back"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream your phone’s apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stream apps and other system features from your phone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-en-rIN/strings.xml b/packages/CompanionDeviceManager/res/values-en-rIN/strings.xml index e4215c63ff7c..ff1394d149ec 100644 --- a/packages/CompanionDeviceManager/res/values-en-rIN/strings.xml +++ b/packages/CompanionDeviceManager/res/values-en-rIN/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"watch"</string> <string name="chooser_title" msgid="2262294130493605839">"Choose a <xliff:g id="PROFILE_NAME">%1$s</xliff:g> to be managed by <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, and access these permissions:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to manage <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"This app is needed to manage <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to interact with your notifications and access your phone, SMS, contacts, microphone and Nearby devices permissions."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"This app will be allowed to access these permissions on your phone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access this information from your phone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> to stream apps between your devices"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Allow <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> to take this action?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_NAME">%2$s</xliff:g> to stream apps and other system features to nearby devices"</string> <string name="profile_name_generic" msgid="6851028682723034988">"device"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Allow"</string> <string name="consent_no" msgid="2640796915611404382">"Don\'t allow"</string> <string name="consent_back" msgid="2560683030046918882">"Back"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream your phone’s apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stream apps and other system features from your phone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-en-rXC/strings.xml b/packages/CompanionDeviceManager/res/values-en-rXC/strings.xml index 0d12e98c8b5a..b012b6f9710a 100644 --- a/packages/CompanionDeviceManager/res/values-en-rXC/strings.xml +++ b/packages/CompanionDeviceManager/res/values-en-rXC/strings.xml @@ -17,15 +17,18 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"watch"</string> <string name="chooser_title" msgid="2262294130493605839">"Choose a <xliff:g id="PROFILE_NAME">%1$s</xliff:g> to be managed by <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"The app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, and access these permissions:"</string> + <string name="summary_watch" msgid="898569637110705523">"This app is needed to manage your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions."</string> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to manage <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"This app is needed to manage <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> will be allowed to interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"This app will be allowed to access these permissions on your phone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Allow <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> to access this information from your phone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> to stream apps between your devices"</string> @@ -38,8 +41,8 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Allow <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> to take this action?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="DEVICE_NAME">%2$s</xliff:g> to stream apps and other system features to nearby devices"</string> <string name="profile_name_generic" msgid="6851028682723034988">"device"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device."</string> + <string name="summary_generic_single_device" msgid="4181180669689590417">"This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="summary_generic" msgid="1761976003668044801">"This app will be able to sync info, like the name of someone calling, between your phone and the chosen device"</string> <string name="consent_yes" msgid="8344487259618762872">"Allow"</string> <string name="consent_no" msgid="2640796915611404382">"Don’t allow"</string> <string name="consent_back" msgid="2560683030046918882">"Back"</string> @@ -69,4 +72,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream your phone’s apps"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Stream apps and other system features from your phone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-es-rUS/strings.xml b/packages/CompanionDeviceManager/res/values-es-rUS/strings.xml index 97b68ed647b6..578af1d855bb 100644 --- a/packages/CompanionDeviceManager/res/values-es-rUS/strings.xml +++ b/packages/CompanionDeviceManager/res/values-es-rUS/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Administrador de dispositivo complementario"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permite que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acceda a <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"reloj"</string> <string name="chooser_title" msgid="2262294130493605839">"Elige un <xliff:g id="PROFILE_NAME">%1$s</xliff:g> para que la app <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> lo administre"</string> - <string name="summary_watch" msgid="6566922405914995759">"Esta app es necesaria para administrar tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> podrá sincronizar información, como el nombre de la persona que llama, interactuar con tus notificaciones y acceder a los permisos de Teléfono, SMS, Contactos, Calendario, Llamadas y Dispositivos cercanos."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Esta app es necesaria para administrar tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> podrá sincronizar información, como el nombre de la persona que llama, y acceder a los siguientes permisos:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Permite que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> administre <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"Gafas"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Esta app es necesaria para administrar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> podrá interactuar con tus notificaciones y acceder a los permisos de Teléfono, SMS, Contactos, Micrófono y Dispositivos cercanos."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Esta app podrá acceder a los siguientes permisos en tu teléfono:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permite que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acceda a esta información de tu teléfono"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Servicios multidispositivo"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> solicita tu permiso en nombre de <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> para transmitir apps entre dispositivos"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"¿Permites que <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> realice esta acción?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> está solicitando permiso en nombre de tu <xliff:g id="DEVICE_NAME">%2$s</xliff:g> para transmitir apps y otras funciones del sistema a dispositivos cercanos"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Esta app podrá sincronizar información, como el nombre de la persona que llama, entre el teléfono y <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Esta app podrá sincronizar información, como el nombre de la persona que llama, entre el teléfono y el dispositivo elegido."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permitir"</string> <string name="consent_no" msgid="2640796915611404382">"No permitir"</string> <string name="consent_back" msgid="2560683030046918882">"Atrás"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Transmitir las apps de tu teléfono"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Transmite apps y otras funciones del sistema desde tu teléfono"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-es/strings.xml b/packages/CompanionDeviceManager/res/values-es/strings.xml index 5ecf79e5bf70..19c556fe1f66 100644 --- a/packages/CompanionDeviceManager/res/values-es/strings.xml +++ b/packages/CompanionDeviceManager/res/values-es/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gestor de dispositivos complementario"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permitir que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acceda a <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"reloj"</string> <string name="chooser_title" msgid="2262294130493605839">"Elige un <xliff:g id="PROFILE_NAME">%1$s</xliff:g> para gestionarlo con <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Se necesita la aplicación para gestionar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> podrá sincronizar información (por ejemplo, el nombre de la persona que te llama), interactuar con tus notificaciones y acceder a tus permisos de teléfono, SMS, contactos, calendario, registros de llamadas y dispositivos cercanos."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Se necesita la aplicación para gestionar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> podrá sincronizar información (por ejemplo, el nombre de la persona que te llama) y acceder a los permisos siguientes:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"¿Permitir que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> gestione <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"gafas"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Se necesita esta aplicación para gestionar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> podrá interactuar con tus notificaciones y acceder a tus permisos de teléfono, SMS, contactos, micrófono y dispositivos cercanos."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Esta aplicación podrá acceder a los siguientes permisos de tu teléfono:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permitir que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acceda a esta información de tu teléfono"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Servicios multidispositivo"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> está pidiendo permiso en nombre de tu <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> para emitir aplicaciones en otros dispositivos tuyos"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"¿Permitir que <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> realice esta acción?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> está pidiendo permiso en nombre de tu <xliff:g id="DEVICE_NAME">%2$s</xliff:g> para emitir aplicaciones y otras funciones del sistema en dispositivos cercanos"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Esta aplicación podrá sincronizar información (por ejemplo, el nombre de la persona que te llama) entre tu teléfono y <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Esta aplicación podrá sincronizar información (por ejemplo, el nombre de la persona que te llama) entre tu teléfono y el dispositivo que elijas."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permitir"</string> <string name="consent_no" msgid="2640796915611404382">"No permitir"</string> <string name="consent_back" msgid="2560683030046918882">"Atrás"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Muestra en streaming las aplicaciones de tu teléfono"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Emite aplicaciones y otras funciones del sistema desde tu teléfono"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-et/strings.xml b/packages/CompanionDeviceManager/res/values-et/strings.xml index f0e565f21661..bbd3ae4a81cc 100644 --- a/packages/CompanionDeviceManager/res/values-et/strings.xml +++ b/packages/CompanionDeviceManager/res/values-et/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Kaasseadme haldur"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Andke rakendusele <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> juurdepääs seadmele <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"käekell"</string> <string name="chooser_title" msgid="2262294130493605839">"Valige <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, mida haldab rakendus <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Seda rakendust on vaja teie seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> haldamiseks. Rakendusel <xliff:g id="APP_NAME">%2$s</xliff:g> lubatakse sünkroonida teavet, näiteks helistaja nime, kasutada teie märguandeid ning pääseda juurde teie telefoni, SMS-ide, kontaktide, kalendri, kõnelogide ja läheduses olevate seadmete lubadele."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Seda rakendust on vaja teie seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> haldamiseks. <xliff:g id="APP_NAME">%2$s</xliff:g> lubatakse sünkroonida teavet, näiteks helistaja nime, ja pääseda juurde järgmistele lubadele."</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Lubage rakendusel <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> hallata seadet <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"prillid"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Seda rakendust on vaja seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> haldamiseks. Rakendusel <xliff:g id="APP_NAME">%2$s</xliff:g> lubatakse kasutada teie märguandeid ning pääseda juurde teie telefoni, SMS-ide, kontaktide, mikrofoni ja läheduses olevate seadmete lubadele."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Sellele rakendusele antakse luba neile juurdepääsudele teie telefonis:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Lubage rakendusel <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> pääseda teie telefonis juurde sellele teabele"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Seadmeülesed teenused"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> taotleb teie seadme <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> nimel luba teie seadmete vahel rakendusi voogesitada"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Kas lubada seadmel <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> teha seda toimingut?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> taotleb teie seadme <xliff:g id="DEVICE_NAME">%2$s</xliff:g> nimel luba voogesitada rakendusi ja muid süsteemi funktsioone läheduses olevatesse seadmetesse"</string> <string name="profile_name_generic" msgid="6851028682723034988">"seade"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"See rakendus saab sünkroonida teavet, näiteks helistaja nime, teie telefoni ja seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vahel."</string> - <string name="summary_generic" msgid="4988130802522924650">"See rakendus saab sünkroonida teavet, näiteks helistaja nime, teie telefoni ja valitud seadme vahel."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Luba"</string> <string name="consent_no" msgid="2640796915611404382">"Ära luba"</string> <string name="consent_back" msgid="2560683030046918882">"Tagasi"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Telefoni rakenduste voogesitamine"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Rakenduste ja muude süsteemi funktsioonide voogesitamine teie telefonist"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-eu/strings.xml b/packages/CompanionDeviceManager/res/values-eu/strings.xml index caebddad363a..1185b2d6ac88 100644 --- a/packages/CompanionDeviceManager/res/values-eu/strings.xml +++ b/packages/CompanionDeviceManager/res/values-eu/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gailu osagarriaren kudeatzailea"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Eman <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> erabiltzeko baimena <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aplikazioari"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"erlojua"</string> <string name="chooser_title" msgid="2262294130493605839">"Aukeratu <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> aplikazioak kudeatu beharreko <xliff:g id="PROFILE_NAME">%1$s</xliff:g>"</string> - <string name="summary_watch" msgid="6566922405914995759">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kudeatzeko behar da aplikazioa. Informazioa sinkronizatzeko (esate baterako, deitzaileen izenak), jakinarazpenekin interakzioan aritzeko, eta telefonoa, SMSak, kontaktuak, egutegia, deien erregistroa eta inguruko gailuak erabiltzeko baimena izango du <xliff:g id="APP_NAME">%2$s</xliff:g> aplikazioak."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kudeatzeko behar da aplikazioa. Informazioa sinkronizatzeko (esate baterako, deitzaileen izenak) eta ekintza hauek gauzatzeko baimena izango du <xliff:g id="APP_NAME">%2$s</xliff:g> aplikazioak:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> kudeatzeko baimena eman nahi diozu <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aplikazioari?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"betaurrekoak"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailua kudeatzeko behar da aplikazioa. Jakinarazpenekin interakzioan aritzeko, eta telefonoa, SMSak, kontaktuak, mikrofonoa eta inguruko gailuak erabiltzeko baimena izango du <xliff:g id="APP_NAME">%2$s</xliff:g> aplikazioak."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Telefonoko baimen hauek erabiltzeko baimena izango du aplikazioak:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Eman informazioa telefonotik hartzeko baimena <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aplikazioari"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Gailu baterako baino gehiagotarako zerbitzuak"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Gailu batetik bestera aplikazioak igortzeko baimena eskatzen ari da <xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> gailuaren izenean"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Ekintza hau gauzatzeko baimena eman nahi diozu <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> aplikazioari?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikazioak eta sistemaren beste eginbide batzuk inguruko gailuetara igortzeko baimena eskatzen ari da <xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="DEVICE_NAME">%2$s</xliff:g> gailuaren izenean"</string> <string name="profile_name_generic" msgid="6851028682723034988">"gailua"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Telefonoaren eta <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuaren artean informazioa sinkronizatzeko gai izango da aplikazioa (esate baterako, deitzaileen izenak)."</string> - <string name="summary_generic" msgid="4988130802522924650">"Telefonoaren eta hautatutako gailuaren artean informazioa sinkronizatzeko gai izango da aplikazioa (esate baterako, deitzaileen izenak)."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Eman baimena"</string> <string name="consent_no" msgid="2640796915611404382">"Ez eman baimenik"</string> <string name="consent_back" msgid="2560683030046918882">"Atzera"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Igorri zuzenean telefonoko aplikazioak"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Igorri aplikazioak eta sistemaren beste eginbide batzuk telefonotik"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-fa/strings.xml b/packages/CompanionDeviceManager/res/values-fa/strings.xml index 031b9d9788a9..d77c5c9cd5e2 100644 --- a/packages/CompanionDeviceManager/res/values-fa/strings.xml +++ b/packages/CompanionDeviceManager/res/values-fa/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"مدیر دستگاه مرتبط"</string> - <string name="confirmation_title" msgid="8024993972587946678">"اجازه دادن به <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> برای دسترسی به <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ساعت"</string> <string name="chooser_title" msgid="2262294130493605839">"انتخاب <xliff:g id="PROFILE_NAME">%1$s</xliff:g> برای مدیریت کردن با <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"این برنامه برای مدیریت <xliff:g id="DEVICE_NAME">%1$s</xliff:g> شما لازم است. به <xliff:g id="APP_NAME">%2$s</xliff:g> اجازه داده میشود اطلاعاتی مثل نام شخصی که تماس میگیرد را همگامسازی کند، با اعلانهای شما تعامل داشته باشد، و به اجازههای «تلفن»، «پیامک»، «مخاطبین»، «تقویم»، «گزارشهای تماس»، و «دستگاههای اطراف» دسترسی داشته باشد."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"این برنامه برای مدیریت <xliff:g id="DEVICE_NAME">%1$s</xliff:g> شما لازم است. به <xliff:g id="APP_NAME">%2$s</xliff:g> اجازه داده میشود اطلاعاتی مثل نام شخصی که تماس میگیرد را همگامسازی کند و به این اجازهها دسترسی داشته باشد:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"به <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> اجازه داده شود <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> را مدیریت کند؟"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"عینک"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"این برنامه برای مدیریت <xliff:g id="DEVICE_NAME">%1$s</xliff:g> لازم است. به <xliff:g id="APP_NAME">%2$s</xliff:g> اجازه داده میشود با اعلانهای شما تعامل داشته باشد و به اجازههای «تلفن»، «پیامک»، «مخاطبین»، «میکروفون»، و «دستگاههای اطراف» دسترسی داشته باشد."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"این برنامه مجاز میشود به اجازههای زیر در تلفن شما دسترسی داشته باشد:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"اجازه دادن به <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> برای دسترسی به اطلاعات تلفن"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"سرویسهای بیندستگاهی"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> اجازه میخواهد ازطرف <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> برنامهها را بین دستگاههای شما جاریسازی کند"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"به <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> اجازه داده شود این اقدام را انجام دهد؟"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ازطرف <xliff:g id="DEVICE_NAME">%2$s</xliff:g> اجازه میخواهد تا برنامهها و دیگر ویژگیهای سیستم را در دستگاههای اطراف جاریسازی کند."</string> <string name="profile_name_generic" msgid="6851028682723034988">"دستگاه"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"این برنامه مجاز میشود اطلاعتی مثل نام شخصی که تماس میگیرد را بین تلفن شما و <xliff:g id="DEVICE_NAME">%1$s</xliff:g> همگامسازی کند."</string> - <string name="summary_generic" msgid="4988130802522924650">"این برنامه مجاز میشود اطلاعتی مثل نام شخصی که تماس میگیرد را بین تلفن شما و دستگاه انتخابشده همگامسازی کند."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"اجازه دادن"</string> <string name="consent_no" msgid="2640796915611404382">"اجازه ندادن"</string> <string name="consent_back" msgid="2560683030046918882">"برگشتن"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"جاریسازی برنامههای تلفن"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"برنامهها و دیگر ویژگیهای سیستم را از تلفن شما جاریسازی میکند"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-fi/strings.xml b/packages/CompanionDeviceManager/res/values-fi/strings.xml index 990b8185d6ed..c679f86b5fed 100644 --- a/packages/CompanionDeviceManager/res/values-fi/strings.xml +++ b/packages/CompanionDeviceManager/res/values-fi/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Salli, että <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> saa pääsyn laitteeseen: <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"kello"</string> <string name="chooser_title" msgid="2262294130493605839">"Valitse <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, jota <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> hallinnoi"</string> - <string name="summary_watch" msgid="6566922405914995759">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> edellyttää ylläpitoon tätä sovellusta. <xliff:g id="APP_NAME">%2$s</xliff:g> saa luvan synkronoida tietoja (esimerkiksi soittajan nimen), hallinnoida ilmoituksiasi sekä pääsyn puhelimeen, tekstiviesteihin, yhteystietoihin, kalenteriin, puhelulokeihin ja lähellä olevat laitteet ‑lupiin."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> edellyttää ylläpitoon tätä sovellusta. <xliff:g id="APP_NAME">%2$s</xliff:g> saa luvan synkronoida tietoja (esimerkiksi soittajan nimen) ja pääsyn näihin lupiin:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Salli, että <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> saa ylläpitää laitetta: <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"lasit"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> edellyttää ylläpitoon tätä sovellusta. <xliff:g id="APP_NAME">%2$s</xliff:g> saa luvan hallinnoida ilmoituksiasi sekä pääsyn puhelimeen, tekstiviesteihin, yhteystietoihin, mikrofoniin ja lähellä olevat laitteet ‑lupiin."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Tämä sovellus saa käyttää näitä lupia puhelimella:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Salli, että <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> saa pääsyn näihin puhelimesi tietoihin"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Laitteidenväliset palvelut"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> pyytää laitteesi (<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>) puolesta lupaa striimata sovelluksia laitteidesi välillä"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Sallitko, että <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> voi suorittaa tämän toiminnon?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> pyytää laitteesi (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) puolesta lupaa striimata sovelluksia ja muita järjestelmän ominaisuuksia lähellä oleviin laitteisiin."</string> <string name="profile_name_generic" msgid="6851028682723034988">"laite"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Sovellus voi synkronoida tietoja (esimerkiksi soittajan nimen) puhelimesi ja laitteen (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) välillä."</string> - <string name="summary_generic" msgid="4988130802522924650">"Sovellus voi synkronoida tietoja (esimerkiksi soittajan nimen) puhelimesi ja valitun laitteen välillä."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Salli"</string> <string name="consent_no" msgid="2640796915611404382">"Älä salli"</string> <string name="consent_back" msgid="2560683030046918882">"Takaisin"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Striimaa puhelimen sovelluksia"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Striimaa sovelluksia ja muita järjestelmän ominaisuuksia puhelimesta"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-fr-rCA/strings.xml b/packages/CompanionDeviceManager/res/values-fr-rCA/strings.xml index 38f01cd8002a..f88864d18af8 100644 --- a/packages/CompanionDeviceManager/res/values-fr-rCA/strings.xml +++ b/packages/CompanionDeviceManager/res/values-fr-rCA/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gestionnaire d\'appareil compagnon"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Autoriser <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à accéder à <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"montre"</string> <string name="chooser_title" msgid="2262294130493605839">"Choisissez un(e) <xliff:g id="PROFILE_NAME">%1$s</xliff:g> qui sera géré(e) par <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"L\'application est nécessaire pour gérer votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> aura l\'autorisation de synchroniser des informations, comme le nom de l\'appelant, d\'interagir avec vos notifications et d\'accéder à vos autorisations pour le téléphone, les messages texte, les contacts, l\'agenda, les journaux d\'appels et les appareils à proximité."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"L\'application est nécessaire pour gérer votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> aura l\'autorisation de synchroniser des informations, comme le nom de l\'appelant, et d\'accéder à ces autorisations :"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Autoriser <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à gérer <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"lunettes"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Cette application est nécessaire pour gérer <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> sera autorisée à interagir avec vos notifications et à accéder à vos autorisations pour le téléphone, les messages texte, les contacts, le microphone et les appareils à proximité."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Cette application pourra accéder aux autorisations suivantes sur votre téléphone :"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Autorisez <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à accéder à ces informations à partir de votre téléphone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Services multiappareils"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> demande l\'autorisation au nom de votre <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> pour diffuser des applications entre vos appareils"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Autoriser <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> à effectuer cette action?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> demande l\'autorisation, au nom de votre <xliff:g id="DEVICE_NAME">%2$s</xliff:g>, de diffuser des applications et d\'autres fonctionnalités du système sur des appareils à proximité"</string> <string name="profile_name_generic" msgid="6851028682723034988">"appareil"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Cette application pourra synchroniser des informations, comme le nom de l\'appelant, entre votre téléphone et <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Cette application pourra synchroniser des informations, comme le nom de l\'appelant, entre votre téléphone et l\'appareil sélectionné."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Autoriser"</string> <string name="consent_no" msgid="2640796915611404382">"Ne pas autoriser"</string> <string name="consent_back" msgid="2560683030046918882">"Retour"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Diffusez les applications de votre téléphone"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Diffusez des applications et d\'autres fonctionnalités du système à partir de votre téléphone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-fr/strings.xml b/packages/CompanionDeviceManager/res/values-fr/strings.xml index dbae1ab46658..94d00afa63f0 100644 --- a/packages/CompanionDeviceManager/res/values-fr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-fr/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gestionnaire d\'appareils associés"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Autoriser <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à accéder à <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"montre"</string> <string name="chooser_title" msgid="2262294130493605839">"Sélectionnez le/la <xliff:g id="PROFILE_NAME">%1$s</xliff:g> qui sera géré(e) par <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Cette appli est nécessaire pour gérer votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> aura l\'autorisation de synchroniser des informations (comme le nom de la personne à l\'origine d\'un appel entrant), d\'interagir avec vos notifications et d\'accéder aux autorisations du téléphone, des SMS, des contacts, de l\'agenda, des journaux d\'appels et des appareils à proximité."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Cette appli est nécessaire pour gérer votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> aura l\'autorisation de synchroniser vos informations, comme le nom de la personne à l\'origine d\'un appel entrant, et d\'accéder à ces autorisations :"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Autoriser <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à gérer <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"lunettes"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Cette appli est nécessaire pour gérer <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> aura l\'autorisation d\'interagir avec vos notifications et d\'accéder aux autorisations du téléphone, des SMS, des contacts, du micro et des appareils à proximité."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Cette appli sera autorisée à accéder à ces autorisations sur votre téléphone :"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Autoriser <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à accéder à ces informations depuis votre téléphone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Services inter-appareils"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> demande l\'autorisation au nom de votre <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> pour caster des applis d\'un appareil à l\'autre"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Autoriser <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> à effectuer cette action ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> demande l\'autorisation au nom de votre <xliff:g id="DEVICE_NAME">%2$s</xliff:g> de diffuser des applis et d\'autres fonctionnalités système en streaming sur des appareils à proximité"</string> <string name="profile_name_generic" msgid="6851028682723034988">"appareil"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Cette appli pourra synchroniser des informations entre votre téléphone et <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, comme le nom de la personne à l\'origine d\'un appel entrant."</string> - <string name="summary_generic" msgid="4988130802522924650">"Cette appli pourra synchroniser des informations entre votre téléphone et l\'appareil choisi, comme le nom de la personne à l\'origine d\'un appel entrant."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Autoriser"</string> <string name="consent_no" msgid="2640796915611404382">"Ne pas autoriser"</string> <string name="consent_back" msgid="2560683030046918882">"Retour"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Diffuser en streaming les applis de votre téléphone"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Diffusez des applis et d\'autres fonctionnalités système en streaming depuis votre téléphone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-gl/strings.xml b/packages/CompanionDeviceManager/res/values-gl/strings.xml index 4f780737dc3e..f9b1475ad894 100644 --- a/packages/CompanionDeviceManager/res/values-gl/strings.xml +++ b/packages/CompanionDeviceManager/res/values-gl/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Xestor de dispositivos complementarios"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permitir que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acceda ao dispositivo (<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>)"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"reloxo"</string> <string name="chooser_title" msgid="2262294130493605839">"Escolle un dispositivo (<xliff:g id="PROFILE_NAME">%1$s</xliff:g>) para que o xestione a aplicación <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"A aplicación é necesaria para xestionar o teu dispositivo (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>). <xliff:g id="APP_NAME">%2$s</xliff:g> poderá sincronizar información (por exemplo, o nome de quen chama), interactuar coas túas notificacións e acceder aos permisos do teu teléfono, das SMS, dos contactos, do calendario, dos rexistros de chamadas e dos dispositivos próximos."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"A aplicación é necesaria para xestionar o teu dispositivo (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>). <xliff:g id="APP_NAME">%2$s</xliff:g> poderá sincronizar información (por exemplo, o nome de quen chama) e acceder a estes permisos:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Queres permitir que <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> xestione o dispositivo (<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>)?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"lentes"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Esta aplicación é necesaria para xestionar o dispositivo (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>). <xliff:g id="APP_NAME">%2$s</xliff:g> poderá interactuar coas túas notificacións e acceder aos permisos do teu teléfono, das SMS, dos contactos, do micrófono e dos dispositivos próximos."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Esta aplicación poderá acceder aos seguintes permisos do teléfono:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permitir que a aplicación <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acceda a esta información desde o teu teléfono"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Servizos multidispositivo"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> está solicitando permiso en nome do teu dispositivo (<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>) para emitir contido de aplicacións entre os teus aparellos"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Queres permitir que <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> leve a cabo esta acción?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> está solicitando permiso en nome do teu dispositivo (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) para emitir o contido das aplicacións e doutras funcións do sistema en dispositivos próximos"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Esta aplicación poderá sincronizar información (por exemplo, o nome de quen chama) entre o teléfono e o dispositivo (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>)."</string> - <string name="summary_generic" msgid="4988130802522924650">"Esta aplicación poderá sincronizar información (por exemplo, o nome de quen chama) entre o teléfono e o dispositivo escollido."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permitir"</string> <string name="consent_no" msgid="2640796915611404382">"Non permitir"</string> <string name="consent_back" msgid="2560683030046918882">"Atrás"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Emite as aplicacións do teu teléfono"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Emite o contido das aplicacións e doutras funcións do sistema desde o teléfono"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-gu/strings.xml b/packages/CompanionDeviceManager/res/values-gu/strings.xml index f4f496f3fee9..dd32e5d845a1 100644 --- a/packages/CompanionDeviceManager/res/values-gu/strings.xml +++ b/packages/CompanionDeviceManager/res/values-gu/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"કમ્પેનિયન ડિવાઇસ મેનેજર"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ને <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ઍક્સેસ કરવાની મંજૂરી આપો"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"સ્માર્ટવૉચ"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> દ્વારા મેનેજ કરવા માટે કોઈ <xliff:g id="PROFILE_NAME">%1$s</xliff:g> પસંદ કરો"</string> - <string name="summary_watch" msgid="6566922405914995759">"તમારા <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ને મેનેજ કરવા માટે ઍપ જરૂરી છે. <xliff:g id="APP_NAME">%2$s</xliff:g>ને કૉલ કરનાર વ્યક્તિનું નામ જેવી માહિતી સિંક કરવાની, તમારા નોટિફિકેશન સાથે ક્રિયાપ્રતિક્રિયા કરવાની અને તમારો ફોન, SMS, સંપર્કો, Calendar, કૉલ લૉગ તથા નજીકના ડિવાઇસની પરવાનગીઓ ઍક્સેસ કરવાની મંજૂરી આપવામાં આવશે."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"તમારા <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ને મેનેજ કરવા માટે ઍપ જરૂરી છે. <xliff:g id="APP_NAME">%2$s</xliff:g>ને કૉલ કરનાર વ્યક્તિનું નામ જેવી માહિતી સિંક કરવાની અને આ પરવાનગીઓ ઍક્સેસ કરવાની મંજૂરી આપવામાં આવશે:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ને <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> મેનેજ કરવા માટે મંજૂરી આપીએ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ચશ્માં"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ને મેનેજ કરવા માટે આ ઍપ જરૂરી છે. <xliff:g id="APP_NAME">%2$s</xliff:g>ને તમારા નોટિફિકેશન સાથે ક્રિયાપ્રતિક્રિયા કરવાની અને તમારો ફોન, SMS, સંપર્કો, માઇક્રોફોન તથા નજીકના ડિવાઇસની પરવાનગીઓ ઍક્સેસ કરવાની મંજૂરી આપવામાં આવશે."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"આ ઍપને તમારા ફોન પર આ પરવાનગીઓ ઍક્સેસ કરવાની મંજૂરી મળશે:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"તમારા ફોનમાંથી આ માહિતી ઍક્સેસ કરવા માટે, <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ને મંજૂરી આપો"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ક્રોસ-ડિવાઇસ સેવાઓ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> તમારા <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> વતી તમારા ડિવાઇસ વચ્ચે ઍપ સ્ટ્રીમ કરવાની પરવાનગીની વિનંતી કરી રહી છે"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>ને આ પગલું ભરવાની મંજૂરી આપીએ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> નજીકના ડિવાઇસ પર ઍપ અને સિસ્ટમની અન્ય સુવિધાઓ સ્ટ્રીમ કરવા તમારા <xliff:g id="DEVICE_NAME">%2$s</xliff:g> વતી પરવાનગીની વિનંતી કરી રહી છે"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ડિવાઇસ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"આ ઍપ તમારા ફોન અને <xliff:g id="DEVICE_NAME">%1$s</xliff:g> વચ્ચે, કૉલ કરનાર કોઈ વ્યક્તિનું નામ જેવી માહિતી સિંક કરી શકશે."</string> - <string name="summary_generic" msgid="4988130802522924650">"આ ઍપ તમારા ફોન અને પસંદ કરેલા ડિવાઇસ વચ્ચે, કૉલ કરનાર કોઈ વ્યક્તિનું નામ જેવી માહિતી સિંક કરી શકશે."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"મંજૂરી આપો"</string> <string name="consent_no" msgid="2640796915611404382">"મંજૂરી આપશો નહીં"</string> <string name="consent_back" msgid="2560683030046918882">"પાછળ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"તમારા ફોનની ઍપ સ્ટ્રીમ કરો"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"તમારા ફોન પરથી ઍપ અને સિસ્ટમની અન્ય સુવિધાઓ સ્ટ્રીમ કરો"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-hi/strings.xml b/packages/CompanionDeviceManager/res/values-hi/strings.xml index 2b1def0b3b22..e5ee703e7ded 100644 --- a/packages/CompanionDeviceManager/res/values-hi/strings.xml +++ b/packages/CompanionDeviceManager/res/values-hi/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"सहयोगी डिवाइस मैनेजर"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> को <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> की जानकारी ऐक्सेस करने की अनुमति दें"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"स्मार्टवॉच"</string> <string name="chooser_title" msgid="2262294130493605839">"कोई <xliff:g id="PROFILE_NAME">%1$s</xliff:g> चुनें, ताकि उसे <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> की मदद से मैनेज किया जा सके"</string> - <string name="summary_watch" msgid="6566922405914995759">"यह ऐप्लिकेशन, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को मैनेज करने के लिए ज़रूरी है. <xliff:g id="APP_NAME">%2$s</xliff:g> को डिवाइस की जानकारी सिंक करने की अनुमति होगी. जैसे, कॉल करने वाले व्यक्ति का नाम. इसे आपकी सूचनाओं पर कार्रवाई करने के साथ-साथ आपके फ़ोन, एसएमएस, संपर्कों, कैलेंडर, कॉल लॉग, और आस-पास मौजूद डिवाइसों को ऐक्सेस करने की अनुमति भी होगी."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"यह ऐप्लिकेशन, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को मैनेज करने के लिए ज़रूरी है. <xliff:g id="APP_NAME">%2$s</xliff:g> को डिवाइस की जानकारी सिंक करने की अनुमति होगी. जैसे, कॉल करने वाले व्यक्ति का नाम. ऐप्लिकेशन इन अनुमतियों का भी इस्तेमाल कर पाएगा:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"क्या <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> को <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> मैनेज करने की अनुमति देनी है?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"चश्मा"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"यह ऐप्लिकेशन, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को मैनेज करने के लिए ज़रूरी है. <xliff:g id="APP_NAME">%2$s</xliff:g> को डिवाइस की सूचनाओं पर कार्रवाई करने की अनुमति होगी. इसे आपके फ़ोन, मैसेज, संपर्कों, माइक्रोफ़ोन, और आस-पास मौजूद डिवाइसों को ऐक्सेस करने की अनुमति भी होगी."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"इस ऐप्लिकेशन को आपके फ़ोन पर ये अनुमतियां ऐक्सेस करने की अनुमति होगी:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> को अपने फ़ोन से यह जानकारी ऐक्सेस करने की अनुमति दें"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"क्रॉस-डिवाइस से जुड़ी सेवाएं"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपके <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> की ओर से, आपके डिवाइसों के बीच ऐप्लिकेशन को स्ट्रीम करने की अनुमति मांग रहा है"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"क्या <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> को यह कार्रवाई करने की अनुमति देनी है?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपके <xliff:g id="DEVICE_NAME">%2$s</xliff:g> की ओर से, ऐप्लिकेशन और दूसरे सिस्टम की सुविधाओं को आस-पास मौजूद डिवाइसों पर स्ट्रीम करने की अनुमति मांग रहा है"</string> <string name="profile_name_generic" msgid="6851028682723034988">"डिवाइस"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"यह ऐप्लिकेशन, आपके फ़ोन और <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के बीच जानकारी सिंक कर सकता है. जैसे, कॉल करने वाले व्यक्ति का नाम."</string> - <string name="summary_generic" msgid="4988130802522924650">"यह ऐप्लिकेशन, आपके फ़ोन और चुने हुए डिवाइस के बीच जानकारी सिंक कर सकता है. जैसे, कॉल करने वाले व्यक्ति का नाम."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"अनुमति दें"</string> <string name="consent_no" msgid="2640796915611404382">"अनुमति न दें"</string> <string name="consent_back" msgid="2560683030046918882">"वापस जाएं"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"अपने फ़ोन पर मौजूद ऐप्लिकेशन स्ट्रीम करें"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"अपने फ़ोन से ऐप्लिकेशन और दूसरे सिस्टम की सुविधाओं को स्ट्रीम करें"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-hr/strings.xml b/packages/CompanionDeviceManager/res/values-hr/strings.xml index 77c7f9434cc6..559dfd55d922 100644 --- a/packages/CompanionDeviceManager/res/values-hr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-hr/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Dopustite aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> da pristupa uređaju <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"satom"</string> <string name="chooser_title" msgid="2262294130493605839">"Odaberite <xliff:g id="PROFILE_NAME">%1$s</xliff:g> kojim će upravljati aplikacija <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplikacija je potrebna za upravljanje vašim uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikacija <xliff:g id="APP_NAME">%2$s</xliff:g> moći će sinkronizirati podatke, primjerice ime pozivatelja, stupati u interakciju s vašim obavijestima i pristupati vašim dopuštenjima za telefon, SMS-ove, kontakte, kalendar, zapisnike poziva i uređaje u blizini."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplikacija je potrebna za upravljanje vašim uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikacija <xliff:g id="APP_NAME">%2$s</xliff:g> moći će sinkronizirati podatke, primjerice ime pozivatelja i pristupati sljedećim dopuštenjima:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Dopustiti aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> da upravlja uređajem <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"naočale"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ta je aplikacija potrebna za upravljanje uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikacija <xliff:g id="APP_NAME">%2$s</xliff:g> moći će stupati u interakciju s vašim obavijestima i pristupati vašim dopuštenjima za telefon, SMS-ove, kontakte, mikrofon i uređaje u blizini."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Aplikacija će moći pristupati ovim dopuštenjima na telefonu:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Omogućite aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> da pristupa informacijama s vašeg telefona"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Usluge na različitim uređajima"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> zahtijeva dopuštenje u ime vašeg uređaja <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> za emitiranje aplikacija između vaših uređaja"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Dopustiti <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> da izvede tu radnju?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> zahtijeva dopuštenje u ime vašeg uređaja <xliff:g id="DEVICE_NAME">%2$s</xliff:g> za emitiranje aplikacija i drugih značajki sustava na uređajima u blizini"</string> <string name="profile_name_generic" msgid="6851028682723034988">"uređaj"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ta će aplikacija moći sinkronizirati podatke između vašeg telefona i uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, primjerice ime pozivatelja."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ta će aplikacija moći sinkronizirati podatke između vašeg telefona i odabranog uređaja, primjerice ime pozivatelja."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Dopusti"</string> <string name="consent_no" msgid="2640796915611404382">"Nemoj dopustiti"</string> <string name="consent_back" msgid="2560683030046918882">"Natrag"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Streaming aplikacija vašeg telefona"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Emitiranje aplikacija i drugih značajki sustava s vašeg telefona"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-hu/strings.xml b/packages/CompanionDeviceManager/res/values-hu/strings.xml index f1b55201518f..bc317ee4c33d 100644 --- a/packages/CompanionDeviceManager/res/values-hu/strings.xml +++ b/packages/CompanionDeviceManager/res/values-hu/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Társeszközök kezelője"</string> - <string name="confirmation_title" msgid="8024993972587946678">"A(z) <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> hozzáférésének engedélyezése a(z) <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> eszközhöz"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"óra"</string> <string name="chooser_title" msgid="2262294130493605839">"A(z) <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> alkalmazással kezelni kívánt <xliff:g id="PROFILE_NAME">%1$s</xliff:g> kiválasztása"</string> - <string name="summary_watch" msgid="6566922405914995759">"Az alkalmazásra szükség van a következő eszköz kezeléséhez: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. A(z) <xliff:g id="APP_NAME">%2$s</xliff:g> képes lesz szinkronizálni információkat (például a hívó fél nevét), műveleteket végezhet majd az értesítésekkel, és hozzáférhet majd a Telefon, az SMS, a Névjegyek, a Naptár, a Hívásnaplók és a Közeli eszközök engedélyekhez."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Az alkalmazásra szükség van a következő eszköz kezeléséhez: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. A(z) <xliff:g id="APP_NAME">%2$s</xliff:g> képes lesz szinkronizálni információkat (például a hívó fél nevét), és hozzáférhet majd ezekhez az engedélyekhez:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Engedélyezi, hogy a(z) <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> kezelje a következő eszközt: <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"szemüveg"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Erre az alkalmazásra szükség van a következő eszköz kezeléséhez: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. A(z) <xliff:g id="APP_NAME">%2$s</xliff:g> műveleteket végezhet majd az értesítésekkel, és hozzáférhet majd a Telefon, az SMS, a Névjegyek, a Mikrofon és a Közeli eszközök engedélyekhez."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Az alkalmazás hozzáférhet majd a következő engedélyekhez a telefonon:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Engedélyezi a(z) „<xliff:g id="APP_NAME">%1$s</xliff:g>” alkalmazás számára az információhoz való hozzáférést a telefonról"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Többeszközös szolgáltatások"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> engedélyt kér a(z) <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> nevében az alkalmazások eszközök közötti streameléséhez"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Engedélyezi a(z) <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> számára ennek a műveletnek a végrehajtását?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> engedélyt kér a(z) <xliff:g id="DEVICE_NAME">%2$s</xliff:g> nevében az alkalmazások és más rendszerfunkciók közeli eszközökre történő streamelésére"</string> <string name="profile_name_generic" msgid="6851028682723034988">"eszköz"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ez az alkalmazás képes lesz szinkronizálni az olyan információkat a telefon és a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz között, mint például a hívó fél neve."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ez az alkalmazás képes lesz szinkronizálni az olyan információkat a telefon és a kiválasztott eszköz között, mint például a hívó fél neve."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Engedélyezés"</string> <string name="consent_no" msgid="2640796915611404382">"Tiltás"</string> <string name="consent_back" msgid="2560683030046918882">"Vissza"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"A telefon alkalmazásainak streamelése"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Alkalmazások és más rendszerfunkciók streamelése a telefonról"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-hy/strings.xml b/packages/CompanionDeviceManager/res/values-hy/strings.xml index e45ccaf15a36..bc7bfc7fec5c 100644 --- a/packages/CompanionDeviceManager/res/values-hy/strings.xml +++ b/packages/CompanionDeviceManager/res/values-hy/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Թույլատրեք <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> հավելվածին կառավարել <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> սարքը"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ժամացույց"</string> <string name="chooser_title" msgid="2262294130493605839">"Ընտրեք <xliff:g id="PROFILE_NAME">%1$s</xliff:g>ը, որը պետք է կառավարվի <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> հավելվածի կողմից"</string> - <string name="summary_watch" msgid="6566922405914995759">"Հավելվածն անհրաժեշտ է ձեր <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը կառավարելու համար։ <xliff:g id="APP_NAME">%2$s</xliff:g> հավելվածը կկարողանա համաժամացնել տվյալները, օր․՝ զանգողի անունը, փոխազդել ձեր ծանուցումների հետ և կստանա «Հեռախոս», «SMS», «Կոնտակտներ», «Օրացույց», «Կանչերի ցուցակ» և «Մոտակա սարքեր» թույլտվությունները։"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Հավելվածն անհրաժեշտ է ձեր <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը կառավարելու համար։ <xliff:g id="APP_NAME">%2$s</xliff:g> հավելվածը կկարողանա համաժամացնել տվյալները, օր․՝ զանգողի անունը, և կստանա հետևյալ թույլտվությունները․"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Թույլատրե՞լ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> հավելվածին կառավարել <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> սարքը"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ակնոց"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Այս հավելվածն անհրաժեշտ է <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը կառավարելու համար։ <xliff:g id="APP_NAME">%2$s</xliff:g> հավելվածը կկարողանա փոխազդել ձեր ծանուցումների հետ և կստանա «Հեռախոս», «SMS», «Կոնտակտներ», «Խոսափող» և «Մոտակա սարքեր» թույլտվությունները։"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Այս հեռախոսին հասանելի կլինեն հետևյալ թույլտվությունները ձեր հեռախոսում․"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Թույլատրեք <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> հավելվածին օգտագործել այս տեղեկությունները ձեր հեռախոսից"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Միջսարքային ծառայություններ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը ձեր <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> սարքի անունից թույլտվություն է խնդրում՝ ձեր սարքերի միջև հավելվածներ հեռարձակելու համար"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Թույլատրե՞լ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> հավելվածին կատարել այս գործողությունը"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը ձեր <xliff:g id="DEVICE_NAME">%2$s</xliff:g> սարքի անունից թույլտվություն է խնդրում՝ մոտակա սարքերին հավելվածներ և համակարգի այլ գործառույթներ հեռարձակելու համար"</string> <string name="profile_name_generic" msgid="6851028682723034988">"սարք"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Այս հավելվածը կկարողանա համաժամացնել ձեր հեռախոսի և <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքի տվյալները, օր․՝ զանգողի անունը։"</string> - <string name="summary_generic" msgid="4988130802522924650">"Այս հավելվածը կկարողանա համաժամացնել ձեր հեռախոսի և ընտրված սարքի տվյալները, օր․՝ զանգողի անունը։"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Թույլատրել"</string> <string name="consent_no" msgid="2640796915611404382">"Չթույլատրել"</string> <string name="consent_back" msgid="2560683030046918882">"Հետ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Հեռարձակել հեռախոսի հավելվածները"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Հեռարձակել հավելվածներ և համակարգի այլ գործառույթներ հեռախոսում"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-in/strings.xml b/packages/CompanionDeviceManager/res/values-in/strings.xml index db2f1ef3bb0c..8ece9defea44 100644 --- a/packages/CompanionDeviceManager/res/values-in/strings.xml +++ b/packages/CompanionDeviceManager/res/values-in/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Pengelola Perangkat Pendamping"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Izinkan <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> mengakses <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"smartwatch"</string> <string name="chooser_title" msgid="2262294130493605839">"Pilih <xliff:g id="PROFILE_NAME">%1$s</xliff:g> untuk dikelola oleh <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplikasi diperlukan untuk mengelola <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> akan diizinkan menyinkronkan informasi, seperti nama pemanggil, berinteraksi dengan notifikasi, dan mengakses izin Telepon, SMS, Kontak, Kalender, Log panggilan, dan Perangkat di sekitar."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplikasi diperlukan untuk mengelola <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> akan diizinkan menyinkronkan informasi, seperti nama pemanggil, dan mengakses izin berikut:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Izinkan <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> mengelola <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Aplikasi ini diperlukan untuk mengelola <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> akan diizinkan berinteraksi dengan notifikasi dan mengakses izin Ponsel, SMS, Kontak, Mikrofon, dan Perangkat di sekitar."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Aplikasi ini akan diizinkan untuk mengakses izin ini di ponsel Anda:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Izinkan <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> untuk mengakses informasi ini dari ponsel Anda"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Layanan lintas perangkat"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> meminta izin atas nama <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> untuk menstreaming aplikasi di antara perangkat Anda"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Izinkan <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> melakukan tindakan ini?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> meminta izin atas nama <xliff:g id="DEVICE_NAME">%2$s</xliff:g> untuk menstreaming aplikasi dan fitur sistem lainnya ke perangkat di sekitar"</string> <string name="profile_name_generic" msgid="6851028682723034988">"perangkat"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Aplikasi ini akan dapat menyinkronkan info, seperti nama penelepon, antara ponsel dan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Aplikasi ini akan dapat menyinkronkan info, seperti nama penelepon, antara ponsel dan perangkat yang dipilih."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Izinkan"</string> <string name="consent_no" msgid="2640796915611404382">"Jangan izinkan"</string> <string name="consent_back" msgid="2560683030046918882">"Kembali"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Streaming aplikasi ponsel"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Menstreaming aplikasi dan fitur sistem lainnya dari ponsel Anda"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-is/strings.xml b/packages/CompanionDeviceManager/res/values-is/strings.xml index a906cbcd8617..49b06f09d708 100644 --- a/packages/CompanionDeviceManager/res/values-is/strings.xml +++ b/packages/CompanionDeviceManager/res/values-is/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Stjórnun fylgdartækja"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Veita <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aðgang að <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"úr"</string> <string name="chooser_title" msgid="2262294130493605839">"Velja <xliff:g id="PROFILE_NAME">%1$s</xliff:g> sem <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> á að stjórna"</string> - <string name="summary_watch" msgid="6566922405914995759">"Forritið er nauðsynlegt til að stjórna <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> fær heimild til að samstilla upplýsingar, t.d. nafn þess sem hringir, og bregðast við tilkynningum og fær aðgang að heimildum fyrir síma, SMS, tengiliði, dagatal, símtalaskrár og nálæg tæki."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Forritið er nauðsynlegt til að stjórna <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> fær heimild til að samstilla upplýsingar, t.d. nafn þess sem hringir, og fær aðgang að eftirfarandi heimildum:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Leyfa <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> að stjórna <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"gleraugu"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Þetta forrit er nauðsynlegt til að stjórna <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> fær heimild til að bregðast við tilkynningum og fær aðgang að heimildum fyrir síma, SMS, tengiliði, hljóðnema og nálæg tæki."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Þetta forrit fær aðgang að eftirfarandi heimildum í símanum þínum:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Veita <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aðgang að þessum upplýsingum úr símanum þínum"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Þjónustur á milli tækja"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> sendir beiðni um heimild til straumspilunar forrita á milli tækjanna þinna fyrir hönd <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Leyfa <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> að framkvæma þessa aðgerð?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> biður um heimild fyrir <xliff:g id="DEVICE_NAME">%2$s</xliff:g> til að streyma forritum og öðrum kerfiseiginleikum í nálægum tækjum"</string> <string name="profile_name_generic" msgid="6851028682723034988">"tæki"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Þetta forrit mun geta samstillt upplýsingar, t.d. nafn þess sem hringir, á milli símans og <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Þetta forrit mun geta samstillt upplýsingar, t.d. nafn þess sem hringir, á milli símans og valins tækis."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Leyfa"</string> <string name="consent_no" msgid="2640796915611404382">"Ekki leyfa"</string> <string name="consent_back" msgid="2560683030046918882">"Til baka"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Streymdu forritum símans"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Streymdu forritum og öðrum kerfiseiginleikum úr símanum"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-it/strings.xml b/packages/CompanionDeviceManager/res/values-it/strings.xml index 7c9077574186..0dc78baff7c2 100644 --- a/packages/CompanionDeviceManager/res/values-it/strings.xml +++ b/packages/CompanionDeviceManager/res/values-it/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gestione dispositivi companion"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Consenti all\'app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> di accedere a <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"orologio"</string> <string name="chooser_title" msgid="2262294130493605839">"Scegli un <xliff:g id="PROFILE_NAME">%1$s</xliff:g> da gestire con <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Questa app è necessaria per gestire <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> potrà sincronizzare informazioni, ad esempio il nome di un chiamante, interagire con le tue notifiche e accedere alle autorizzazioni Telefono, SMS, Contatti, Calendario, Registri chiamate e Dispositivi nelle vicinanze."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Questa app è necessaria per gestire <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> potrà sincronizzare informazioni, ad esempio il nome di un chiamante, e accedere alle seguenti autorizzazioni:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Vuoi consentire all\'app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> di gestire <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"occhiali"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Questa app è necessaria per gestire <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> potrà interagire con le tue notifiche e accedere alle autorizzazioni Telefono, SMS, Contatti, Microfono e Dispositivi nelle vicinanze."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"L\'app potrà accedere alle seguenti autorizzazioni sul telefono:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Consenti a <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> di accedere a queste informazioni dal tuo telefono"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Servizi cross-device"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> richiede per conto del tuo <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> l\'autorizzazione a trasmettere app in streaming tra i dispositivi"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vuoi consentire a <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> di compiere questa azione?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> richiede per conto di <xliff:g id="DEVICE_NAME">%2$s</xliff:g> l\'autorizzazione a trasmettere in streaming app e altre funzionalità di sistema ai dispositivi nelle vicinanze"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Questa app potrà sincronizzare informazioni, ad esempio il nome di un chiamante, tra il telefono e <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Questa app potrà sincronizzare informazioni, ad esempio il nome di un chiamante, tra il telefono e il dispositivo scelto."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Consenti"</string> <string name="consent_no" msgid="2640796915611404382">"Non consentire"</string> <string name="consent_back" msgid="2560683030046918882">"Indietro"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Trasmetti in streaming le app del tuo telefono"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Consente di trasmettere in streaming app e altre funzionalità di sistema dal telefono"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-iw/strings.xml b/packages/CompanionDeviceManager/res/values-iw/strings.xml index 28a8877a59a0..8ef04eb7fe60 100644 --- a/packages/CompanionDeviceManager/res/values-iw/strings.xml +++ b/packages/CompanionDeviceManager/res/values-iw/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"ניהול מכשיר מותאם"</string> - <string name="confirmation_title" msgid="8024993972587946678">"אישור לאפליקציה <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong&g; לגשת אל <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"שעון"</string> <string name="chooser_title" msgid="2262294130493605839">"בחירת <xliff:g id="PROFILE_NAME">%1$s</xliff:g> לניהול באמצעות <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"האפליקציה הזו נחוצה כדי לנהל את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. האפליקציה <xliff:g id="APP_NAME">%2$s</xliff:g> תוכל לסנכרן מידע, כמו השם של מישהו שמתקשר, לבצע פעולות בהתראות ולקבל הרשאות גישה לטלפון, ל-SMS לאנשי הקשר, למיקרופון ולמכשירים בקרבת מקום."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"האפליקציה הזו נחוצה כדי לנהל את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. האפליקציה <xliff:g id="APP_NAME">%2$s</xliff:g> תוכל לסנכרן מידע, כמו השם של מישהו שמתקשר, ולקיים אינטראקציה עם ההרשאות הבאות:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"מתן הרשאה לאפליקציה <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong&g; לנהל את <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"משקפיים"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"האפליקציה הזו נחוצה כדי לנהל את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. האפליקציה <xliff:g id="APP_NAME">%2$s</xliff:g> תוכל לבצע פעולות בהתראות ותקבל הרשאות גישה לטלפון, ל-SMS לאנשי הקשר, למיקרופון ולמכשירים בקרבת מקום."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"האפליקציה הזו תוכל לגשת להרשאות הבאות בטלפון שלך:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"מתן אישור לאפליקציה <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> לגשת למידע הזה מהטלפון שלך"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"שירותים למספר מכשירים"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> מבקשת הרשאה עבור מכשיר <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> כדי לשדר אפליקציות בין המכשירים שלך"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"לתת הרשאה למכשיר <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> לבצע את הפעולה הזו?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> מבקשת הרשאה עבור <xliff:g id="DEVICE_NAME">%2$s</xliff:g> כדי להעביר אפליקציות ותכונות מערכת אחרות בסטרימינג למכשירים בקרבת מקום"</string> <string name="profile_name_generic" msgid="6851028682723034988">"מכשיר"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"האפליקציה הזו תוכל לסנכרן מידע, כמו השם של מישהו שמתקשר, מהטלפון שלך ל-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"האפליקציה הזו תוכל לסנכרן מידע, כמו השם של מישהו שמתקשר, מהטלפון שלך למכשיר שבחרת."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"יש אישור"</string> <string name="consent_no" msgid="2640796915611404382">"אין אישור"</string> <string name="consent_back" msgid="2560683030046918882">"חזרה"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"שידור אפליקציות מהטלפון"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"העברה של אפליקציות ותכונות מערכת אחרות בסטרימינג מהטלפון"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ja/strings.xml b/packages/CompanionDeviceManager/res/values-ja/strings.xml index 964b63f4c259..862ec9416dc9 100644 --- a/packages/CompanionDeviceManager/res/values-ja/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ja/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"コンパニオン デバイス マネージャー"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> に <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> へのアクセスを許可する"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ウォッチ"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> の管理対象となる<xliff:g id="PROFILE_NAME">%1$s</xliff:g>の選択"</string> - <string name="summary_watch" msgid="6566922405914995759">"このアプリは <xliff:g id="DEVICE_NAME">%1$s</xliff:g> の管理に必要です。<xliff:g id="APP_NAME">%2$s</xliff:g> は通話相手の名前などの情報を同期したり、デバイスの通知を使用したり、電話、SMS、連絡先、カレンダー、通話履歴、付近のデバイスの権限にアクセスしたりできるようになります。"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"このアプリは <xliff:g id="DEVICE_NAME">%1$s</xliff:g> の管理に必要です。<xliff:g id="APP_NAME">%2$s</xliff:g> は通話相手の名前などの情報を同期したり、次の権限にアクセスしたりできるようになります。"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> に <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> の管理を許可しますか？"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"眼鏡"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"このアプリは <xliff:g id="DEVICE_NAME">%1$s</xliff:g> の管理に必要です。<xliff:g id="APP_NAME">%2$s</xliff:g> はデバイスの通知を使用したり、電話、SMS、連絡先、マイク、付近のデバイスの権限にアクセスしたりできるようになります。"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"このアプリは、スマートフォンの以下の権限へのアクセスが可能になります:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"スマートフォンのこの情報へのアクセスを <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> に許可"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"クロスデバイス サービス"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> が <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> に代わってデバイス間でアプリをストリーミングする権限をリクエストしています"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> にこの操作の実行を許可しますか？"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> が <xliff:g id="DEVICE_NAME">%2$s</xliff:g> に代わって、アプリやその他のシステム機能を付近のデバイスにストリーミングする権限をリクエストしています"</string> <string name="profile_name_generic" msgid="6851028682723034988">"デバイス"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"このアプリは、あなたのスマートフォンと <xliff:g id="DEVICE_NAME">%1$s</xliff:g> との間で、通話相手の名前などの情報を同期できるようになります。"</string> - <string name="summary_generic" msgid="4988130802522924650">"このアプリは、あなたのスマートフォンと選択したデバイスとの間で、通話相手の名前などの情報を同期できるようになります。"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"許可"</string> <string name="consent_no" msgid="2640796915611404382">"許可しない"</string> <string name="consent_back" msgid="2560683030046918882">"戻る"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"スマートフォンのアプリをストリーミングします"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"アプリやその他のシステム機能をスマートフォンからストリーミングする"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ka/strings.xml b/packages/CompanionDeviceManager/res/values-ka/strings.xml index 930ef906f228..f80515bd7fbf 100644 --- a/packages/CompanionDeviceManager/res/values-ka/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ka/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"კომპანიონი მოწყობილობების მენეჯერი"</string> - <string name="confirmation_title" msgid="8024993972587946678">"დაუშვით <strong><xliff:g id="APP_NAME">%1$s</xliff:g>-ის</strong> წვდომა <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g>-ზე</strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"საათი"</string> <string name="chooser_title" msgid="2262294130493605839">"აირჩიეთ <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, რომელიც უნდა მართოს <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>-მა"</string> - <string name="summary_watch" msgid="6566922405914995759">"ეს აპი საჭიროა თქვენი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის სამართავად. <xliff:g id="APP_NAME">%2$s</xliff:g>-ს ექნება უფლება, მოახდინოს ისეთი ინფორმაციის სინქრონიზაცია, როგორიც იმ ადამიანის სახელია, რომელიც რეკავს, მოახდინოს ინტერაქცია თქვენს შეტყობინებებთან და ჰქონდეს წვდომა თქვენს ტელეფონზე, SMS-ებზე, კონტაქტებზე, კალენდარზე, ზარების ჟურნალებზე და ახლომახლო მოწყობილობების ნებართვებზე."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ეს აპი საჭიროა თქვენი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის სამართავად. <xliff:g id="APP_NAME">%2$s</xliff:g>-ს ექნება უფლება, მოახდინოს ისეთი ინფორმციის სინქრონიზაცია, როგორიც იმ ადამიანის სახელია, რომელიც რეკავს, და ჰქონდეს წვდომა შემდეგ ნებართვებზე:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"ნება დართეთ <strong><xliff:g id="APP_NAME">%1$s</xliff:g>-ს</strong> მართოს <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"სათვალე"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"ეს აპი საჭიროა თქვენი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის სამართავად. <xliff:g id="APP_NAME">%2$s</xliff:g> შეძლებს თქვენს შეტყობინებებთან ინტერაქციას და თქვენს ტელეფონზე, SMS-ებზე, კონტაქტებზე, მიკროფონსა და ახლომახლო მოწყობილობების ნებართვებზე წვდომას."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ამ აპისთვის ნებადართული იქნება მოცემულ ნებართვებზე წვდომა თქვენს ტელეფონში:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"ნება დართეთ, რომ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> აპს ჰქონდეს ამ ინფორმაციაზე წვდომა თქვენი ტელეფონიდან"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"მოწყობილობათშორისი სერვისები"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> ითხოვს უფლებას თქვენი <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>-ის სახელით, რომ მოწყობილობებს შორის აპების სტრიმინგი შეძლოს"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"გსურთ ნება მისცეთ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ს</strong> ამ მოქმედების შესასრულებლად?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ითხოვს თქვენი <xliff:g id="DEVICE_NAME">%2$s</xliff:g>-ის სახელით აპების და სისტემის სხვა ფუნქციების ახლომახლო მოწყობილობებზე სტრიმინგის ნებართვას"</string> <string name="profile_name_generic" msgid="6851028682723034988">"მოწყობილობა"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ეს აპი შეძლებს, მოახდინოს ისეთი ინფორმაციის სინქრონიზაცია, როგორიც იმ ადამიანის სახელია, რომელიც რეკავს, თქვენს ტელეფონსა და <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ს შორის."</string> - <string name="summary_generic" msgid="4988130802522924650">"ეს აპი შეძლებს, მოახდინოს ისეთი ინფორმაციის სინქრონიზაცია, როგორიც იმ ადამიანის სახელია, რომელიც რეკავს, თქვენს ტელეფონსა და არჩეულ მოწყობილობას შორის."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"დაშვება"</string> <string name="consent_no" msgid="2640796915611404382">"არ დაიშვას"</string> <string name="consent_back" msgid="2560683030046918882">"უკან"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"თქვენი ტელეფონის აპების სტრიმინგი"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"აწარმოეთ აპების და სისტემის სხვა ფუნქციების სტრიმინგი თქვენი ტელეფონიდან"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-kk/strings.xml b/packages/CompanionDeviceManager/res/values-kk/strings.xml index 21b9ff84e00c..67d1ab820d7b 100644 --- a/packages/CompanionDeviceManager/res/values-kk/strings.xml +++ b/packages/CompanionDeviceManager/res/values-kk/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> қолданбасына <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> құрылғысын пайдалануға рұқсат беру"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"сағат"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> арқылы басқарылатын <xliff:g id="PROFILE_NAME">%1$s</xliff:g> құрылғысын таңдаңыз"</string> - <string name="summary_watch" msgid="6566922405914995759">"Қолданба <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысын басқару үшін қажет. <xliff:g id="APP_NAME">%2$s</xliff:g> қолданбасына қоңырау шалушының аты сияқты деректі синхрондау, хабарландыруларды оқу, телефон, SMS, контактілер, күнтізбе, қоңырау журналдары қолданбаларын және маңайдағы құрылғыларды пайдалану рұқсаттары беріледі."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Қолданба <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысын басқару үшін қажет. <xliff:g id="APP_NAME">%2$s</xliff:g> қолданбасына деректі (мысалы, қоңырау шалушының аты) синхрондауға және мына рұқсаттарды пайдалануға рұқсат беріледі:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> қолданбасына <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> құрылғысын басқаруға рұқсат беру керек пе?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"көзілдірік"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Бұл қолданба <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысын басқару үшін қажет. <xliff:g id="APP_NAME">%2$s</xliff:g> қолданбасына хабарландыруларды оқуға, телефонды, хабарларды, контактілерді, микрофон мен маңайдағы құрылғыларды пайдалануға рұқсат беріледі."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Бұл қолданба телефоныңыздағы мына рұқсаттарды пайдалана алады:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> қолданбасына телефоныңыздағы осы ақпаратты пайдалануға рұқсат беріңіз."</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Аралық құрылғы қызметтері"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> атынан құрылғылар арасында қолданбалар трансляциялау үшін рұқсат сұрайды."</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> құрылғысына бұл әрекетті орындауға рұқсат беру керек пе?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы <xliff:g id="DEVICE_NAME">%2$s</xliff:g> атынан қолданбалар мен басқа да жүйе функцияларын маңайдағы құрылғыларға трансляциялау рұқсатын сұрап тұр."</string> <string name="profile_name_generic" msgid="6851028682723034988">"құрылғы"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Бұл қолданба телефон мен <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы арасында деректі (мысалы, қоңырау шалушының атын) синхрондайды."</string> - <string name="summary_generic" msgid="4988130802522924650">"Бұл қолданба телефон мен таңдалған құрылғы арасында деректі (мысалы, қоңырау шалушының атын) синхрондайды."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Рұқсат беру"</string> <string name="consent_no" msgid="2640796915611404382">"Рұқсат бермеу"</string> <string name="consent_back" msgid="2560683030046918882">"Артқа"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Телефон қолданбаларын трансляциялайды."</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Қолданбалар мен басқа да жүйе функцияларын телефоннан трансляциялау"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-km/strings.xml b/packages/CompanionDeviceManager/res/values-km/strings.xml index 504861651a1d..83cea128619c 100644 --- a/packages/CompanionDeviceManager/res/values-km/strings.xml +++ b/packages/CompanionDeviceManager/res/values-km/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"កម្មវិធីគ្រប់គ្រងឧបករណ៍ដៃគូ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"អនុញ្ញាតឱ្យ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ចូលប្រើ <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"នាឡិកា"</string> <string name="chooser_title" msgid="2262294130493605839">"ជ្រើសរើស <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ដើម្បីឱ្យស្ថិតក្រោមការគ្រប់គ្រងរបស់ <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"ត្រូវការកម្មវិធីនេះ ដើម្បីគ្រប់គ្រង <xliff:g id="DEVICE_NAME">%1$s</xliff:g> របស់អ្នក។ <xliff:g id="APP_NAME">%2$s</xliff:g> នឹងត្រូវបានអនុញ្ញាតឱ្យធ្វើសមកាលកម្មព័ត៌មានដូចជា ឈ្មោះមនុស្សដែលហៅទូរសព្ទ ធ្វើអន្តរកម្មជាមួយការជូនដំណឹងរបស់អ្នក និងចូលប្រើការអនុញ្ញាតទូរសព្ទ, SMS, ទំនាក់ទំនង, ប្រតិទិន, កំណត់ហេតុហៅទូរសព្ទ និងឧបករណ៍នៅជិតរបស់អ្នក។"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ត្រូវការកម្មវិធីនេះ ដើម្បីគ្រប់គ្រង <xliff:g id="DEVICE_NAME">%1$s</xliff:g> របស់អ្នក។ <xliff:g id="APP_NAME">%2$s</xliff:g> នឹងត្រូវបានអនុញ្ញាតឱ្យធ្វើសមកាលកម្មព័ត៌មានដូចជា ឈ្មោះមនុស្សដែលហៅទូរសព្ទ និងចូលប្រើការអនុញ្ញាតទាំងនេះ៖"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"អនុញ្ញាតឱ្យ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> គ្រប់គ្រង <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ឬ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"វ៉ែនតា"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"ត្រូវការកម្មវិធីនេះ ដើម្បីគ្រប់គ្រង <xliff:g id="DEVICE_NAME">%1$s</xliff:g>។ <xliff:g id="APP_NAME">%2$s</xliff:g> នឹងត្រូវបានអនុញ្ញាតឱ្យធ្វើអន្តរកម្មជាមួយការជូនដំណឹងរបស់អ្នក និងចូលប្រើការអនុញ្ញាតរបស់ទូរសព្ទ, SMS, ទំនាក់ទំនង, មីក្រូហ្វូន និងឧបករណ៍នៅជិតរបស់អ្នក។"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"កម្មវិធីនេះនឹងត្រូវបានអនុញ្ញាតឱ្យចូលប្រើការកំណត់ទាំងនេះនៅលើទូរសព្ទរបស់អ្នក៖"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"អនុញ្ញាតឱ្យ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ចូលប្រើព័ត៌មាននេះពីទូរសព្ទរបស់អ្នក"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"សេវាកម្មឆ្លងកាត់ឧបករណ៍"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> កំពុងស្នើសុំការអនុញ្ញាតជំនួសឱ្យ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> របស់អ្នក ដើម្បីបញ្ចាំងកម្មវិធីរវាងឧបករណ៍របស់អ្នក"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"អនុញ្ញាតឱ្យ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ធ្វើសកម្មភាពនេះឬ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> កំពុងស្នើសុំការអនុញ្ញាតជំនួសឱ្យ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> របស់អ្នក ដើម្បីចាក់ផ្សាយកម្មវិធី និងមុខងារប្រព័ន្ធផ្សេងទៀតទៅកាន់ឧបករណ៍នៅជិត"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ឧបករណ៍"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"កម្មវិធីនឹងអាចធ្វើសមកាលកម្មព័ត៌មានដូចជា ឈ្មោះមនុស្សដែលហៅទូរសព្ទរវាងទូរសព្ទ និង <xliff:g id="DEVICE_NAME">%1$s</xliff:g> របស់អ្នក។"</string> - <string name="summary_generic" msgid="4988130802522924650">"កម្មវិធីនេះនឹងអាចធ្វើសមកាលកម្មព័ត៌មានដូចជា ឈ្មោះមនុស្សដែលហៅទូរសព្ទរវាងឧបករណ៍ដែលបានជ្រើសរើស និងទូរសព្ទរបស់អ្នក។"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"អនុញ្ញាត"</string> <string name="consent_no" msgid="2640796915611404382">"មិនអនុញ្ញាត"</string> <string name="consent_back" msgid="2560683030046918882">"ថយក្រោយ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"ផ្សាយកម្មវិធីរបស់ទូរសព្ទអ្នក"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ចាក់ផ្សាយកម្មវិធី និងមុខងារប្រព័ន្ធផ្សេងទៀតពីទូរសព្ទរបស់អ្នក"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-kn/strings.xml b/packages/CompanionDeviceManager/res/values-kn/strings.xml index e7f9f7d7d1b6..91131a709dcf 100644 --- a/packages/CompanionDeviceManager/res/values-kn/strings.xml +++ b/packages/CompanionDeviceManager/res/values-kn/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನ ನಿರ್ವಾಹಕರು"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ಅನ್ನು ಪ್ರವೇಶಿಸಲು <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ಗೆ ಅನುಮತಿಸಿ"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ವೀಕ್ಷಿಸಿ"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ಮೂಲಕ ನಿರ್ವಹಿಸಬೇಕಾದ <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> - <string name="summary_watch" msgid="6566922405914995759">"ನಿಮ್ಮ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಅನ್ನು ನಿರ್ವಹಿಸಲು ಆ್ಯಪ್ನ ಅಗತ್ಯವಿದೆ. ಕರೆ ಮಾಡುವವರ ಹೆಸರು, ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ಮತ್ತು ಫೋನ್, SMS, ಸಂಪರ್ಕಗಳು, ಕ್ಯಾಲೆಂಡರ್, ಕರೆ ಲಾಗ್ಗಳು ಮತ್ತು ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳ ದೃಢೀಕರಣಗಳಂತಹ ಮಾಹಿತಿಯನ್ನು ಸಿಂಕ್ ಮಾಡಲು <xliff:g id="APP_NAME">%2$s</xliff:g> ಗೆ ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ನಿಮ್ಮ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಅನ್ನು ನಿರ್ವಹಿಸಲು ಆ್ಯಪ್ನ ಅಗತ್ಯವಿದೆ. ಕರೆ ಮಾಡುವವರ ಹೆಸರಿನಂತಹ ಮಾಹಿತಿಯನ್ನು ಸಿಂಕ್ ಮಾಡಲು ಮತ್ತು ಈ ಅನುಮತಿಗಳನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು <xliff:g id="APP_NAME">%2$s</xliff:g> ಗೆ ಅನುಮತಿಸಲಾಗುತ್ತದೆ:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>? ನಿರ್ವಹಿಸಲು <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ಗೆ ಅನುಮತಿಸಬೇಕೇ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ಗ್ಲಾಸ್ಗಳು"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಅನ್ನು ನಿರ್ವಹಿಸಲು ಈ ಆ್ಯಪ್ನ ಅಗತ್ಯವಿದೆ. <xliff:g id="APP_NAME">%2$s</xliff:g> ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್, SMS, ಸಂಪರ್ಕಗಳು, ಮೈಕ್ರೊಫೋನ್ ಮತ್ತು ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳ ಅನುಮತಿಗಳನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು ಅನುಮತಿಸಲಾಗುತ್ತದೆ."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಈ ಅನುಮತಿಗಳನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು ಈ ಆ್ಯಪ್ಗೆ ಅನುಮತಿಸಲಾಗುತ್ತದೆ:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"ನಿಮ್ಮ ಫೋನ್ ಮೂಲಕ ಈ ಮಾಹಿತಿಯನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ಗೆ ಅನುಮತಿಸಿ"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ಕ್ರಾಸ್-ಡಿವೈಸ್ ಸೇವೆಗಳು"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"ನಿಮ್ಮ ಸಾಧನಗಳ ನಡುವೆ ಆ್ಯಪ್ಗಳನ್ನು ಸ್ಟ್ರೀಮ್ ಮಾಡಲು ನಿಮ್ಮ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ನ ಪರವಾಗಿ <xliff:g id="APP_NAME">%1$s</xliff:g> ಅನುಮತಿಯನ್ನು ವಿನಂತಿಸಿಕೊಳ್ಳುತ್ತಿದೆ"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"ಈ ಆ್ಯಕ್ಷನ್ ಅನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ಅನುಮತಿಸಬೇಕೇ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳಿಗೆ ಆ್ಯಪ್ಗಳು ಮತ್ತು ಇತರ ಸಿಸ್ಟಂ ಫೀಚರ್ಗಳನ್ನು ಸ್ಟ್ರೀಮ್ ಮಾಡಲು ನಿಮ್ಮ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> ರ ಪರವಾಗಿ <xliff:g id="APP_NAME">%1$s</xliff:g> ಅನುಮತಿಯನ್ನು ವಿನಂತಿಸುತ್ತಿದೆ"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ಸಾಧನ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ಈ ಆ್ಯಪ್, ಮೊಬೈಲ್ ಫೋನ್ ಮತ್ತು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನದ ನಡುವೆ ಕರೆ ಮಾಡುವವರ ಹೆಸರಿನಂತಹ ಮಾಹಿತಿಯನ್ನು ಸಿಂಕ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string> - <string name="summary_generic" msgid="4988130802522924650">"ಈ ಆ್ಯಪ್, ಮೊಬೈಲ್ ಫೋನ್ ಮತ್ತು ಆಯ್ಕೆಮಾಡಿದ ಸಾಧನದ ನಡುವೆ ಕರೆ ಮಾಡುವವರ ಹೆಸರಿನಂತಹ ಮಾಹಿತಿಯನ್ನು ಸಿಂಕ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ಅನುಮತಿಸಿ"</string> <string name="consent_no" msgid="2640796915611404382">"ಅನುಮತಿಸಬೇಡಿ"</string> <string name="consent_back" msgid="2560683030046918882">"ಹಿಂದೆ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"ನಿಮ್ಮ ಫೋನ್ನ ಆ್ಯಪ್ಗಳನ್ನು ಸ್ಟ್ರೀಮ್ ಮಾಡಿ"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ನಿಮ್ಮ ಫೋನ್ನಿಂದ ಆ್ಯಪ್ಗಳು ಮತ್ತು ಇತರ ಸಿಸ್ಟಂ ಫೀಚರ್ಗಳನ್ನು ಸ್ಟ್ರೀಮ್ ಮಾಡಿ"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ko/strings.xml b/packages/CompanionDeviceManager/res/values-ko/strings.xml index 67ca4a080411..5b9c42981fea 100644 --- a/packages/CompanionDeviceManager/res/values-ko/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ko/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"부속 기기 관리자"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>에서 <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> 기기에 액세스하도록 허용"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"시계"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>에서 관리할 <xliff:g id="PROFILE_NAME">%1$s</xliff:g>을(를) 선택"</string> - <string name="summary_watch" msgid="6566922405914995759">"이 앱은 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기를 관리하는 데 필요합니다. <xliff:g id="APP_NAME">%2$s</xliff:g>에서 전화를 건 사람 이름과 같은 정보를 동기화하며 알림과 상호작용하고 내 전화, SMS, 연락처, Calendar, 통화 기록, 근처 기기에 액세스할 수 있게 됩니다."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"이 앱은 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기를 관리하는 데 필요합니다. <xliff:g id="APP_NAME">%2$s</xliff:g>에서 전화를 건 사람 이름과 같은 정보를 동기화하며 이러한 권한에 액세스할 수 있게 됩니다."</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>에서 <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>? 기기를 관리하도록 허용"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"안경"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"이 앱은 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기를 관리하는 데 필요합니다. <xliff:g id="APP_NAME">%2$s</xliff:g>에서 알림과 상호작용하고 내 전화, SMS, 연락처, 마이크, 근처 기기에 대한 권한을 갖게 됩니다."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"앱이 내 휴대전화에서 이러한 권한에 액세스할 수 있게 됩니다."</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>이 휴대전화의 이 정보에 액세스하도록 허용합니다."</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"교차 기기 서비스"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> 대신 기기 간에 앱을 스트리밍할 수 있는 권한을 요청하고 있습니다."</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> 기기가 이 작업을 수행하도록 허용하시겠습니까?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 <xliff:g id="DEVICE_NAME">%2$s</xliff:g> 대신 근처 기기로 앱 및 기타 시스템 기능을 스트리밍할 권한을 요청하고 있습니다."</string> <string name="profile_name_generic" msgid="6851028682723034988">"기기"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"이 앱이 전화를 건 사람 이름과 같은 정보를 휴대전화와 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 간에 동기화할 수 있습니다."</string> - <string name="summary_generic" msgid="4988130802522924650">"이 앱이 전화를 건 사람 이름과 같은 정보를 휴대전화와 선택한 기기 간에 동기화할 수 있습니다."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"허용"</string> <string name="consent_no" msgid="2640796915611404382">"허용 안함"</string> <string name="consent_back" msgid="2560683030046918882">"뒤로"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"휴대전화의 앱을 스트리밍합니다."</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"내 휴대전화의 앱 및 기타 시스템 기능 스트리밍"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ky/strings.xml b/packages/CompanionDeviceManager/res/values-ky/strings.xml index acbc0316b8b4..2f9957741fba 100644 --- a/packages/CompanionDeviceManager/res/values-ky/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ky/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> колдонмосуна <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> түзмөгүнө кирүүгө уруксат бериңиз"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"саат"</string> <string name="chooser_title" msgid="2262294130493605839">"<xliff:g id="PROFILE_NAME">%1$s</xliff:g> <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> тарабынан башкарылсын"</string> - <string name="summary_watch" msgid="6566922405914995759">"Бул колдонмо <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүңүздү тескөө үчүн керек. <xliff:g id="APP_NAME">%2$s</xliff:g> маалыматты шайкештирип, мисалы, билдирмелериңизди көрүп, телефонуңуз, SMS билдирүүлөр, байланыштар, жылнаама, чалуулар тизмеси жана жакын жердеги түзмөктөргө болгон уруксаттарды пайдалана алат."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Бул колдонмо <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүңүздү тескөө үчүн керек. <xliff:g id="APP_NAME">%2$s</xliff:g> маалыматты шайкештире алат, мисалы, чалып жаткан кишинин атын шайкештирет жана анын төмөнкү уруксаттары болот:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> колдонмосуна <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> түзмөгүн тескөөгө уруксат бересизби?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"көз айнектер"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Бул колдонмо <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүн башкаруу үчүн керек. <xliff:g id="APP_NAME">%2$s</xliff:g> билдирмелериңизди көрүп, телефонуңуз, SMS билдирүүлөр, Байланыштар, Микрофон жана Жакын жердеги түзмөктөргө болгон уруксаттарды пайдалана алат."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Бул колдонмого телефонуңузда төмөнкүлөрдү аткарууга уруксат берилет:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> колдонмосуна телефонуңуздагы ушул маалыматты көрүүгө уруксат бериңиз"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Түзмөктөр аралык кызматтар"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> түзмөгүңүздүн атынан түзмөктөрүңүздүн ортосунда колдонмолорду өткөрүүгө уруксат сурап жатат"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> түзмөгүнө бул аракетти аткарууга уруксат бересизби?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_NAME">%2$s</xliff:g> түзмөгүңүздүн атынан жакын жердеги түзмөктөрдө колдонмолорду жана тутумдун башка функцияларын алып ойнотууга уруксат сурап жатат"</string> <string name="profile_name_generic" msgid="6851028682723034988">"түзмөк"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Бул колдонмо маалыматты шайкештире алат, мисалы, чалып жаткан кишинин атын телефон жана <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгү менен шайкештирет."</string> - <string name="summary_generic" msgid="4988130802522924650">"Бул колдонмо маалыматты шайкештире алат, мисалы, чалып жаткан кишинин атын телефон жана тандалган түзмөк менен шайкештирет."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Ооба"</string> <string name="consent_no" msgid="2640796915611404382">"Уруксат берилбесин"</string> <string name="consent_back" msgid="2560683030046918882">"Артка"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Телефондогу колдонмолорду алып ойнотуу"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Телефонуңуздагы колдонмолорду жана тутумдун башка функцияларын алып ойнотуу"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-lo/strings.xml b/packages/CompanionDeviceManager/res/values-lo/strings.xml index 9b488361a573..53995be29d43 100644 --- a/packages/CompanionDeviceManager/res/values-lo/strings.xml +++ b/packages/CompanionDeviceManager/res/values-lo/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"ຕົວຈັດການອຸປະກອນປະກອບ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"ອະນຸຍາດ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ໃຫ້ເຂົ້າເຖິງ <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ໄດ້"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ໂມງ"</string> <string name="chooser_title" msgid="2262294130493605839">"ເລືອກ <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ເພື່ອໃຫ້ຖືກຈັດການໂດຍ <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"ຕ້ອງໃຊ້ແອັບດັ່ງກ່າວເພື່ອຈັດການ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຂອງທ່ານ. <xliff:g id="APP_NAME">%2$s</xliff:g> ຈະໄດ້ຮັບອະນຸຍາດໃຫ້ຊິງຂໍ້ມູນເຊັ່ນ: ຊື່ຂອງບາງຄົນທີ່ກຳລັງໂທ, ໂຕ້ຕອບກັບການແຈ້ງເຕືອນຂອງທ່ານ ແລະ ເຂົ້າເຖິງການອະນຸຍາດໂທລະສັບ, SMS, ລາຍຊື່ຜູ້ຕິດຕໍ່, ປະຕິທິນ, ບັນທຶກການໂທ ແລະ ອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງຂອງທ່ານ."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ຕ້ອງໃຊ້ແອັບດັ່ງກ່າວເພື່ອຈັດການ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຂອງທ່ານ. <xliff:g id="APP_NAME">%2$s</xliff:g> ຈະໄດ້ຮັບອະນຸຍາດໃຫ້ຊິງຂໍ້ມູນເຊັ່ນ: ຊື່ຂອງບາງຄົນທີ່ກຳລັງໂທ ແລະ ເຂົ້າເຖິງການອະນຸຍາດເຫຼົ່ານີ້:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"ອະນຸຍາດ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ຈັດການ <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ບໍ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ແວ່ນຕາ"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"ຕ້ອງໃຊ້ແອັບນີ້ເພື່ອຈັດການ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ຈະໄດ້ຮັບອະນຸຍາດໃຫ້ໂຕ້ຕອບກັບການແຈ້ງເຕືອນຂອງທ່ານ ແລະ ການອະນຸຍາດສິດເຂົ້າເຖິງໂທລະສັບ, SMS, ລາຍຊື່ຜູ້ຕິດຕໍ່, ໄມໂຄຣໂຟນ ແລະ ອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງຂອງທ່ານ."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ແອັບນີ້ຈະຖືກອະນຸຍາດໃຫ້ເຂົ້າເຖິງການອະນຸຍາດເຫຼົ່ານີ້ຢູ່ໃນໂທລະສັບຂອງທ່ານ:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"ອະນຸຍາດ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ໃຫ້ເຂົ້າເຖິງຂໍ້ມູນນີ້ຈາກໂທລະສັບຂອງທ່ານໄດ້"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ບໍລິການຂ້າມອຸປະກອນ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> ກຳລັງຮ້ອງຂໍການອະນຸຍາດໃນນາມຂອງ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ເພື່ອສະຕຣີມແອັບລະຫວ່າງອຸປະກອນຂອງທ່ານ"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"ອະນຸຍາດ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ເພື່ອດຳເນີນຄຳສັ່ງນີ້ບໍ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ກໍາລັງຮ້ອງຂໍການອະນຸຍາດໃນນາມ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> ຂອງທ່ານເພື່ອສະຕຣີມແອັບ ແລະ ຄຸນສົມບັດລະບົບອື່ນໆໄປຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງ"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ອຸປະກອນ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ແອັບນີ້ຈະສາມາດຊິງຂໍ້ມູນເຊັ່ນ: ຊື່ຂອງບາງຄົນທີ່ກຳລັງໂທຢູ່ລະຫວ່າງໂທລະສັບຂອງທ່ານ ແລະ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້."</string> - <string name="summary_generic" msgid="4988130802522924650">"ແອັບນີ້ຈະສາມາດຊິງຂໍ້ມູນເຊັ່ນ: ຊື່ຂອງບາງຄົນທີ່ກຳລັງໂທຢູ່ລະຫວ່າງໂທລະສັບຂອງທ່ານ ແລະ ອຸປະກອນທີ່ເລືອກໄດ້."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ອະນຸຍາດ"</string> <string name="consent_no" msgid="2640796915611404382">"ບໍ່ອະນຸຍາດ"</string> <string name="consent_back" msgid="2560683030046918882">"ກັບຄືນ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"ສະຕຣີມແອັບຂອງໂທລະສັບທ່ານ"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ສະຕຣີມແອັບ ແລະ ຄຸນສົມບັດລະບົບອື່ນໆຈາກໂທລະສັບຂອງທ່ານ"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-lt/strings.xml b/packages/CompanionDeviceManager/res/values-lt/strings.xml index 4b4deecfb775..56cfcb8e813f 100644 --- a/packages/CompanionDeviceManager/res/values-lt/strings.xml +++ b/packages/CompanionDeviceManager/res/values-lt/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Leisti <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> pasiekti <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"laikrodį"</string> <string name="chooser_title" msgid="2262294130493605839">"Jūsų <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, kurį valdys <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> (pasirinkite)"</string> - <string name="summary_watch" msgid="6566922405914995759">"Programa reikalinga norint tvarkyti jūsų įrenginį „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. Programai „<xliff:g id="APP_NAME">%2$s</xliff:g>“ bus leidžiama sinchronizuoti tam tikrą informaciją, pvz., skambinančio asmens vardą, sąveikauti su jūsų pranešimais ir pasiekti jūsų leidimus „Telefonas“, „SMS“, „Kontaktai“, „Kalendorius“, „Skambučių žurnalai“ ir „Įrenginiai netoliese“."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Programa reikalinga norint tvarkyti jūsų įrenginį „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. Programai „<xliff:g id="APP_NAME">%2$s</xliff:g>“ bus leidžiama sinchronizuoti tam tikrą informaciją, pvz., skambinančio asmens vardą, ir pasiekti toliau nurodytus leidimus."</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Leisti <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> valdyti <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"akiniai"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ši programa reikalinga norint tvarkyti įrenginį „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. Programai „<xliff:g id="APP_NAME">%2$s</xliff:g>“ bus leidžiama sąveikauti su jūsų pranešimais ir pasiekti jūsų leidimus „Telefonas“, „SMS“, „Kontaktai“, „Mikrofonas“ ir „Įrenginiai netoliese“."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Šiai programai bus leidžiama pasiekti toliau nurodytus leidimus jūsų telefone."</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Leisti <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> pasiekti šią informaciją iš jūsų telefono"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Pasl. keliuose įrenginiuose"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo jūsų „<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>“ vardu, kad galėtų srautu perduoti programas iš vieno įrenginio į kitą"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Leisti <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> atlikti šį veiksmą?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo jūsų „<xliff:g id="DEVICE_NAME">%2$s</xliff:g>“ vardu, kad galėtų srautu perduoti programas ir kitas sistemos funkcijas įrenginiams netoliese"</string> <string name="profile_name_generic" msgid="6851028682723034988">"įrenginys"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ši programa galės sinchronizuoti tam tikrą informaciją, pvz., skambinančio asmens vardą, su jūsų telefonu ir įrenginiu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ši programa galės sinchronizuoti tam tikrą informaciją, pvz., skambinančio asmens vardą, su jūsų telefonu ir pasirinktu įrenginiu."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Leisti"</string> <string name="consent_no" msgid="2640796915611404382">"Neleisti"</string> <string name="consent_back" msgid="2560683030046918882">"Atgal"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Telefono programų perdavimas srautu"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Srautu perduokite programas ir kitas sistemos funkcijas iš telefono"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-lv/strings.xml b/packages/CompanionDeviceManager/res/values-lv/strings.xml index 76ca97e5035f..b6dcd2da8958 100644 --- a/packages/CompanionDeviceManager/res/values-lv/strings.xml +++ b/packages/CompanionDeviceManager/res/values-lv/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Palīgierīču pārzinis"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Atļauja lietotnei <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> piekļūt ierīcei <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"pulkstenis"</string> <string name="chooser_title" msgid="2262294130493605839">"Profila (<xliff:g id="PROFILE_NAME">%1$s</xliff:g>) izvēle, ko pārvaldīt lietotnē <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Šī lietotne ir nepieciešama jūsu ierīces (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) pārvaldībai. <xliff:g id="APP_NAME">%2$s</xliff:g> drīkstēs sinhronizēt informāciju, piemēram, zvanītāja vārdu, mijiedarboties ar jūsu paziņojumiem un piekļūt atļaujām Tālrunis, Īsziņas, Kontaktpersonas, Kalendārs, Zvanu žurnāli un Tuvumā esošas ierīces."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Šī lietotne ir nepieciešama jūsu ierīces (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) pārvaldībai. <xliff:g id="APP_NAME">%2$s</xliff:g> drīkstēs sinhronizēt informāciju, piemēram, zvanītāja vārdu, un piekļūt šīm atļaujām:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Vai atļaut lietotnei <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> piekļūt ierīcei <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"brilles"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Šī lietotne ir nepieciešama šādas ierīces pārvaldībai: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> drīkstēs mijiedarboties ar jūsu paziņojumiem un piekļūt atļaujām Tālrunis, Īsziņas, Kontaktpersonas, Mikrofons un Tuvumā esošas ierīces."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Šai lietotnei tiks sniegta piekļuve šādām atļaujām jūsu tālrunī:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Atļaut lietotnei <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> piekļūt šai informācijai no jūsu tālruņa"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Vairāku ierīču pakalpojumi"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> pieprasa atļauju straumēt lietotnes starp jūsu ierīcēm šīs ierīces vārdā: <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vai atļaut ierīcei <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> veikt šo darbību?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> pieprasa atļauju tuvumā esošās ierīcēs straumēt lietotnes un citas sistēmas funkcijas šīs ierīces vārdā: <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ierīce"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Šī lietotne varēs sinhronizēt informāciju, piemēram, zvanītāja vārdu, starp jūsu tālruni un šo ierīci: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Šī lietotne varēs sinhronizēt informāciju, piemēram, zvanītāja vārdu, starp jūsu tālruni un izvēlēto ierīci."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Atļaut"</string> <string name="consent_no" msgid="2640796915611404382">"Neatļaut"</string> <string name="consent_back" msgid="2560683030046918882">"Atpakaļ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Straumēt jūsu tālruņa lietotnes"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"No sava tālruņa straumējiet lietotnes un citas sistēmas funkcijas"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-mk/strings.xml b/packages/CompanionDeviceManager/res/values-mk/strings.xml index 1df8093dc67b..8b4c9e1c5072 100644 --- a/packages/CompanionDeviceManager/res/values-mk/strings.xml +++ b/packages/CompanionDeviceManager/res/values-mk/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Дозволете <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> да пристапува до <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"часовник"</string> <string name="chooser_title" msgid="2262294130493605839">"Изберете <xliff:g id="PROFILE_NAME">%1$s</xliff:g> со којшто ќе управува <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Апликацијата е потребна за управување со вашиот <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ќе може да ги синхронизира податоците како што се имињата на јавувачите, да остварува интеракција со известувањата и да пристапува до дозволите за „Телефон“, SMS, „Контакти“, „Календар“, „Евиденција на повици“ и „Уреди во близина“."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Апликацијата е потребна за управување со вашиот <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ќе има дозвола да ги синхронизира податоците како што се имињата на јавувачите и да пристапува до следниве дозволи:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Ќе дозволите <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> да управува со <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"очила"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Апликацијава е потребна за управување со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ќе може да остварува интеракција со известувањата и да пристапува до дозволите за „Телефон“, SMS, „Контакти“, „Микрофон“ и „Уреди во близина“."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Апликацијава ќе може да пристапува до овие дозволи на телефонот:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Овозможете <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> да пристапува до овие податоци на телефонот"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Повеќенаменски услуги"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> бара дозвола во име на вашиот <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> за да стримува апликации помеѓу вашите уреди"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Ќе дозволите <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> да го преземе ова дејство?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> бара дозвола во име на вашиот <xliff:g id="DEVICE_NAME">%2$s</xliff:g> за да стримува апликации и други системски карактеристики на уредите во близина"</string> <string name="profile_name_generic" msgid="6851028682723034988">"уред"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Оваа апликација ќе може да ги синхронизира податоците како што се имињата на јавувачите помеѓу вашиот телефон и <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Оваа апликација ќе може да ги синхронизира податоците како што се имињата на јавувачите помеѓу вашиот телефон и избраниот уред."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Дозволи"</string> <string name="consent_no" msgid="2640796915611404382">"Не дозволувај"</string> <string name="consent_back" msgid="2560683030046918882">"Назад"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Стримувајте ги апликациите на телефонот"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Апликации за стриминг и други системски карактеристики од вашиот телефон"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ml/strings.xml b/packages/CompanionDeviceManager/res/values-ml/strings.xml index 99219e24083c..f86897c472b5 100644 --- a/packages/CompanionDeviceManager/res/values-ml/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ml/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"കമ്പാനിയൻ ഉപകരണ മാനേജർ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ആക്സസ് ചെയ്യാൻ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> എന്നതിനെ അനുവദിക്കുക"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"വാച്ച്"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ഉപയോഗിച്ച് മാനേജ് ചെയ്യുന്നതിന് ഒരു <xliff:g id="PROFILE_NAME">%1$s</xliff:g> തിരഞ്ഞെടുക്കുക"</string> - <string name="summary_watch" msgid="6566922405914995759">"നിങ്ങളുടെ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യാൻ ആപ്പ് ആവശ്യമാണ്. വിളിക്കുന്നയാളുടെ പേര് പോലുള്ള വിവരങ്ങൾ സമന്വയിപ്പിക്കുന്നതിനും നിങ്ങളുടെ അറിയിപ്പുകളുമായി സംവദിക്കാനും നിങ്ങളുടെ ഫോൺ, SMS, Contacts, Calendar, കോൾ ചരിത്രം, സമീപമുള്ള ഉപകരണങ്ങളുടെ അനുമതികൾ എന്നിവ ആക്സസ് ചെയ്യാനും <xliff:g id="APP_NAME">%2$s</xliff:g> ആപ്പിനെ അനുവദിക്കും."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"നിങ്ങളുടെ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യാൻ ആപ്പ് ആവശ്യമാണ്. വിളിക്കുന്നയാളുടെ പേര് പോലുള്ള വിവരങ്ങൾ സമന്വയിപ്പിക്കുന്നതിനും ഈ അനുമതികൾ ആക്സസ് ചെയ്യുന്നതിനും <xliff:g id="APP_NAME">%2$s</xliff:g> എന്നതിനെ അനുവദിക്കും:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>? മാനേജ് ചെയ്യാൻ, <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> എന്നതിനെ അനുവദിക്കുക"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ഗ്ലാസുകൾ"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യാൻ ഈ ആപ്പ് ആവശ്യമാണ്. നിങ്ങളുടെ അറിയിപ്പുകളുമായി ഇടപഴകാനും ഫോൺ, SMS, കോൺടാക്റ്റുകൾ, മൈക്രോഫോൺ, സമീപമുള്ള ഉപകരണങ്ങളുടെ അനുമതികൾ എന്നിവ ആക്സസ് ചെയ്യാനും <xliff:g id="APP_NAME">%2$s</xliff:g> എന്നതിനെ അനുവദിക്കും."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"നിങ്ങളുടെ ഫോണിൽ ഇനിപ്പറയുന്ന അനുമതികൾ ആക്സസ് ചെയ്യാൻ ഈ ആപ്പിനെ അനുവദിക്കും:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"നിങ്ങളുടെ ഫോണിൽ നിന്ന് ഈ വിവരങ്ങൾ ആക്സസ് ചെയ്യാൻ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ആപ്പിനെ അനുവദിക്കുക"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ക്രോസ്-ഉപകരണ സേവനങ്ങൾ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"നിങ്ങളുടെ ഉപകരണങ്ങളിൽ ഒന്നിൽ നിന്ന് അടുത്തതിലേക്ക് ആപ്പുകൾ സ്ട്രീം ചെയ്യാൻ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ഉപകരണത്തിന് വേണ്ടി <xliff:g id="APP_NAME">%1$s</xliff:g> അനുമതി അഭ്യർത്ഥിക്കുന്നു"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"ഈ പ്രവർത്തനം നടത്താൻ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> എന്നതിനെ അനുവദിക്കണോ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"സമീപമുള്ള ഉപകരണങ്ങളിൽ ആപ്പുകളും മറ്റ് സിസ്റ്റം ഫീച്ചറുകളും സ്ട്രീം ചെയ്യാൻ നിങ്ങളുടെ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> എന്നതിന് വേണ്ടി <xliff:g id="APP_NAME">%1$s</xliff:g> അനുമതി അഭ്യർത്ഥിക്കുന്നു"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ഉപകരണം"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"വിളിക്കുന്നയാളുടെ പേര് പോലുള്ള വിവരങ്ങൾ നിങ്ങളുടെ ഫോണിനും <xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതിനും ഇടയിൽ സമന്വയിപ്പിക്കുന്നതിന് ഈ ആപ്പിന് കഴിയും."</string> - <string name="summary_generic" msgid="4988130802522924650">"വിളിക്കുന്നയാളുടെ പേര് പോലുള്ള വിവരങ്ങൾ നിങ്ങളുടെ ഫോണിനും തിരഞ്ഞെടുത്ത ഉപകരണത്തിനും ഇടയിൽ സമന്വയിപ്പിക്കുന്നതിന് ഈ ആപ്പിന് കഴിയും."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"അനുവദിക്കുക"</string> <string name="consent_no" msgid="2640796915611404382">"അനുവദിക്കരുത്"</string> <string name="consent_back" msgid="2560683030046918882">"മടങ്ങുക"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"നിങ്ങളുടെ ഫോണിലെ ആപ്പുകൾ സ്ട്രീം ചെയ്യുക"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"നിങ്ങളുടെ ഫോണിൽ നിന്ന് ആപ്പുകളും മറ്റ് സിസ്റ്റം ഫീച്ചറുകളും സ്ട്രീം ചെയ്യാം"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-mn/strings.xml b/packages/CompanionDeviceManager/res/values-mn/strings.xml index e4d658ff7dde..1d29cdef2c28 100644 --- a/packages/CompanionDeviceManager/res/values-mn/strings.xml +++ b/packages/CompanionDeviceManager/res/values-mn/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>-д <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>-д хандахыг зөвшөөрнө үү"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"цаг"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>-н удирдах<xliff:g id="PROFILE_NAME">%1$s</xliff:g>-г сонгоно уу"</string> - <string name="summary_watch" msgid="6566922405914995759">"Энэ апп таны <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г удирдахад шаардлагатай. <xliff:g id="APP_NAME">%2$s</xliff:g>-д залгаж буй хүний нэр зэрэг мэдээллийг синк хийх, таны мэдэгдэлтэй харилцан үйлдэл хийх, Утас, SMS, Харилцагчид, Календарь, Дуудлагын жагсаалт болон Ойролцоох төхөөрөмжүүдийн зөвшөөрөлд хандахыг зөвшөөрнө."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Энэ апп таны <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г удирдахад шаардлагатай. <xliff:g id="APP_NAME">%2$s</xliff:g>-д залгаж буй хүний нэр зэрэг мэдээллийг синк хийх болон эдгээр зөвшөөрөлд хандахыг зөвшөөрнө:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>-д <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>-г удирдахыг зөвшөөрөх үү?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"нүдний шил"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Энэ апп <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г удирдахад шаардлагатай. <xliff:g id="APP_NAME">%2$s</xliff:g>-д таны мэдэгдэлтэй харилцан үйлдэл хийх, Утас, SMS, Харилцагчид, Микрофон болон Ойролцоох төхөөрөмжүүдийн зөвшөөрөлд хандахыг зөвшөөрнө."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Энэ апп таны утасны эдгээр зөвшөөрөлд хандах эрхтэй байх болно:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>-д таны утаснаас энэ мэдээлэлд хандахыг зөвшөөрнө үү"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Төхөөрөмж хоорондын үйлчилгээ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Таны төхөөрөмжүүд хооронд апп дамжуулахын тулд <xliff:g id="APP_NAME">%1$s</xliff:g> таны <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>-н өмнөөс зөвшөөрөл хүсэж байна"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>-д энэ үйлдлийг хийхийг зөвшөөрөх үү?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> таны <xliff:g id="DEVICE_NAME">%2$s</xliff:g>-н өмнөөс аппууд болон системийн бусад онцлогийг ойролцоох төхөөрөмжүүд рүү дамжуулах зөвшөөрөл хүсэж байна"</string> <string name="profile_name_generic" msgid="6851028682723034988">"төхөөрөмж"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Энэ апп залгаж буй хүний нэр зэрэг мэдээллийг таны утас болон <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-н хооронд синк хийх боломжтой болно."</string> - <string name="summary_generic" msgid="4988130802522924650">"Энэ апп залгаж буй хүний нэр зэрэг мэдээллийг таны утас болон сонгосон төхөөрөмжийн хооронд синк хийх боломжтой болно."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Зөвшөөрөх"</string> <string name="consent_no" msgid="2640796915611404382">"Бүү зөвшөөр"</string> <string name="consent_back" msgid="2560683030046918882">"Буцах"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Утасныхаа аппуудыг дамжуулаарай"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Утаснаасаа аппууд болон системийн бусад онцлогийг дамжуулаарай"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-mr/strings.xml b/packages/CompanionDeviceManager/res/values-mr/strings.xml index c7edf743ff98..9c082a46584b 100644 --- a/packages/CompanionDeviceManager/res/values-mr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-mr/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"सहयोगी डिव्हाइस व्यवस्थापक"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ला <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> अॅक्सेस करण्याची अनुमती द्या"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"वॉच"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> द्वारे व्यवस्थापित करण्यासाठी <xliff:g id="PROFILE_NAME">%1$s</xliff:g> निवडा"</string> - <string name="summary_watch" msgid="6566922405914995759">"तुमचे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> व्यवस्थापित करण्यासाठी हे ॲप आवश्यक आहे. <xliff:g id="APP_NAME">%2$s</xliff:g> ला कॉल करत असलेल्या एखाद्या व्यक्तीचे नाव यासारखी माहिती सिंक करण्याची, तुमच्या सूचनांसोबत संवाद साधण्याची आणि तुमचा फोन, एसएमएस, संपर्क, कॅलेंडर, कॉल लॉग व जवळपासच्या डिव्हाइसच्या परवानग्या अॅक्सेस करण्याची अनुमती मिळेल."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"तुमचे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> व्यवस्थापित करण्यासाठी हे ॲप आवश्यक आहे. <xliff:g id="APP_NAME">%2$s</xliff:g> ला कॉल करत असलेल्या एखाद्या व्यक्तीचे नाव यासारखी माहिती सिंक करण्याची आणि पुढील परवानग्या अॅक्सेस करण्याची अनुमती मिळेल:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ला <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> व्यवस्थापित करण्याची अनुमती द्यायची आहे?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"Glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> व्यवस्थापित करण्यासाठी हे ॲप आवश्यक आहे. <xliff:g id="APP_NAME">%2$s</xliff:g> ला तुमच्या सूचनांसोबत संवाद साधण्याची आणि तुमचा फोन, एसएमएस, संपर्क, मायक्रोफोन व जवळपासच्या डिव्हाइसच्या परवानग्या अॅक्सेस करण्याची अनुमती मिळेल."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"या अॅपला तुमच्या फोनवर या परवानग्या अॅक्सेस करण्याची अनुमती दिली जाईल:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ला ही माहिती तुमच्या फोनवरून अॅक्सेस करण्यासाठी अनुमती द्या"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"क्रॉस-डिव्हाइस सेवा"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"तुमच्या डिव्हाइसदरम्यान ॲप्स स्ट्रीम करण्यासाठी <xliff:g id="APP_NAME">%1$s</xliff:g> हे तुमच्या <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> च्या वतीने परवानगीची विनंती करत आहे"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ला ही कृती करण्याची अनुमती द्यायची आहे का?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> हे जवळपासच्या डिव्हाइसवर अॅप्स आणि इतर सिस्टीम वैशिष्ट्ये स्ट्रीम करण्यासाठी तुमच्या <xliff:g id="DEVICE_NAME">%2$s</xliff:g> च्या वतीने परवानगीची विनंती करा"</string> <string name="profile_name_generic" msgid="6851028682723034988">"डिव्हाइस"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"हे ॲप तुमचा फोन आणि <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दरम्यान कॉल करत असलेल्या एखाद्या व्यक्तीचे नाव यासारखी माहिती सिंक करू शकेल."</string> - <string name="summary_generic" msgid="4988130802522924650">"हे ॲप तुमचा फोन आणि निवडलेल्या डिव्हाइसदरम्यान कॉल करत असलेल्या एखाद्या व्यक्तीचे नाव यासारखी माहिती सिंक करू शकेल."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"अनुमती द्या"</string> <string name="consent_no" msgid="2640796915611404382">"अनुमती देऊ नका"</string> <string name="consent_back" msgid="2560683030046918882">"मागे जा"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"तुमच्या फोनवरील ॲप्स स्ट्रीम करा"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"तुमच्या फोनवरून अॅप्स आणि इतर सिस्टीम वैशिष्ट्ये स्ट्रीम करा"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ms/strings.xml b/packages/CompanionDeviceManager/res/values-ms/strings.xml index 75894177faa5..69f3c85de963 100644 --- a/packages/CompanionDeviceManager/res/values-ms/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ms/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Pengurus Peranti Rakan"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Benarkan <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> untuk mengakses <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"jam tangan"</string> <string name="chooser_title" msgid="2262294130493605839">"Pilih <xliff:g id="PROFILE_NAME">%1$s</xliff:g> untuk diurus oleh <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Apl ini diperlukan untuk mengurus <xliff:g id="DEVICE_NAME">%1$s</xliff:g> anda. <xliff:g id="APP_NAME">%2$s</xliff:g> akan dibenarkan untuk menyegerakkan maklumat seperti nama individu yang memanggil, berinteraksi dengan pemberitahuan anda dan mengakses kebenaran Telefon, SMS, Kenalan, Kalendar, Log panggilan dan Peranti berdekatan anda."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Apl ini diperlukan untuk mengurus <xliff:g id="DEVICE_NAME">%1$s</xliff:g> anda. <xliff:g id="APP_NAME">%2$s</xliff:g> akan dibenarkan untuk menyegerakkan maklumat seperti nama individu yang memanggil dan mengakses kebenaran ini:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Benarkan <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> mengurus <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"cermin mata"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Apl ini diperlukan untuk mengurus <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> akan dibenarkan untuk berinteraksi dengan pemberitahuan anda dan mengakses kebenaran Telefon, SMS, Kenalan, Mikrofon dan Peranti berdekatan anda."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Apl ini akan dibenarkan untuk mengakses kebenaran yang berikut pada telefon anda:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Benarkan <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> mengakses maklumat ini daripada telefon anda"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Perkhidmatan silang peranti"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang meminta kebenaran bagi pihak <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> anda untuk menstrim apl antara peranti anda"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Benarkan <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> mengambil tindakan ini?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang meminta kebenaran bagi pihak <xliff:g id="DEVICE_NAME">%2$s</xliff:g> anda untuk menstrim apl dan ciri sistem yang lain pada peranti berdekatan"</string> <string name="profile_name_generic" msgid="6851028682723034988">"peranti"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Apl ini akan dapat menyegerakkan maklumat seperti nama individu yang memanggil, antara telefon anda dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Apl ini akan dapat menyegerakkan maklumat seperti nama individu yang memanggil, antara telefon anda dengan peranti yang dipilih."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Benarkan"</string> <string name="consent_no" msgid="2640796915611404382">"Jangan benarkan"</string> <string name="consent_back" msgid="2560683030046918882">"Kembali"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Strim apl telefon anda"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Strim apl dan ciri sistem yang lain daripada telefon anda"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-my/strings.xml b/packages/CompanionDeviceManager/res/values-my/strings.xml index 91ac47a19ebb..ebd63574d95e 100644 --- a/packages/CompanionDeviceManager/res/values-my/strings.xml +++ b/packages/CompanionDeviceManager/res/values-my/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"တွဲဖက်ကိရိယာ မန်နေဂျာ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ကို သုံးရန် <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ကို ခွင့်ပြုပါ"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"နာရီ"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> က စီမံခန့်ခွဲရန် <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ကို ရွေးချယ်ပါ"</string> - <string name="summary_watch" msgid="6566922405914995759">"သင်၏ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို စီမံခန့်ခွဲရန် ဤအက်ပ်လိုအပ်သည်။ ခေါ်ဆိုသူ၏အမည်ကဲ့သို့ အချက်အလက်ကို စင့်ခ်လုပ်ရန်၊ သင်၏ဖုန်း၊ SMS စာတိုစနစ်၊ အဆက်အသွယ်များ၊ ပြက္ခဒိန်၊ ခေါ်ဆိုမှတ်တမ်းနှင့် အနီးတစ်ဝိုက်ရှိ စက်များဆိုင်ရာ ခွင့်ပြုချက်များသုံးရန်၊ အကြောင်းကြားချက်များနှင့် ပြန်လှန်တုံ့ပြန်ရန် <xliff:g id="APP_NAME">%2$s</xliff:g> ကို ခွင့်ပြုမည်။"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"သင်၏ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို စီမံခန့်ခွဲရန် ဤအက်ပ်လိုအပ်သည်။ ခေါ်ဆိုသူ၏အမည်ကဲ့သို့ အချက်အလက်ကို စင့်ခ်လုပ်ရန်နှင့် ဤခွင့်ပြုချက်များသုံးရန် <xliff:g id="APP_NAME">%2$s</xliff:g> ကို ခွင့်ပြုမည်-"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ကို <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> အား စီမံခွင့်ပြုမလား။"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"မျက်မှန်"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို စီမံခန့်ခွဲရန် ဤအက်ပ်လိုအပ်သည်။ သင်၏ဖုန်း၊ SMS စာတိုစနစ်၊ အဆက်အသွယ်များ၊ မိုက်ခရိုဖုန်းနှင့် အနီးတစ်ဝိုက်ရှိ စက်များဆိုင်ရာ ခွင့်ပြုချက်များသုံးရန်၊ အကြောင်းကြားချက်များနှင့် ပြန်လှန်တုံ့ပြန်ရန် <xliff:g id="APP_NAME">%2$s</xliff:g> ကို ခွင့်ပြုမည်။"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ဤအက်ပ်သည် သင့်ဖုန်းတွင် ဤခွင့်ပြုချက်များကို သုံးခွင့်ရပါမည်-"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ကို သင့်ဖုန်းမှ ဤအချက်အလက် သုံးခွင့်ပြုမည်"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"စက်များကြားသုံး ဝန်ဆောင်မှုများ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> သည် သင်၏စက်များအကြား အက်ပ်များတိုက်ရိုက်လွှင့်ရန် <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ကိုယ်စား ခွင့်ပြုချက်တောင်းနေသည်"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ကို ဤသို့လုပ်ဆောင်ခွင့်ပြုမလား။"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> သည် အနီးတစ်ဝိုက်ရှိ အက်ပ်များနှင့် အခြားစနစ်အင်္ဂါရပ်များကို တိုက်ရိုက်ဖွင့်ရန် သင့် <xliff:g id="DEVICE_NAME">%2$s</xliff:g> ကိုယ်စား ခွင့်ပြုချက်တောင်းနေသည်"</string> <string name="profile_name_generic" msgid="6851028682723034988">"စက်"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ဤအက်ပ်သည် သင့်ဖုန်းနှင့် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> အကြား ခေါ်ဆိုသူ၏အမည်ကဲ့သို့ အချက်အလက်ကို စင့်ခ်လုပ်နိုင်ပါမည်။"</string> - <string name="summary_generic" msgid="4988130802522924650">"ဤအက်ပ်သည် သင့်ဖုန်းနှင့် ရွေးထားသောစက်အကြား ခေါ်ဆိုသူ၏အမည်ကဲ့သို့ အချက်အလက်ကို စင့်ခ်လုပ်နိုင်ပါမည်။"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ခွင့်ပြုရန်"</string> <string name="consent_no" msgid="2640796915611404382">"ခွင့်မပြုပါ"</string> <string name="consent_back" msgid="2560683030046918882">"နောက်သို့"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"သင့်ဖုန်းရှိအက်ပ်များကို တိုက်ရိုက်ဖွင့်နိုင်သည်"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"သင့်ဖုန်းမှ အက်ပ်များနှင့် အခြားစနစ်အင်္ဂါရပ်များကို တိုက်ရိုက်ဖွင့်သည်"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-nb/strings.xml b/packages/CompanionDeviceManager/res/values-nb/strings.xml index 60be2456b94a..4801c8ce8a62 100644 --- a/packages/CompanionDeviceManager/res/values-nb/strings.xml +++ b/packages/CompanionDeviceManager/res/values-nb/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Tillat at <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> bruker <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"klokke"</string> <string name="chooser_title" msgid="2262294130493605839">"Velg <xliff:g id="PROFILE_NAME">%1$s</xliff:g> som skal administreres av <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Appen kreves for å administrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tillatelse til å synkronisere informasjon som navnet til noen som ringer, og samhandle med varslene dine, og får tilgang til tillatelsene for telefon, SMS, kontakter, kalender, samtalelogger og enheter i nærheten."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Appen kreves for å administrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tillatelse til å synkronisere informasjon som navnet til noen som ringer, og kan bruke disse tillatelsene:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Vil du la <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> administrere <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"briller"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Denne appen kreves for å administrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tilgang til varslene dine og får tillatelsene for telefon, SMS, kontakter, mikrofon og enheter i nærheten."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Denne appen får disse tillatelsene på telefonen din:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Gi <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> tilgang til denne informasjonen fra telefonen din"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Tjenester på flere enheter"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> ber om tillatelse til å strømme apper mellom enhetene dine, på vegne av <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vil du la <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> gjøre dette?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ber om tillatelse på vegne av <xliff:g id="DEVICE_NAME">%2$s</xliff:g> til å strømme apper og andre systemfunksjoner til enheter i nærheten"</string> <string name="profile_name_generic" msgid="6851028682723034988">"enhet"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Denne appen kan synkronisere informasjon som navnet til noen som ringer, mellom telefonen og <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Denne appen kan synkronisere informasjon som navnet til noen som ringer, mellom telefonen og den valgte enheten."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Tillat"</string> <string name="consent_no" msgid="2640796915611404382">"Ikke tillat"</string> <string name="consent_back" msgid="2560683030046918882">"Tilbake"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Strøm appene på telefonen"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Strøm apper og andre systemfunksjoner fra telefonen"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ne/strings.xml b/packages/CompanionDeviceManager/res/values-ne/strings.xml index 6e51cd0584db..71b7695ab4b9 100644 --- a/packages/CompanionDeviceManager/res/values-ne/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ne/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"सहयोगी डिभाइसको प्रबन्धक"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> लाई <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> प्रयोग गर्ने अनुमति दिनुहोस्"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"घडी"</string> <string name="chooser_title" msgid="2262294130493605839">"आफूले <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> प्रयोग गरी व्यवस्थापन गर्न चाहेको <xliff:g id="PROFILE_NAME">%1$s</xliff:g> चयन गर्नुहोस्"</string> - <string name="summary_watch" msgid="6566922405914995759">"तपाईंको <xliff:g id="DEVICE_NAME">%1$s</xliff:g> व्यवस्थापन गर्न यो एप चाहिन्छ। <xliff:g id="APP_NAME">%2$s</xliff:g> लाई कल गर्ने व्यक्तिको नाम जस्ता जानकारी सिंक गर्ने, तपाईंका सूचना हेर्ने र फोन, SMS, कन्ट्याक्ट, पात्रो, कल लग तथा नजिकैका डिभाइससम्बन्धी अनुमतिहरू हेर्ने तथा प्रयोग गर्ने अनुमति दिइने छ।"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"तपाईंको <xliff:g id="DEVICE_NAME">%1$s</xliff:g> व्यवस्थापन गर्न यो एप चाहिन्छ। <xliff:g id="APP_NAME">%2$s</xliff:g> लाई कल गर्ने व्यक्तिको नाम जस्ता जानकारी सिंक गर्ने र यी अनुमतिहरू हेर्ने तथा प्रयोग गर्ने अनुमति दिइने छ:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> लाई <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> व्यवस्थापन गर्ने अनुमति दिने हो?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"चस्मा"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> व्यवस्थापन गर्न यो एप चाहिन्छ। <xliff:g id="APP_NAME">%2$s</xliff:g> लाई तपाईंका सूचना हेर्ने र फोन, SMS, कन्ट्याक्ट, माइक्रोफोन तथा नजिकैका डिभाइससम्बन्धी अनुमतिहरू हेर्ने तथा प्रयोग गर्ने अनुमति दिइने छ।"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"तपाईंको फोनमा यो एपलाई निम्न अनुमति दिइने छ:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> लाई तपाईंको फोनमा भएको यो जानकारी हेर्ने तथा प्रयोग गर्ने अनुमति दिनुहोस्"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"क्रस-डिभाइस सेवाहरू"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> तपाईंको डिभाइस <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> को तर्फबाट तपाईंका कुनै एउटा डिभाइसबाट अर्को डिभाइसमा एप स्ट्रिम गर्ने अनुमति माग्दै छ"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> लाई यो कार्य गर्ने अनुमति दिने हो?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> तपाईंको डिभाइस <xliff:g id="DEVICE_NAME">%2$s</xliff:g> को तर्फबाट नजिकैका डिभाइसहरूमा एप र सिस्टमका अन्य सुविधाहरू स्ट्रिम गर्ने अनुमति माग्दै छ"</string> <string name="profile_name_generic" msgid="6851028682723034988">"यन्त्र"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"यो एपले तपाईंको फोन र तपाईंले छनौट गर्ने <xliff:g id="DEVICE_NAME">%1$s</xliff:g> का बिचमा कल गर्ने व्यक्तिको नाम जस्ता जानकारी सिंक गर्न सक्ने छ।"</string> - <string name="summary_generic" msgid="4988130802522924650">"यो एपले तपाईंको फोन र तपाईंले छनौट गर्ने डिभाइसका बिचमा कल गर्ने व्यक्तिको नाम जस्ता जानकारी सिंक गर्न सक्ने छ।"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"अनुमति दिनुहोस्"</string> <string name="consent_no" msgid="2640796915611404382">"अनुमति नदिनुहोस्"</string> <string name="consent_back" msgid="2560683030046918882">"पछाडि"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"आफ्नो फोनका एपहरू प्रयोग गर्नुहोस्"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"आफ्नो फोनबाट एप र सिस्टमका अन्य सुविधाहरू स्ट्रिम गर्नुहोस्"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-nl/strings.xml b/packages/CompanionDeviceManager/res/values-nl/strings.xml index 628379b64c68..d953a951f288 100644 --- a/packages/CompanionDeviceManager/res/values-nl/strings.xml +++ b/packages/CompanionDeviceManager/res/values-nl/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> toegang geven tot <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"smartwatch"</string> <string name="chooser_title" msgid="2262294130493605839">"Een <xliff:g id="PROFILE_NAME">%1$s</xliff:g> kiezen om te beheren met <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"De app is nodig om je <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te beheren. <xliff:g id="APP_NAME">%2$s</xliff:g> mag informatie (zoals de naam van iemand die belt) synchroniseren, interactie hebben met je meldingen en krijgt toegang tot de rechten Telefoon, Sms, Contacten, Agenda, Gesprekslijsten en Apparaten in de buurt."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"De app is nodig om je <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te beheren. <xliff:g id="APP_NAME">%2$s</xliff:g> mag informatie (zoals de naam van iemand die belt) synchroniseren en krijgt toegang tot deze rechten:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> toestaan <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> te beheren?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"brillen"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Deze app is nodig om <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te beheren. <xliff:g id="APP_NAME">%2$s</xliff:g> mag interactie hebben met je meldingen en krijgt toegang tot de rechten Telefoon, Sms, Contacten, Microfoon en Apparaten in de buurt."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Deze app krijgt toegang tot deze rechten op je telefoon:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> toegang geven tot deze informatie op je telefoon"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device-services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> vraagt namens jouw <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> toestemming om apps te streamen tussen je apparaten"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Toestaan dat <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> deze actie uitvoert?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> vraagt namens je <xliff:g id="DEVICE_NAME">%2$s</xliff:g> toestemming om apps en andere systeemfuncties naar apparaten in de buurt te streamen"</string> <string name="profile_name_generic" msgid="6851028682723034988">"apparaat"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Deze app kan informatie, zoals de naam van iemand die belt, synchroniseren tussen je telefoon en <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Deze app kan informatie (zoals de naam van iemand die belt) synchroniseren tussen je telefoon en het gekozen apparaat."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Toestaan"</string> <string name="consent_no" msgid="2640796915611404382">"Niet toestaan"</string> <string name="consent_back" msgid="2560683030046918882">"Terug"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Stream de apps van je telefoon"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Apps en andere systeemfuncties streamen vanaf je telefoon"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-or/strings.xml b/packages/CompanionDeviceManager/res/values-or/strings.xml index ba61866f1fda..f9a5c304227a 100644 --- a/packages/CompanionDeviceManager/res/values-or/strings.xml +++ b/packages/CompanionDeviceManager/res/values-or/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"ସହଯୋଗୀ ଡିଭାଇସ୍ ପରିଚାଳକ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>କୁ ଆକ୍ସେସ କରିବା ପାଇଁ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ୱାଚ୍"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ଦ୍ୱାରା ପରିଚାଳିତ ହେବା ପାଇଁ ଏକ <xliff:g id="PROFILE_NAME">%1$s</xliff:g>କୁ ବାଛନ୍ତୁ"</string> - <string name="summary_watch" msgid="6566922405914995759">"ଆପଣଙ୍କ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ପରିଚାଳନା କରିବା ପାଇଁ ଆପ ଆବଶ୍ୟକ। କଲ କରୁଥିବା ଯେ କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ନାମ ପରି ସୂଚନା ସିଙ୍କ କରିବା, ଆପଣଙ୍କ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ସହ ଇଣ୍ଟରାକ୍ଟ କରିବା ଏବଂ ଆପଣଙ୍କର ଫୋନ, SMS, କଣ୍ଟାକ୍ଟ, କେଲେଣ୍ଡର, କଲ ଲଗ ଓ ଆଖପାଖର ଡିଭାଇସ ଅନୁମତିଗୁଡ଼ିକୁ ଆକ୍ସେସ କରିବା ପାଇଁ <xliff:g id="APP_NAME">%2$s</xliff:g>କୁ ଅନୁମତି ଦିଆଯିବ।"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ଆପଣଙ୍କ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ପରିଚାଳନା କରିବା ପାଇଁ ଆପ ଆବଶ୍ୟକ। କଲ କରୁଥିବା ଯେ କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ନାମ ପରି ସୂଚନା ସିଙ୍କ କରିବା ଏବଂ ଏହି ଅନୁମତିଗୁଡ଼ିକୁ ଆକ୍ସେସ କରିବା ପାଇଁ <xliff:g id="APP_NAME">%2$s</xliff:g>କୁ ଅନୁମତି ଦିଆଯିବ:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>କୁ ପରିଚାଳନା କରିବା ପାଇଁ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>କୁ ଅନୁମତି ଦେବେ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ଚଷମା"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ପରିଚାଳନା କରିବା ପାଇଁ ଏହି ଆପ ଆବଶ୍ୟକ। ଆପଣଙ୍କ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ସହ ଇଣ୍ଟରାକ୍ଟ କରିବା ଏବଂ ଆପଣଙ୍କର ଫୋନ, SMS, କଣ୍ଟାକ୍ଟ, ମାଇକ୍ରୋଫୋନ ଓ ଆଖପାଖର ଡିଭାଇସ ଅନୁମତିଗୁଡ଼ିକୁ ଆକ୍ସେସ କରିବା ପାଇଁ <xliff:g id="APP_NAME">%2$s</xliff:g>କୁ ଅନୁମତି ଦିଆଯିବ।"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ଆପଣଙ୍କ ଫୋନରେ ଏହି ଅନୁମତିଗୁଡ଼ିକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ଏହି ଆପକୁ ଅନୁମତି ଦିଆଯିବ:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"ଆପଣଙ୍କ ଫୋନରୁ ଏହି ସୂଚନାକୁ ଆକ୍ସେସ କରିବା ପାଇଁ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"କ୍ରସ-ଡିଭାଇସ ସେବାଗୁଡ଼ିକ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"ଆପଣଙ୍କ ଡିଭାଇସଗୁଡ଼ିକ ମଧ୍ୟରେ ଆପ୍ସକୁ ଷ୍ଟ୍ରିମ କରିବା ପାଇଁ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କର <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ତରଫରୁ ଅନୁମତି ପାଇଁ ଅନୁରୋଧ କରୁଛି"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"ଏହି ପଦକ୍ଷେପ ନେବା ପାଇଁ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>କୁ ଅନୁମତି ଦେବେ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"ଆଖପାଖର ଡିଭାଇସଗୁଡ଼ିକରେ ଆପ୍ସ ଏବଂ ଅନ୍ୟ ସିଷ୍ଟମ ଫିଚରଗୁଡ଼ିକୁ ଷ୍ଟ୍ରିମ କରିବା ପାଇଁ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> ତରଫରୁ ଅନୁମତି ପାଇଁ ଅନୁରୋଧ କରୁଛି"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ଡିଭାଇସ୍"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ଆପଣଙ୍କ ଫୋନ ଏବଂ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ମଧ୍ୟରେ, କଲ କରୁଥିବା ଯେ କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ନାମ ପରି ସୂଚନା ସିଙ୍କ କରିବାକୁ ଏହି ଆପ ସକ୍ଷମ ହେବ।"</string> - <string name="summary_generic" msgid="4988130802522924650">"ଆପଣଙ୍କ ଫୋନ ଏବଂ ବଛାଯାଇଥିବା ଡିଭାଇସ ମଧ୍ୟରେ, କଲ କରୁଥିବା ଯେ କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ନାମ ପରି ସୂଚନା ସିଙ୍କ କରିବାକୁ ଏହି ଆପ ସକ୍ଷମ ହେବ।"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="consent_no" msgid="2640796915611404382">"ଅନୁମତି ଦିଅନ୍ତୁ ନାହିଁ"</string> <string name="consent_back" msgid="2560683030046918882">"ପଛକୁ ଫେରନ୍ତୁ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"ଆପଣଙ୍କ ଫୋନର ଆପ୍ସକୁ ଷ୍ଟ୍ରିମ କରନ୍ତୁ"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ଆପଣଙ୍କ ଫୋନରୁ ଆପ୍ସ ଏବଂ ଅନ୍ୟ ସିଷ୍ଟମ ଫିଚରଗୁଡ଼ିକୁ ଷ୍ଟ୍ରିମ କରନ୍ତୁ"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-pa/strings.xml b/packages/CompanionDeviceManager/res/values-pa/strings.xml index 7dd03c28d83a..b6b8b290f584 100644 --- a/packages/CompanionDeviceManager/res/values-pa/strings.xml +++ b/packages/CompanionDeviceManager/res/values-pa/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਪ੍ਰਬੰਧਕ"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ਨੂੰ <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ਸਮਾਰਟ-ਵਾਚ"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ ਕੀਤੇ ਜਾਣ ਲਈ <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ਚੁਣੋ"</string> - <string name="summary_watch" msgid="6566922405914995759">"ਇਹ ਐਪ ਤੁਹਾਡੇ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਲਈ ਲੋੜੀਂਦੀ ਹੈ। <xliff:g id="APP_NAME">%2$s</xliff:g> ਨੂੰ ਕਾਲਰ ਦੇ ਨਾਮ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿੰਕ ਕਰਨ, ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਨਾਲ ਅੰਤਰਕਿਰਿਆ ਕਰਨ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ, SMS, ਸੰਪਰਕਾਂ, ਕੈਲੰਡਰ, ਕਾਲ ਲੌਗਾਂ ਅਤੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਸੰਬੰਧੀ ਇਜਾਜ਼ਤਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਹੋਵੇਗੀ।"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ਇਹ ਐਪ ਤੁਹਾਡੇ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਲਈ ਲੋੜੀਂਦੀ ਹੈ। <xliff:g id="APP_NAME">%2$s</xliff:g> ਨੂੰ ਕਾਲਰ ਦੇ ਨਾਮ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿੰਕ ਕਰਨ ਅਤੇ ਇਨ੍ਹਾਂ ਇਜਾਜ਼ਤਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਹੋਵੇਗੀ:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"ਕੀ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ਨੂੰ <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ਐਨਕਾਂ"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"ਇਹ ਐਪ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਲਈ ਲੋੜੀਂਦੀ ਹੈ। <xliff:g id="APP_NAME">%2$s</xliff:g> ਨੂੰ ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਨਾਲ ਅੰਤਰਕਿਰਿਆ ਕਰਨ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ, SMS, ਸੰਪਰਕਾਂ, ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਅਤੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਸੰਬੰਧੀ ਇਜਾਜ਼ਤਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਹੋਵੇਗੀ।"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਇਨ੍ਹਾਂ ਇਜਾਜ਼ਤਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਹੋਵੇਗੀ:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ਨੂੰ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੋਂ ਇਸ ਜਾਣਕਾਰੀ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"ਕ੍ਰਾਸ-ਡੀਵਾਈਸ ਸੇਵਾਵਾਂ"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਤੁਹਾਡੇ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> ਦੀ ਤਰਫ਼ੋਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸਾਂ ਵਿਚਕਾਰ ਐਪਾਂ ਨੂੰ ਸਟ੍ਰੀਮ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਮੰਗ ਰਹੀ ਹੈ"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"ਕੀ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ਨੂੰ ਇਹ ਕਾਰਵਾਈ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਤੁਹਾਡੇ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> ਦੀ ਤਰਫ਼ੋਂ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ \'ਤੇ ਐਪਾਂ ਅਤੇ ਹੋਰ ਸਿਸਟਮ ਸੰਬੰਧੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਟ੍ਰੀਮ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਮੰਗ ਰਹੀ ਹੈ"</string> <string name="profile_name_generic" msgid="6851028682723034988">"ਡੀਵਾਈਸ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਅਤੇ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਵਿਚਕਾਰ ਕਾਲਰ ਦੇ ਨਾਮ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿੰਕ ਕਰ ਸਕੇਗੀ।"</string> - <string name="summary_generic" msgid="4988130802522924650">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਅਤੇ ਚੁਣੇ ਗਏ ਡੀਵਾਈਸ ਵਿਚਕਾਰ ਕਾਲਰ ਦੇ ਨਾਮ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿੰਕ ਕਰ ਸਕੇਗੀ।"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ਆਗਿਆ ਦਿਓ"</string> <string name="consent_no" msgid="2640796915611404382">"ਆਗਿਆ ਨਾ ਦਿਓ"</string> <string name="consent_back" msgid="2560683030046918882">"ਪਿੱਛੇ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"ਆਪਣੇ ਫ਼ੋਨ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਸਟ੍ਰੀਮ ਕਰੋ"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ਆਪਣੇ ਫ਼ੋਨ ਤੋਂ ਐਪਾਂ ਅਤੇ ਹੋਰ ਸਿਸਟਮ ਸੰਬੰਧੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਟ੍ਰੀਮ ਕਰੋ"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-pl/strings.xml b/packages/CompanionDeviceManager/res/values-pl/strings.xml index 776f4b89f7ca..dafdb631b5a3 100644 --- a/packages/CompanionDeviceManager/res/values-pl/strings.xml +++ b/packages/CompanionDeviceManager/res/values-pl/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Menedżer urządzeń towarzyszących"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Zezwól na dostęp aplikacji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> do urządzenia <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"zegarek"</string> <string name="chooser_title" msgid="2262294130493605839">"Wybierz profil <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, którym ma zarządzać aplikacja <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Ta aplikacja jest niezbędna do zarządzania urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikacja <xliff:g id="APP_NAME">%2$s</xliff:g> będzie mogła synchronizować informacje takie jak nazwa osoby dzwoniącej, korzystać z powiadomień oraz uprawnień dotyczących Telefonu, SMS-ów, Kontaktów, Kalendarza, rejestrów połączeń i Urządzeń w pobliżu."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Ta aplikacja jest niezbędna do zarządzania urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikacja <xliff:g id="APP_NAME">%2$s</xliff:g> będzie mogła synchronizować informacje takie jak nazwa osoby dzwoniącej i korzystać z tych uprawnień:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Zezwolić na dostęp aplikacji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> do urządzenia <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"Okulary"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ta aplikacja jest niezbędna do zarządzania urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Aplikacja <xliff:g id="APP_NAME">%2$s</xliff:g> będzie mogła wchodzić w interakcję z powiadomieniami i korzystać z uprawnień dotyczących telefonu, SMS-ów, kontaktów, mikrofonu oraz urządzeń w pobliżu."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Aplikacja będzie miała dostęp do tych uprawnień na Twoim telefonie:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Zezwól urządzeniu <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> na dostęp do tych informacji na Twoim telefonie"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Usługi na innym urządzeniu"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> prosi w imieniu urządzenia <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> o uprawnienia dotyczące strumieniowego odtwarzania treści z aplikacji na innym urządzeniu"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Zezwolić urządzeniu <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> na wykonanie tego działania?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> prosi w imieniu urządzenia <xliff:g id="DEVICE_NAME">%2$s</xliff:g> o uprawnienia do strumieniowego odtwarzania treści i innych funkcji systemowych na urządzeniach w pobliżu"</string> <string name="profile_name_generic" msgid="6851028682723034988">"urządzenie"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ta aplikacja może synchronizować informacje takie jak nazwa osoby dzwoniącej między Twoim telefonem i urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ta aplikacja może synchronizować informacje takie jak nazwa osoby dzwoniącej między Twoim telefonem i wybranym urządzeniem."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Zezwól"</string> <string name="consent_no" msgid="2640796915611404382">"Nie zezwalaj"</string> <string name="consent_back" msgid="2560683030046918882">"Wstecz"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Odtwarzaj strumieniowo aplikacje z telefonu"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Aplikacje do odtwarzania strumieniowego i inne funkcje systemowe na Twoim telefonie"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-pt-rBR/strings.xml b/packages/CompanionDeviceManager/res/values-pt-rBR/strings.xml index 7b9cc8ca7512..221456704814 100644 --- a/packages/CompanionDeviceManager/res/values-pt-rBR/strings.xml +++ b/packages/CompanionDeviceManager/res/values-pt-rBR/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gerenciador de dispositivos complementar"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permitir que o app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acesse o dispositivo <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"relógio"</string> <string name="chooser_title" msgid="2262294130493605839">"Escolha um <xliff:g id="PROFILE_NAME">%1$s</xliff:g> para ser gerenciado pelo app <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"O app <xliff:g id="APP_NAME">%2$s</xliff:g> é necessário para gerenciar o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Ele poderá sincronizar informações, como o nome de quem está ligando, interagir com suas notificações e acessar as permissões de telefone, SMS, contatos, agenda, registro de chamadas e dispositivos por perto."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"O app <xliff:g id="APP_NAME">%2$s</xliff:g> é necessário para gerenciar seu dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Ele poderá sincronizar informações, como o nome de quem está ligando, e acessar estas permissões:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Permitir que o app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> gerencie o dispositivo <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"óculos"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"O app <xliff:g id="APP_NAME">%2$s</xliff:g> é necessário para gerenciar o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Ele poderá interagir com suas notificações e acessar suas permissões de telefone, SMS, contatos, microfone e dispositivos por perto."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Esse app poderá acessar estas permissões no smartphone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permitir que o app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acesse estas informações do smartphone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Serviços entre dispositivos"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"O app <xliff:g id="APP_NAME">%1$s</xliff:g> está pedindo permissão em nome do seu <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> para fazer streaming de apps entre seus dispositivos"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Permitir que o dispositivo <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> realize essa ação?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> está pedindo permissão em nome do seu dispositivo <xliff:g id="DEVICE_NAME">%2$s</xliff:g> para fazer streaming de apps e de outros recursos do sistema para dispositivos por perto"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"O app poderá sincronizar informações, como o nome de quem está ligando, entre seu smartphone e o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"O app poderá sincronizar informações, como o nome de quem está ligando, entre seu smartphone e o dispositivo escolhido."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permitir"</string> <string name="consent_no" msgid="2640796915611404382">"Não permitir"</string> <string name="consent_back" msgid="2560683030046918882">"Voltar"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Fazer transmissão dos apps no seu smartphone"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Faça streaming de apps e outros recursos do sistema pelo smartphone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-pt-rPT/strings.xml b/packages/CompanionDeviceManager/res/values-pt-rPT/strings.xml index 89fcdfe84df3..738fe4addeb6 100644 --- a/packages/CompanionDeviceManager/res/values-pt-rPT/strings.xml +++ b/packages/CompanionDeviceManager/res/values-pt-rPT/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gestor de dispositivos associados"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permita que a app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aceda ao dispositivo <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"relógio"</string> <string name="chooser_title" msgid="2262294130493605839">"Escolha um <xliff:g id="PROFILE_NAME">%1$s</xliff:g> para ser gerido pela app <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"A app é necessária para gerir o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. A app <xliff:g id="APP_NAME">%2$s</xliff:g> vai poder sincronizar informações, como o nome do autor de uma chamada, interagir com as suas notificações e aceder às autorizações do Telefone, SMS, Contactos, Calendário, Registos de chamadas e Dispositivos próximos."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"A app é necessária para gerir o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. A app <xliff:g id="APP_NAME">%2$s</xliff:g> vai poder sincronizar informações, como o nome do autor de uma chamada, e aceder às seguintes autorizações:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Permita que a app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> faça a gestão do dispositivo <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"óculos"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Esta app é necessária para gerir o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. A app <xliff:g id="APP_NAME">%2$s</xliff:g> vai poder interagir com as suas notificações e aceder às autorizações do Telemóvel, SMS, Contactos, Microfone e Dispositivos próximos."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Esta app fica autorizada a aceder a estas autorizações no seu telemóvel:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permita que a app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> aceda a estas informações do seu telemóvel"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Serviços entre dispositivos"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"A app <xliff:g id="APP_NAME">%1$s</xliff:g> está a pedir autorização em nome do seu dispositivo <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> para fazer stream de apps entre os seus dispositivos"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Permitir que o dispositivo <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> realize esta ação?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"A app <xliff:g id="APP_NAME">%1$s</xliff:g> está a pedir autorização em nome do dispositivo <xliff:g id="DEVICE_NAME">%2$s</xliff:g> para fazer stream de apps e outras funcionalidades do sistema para dispositivos próximos"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Esta app vai poder sincronizar informações, como o nome do autor de uma chamada, entre o telemóvel e o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Esta app vai poder sincronizar informações, como o nome do autor de uma chamada, entre o telemóvel e o dispositivo escolhido."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permitir"</string> <string name="consent_no" msgid="2640796915611404382">"Não permitir"</string> <string name="consent_back" msgid="2560683030046918882">"Voltar"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Faça stream das apps do telemóvel"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Faça stream de apps e outras funcionalidades do sistema a partir do telemóvel"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-pt/strings.xml b/packages/CompanionDeviceManager/res/values-pt/strings.xml index 7b9cc8ca7512..221456704814 100644 --- a/packages/CompanionDeviceManager/res/values-pt/strings.xml +++ b/packages/CompanionDeviceManager/res/values-pt/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Gerenciador de dispositivos complementar"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permitir que o app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acesse o dispositivo <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"relógio"</string> <string name="chooser_title" msgid="2262294130493605839">"Escolha um <xliff:g id="PROFILE_NAME">%1$s</xliff:g> para ser gerenciado pelo app <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"O app <xliff:g id="APP_NAME">%2$s</xliff:g> é necessário para gerenciar o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Ele poderá sincronizar informações, como o nome de quem está ligando, interagir com suas notificações e acessar as permissões de telefone, SMS, contatos, agenda, registro de chamadas e dispositivos por perto."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"O app <xliff:g id="APP_NAME">%2$s</xliff:g> é necessário para gerenciar seu dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Ele poderá sincronizar informações, como o nome de quem está ligando, e acessar estas permissões:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Permitir que o app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> gerencie o dispositivo <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"óculos"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"O app <xliff:g id="APP_NAME">%2$s</xliff:g> é necessário para gerenciar o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Ele poderá interagir com suas notificações e acessar suas permissões de telefone, SMS, contatos, microfone e dispositivos por perto."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Esse app poderá acessar estas permissões no smartphone:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permitir que o app <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> acesse estas informações do smartphone"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Serviços entre dispositivos"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"O app <xliff:g id="APP_NAME">%1$s</xliff:g> está pedindo permissão em nome do seu <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> para fazer streaming de apps entre seus dispositivos"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Permitir que o dispositivo <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> realize essa ação?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> está pedindo permissão em nome do seu dispositivo <xliff:g id="DEVICE_NAME">%2$s</xliff:g> para fazer streaming de apps e de outros recursos do sistema para dispositivos por perto"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispositivo"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"O app poderá sincronizar informações, como o nome de quem está ligando, entre seu smartphone e o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"O app poderá sincronizar informações, como o nome de quem está ligando, entre seu smartphone e o dispositivo escolhido."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permitir"</string> <string name="consent_no" msgid="2640796915611404382">"Não permitir"</string> <string name="consent_back" msgid="2560683030046918882">"Voltar"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Fazer transmissão dos apps no seu smartphone"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Faça streaming de apps e outros recursos do sistema pelo smartphone"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ro/strings.xml b/packages/CompanionDeviceManager/res/values-ro/strings.xml index 63e9d7caa727..cf4275379897 100644 --- a/packages/CompanionDeviceManager/res/values-ro/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ro/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Manager de dispozitiv Companion"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Permite ca <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> să acceseze dispozitivul <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ceas"</string> <string name="chooser_title" msgid="2262294130493605839">"Alege un profil <xliff:g id="PROFILE_NAME">%1$s</xliff:g> pe care să îl gestioneze <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplicația este necesară pentru a gestiona <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> va putea să sincronizeze informații, cum ar fi numele unui apelant, să interacționeze cu notificările tale și să îți acceseze permisiunile pentru Telefon, SMS, Agendă, Calendar, Jurnale de apeluri și Dispozitive din apropiere."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplicația este necesară pentru a gestiona <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> va putea să sincronizeze informații, cum ar fi numele unui apelant, și să acceseze următoarele permisiuni:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Permiți ca <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> să gestioneze <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"ochelari"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Această aplicație este necesară pentru a gestiona <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> va putea să interacționeze cu notificările tale și să-ți acceseze permisiunile pentru Telefon, SMS, Agendă, Microfon și Dispozitive din apropiere."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Aplicația va putea să acceseze următoarele permisiuni pe telefon:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Permite ca <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> să acceseze aceste informații de pe telefon"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Servicii pe mai multe dispozitive"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea pentru <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> de a reda în stream aplicații între dispozitivele tale"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Permiți ca <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> să realizeze această acțiune?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea pentru <xliff:g id="DEVICE_NAME">%2$s</xliff:g> de a reda în stream conținut din aplicații și alte funcții de sistem pe dispozitivele din apropiere"</string> <string name="profile_name_generic" msgid="6851028682723034988">"dispozitiv"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Aplicația va putea să sincronizeze informații, cum ar fi numele unui apelant, între telefonul tău și <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Aplicația va putea să sincronizeze informații, cum ar fi numele unui apelant, între telefonul tău și dispozitivul ales."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Permite"</string> <string name="consent_no" msgid="2640796915611404382">"Nu permite"</string> <string name="consent_back" msgid="2560683030046918882">"Înapoi"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Să redea în stream aplicațiile telefonului"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Redă în stream conținut din aplicații și alte funcții de sistem de pe telefon"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ru/strings.xml b/packages/CompanionDeviceManager/res/values-ru/strings.xml index b1699c33697f..6b1172df5f01 100644 --- a/packages/CompanionDeviceManager/res/values-ru/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ru/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Управление подключенными устройствами"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Разрешите приложению <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> доступ к устройству <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"часы"</string> <string name="chooser_title" msgid="2262294130493605839">"Выберите устройство (<xliff:g id="PROFILE_NAME">%1$s</xliff:g>), которым будет управлять приложение <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Это приложение необходимо для управления устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Приложение \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" сможет синхронизировать данные, например журнала звонков, а также получит доступ к уведомлениям и разрешения \"Телефон\", \"SMS\", \"Контакты\", \"Микрофон\" и \"Устройства поблизости\"."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Это приложение необходимо для управления устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Приложение \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" сможет синхронизировать данные, например журнала звонков, и получит следующие разрешения:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Разрешить приложению <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> управлять устройством <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"Очки"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Это приложение необходимо для управления устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Приложение \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" сможет взаимодействовать с уведомлениями, а также получит разрешения \"Телефон\", SMS, \"Контакты\", \"Микрофон\" и \"Устройства поблизости\"."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Это приложение получит следующие разрешения на телефоне:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Разрешите приложению <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> получать эту информацию с вашего телефона"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Сервисы стриминга приложений"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" запрашивает разрешение от имени вашего устройства <xliff:g id="DEVICE_TYPE">%2$s</xliff:g>, чтобы транслировать приложения между вашими устройствами."</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Разрешить приложению <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> выполнять это действие?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" от имени вашего устройства \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\" запрашивает разрешение транслировать приложения и системные функции на устройства поблизости."</string> <string name="profile_name_generic" msgid="6851028682723034988">"устройство"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Приложение сможет синхронизировать информацию между телефоном и устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", например данные из журнала звонков."</string> - <string name="summary_generic" msgid="4988130802522924650">"Приложение сможет синхронизировать информацию между телефоном и выбранным устройством, например данные из журнала звонков."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Разрешить"</string> <string name="consent_no" msgid="2640796915611404382">"Запретить"</string> <string name="consent_back" msgid="2560683030046918882">"Назад"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Трансляция приложений с телефона."</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Трансляция приложений и системных функций с телефона"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-si/strings.xml b/packages/CompanionDeviceManager/res/values-si/strings.xml index af68659490d5..b86b0c438b1a 100644 --- a/packages/CompanionDeviceManager/res/values-si/strings.xml +++ b/packages/CompanionDeviceManager/res/values-si/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"සහායක උපාංග කළමනාකරු"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> හට <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> වෙත ප්රවේශ වීමට ඉඩ දෙන්න"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ඔරලෝසුව"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> මගින් කළමනාකරණය කරනු ලැබීමට <xliff:g id="PROFILE_NAME">%1$s</xliff:g>ක් තෝරන්න"</string> - <string name="summary_watch" msgid="6566922405914995759">"ඔබේ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> කළමනාකරණය කිරීමට මෙම යෙදුම අවශ්යයි. <xliff:g id="APP_NAME">%2$s</xliff:g> හට අමතන කෙනෙකුගේ නම වැනි, තතු සමමුහුර්ත කිරීමට, ඔබේ දැනුම්දීම් සමග අන්තර්ක්රියා කිරීමට සහ ඔබේ දුරකථනය, SMS, සම්බන්ධතා, දින දර්ශනය, ඇමතුම් ලොග සහ අවට උපාංග අවසර වෙත ප්රවේශ වීමට ඉඩ දෙනු ඇත."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ඔබේ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> කළමනාකරණය කිරීමට මෙම යෙදුම අවශ්යයි. <xliff:g id="APP_NAME">%2$s</xliff:g> හට අමතන කෙනෙකුගේ නම වැනි, තතු සමමුහුර්ත කිරීමට සහ මෙම අවසරවලට ප්රවේශ වීමට ඉඩ දෙනු ඇත:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> හට <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> කළමනා කිරීමට ඉඩ දෙන්න ද?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"කණ්ණාඩි"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> කළමනා කිරීමට මෙම යෙදුම අවශ්යයි. <xliff:g id="APP_NAME">%2$s</xliff:g> හට ඔබේ දැනුම්දීම් සමග අන්තර්ක්රියා කිරීමට සහ ඔබේ දුරකථනය, කෙටි පණිවුඩය, සම්බන්ධතා, මයික්රොෆෝනය සහ අවට උපාංග අවසර වෙත ප්රවේශ වීමට ඉඩ දෙයි."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"මෙම යෙදුමට ඔබේ දුරකථනයේ මෙම අවසර වෙත ප්රවේශ වීමට ඉඩ ලැබේ:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> හට ඔබගේ දුරකථනයෙන් මෙම තොරතුරුවලට ප්රවේශ වීමට ඉඩ දෙන්න"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"හරස්-උපාංග සේවා"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> ඔබගේ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> වෙනුවෙන් ඔබගේ උපාංග අතර යෙදුම් ප්රවාහ කිරීමට අවසරය ඉල්ලමින් සිටියි"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"මෙම ක්රියාව කිරීමට <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> හට ඉඩ දෙන්න ද?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ඔබේ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> වෙනුවෙන් යෙදුම් සහ අනෙකුත් පද්ධති විශේෂාංග අවට උපාංග වෙත ප්රවාහ කිරීමට අවසර ඉල්ලයි"</string> <string name="profile_name_generic" msgid="6851028682723034988">"උපාංගය"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"මෙම යෙදුමට ඔබේ දුරකථනය සහ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> අතර, අමතන කෙනෙකුගේ නම වැනි, තතු සමමුහුර්ත කිරීමට හැකි වනු ඇත."</string> - <string name="summary_generic" msgid="4988130802522924650">"මෙම යෙදුමට ඔබේ දුරකථනය සහ තෝරා ගත් උපාංගය අතර, අමතන කෙනෙකුගේ නම වැනි, තතු සමමුහුර්ත කිරීමට හැකි වනු ඇත."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"ඉඩ දෙන්න"</string> <string name="consent_no" msgid="2640796915611404382">"ඉඩ නොදෙන්න"</string> <string name="consent_back" msgid="2560683030046918882">"ආපසු"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"ඔබේ දුරකථනයේ යෙදුම් ප්රවාහ කරන්න"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"ඔබේ දුරකථනයෙන් යෙදුම් සහ අනෙකුත් පද්ධති විශේෂාංග ප්රවාහ කරන්න"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-sk/strings.xml b/packages/CompanionDeviceManager/res/values-sk/strings.xml index d10da1512032..77cfe8d3951c 100644 --- a/packages/CompanionDeviceManager/res/values-sk/strings.xml +++ b/packages/CompanionDeviceManager/res/values-sk/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Správca sprievodných zariadení"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Povoľte aplikácii <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> prístup k zariadeniu <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"hodinky"</string> <string name="chooser_title" msgid="2262294130493605839">"Vyberte profil <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, ktorý bude spravovať aplikácia <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Daná aplikácia sa vyžaduje na správu zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> bude môcť synchronizovať informácie, napríklad meno volajúceho, interagovať s vašimi upozorneniami a získavať prístup k povoleniam telefónu, SMS, kontaktov, kalendára, zoznamu hovorov a zariadení v okolí."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Daná aplikácia sa vyžaduje na správu zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> bude môcť synchronizovať informácie, napríklad meno volajúceho, a získavať prístup k týmto povoleniam:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Chcete povoliť aplikácii <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> spravovať zariadenie <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"okuliare"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Táto aplikácia sa vyžaduje na správu zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> bude môcť interagovať s vašimi upozorneniami a získa prístup k povoleniam pre telefón, SMS, kontakty, mikrofón a zariadenia v okolí."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Táto aplikácia bude mať vo vašom telefóne prístup k týmto povoleniam:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Povoľte aplikácii <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> prístup k týmto informáciám z vášho telefónu"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Služby pre viacero zariadení"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> vyžaduje povolenie na streamovanie aplikácií medzi vašimi zariadeniami v mene tohto zariadenia (<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>)"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Chcete povoliť zariadeniu <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> vykonať túto akciu?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> vyžaduje pre zariadenie <xliff:g id="DEVICE_NAME">%2$s</xliff:g> povolenie streamovať aplikácie a ďalšie systémové funkcie do zariadení v okolí"</string> <string name="profile_name_generic" msgid="6851028682723034988">"zariadenie"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Táto aplikácia bude môcť synchronizovať informácie, napríklad meno volajúceho, medzi telefónom a zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Táto aplikácia bude môcť synchronizovať informácie, napríklad meno volajúceho, medzi telefónom a vybraným zariadením."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Povoliť"</string> <string name="consent_no" msgid="2640796915611404382">"Nepovoliť"</string> <string name="consent_back" msgid="2560683030046918882">"Späť"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Streamovať aplikácie telefónu"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Steaming aplikácii a ďalších systémov funkcií zo zariadenia"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-sl/strings.xml b/packages/CompanionDeviceManager/res/values-sl/strings.xml index ee330ddc7537..976289a4164c 100644 --- a/packages/CompanionDeviceManager/res/values-sl/strings.xml +++ b/packages/CompanionDeviceManager/res/values-sl/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Upravitelj spremljevalnih naprav"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> dovolite dostop do naprave <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ura"</string> <string name="chooser_title" msgid="2262294130493605839">"Izbira naprave »<xliff:g id="PROFILE_NAME">%1$s</xliff:g>«, ki jo bo upravljala aplikacija <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Ta aplikacija je potrebna za upravljanje naprave »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«. Aplikaciji <xliff:g id="APP_NAME">%2$s</xliff:g> bodo omogočene sinhronizacija podatkov, na primer imena klicatelja, interakcija z obvestili in uporaba dovoljenj Telefon, SMS, Stiki, Koledar, Dnevniki klicev in Naprave v bližini."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Ta aplikacija je potrebna za upravljanje naprave »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«. Aplikaciji <xliff:g id="APP_NAME">%2$s</xliff:g> bosta omogočena sinhronizacija podatkov, na primer imena klicatelja, in dostop do teh dovoljenj:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Želite aplikaciji <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> dovoliti upravljanje naprave <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"očala"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ta aplikacija je potrebna za upravljanje naprave »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«. Aplikaciji <xliff:g id="APP_NAME">%2$s</xliff:g> bosta omogočeni interakcija z obvestili in uporaba dovoljenj Telefon, SMS, Stiki, Mikrofon in Naprave v bližini."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Ta aplikacija bo lahko dostopala do teh dovoljenj v telefonu:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Dovolite, da <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> dostopa do teh podatkov v vašem telefonu"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Storitve za zunanje naprave"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> v imenu naprave »<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>« zahteva dovoljenje za pretočno predvajanje aplikacij v vaših napravah."</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Ali napravi <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> dovolite izvedbo tega dejanja?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> v imenu naprave »<xliff:g id="DEVICE_NAME">%2$s</xliff:g>« zahteva dovoljenje za pretočno predvajanje aplikacij in drugih sistemskih funkcij v napravah v bližini."</string> <string name="profile_name_generic" msgid="6851028682723034988">"naprava"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ta aplikacija bo lahko sinhronizirala podatke, na primer ime klicatelja, v telefonu in napravi »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ta aplikacija bo lahko sinhronizirala podatke, na primer ime klicatelja, v telefonu in izbrani napravi."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Dovoli"</string> <string name="consent_no" msgid="2640796915611404382">"Ne dovoli"</string> <string name="consent_back" msgid="2560683030046918882">"Nazaj"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Pretočno predvajanje aplikacij telefona"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Pretočno predvajanje aplikacij in drugih sistemskih funkcij iz telefona"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-sq/strings.xml b/packages/CompanionDeviceManager/res/values-sq/strings.xml index afff09df1c10..97fdcbb0ca99 100644 --- a/packages/CompanionDeviceManager/res/values-sq/strings.xml +++ b/packages/CompanionDeviceManager/res/values-sq/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Menaxheri i pajisjes shoqëruese"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Lejo që <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> të ketë qasje te <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"ora inteligjente"</string> <string name="chooser_title" msgid="2262294130493605839">"Zgjidh \"<xliff:g id="PROFILE_NAME">%1$s</xliff:g>\" që do të menaxhohet nga <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Aplikacioni nevojitet për të menaxhuar profilin tënd të <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> do të lejohet të sinkronizojë informacione, si p.sh. emri i dikujt që po telefonon, të ndërveprojë me njoftimet e tua dhe të ketë qasje te lejet e \"Telefonit\", \"SMS-ve\", \"Kontakteve\", \"Kalendarit\", \"Evidencave të telefonatave\" dhe \"Pajisjeve në afërsi\"."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Aplikacioni nevojitet për të menaxhuar profilin tënd të <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> do të lejohet të sinkronizojë informacione, si p.sh. emri i dikujt që po telefonon dhe të ketë qasje te këto leje:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Të lejohet që <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> të menaxhojë <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"syzet"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ky aplikacion nevojitet për të menaxhuar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> do të lejohet të ndërveprojë me njoftimet e tua dhe të ketë qasje te lejet e \"Telefonit\", \"SMS-ve\", \"Kontakteve\", \"Mikrofonit\" dhe të \"Pajisjeve në afërsi\"."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Ky aplikacion do të lejohet të ketë qasje te këto leje në telefonin tënd:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Lejo që <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> të ketë qasje në këtë informacion nga telefoni yt"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Shërbimet mes pajisjeve"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> po kërkon leje në emër të <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> për të transmetuar aplikacione ndërmjet pajisjeve të tua"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Të lejohet që <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> të ndërmarrë këtë veprim?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> po kërkon leje në emër të (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) tënde për të transmetuar aplikacione dhe veçori të tjera të sistemit te pajisjet në afërsi"</string> <string name="profile_name_generic" msgid="6851028682723034988">"pajisja"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ky aplikacion do të mund të sinkronizojë informacione, si p.sh emri i dikujt që po telefonon, mes telefonit tënd dhe <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ky aplikacion do të mund të sinkronizojë informacione, si p.sh emri i dikujt që po telefonon, mes telefonit tënd dhe pajisjes së zgjedhur."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Lejo"</string> <string name="consent_no" msgid="2640796915611404382">"Mos lejo"</string> <string name="consent_back" msgid="2560683030046918882">"Pas"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Transmeto aplikacionet e telefonit tënd"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Transmeto aplikacionet dhe veçoritë e tjera të sistemit nga telefoni yt"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-sr/strings.xml b/packages/CompanionDeviceManager/res/values-sr/strings.xml index 2c02500d5043..b205061c431d 100644 --- a/packages/CompanionDeviceManager/res/values-sr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-sr/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Менаџер придруженог уређаја"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Дозволите да <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> приступа уређају <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"сат"</string> <string name="chooser_title" msgid="2262294130493605839">"Одаберите <xliff:g id="PROFILE_NAME">%1$s</xliff:g> којим ће управљати апликација <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Апликација је потребна за управљање уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ће добити дозволу за синхронизовање информација, попут особе која упућује позив, за интеракцију са обавештењима и приступ дозволама за телефон, SMS, контакте, календар, евиденције позива и уређаје у близини."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Апликација је потребна за управљање уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ће добити дозволу за синхронизацију информација, попут особе која упућује позив, као за приступ следећим дозволама:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Желите ли да дозволите да <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> управља уређајем <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"наочаре"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Ова апликација је потребна за управљање уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> ће добити дозволу за интеракцију са обавештењима и приступ дозволама за телефон, SMS, контакте, микрофон и уређаје у близини."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Овој апликацији ће бити дозвољено да приступа овим дозволама на телефону:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Дозволите да <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> приступа овим информацијама са телефона"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Услуге на више уређаја"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> захтева дозволу у име уређаја <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> за стримовање апликација између уређаја"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Желите ли да дозволите да <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> обави ову радњу?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> захтева дозволу у име уређаја <xliff:g id="DEVICE_NAME">%2$s</xliff:g> да стримује апликације и друге системске функције на уређаје у близини"</string> <string name="profile_name_generic" msgid="6851028682723034988">"уређај"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ова апликација ће моћи да синхронизује податке, попут имена особе која упућује позив, између телефона и уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ова апликација ће моћи да синхронизује податке, попут имена особе која упућује позив, између телефона и одабраног уређаја."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Дозволи"</string> <string name="consent_no" msgid="2640796915611404382">"Не дозволи"</string> <string name="consent_back" msgid="2560683030046918882">"Назад"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Стримујте апликације на телефону"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Стримујте апликације и друге системске функције са телефона"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-sv/strings.xml b/packages/CompanionDeviceManager/res/values-sv/strings.xml index afdec60ed810..45089f096334 100644 --- a/packages/CompanionDeviceManager/res/values-sv/strings.xml +++ b/packages/CompanionDeviceManager/res/values-sv/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Tillåt att <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> får åtkomst till <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"klocka"</string> <string name="chooser_title" msgid="2262294130493605839">"Välj en <xliff:g id="PROFILE_NAME">%1$s</xliff:g> för hantering av <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Appen behövs för att hantera <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tillåtelse att synkronisera information, till exempel namnet på någon som ringer, interagera med dina aviseringar och får åtkomst till behörigheterna Telefon, Sms, Kontakter, Kalender, Samtalsloggar och Enheter i närheten."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Appen behövs för att hantera <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tillåtelse att synkronisera information, till exempel namnet på någon som ringer, och får åtkomst till följande behörigheter:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Tillåt att <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> hanterar <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasögon"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Appen behövs för att hantera <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> får tillåtelse att interagera med dina aviseringar och får åtkomst till behörigheterna Telefon, Sms, Kontakter, Mikrofon och Enheter i närheten."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Appen får tillåtelse att använda dessa behörigheter på din telefon:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Ge <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> åtkomstbehörighet till denna information på telefonen"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Tjänster för flera enheter"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> begär behörighet att låta <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> streama appar mellan enheter"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vill du tillåta att <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> utför denna åtgärd?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> begär behörighet att streama appar och andra systemfunktioner till enheter i närheten för din <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="profile_name_generic" msgid="6851028682723034988">"enhet"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Den här appen kommer att kunna synkronisera information mellan telefonen och <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, till exempel namnet på någon som ringer."</string> - <string name="summary_generic" msgid="4988130802522924650">"Den här appen kommer att kunna synkronisera information mellan telefonen och den valda enheten, till exempel namnet på någon som ringer."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Tillåt"</string> <string name="consent_no" msgid="2640796915611404382">"Tillåt inte"</string> <string name="consent_back" msgid="2560683030046918882">"Tillbaka"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Streama telefonens appar"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Streama appar och andra systemfunktioner från din telefon"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-sw/strings.xml b/packages/CompanionDeviceManager/res/values-sw/strings.xml index 3cbcc6a18ef3..a12f3c21bb7a 100644 --- a/packages/CompanionDeviceManager/res/values-sw/strings.xml +++ b/packages/CompanionDeviceManager/res/values-sw/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Kidhibiti cha Vifaa Visaidizi"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Ruhusu <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ifikie <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"saa"</string> <string name="chooser_title" msgid="2262294130493605839">"Chagua <xliff:g id="PROFILE_NAME">%1$s</xliff:g> ili idhibitiwe na <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Programu hii inahitajika ili udhibiti <xliff:g id="DEVICE_NAME">%1$s</xliff:g> yako. <xliff:g id="APP_NAME">%2$s</xliff:g> itaruhusiwa kusawazisha maelezo, kama vile jina la mtu anayepiga simu, kutumia arifa zako na ruhusa zako za Simu, SMS, Anwani, Maikrofoni na vifaa vilivyo Karibu."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Programu hii inahitajika ili udhibiti <xliff:g id="DEVICE_NAME">%1$s</xliff:g> yako. <xliff:g id="APP_NAME">%2$s</xliff:g> itaruhusiwa kusawazisha maelezo, kama vile jina la mtu anayepiga simu na kufikia ruhusa hizi:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Ungependa kuruhusu <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> idhibiti <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"miwani"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Programu hii inahitajika ili udhibiti <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> itaruhusiwa kutumia arifa zako na kufikia ruhusa zako za Simu, SMS, Anwani, Maikrofoni na Vifaa vilivyo Karibu."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Programu hii itaruhusiwa kufikia ruhusa hizi kwenye simu yako:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Ruhusu <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ifikie maelezo haya kutoka kwenye simu yako"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Huduma za kifaa kilichounganishwa kwingine"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> inaomba ruhusa kwa niaba ya <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> yako ili itiririshe programu kati ya vifaa vyako"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Ungependa kuruhusu <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> itekeleze kitendo hiki?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> inaomba ruhusa kwa niaba ya <xliff:g id="DEVICE_NAME">%2$s</xliff:g> chako ili itiririshe programu na vipengele vingine vya mfumo kwenye vifaa vilivyo karibu"</string> <string name="profile_name_generic" msgid="6851028682723034988">"kifaa"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Programu hii itaweza kusawazisha maelezo, kama vile jina la mtu anayepiga simu, kati ya simu na <xliff:g id="DEVICE_NAME">%1$s</xliff:g> yako."</string> - <string name="summary_generic" msgid="4988130802522924650">"Programu hii itaweza kusawazisha maelezo, kama vile jina la mtu anayepiga simu, kati ya simu yako na kifaa ulichochagua."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Ruhusu"</string> <string name="consent_no" msgid="2640796915611404382">"Usiruhusu"</string> <string name="consent_back" msgid="2560683030046918882">"Nyuma"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Tiririsha programu za simu yako"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Kutiririsha programu na vipengele vya mfumo kwenye simu yako"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ta/strings.xml b/packages/CompanionDeviceManager/res/values-ta/strings.xml index 939ba8efa13c..98981b2c7f28 100644 --- a/packages/CompanionDeviceManager/res/values-ta/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ta/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"கம்பேனியன் சாதன நிர்வாகி"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> சாதனத்தை <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ஆப்ஸ் அணுக அனுமதியுங்கள்"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"வாட்ச்"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ஆப்ஸ் நிர்வகிக்கக்கூடிய <xliff:g id="PROFILE_NAME">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட வேண்டும்"</string> - <string name="summary_watch" msgid="6566922405914995759">"உங்கள் <xliff:g id="DEVICE_NAME">%1$s</xliff:g> சாதனத்தை நிர்வகிக்க இந்த ஆப்ஸ் தேவை. தகவலை (அழைப்பவரின் பெயர் போன்றவை) ஒத்திசைத்தல், உங்கள் அறிவிப்புகளைப் பார்த்தல் போன்றவற்றுக்கான அனுமதியையும் உங்கள் மொபைல், மெசேஜ், தொடர்புகள், கேலெண்டர், அழைப்புப் பதிவுகள், அருகிலுள்ள சாதனங்கள் ஆகியவற்றுக்கான அணுகலையும் <xliff:g id="APP_NAME">%2$s</xliff:g> ஆப்ஸ் பெறும்."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"உங்கள் <xliff:g id="DEVICE_NAME">%1$s</xliff:g> சாதனத்தை நிர்வகிக்க இந்த ஆப்ஸ் தேவை. தகவலை (அழைப்பவரின் பெயர் போன்றவை) ஒத்திசைப்பதற்கும் இந்த அனுமதிகளைப் பயன்படுத்துவதற்கும் <xliff:g id="APP_NAME">%2$s</xliff:g> ஆப்ஸுக்கு அனுமதி வழங்கப்படும்:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong&gt சாதனத்தை நிர்வகிக்க <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ஆப்ஸை அனுமதிக்கவா?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"கிளாஸஸ்"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> சாதனத்தை நிர்வகிக்க இந்த ஆப்ஸ் தேவை. உங்கள் மொபைல், மெசேஜ், தொடர்புகள், மைக்ரோஃபோன், அருகிலுள்ள சாதனங்கள் ஆகியவற்றுக்கான அணுகலையும் உங்கள் அறிவிப்புகளைப் பார்ப்பதற்கான அனுமதியையும் <xliff:g id="APP_NAME">%2$s</xliff:g> பெறும்."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"உங்கள் மொபைலில் இந்த அனுமதிகளை அணுகுவதற்கு ஆப்ஸுக்கு அனுமதி வழங்கப்படும்:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"மொபைலில் உள்ள இந்தத் தகவல்களை அணுக, <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ஆப்ஸை அனுமதிக்கவும்"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"பன்முக சாதன சேவைகள்"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"உங்கள் சாதனங்களுக்கு இடையே ஆப்ஸை ஸ்ட்ரீம் செய்ய உங்கள் <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> சார்பாக <xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸ் அனுமதியைக் கோருகிறது"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"இந்தச் செயலைச் செய்ய <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong&gt சாதனத்தை அனுமதிக்கவா?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"அருகிலுள்ள சாதனங்களுக்கு ஆப்ஸையும் பிற சிஸ்டம் அம்சங்களையும் ஸ்ட்ரீம் செய்ய உங்கள் <xliff:g id="DEVICE_NAME">%2$s</xliff:g> சார்பாக <xliff:g id="APP_NAME">%1$s</xliff:g> அனுமதி கோருகிறது"</string> <string name="profile_name_generic" msgid="6851028682723034988">"சாதனம்"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"இந்த ஆப்ஸால் தகவலை (அழைப்பவரின் பெயர் போன்றவை) உங்கள் மொபைலிலும் <xliff:g id="DEVICE_NAME">%1$s</xliff:g> சாதனத்திலும் ஒத்திசைக்க முடியும்."</string> - <string name="summary_generic" msgid="4988130802522924650">"இந்த ஆப்ஸால் தகவலை (அழைப்பவரின் பெயர் போன்றவை) உங்கள் மொபைலிலும் தேர்ந்தெடுக்கப்பட்ட சாதனத்திலும் ஒத்திசைக்க முடியும்."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"அனுமதி"</string> <string name="consent_no" msgid="2640796915611404382">"அனுமதிக்க வேண்டாம்"</string> <string name="consent_back" msgid="2560683030046918882">"பின்செல்"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"உங்கள் மொபைல் ஆப்ஸை ஸ்ட்ரீம் செய்யலாம்"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"உங்கள் மொபைலில் இருந்து ஆப்ஸையும் பிற சிஸ்டம் அம்சங்களையும் ஸ்ட்ரீம் செய்யலாம்"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-te/strings.xml b/packages/CompanionDeviceManager/res/values-te/strings.xml index 5009407e0eca..d7ffce7d5782 100644 --- a/packages/CompanionDeviceManager/res/values-te/strings.xml +++ b/packages/CompanionDeviceManager/res/values-te/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"సహచర పరికర మేనేజర్"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>ను యాక్సెస్ చేయడానికి <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ను అనుమతించండి"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"వాచ్"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> ద్వారా మేనేజ్ చేయబడటానికి ఒక <xliff:g id="PROFILE_NAME">%1$s</xliff:g>ను ఎంచుకోండి"</string> - <string name="summary_watch" msgid="6566922405914995759">"మీ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను మేనేజ్ చేయడానికి ఈ యాప్ అవసరం. కాల్ చేస్తున్న వారి పేరు వంటి సమాచారాన్ని సింక్ చేయడానికి, మీ నోటిఫికేషన్లతో ఇంటరాక్ట్ అవ్వడానికి, అలాగే మీ ఫోన్, SMS, కాంటాక్ట్లు, క్యాలెండర్, కాల్ లాగ్లు, సమీపంలోని పరికరాల అనుమతులను యాక్సెస్ చేయడానికి <xliff:g id="APP_NAME">%2$s</xliff:g> అనుమతించబడుతుంది."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"మీ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను మేనేజ్ చేయడానికి ఈ యాప్ అవసరం. కాల్ చేస్తున్న వారి పేరు వంటి సమాచారాన్ని సింక్ చేయడానికి, ఈ అనుమతులను యాక్సెస్ చేయడానికి <xliff:g id="APP_NAME">%2$s</xliff:g> అనుమతించబడుతుంది:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>ను మేనేజ్ చేయడానికి <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>ను అనుమతించాలా?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"గ్లాసెస్"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను మేనేజ్ చేయడానికి ఈ యాప్ అవసరం. మీ నోటిఫికేషన్లతో ఇంటరాక్ట్ అవ్వడానికి, అలాగే మీ ఫోన్, SMS, కాంటాక్ట్లు, మైక్రోఫోన్, సమీపంలోని పరికరాల అనుమతులను యాక్సెస్ చేయడానికి <xliff:g id="APP_NAME">%2$s</xliff:g> అనుమతించబడుతుంది."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"మీ ఫోన్లో ఈ అనుమతులను యాక్సెస్ చేయడానికి ఈ యాప్ అనుమతించబడుతుంది:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"మీ ఫోన్ నుండి ఈ సమాచారాన్ని యాక్సెస్ చేయడానికి <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> యాప్ను అనుమతించండి"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cross-device services"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"మీ పరికరాల మధ్య యాప్లను స్ట్రీమ్ చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> మీ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> తరఫున అనుమతిని రిక్వెస్ట్ చేస్తోంది"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"ఈ చర్యను అమలు చేయడానికి <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>ను అనుమతించాలా?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"సమీపంలోని పరికరాలకు యాప్లను, ఇతర సిస్టమ్ ఫీచర్లను స్ట్రీమ్ చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> మీ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> తరఫున అనుమతిని రిక్వెస్ట్ చేస్తోంది"</string> <string name="profile_name_generic" msgid="6851028682723034988">"పరికరం"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"కాల్ చేస్తున్న వారి పేరు వంటి సమాచారాన్ని ఈ యాప్ మీ ఫోన్, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> మధ్య సింక్ చేయగలుగుతుంది."</string> - <string name="summary_generic" msgid="4988130802522924650">"కాల్ చేస్తున్న వారి పేరు వంటి సమాచారాన్ని ఈ యాప్ మీ ఫోన్, ఎంచుకున్న పరికరం మధ్య సింక్ చేయగలుగుతుంది."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"అనుమతించండి"</string> <string name="consent_no" msgid="2640796915611404382">"అనుమతించవద్దు"</string> <string name="consent_back" msgid="2560683030046918882">"వెనుకకు"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"మీ ఫోన్లోని యాప్లను స్ట్రీమ్ చేయండి"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"మీ ఫోన్ నుండి యాప్లను, ఇతర సిస్టమ్ ఫీచర్లను స్ట్రీమ్ చేస్తుంది"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-th/strings.xml b/packages/CompanionDeviceManager/res/values-th/strings.xml index e53f70c93ebf..ff17b6920724 100644 --- a/packages/CompanionDeviceManager/res/values-th/strings.xml +++ b/packages/CompanionDeviceManager/res/values-th/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"อนุญาตให้ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> เข้าถึง <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"นาฬิกา"</string> <string name="chooser_title" msgid="2262294130493605839">"เลือก<xliff:g id="PROFILE_NAME">%1$s</xliff:g>ที่จะให้มีการจัดการโดย <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"ต้องใช้แอปนี้ในการจัดการ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="APP_NAME">%2$s</xliff:g> จะได้รับอนุญาตให้ซิงค์ข้อมูล เช่น ชื่อของบุคคลที่โทรเข้ามา โต้ตอบกับการแจ้งเตือน รวมถึงมีสิทธิ์เข้าถึงโทรศัพท์, SMS, รายชื่อติดต่อ, ปฏิทิน, บันทึกการโทร และอุปกรณ์ที่อยู่ใกล้เคียง"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"ต้องใช้แอปนี้ในการจัดการ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="APP_NAME">%2$s</xliff:g> จะได้รับอนุญาตให้ซิงค์ข้อมูล เช่น ชื่อของบุคคลที่โทรเข้ามา และมีสิทธิ์เข้าถึงสิ่งต่างๆ ต่อไปนี้"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"อนุญาตให้ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> จัดการ <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ไหม"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"แว่นตา"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"ต้องใช้แอปนี้ในการจัดการ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="APP_NAME">%2$s</xliff:g> จะได้รับอนุญาตให้โต้ตอบกับการแจ้งเตือนและมีสิทธิ์เข้าถึงโทรศัพท์, SMS, รายชื่อติดต่อ, ไมโครโฟน และอุปกรณ์ที่อยู่ใกล้เคียง"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"แอปนี้จะได้รับสิทธิ์ดังต่อไปนี้ในโทรศัพท์ของคุณ"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"อนุญาตให้ <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> เข้าถึงข้อมูลนี้จากโทรศัพท์ของคุณ"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"บริการหลายอุปกรณ์"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> กำลังขอสิทธิ์ในนามของ <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> เพื่อสตรีมแอประหว่างอุปกรณ์ต่างๆ ของคุณ"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"อนุญาตให้ <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ทำงานนี้ไหม"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> กำลังขอสิทธิ์ในนามของ <xliff:g id="DEVICE_NAME">%2$s</xliff:g> เพื่อสตรีมแอปและฟีเจอร์อื่นๆ ของระบบไปยังอุปกรณ์ที่อยู่ใกล้เคียง"</string> <string name="profile_name_generic" msgid="6851028682723034988">"อุปกรณ์"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"แอปนี้จะสามารถซิงค์ข้อมูล เช่น ชื่อของบุคคลที่โทรเข้ามา ระหว่างโทรศัพท์ของคุณและ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ได้"</string> - <string name="summary_generic" msgid="4988130802522924650">"แอปนี้จะสามารถซิงค์ข้อมูล เช่น ชื่อของบุคคลที่โทรเข้ามา ระหว่างโทรศัพท์ของคุณและอุปกรณ์ที่เลือกไว้ได้"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"อนุญาต"</string> <string name="consent_no" msgid="2640796915611404382">"ไม่อนุญาต"</string> <string name="consent_back" msgid="2560683030046918882">"กลับ"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"สตรีมแอปของโทรศัพท์คุณ"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"สตรีมแอปและฟีเจอร์อื่นๆ ของระบบจากโทรศัพท์"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-tl/strings.xml b/packages/CompanionDeviceManager/res/values-tl/strings.xml index 4195c6d8c1ab..afb6adb30a69 100644 --- a/packages/CompanionDeviceManager/res/values-tl/strings.xml +++ b/packages/CompanionDeviceManager/res/values-tl/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Kasamang Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Payagan ang <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> na i-access ang <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"relo"</string> <string name="chooser_title" msgid="2262294130493605839">"Pumili ng <xliff:g id="PROFILE_NAME">%1$s</xliff:g> para pamahalaan ng <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Kailangan ang app para mapamahalaan ang iyong <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Papayagan ang <xliff:g id="APP_NAME">%2$s</xliff:g> na mag-sync ng impormasyon, tulad ng pangalan ng isang taong tumatawag, makipag-ugnayan sa mga notification mo, at ma-access ang iyong mga pahintulot sa Telepono, SMS, Mga Contact, Kalendaryo, Mga log ng tawag, at Mga kalapit na device."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Kailangan ang app para mapamahalaan ang iyong <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Papayagan ang <xliff:g id="APP_NAME">%2$s</xliff:g> na mag-sync ng impormasyon, tulad ng pangalan ng isang taong tumatawag, at na ma-access ang mga pahintulot na ito:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Payagan ang <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> na pamahalaan ang <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"salamin"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Kailangan ang app na ito para mapamahalaan ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Papayagan ang <xliff:g id="APP_NAME">%2$s</xliff:g> na makipag-ugnayan sa mga notification mo at i-access ang iyong mga pahintulot sa Telepono, SMS, Mga Contact, Mikropono, at Mga kalapit na device."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Papayagan ang app na ito na i-access ang mga pahintulot na ito sa iyong telepono:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Payagan ang <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> na i-access ang impormasyong ito sa iyong telepono"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Mga cross-device na serbisyo"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Ang <xliff:g id="APP_NAME">%1$s</xliff:g> ay humihiling ng pahintulot sa ngalan ng iyong <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> para mag-stream ng mga app sa pagitan ng mga device mo"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Payagan ang <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> na gawin ang pagkilos na ito?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Humihiling ang <xliff:g id="APP_NAME">%1$s</xliff:g> ng pahintulot sa ngalan ng iyong <xliff:g id="DEVICE_NAME">%2$s</xliff:g> para mag-stream ng mga app at iba pang feature ng system sa mga kalapit na device"</string> <string name="profile_name_generic" msgid="6851028682723034988">"device"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Magagawa ng app na ito na mag-sync ng impormasyon, tulad ng pangalan ng isang taong tumatawag, sa pagitan ng iyong telepono at ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Magagawa ng app na ito na mag-sync ng impormasyon, tulad ng pangalan ng isang taong tumatawag, sa pagitan ng iyong telepono at ng napiling device."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Payagan"</string> <string name="consent_no" msgid="2640796915611404382">"Huwag payagan"</string> <string name="consent_back" msgid="2560683030046918882">"Bumalik"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"I-stream ang mga app ng iyong telepono"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Mag-stream ng mga app at iba pang feature ng system mula sa iyong telepono"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-tr/strings.xml b/packages/CompanionDeviceManager/res/values-tr/strings.xml index d90fd338798a..69d08b77ba10 100644 --- a/packages/CompanionDeviceManager/res/values-tr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-tr/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> cihazına erişmesi için <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> uygulamasına izin verin"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"saat"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> tarafından yönetilecek bir <xliff:g id="PROFILE_NAME">%1$s</xliff:g> seçin"</string> - <string name="summary_watch" msgid="6566922405914995759">"Bu uygulama, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazınızın yönetilmesi için gereklidir. <xliff:g id="APP_NAME">%2$s</xliff:g> adlı uygulamanın arayan kişinin adı gibi bilgileri senkronize etmesine, bildirimlerinizle etkileşimde bulunup Telefon, SMS, Kişiler, Takvim, Arama kayıtları ve Yakındaki cihazlar izinlerine erişmesine izin verilir."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Bu uygulama, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazınızın yönetilmesi için gereklidir. <xliff:g id="APP_NAME">%2$s</xliff:g> adlı uygulamanın arayan kişinin adı gibi bilgileri senkronize etmesine ve aşağıdaki izinlere erişmesine izin verilir:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> uygulamasına <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> cihazını yönetmesi için izin verilsin mi?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"glasses"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Bu uygulama, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazının yönetilmesi için gereklidir. <xliff:g id="APP_NAME">%2$s</xliff:g> adlı uygulamanın bildirimlerinizle etkileşimde bulunup Telefon, SMS, Kişiler, Mikrofon ve Yakındaki cihazlar izinlerine erişmesine izin verilir."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Bu uygulamanın telefonunuzda şu izinlere erişmesine izin verilecek:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> uygulamasının, telefonunuzdaki bu bilgilere erişmesine izin verin"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Cihazlar arası hizmetler"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g>, cihazlarınız arasında uygulama akışı gerçekleştirmek için <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> cihazınız adına izin istiyor"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> cihazının bu işlem yapmasına izin verilsin mi?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> uygulaması <xliff:g id="DEVICE_NAME">%2$s</xliff:g> cihazınız adına uygulamaları ve diğer sistem özelliklerini yakındaki cihazlara aktarmak için izin istiyor"</string> <string name="profile_name_generic" msgid="6851028682723034988">"cihaz"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Bu uygulama, arayan kişinin adı gibi bilgileri telefonunuz ve <xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihaz arasında senkronize edebilir."</string> - <string name="summary_generic" msgid="4988130802522924650">"Bu uygulama, arayan kişinin adı gibi bilgileri telefonunuz ve seçili cihaz arasında senkronize edebilir."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"İzin ver"</string> <string name="consent_no" msgid="2640796915611404382">"İzin verme"</string> <string name="consent_back" msgid="2560683030046918882">"Geri"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Telefonunuzun uygulamalarını yayınlama"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Telefonunuzdan uygulamaları ve diğer sistem özelliklerini yayınlayın"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-uk/strings.xml b/packages/CompanionDeviceManager/res/values-uk/strings.xml index 9af7f464066b..0733997f5202 100644 --- a/packages/CompanionDeviceManager/res/values-uk/strings.xml +++ b/packages/CompanionDeviceManager/res/values-uk/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Диспетчер супутніх пристроїв"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Надати додатку <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> доступ до пристрою <strong>\"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\"</strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"годинник"</string> <string name="chooser_title" msgid="2262294130493605839">"Виберіть <xliff:g id="PROFILE_NAME">%1$s</xliff:g>, яким керуватиме додаток <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"Цей додаток потрібен, щоб керувати пристроєм \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Додаток <xliff:g id="APP_NAME">%2$s</xliff:g> зможе синхронізувати інформацію (наприклад, ім’я абонента, який викликає), взаємодіяти з вашими сповіщеннями й отримає дозволи \"Телефон\", \"SMS\", \"Контакти\", \"Календар\", \"Журнали викликів\" і \"Пристрої поблизу\"."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Цей додаток потрібен, щоб керувати пристроєм \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Додаток <xliff:g id="APP_NAME">%2$s</xliff:g> зможе синхронізувати інформацію (наприклад, ім’я абонента, який викликає) і отримає такі дозволи:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Дозволити додатку <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> керувати пристроєм <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"окуляри"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Цей додаток потрібен, щоб керувати пристроєм \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Додаток <xliff:g id="APP_NAME">%2$s</xliff:g> зможе взаємодіяти з вашими сповіщеннями й отримає дозволи \"Телефон\", \"SMS\", \"Контакти\", \"Мікрофон\" і \"Пристрої поблизу\"."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Цей додаток матиме доступ до таких дозволів на вашому телефоні:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Надайте додатку <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> доступ до цієї інформації з телефона"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Сервіси для кількох пристроїв"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> від імені вашого пристрою <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> запитує дозвіл на трансляцію додатків між вашими пристроями"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Дозволити додатку <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> виконувати цю дію?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> від імені вашого пристрою (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) запитує дозвіл на трансляцію додатків та інших системних функцій на пристрої поблизу"</string> <string name="profile_name_generic" msgid="6851028682723034988">"пристрій"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Цей додаток зможе синхронізувати інформацію (наприклад, ім’я абонента, який викликає) між телефоном і пристроєм \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string> - <string name="summary_generic" msgid="4988130802522924650">"Цей додаток зможе синхронізувати інформацію (наприклад, ім’я абонента, який викликає) між телефоном і вибраним пристроєм."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Дозволити"</string> <string name="consent_no" msgid="2640796915611404382">"Не дозволяти"</string> <string name="consent_back" msgid="2560683030046918882">"Назад"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Транслювати додатки телефона"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Транслюйте додатки й інші системні функції зі свого телефона"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-ur/strings.xml b/packages/CompanionDeviceManager/res/values-ur/strings.xml index 148ffab58b4c..fee4da20ed49 100644 --- a/packages/CompanionDeviceManager/res/values-ur/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ur/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"ساتھی آلہ مینیجر"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> کو <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> تک رسائی کی اجازت دیں"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"دیکھیں"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> کے ذریعے نظم کئے جانے کیلئے <xliff:g id="PROFILE_NAME">%1$s</xliff:g> کو منتخب کریں"</string> - <string name="summary_watch" msgid="6566922405914995759">"آپ کے <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا نظم کرنے کے لیے، ایپ کی ضرورت ہے۔ <xliff:g id="APP_NAME">%2$s</xliff:g> کو کسی کے کال کرنے والے کے نام، آپ کی اطلاعات کے ساتھ تعامل، آپ کے فون، SMS، رابطے، کیلنڈر، کال لاگز اور قریبی آلات کی اجازتوں جیسی معلومات کی مطابقت پذیری کی اجازت ہوگی۔"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"آپ کے <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا نظم کرنے کے لیے، ایپ کی ضرورت ہے۔ <xliff:g id="APP_NAME">%2$s</xliff:g> کو کسی کال کرنے والے کے نام اور ان اجازتوں تک رسائی جیسی معلومات کی مطابقت پذیری کی اجازت ہوگی:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> کو <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> کا نظم کرنے کی اجازت دیں؟"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"گلاسز"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا نظم کرنے کے لیے، اس ایپ کی ضرورت ہے۔ <xliff:g id="APP_NAME">%2$s</xliff:g> کو آپ کی اطلاعات کے ساتھ تعامل کرنے اور آپ کے فون، SMS، رابطوں، مائیکروفون اور قریبی آلات کی اجازتوں تک رسائی کی اجازت ہوگی۔"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"اس ایپ کو آپ کے فون پر ان اجازتوں تک رسائی کرنے کی اجازت ہوگی:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"اپنے فون سے ان معلومات تک رسائی حاصل کرنے کی <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> کو اجازت دیں"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"کراس ڈیوائس سروسز"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> ایپ آپ کے <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> کی جانب سے آپ کے آلات کے درمیان ایپس کی سلسلہ بندی کرنے کی اجازت کی درخواست کر رہی ہے"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> کو یہ کارروائی انجام دینے کی اجازت دیں؟"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> آپ کے <xliff:g id="DEVICE_NAME">%2$s</xliff:g> کی جانب سے ایپس اور سسٹم کی دیگر خصوصیات کی سلسلہ بندی قریبی آلات پر کرنے کی اجازت طلب کر رہی ہے"</string> <string name="profile_name_generic" msgid="6851028682723034988">"آلہ"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"یہ ایپ آپ کے فون اور <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے درمیان معلومات، جیسے کسی کال کرنے والے کے نام، کی مطابقت پذیری کر سکے گی۔"</string> - <string name="summary_generic" msgid="4988130802522924650">"یہ ایپ آپ کے فون اور منتخب کردہ آلے کے درمیان معلومات، جیسے کسی کال کرنے والے کے نام، کی مطابقت پذیری کر سکے گی۔"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"اجازت دیں"</string> <string name="consent_no" msgid="2640796915611404382">"اجازت نہ دیں"</string> <string name="consent_back" msgid="2560683030046918882">"پیچھے"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"اپنے فون کی ایپس کی سلسلہ بندی کریں"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"اپنے فون سے ایپس اور سسٹم کی دیگر خصوصیات کی سلسلہ بندی کریں"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-uz/strings.xml b/packages/CompanionDeviceManager/res/values-uz/strings.xml index 0b66e4f46ab3..27f60541ea5f 100644 --- a/packages/CompanionDeviceManager/res/values-uz/strings.xml +++ b/packages/CompanionDeviceManager/res/values-uz/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Companion Device Manager"</string> - <string name="confirmation_title" msgid="8024993972587946678">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ilovasiga <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> qurilmasidan foydalanishga ruxsat bering"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"soat"</string> <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> boshqaradigan <xliff:g id="PROFILE_NAME">%1$s</xliff:g> qurilmasini tanlang"</string> - <string name="summary_watch" msgid="6566922405914995759">"Ilova <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmangizni boshqarish uchun kerak. <xliff:g id="APP_NAME">%2$s</xliff:g> ilovasiga chaqiruvchining ismi, bildirishnomalar bilan ishlash va telefon, SMS, kontaktlar, taqvim, chaqiruvlar jurnali va yaqin-atrofdagi qurilmalarni aniqlash kabi maʼlumotlarni sinxronlashga ruxsat beriladi."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Ilova <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmangizni boshqarish uchun kerak. <xliff:g id="APP_NAME">%2$s</xliff:g> ilovasiga chaqiruvchining ismi kabi maʼlumotlarni sinxronlash va quyidagi amallarni bajarishga ruxsat beriladi:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ilovasiga <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> qurilmasini boshqarish uchun ruxsat berilsinmi?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"koʻzoynak"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Bu ilova <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasini boshqarish uchun kerak. <xliff:g id="APP_NAME">%2$s</xliff:g> ilovasiga bildirishnomalar bilan ishlash va telefon, SMS, kontaktlar, mikrofon va yaqin-atrofdagi qurilmalarga kirishga ruxsat beriladi."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Bu ilova telefonda quyidagi ruxsatlarni oladi:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ilovasiga telefondagi ushbu maʼlumot uchun ruxsat bering"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Qurilmalararo xizmatlar"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"Qurilamalararo ilovalar strimingi uchun <xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> nomidan ruxsat soʻramoqda"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> ilovasiga bu amalni bajarish uchun ruxsat berilsinmi?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi <xliff:g id="DEVICE_NAME">%2$s</xliff:g> qurilmangizdan nomidan atrofdagi qurilmalarga ilova va boshqa tizim funksiyalarini uzatish uchun ruxsat olmoqchi"</string> <string name="profile_name_generic" msgid="6851028682723034988">"qurilma"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Bu ilova telefoningiz va <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasida chaqiruvchining ismi kabi maʼlumotlarni sinxronlay oladi."</string> - <string name="summary_generic" msgid="4988130802522924650">"Bu ilova telefoningiz va tanlangan qurilmada chaqiruvchining ismi kabi maʼlumotlarni sinxronlay oladi."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Ruxsat"</string> <string name="consent_no" msgid="2640796915611404382">"Ruxsat berilmasin"</string> <string name="consent_back" msgid="2560683030046918882">"Orqaga"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Telefondagi ilovalarni translatsiya qilish"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Telefoningizdan ilovalar va tizim funksiyalarini translatsiya qilish"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-vi/strings.xml b/packages/CompanionDeviceManager/res/values-vi/strings.xml index c2f966972fc5..fb18b0084bfd 100644 --- a/packages/CompanionDeviceManager/res/values-vi/strings.xml +++ b/packages/CompanionDeviceManager/res/values-vi/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Trình quản lý thiết bị đồng hành"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Cho phép <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> truy cập <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"đồng hồ"</string> <string name="chooser_title" msgid="2262294130493605839">"Chọn một <xliff:g id="PROFILE_NAME">%1$s</xliff:g> sẽ do <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> quản lý"</string> - <string name="summary_watch" msgid="6566922405914995759">"Cần có ứng dụng này để quản lý <xliff:g id="DEVICE_NAME">%1$s</xliff:g> của bạn. <xliff:g id="APP_NAME">%2$s</xliff:g> sẽ được phép đồng bộ hoá thông tin (ví dụ: tên người gọi), tương tác với thông báo của bạn cũng như truy cập vào dữ liệu Điện thoại, SMS, Danh bạ, Lịch, Nhật ký cuộc gọi và Thiết bị ở gần."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"Cần có ứng dụng này để quản lý <xliff:g id="DEVICE_NAME">%1$s</xliff:g> của bạn. <xliff:g id="APP_NAME">%2$s</xliff:g> sẽ được phép đồng bộ hoá thông tin (ví dụ: tên người gọi) và có các quyền sau:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Cho phép <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> quản lý <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>?"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"kính"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Bạn cần có ứng dụng này để quản lý <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> sẽ được phép tương tác với thông báo của bạn, cũng như sử dụng các quyền đối với Điện thoại, SMS, Danh bạ, Micrô và Thiết bị ở gần."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Ứng dụng này sẽ được phép sử dụng những quyền sau trên điện thoại của bạn:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Cho phép <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> truy cập vào thông tin này trên điện thoại của bạn"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Dịch vụ trên nhiều thiết bị"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"<xliff:g id="APP_NAME">%1$s</xliff:g> đang yêu cầu quyền thay cho <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> để truyền trực tuyến ứng dụng giữa các thiết bị của bạn"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Cho phép <strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong> thực hiện hành động này?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"<xliff:g id="APP_NAME">%1$s</xliff:g> đang thay <xliff:g id="DEVICE_NAME">%2$s</xliff:g> yêu cầu quyền truyền trực tuyến ứng dụng và các tính năng khác của hệ thống đến các thiết bị ở gần"</string> <string name="profile_name_generic" msgid="6851028682723034988">"thiết bị"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Ứng dụng này sẽ đồng bộ hoá được thông tin (ví dụ: tên người gọi) giữa điện thoại của bạn và <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Ứng dụng này sẽ đồng bộ hoá được thông tin (ví dụ: tên người gọi) giữa điện thoại của bạn và thiết bị bạn chọn."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Cho phép"</string> <string name="consent_no" msgid="2640796915611404382">"Không cho phép"</string> <string name="consent_back" msgid="2560683030046918882">"Quay lại"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Truyền các ứng dụng trên điện thoại của bạn"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Truyền trực tuyến ứng dụng và các tính năng khác của hệ thống từ điện thoại của bạn"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-zh-rCN/strings.xml b/packages/CompanionDeviceManager/res/values-zh-rCN/strings.xml index e3a90cd81267..25df72787503 100644 --- a/packages/CompanionDeviceManager/res/values-zh-rCN/strings.xml +++ b/packages/CompanionDeviceManager/res/values-zh-rCN/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"配套设备管理器"</string> - <string name="confirmation_title" msgid="8024993972587946678">"允许<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>访问<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"手表"</string> <string name="chooser_title" msgid="2262294130493605839">"选择要由<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>管理的<xliff:g id="PROFILE_NAME">%1$s</xliff:g>"</string> - <string name="summary_watch" msgid="6566922405914995759">"需要使用此应用才能管理您的“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”。<xliff:g id="APP_NAME">%2$s</xliff:g>将能同步信息（例如来电者的姓名），与通知交互，并可获得电话、短信、通讯录、日历、通话记录和附近设备的访问权限。"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"需要使用此应用才能管理您的“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”。<xliff:g id="APP_NAME">%2$s</xliff:g>将能同步信息（例如来电者的姓名），并可使用以下权限："</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"允许<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>管理<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>？"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"眼镜"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"需要使用此应用才能管理<xliff:g id="DEVICE_NAME">%1$s</xliff:g>。“<xliff:g id="APP_NAME">%2$s</xliff:g>”将能与通知交互，并可获得电话、短信、通讯录、麦克风和附近设备的访问权限。"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"该应用将可以获得您手机上的以下权限："</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"允许“<xliff:g id="APP_NAME">%1$s</xliff:g>”<strong></strong>访问您手机中的这项信息"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"跨设备服务"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”正代表您的<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>请求在您的设备之间流式传输应用内容"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"允许<strong><xliff:g id="DEVICE_NAME">%1$s</xliff:g></strong>进行此操作？"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”正代表您的<xliff:g id="DEVICE_NAME">%2$s</xliff:g>请求将应用和其他系统功能流式传输到附近的设备"</string> <string name="profile_name_generic" msgid="6851028682723034988">"设备"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"此应用将能够在您的手机和“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”之间同步信息，例如来电者的姓名。"</string> - <string name="summary_generic" msgid="4988130802522924650">"此应用将能够在您的手机和所选设备之间同步信息，例如来电者的姓名。"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"允许"</string> <string name="consent_no" msgid="2640796915611404382">"不允许"</string> <string name="consent_back" msgid="2560683030046918882">"返回"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"流式传输手机上的应用"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"从您的手机流式传输应用和其他系统功能"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-zh-rHK/strings.xml b/packages/CompanionDeviceManager/res/values-zh-rHK/strings.xml index 66d833d901cb..fe58ddd69013 100644 --- a/packages/CompanionDeviceManager/res/values-zh-rHK/strings.xml +++ b/packages/CompanionDeviceManager/res/values-zh-rHK/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"隨附裝置管理工具"</string> - <string name="confirmation_title" msgid="8024993972587946678">"允許 <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> 存取 <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"手錶"</string> <string name="chooser_title" msgid="2262294130493605839">"選擇由 <strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> 管理的<xliff:g id="PROFILE_NAME">%1$s</xliff:g>"</string> - <string name="summary_watch" msgid="6566922405914995759">"必須使用此應用程式，才能管理「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。「<xliff:g id="APP_NAME">%2$s</xliff:g>」將可同步資訊 (例如來電者的名稱)、透過通知與您互動，並存取電話、短訊、通訊錄、日曆、通話記錄和附近的裝置權限。"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"必須使用此應用程式，才能管理「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。「<xliff:g id="APP_NAME">%2$s</xliff:g>」將可同步資訊 (例如來電者的名稱)，並存取以下權限："</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"要允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」<strong></strong>管理「<xliff:g id="DEVICE_NAME">%2$s</xliff:g>」<strong></strong>嗎？"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"眼鏡"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"必須使用此應用程式，才能管理「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。「<xliff:g id="APP_NAME">%2$s</xliff:g>」將可透過通知與您互動，並存取電話、短訊、通訊錄、麥克風和附近的裝置權限。"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"此應用程式將可在手機上取得以下權限："</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」<strong></strong>存取您手機中的這項資料"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"跨裝置服務"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」正在為 <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> 要求權限，以在裝置之間串流應用程式內容"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"要允許「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」<strong></strong>執行此操作嗎？"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」正在代表「<xliff:g id="DEVICE_NAME">%2$s</xliff:g>」要求權限，才能在附近的裝置上串流播放應用程式和其他系統功能"</string> <string name="profile_name_generic" msgid="6851028682723034988">"裝置"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"此應用程式將可同步手機和「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的資訊，例如來電者的名稱。"</string> - <string name="summary_generic" msgid="4988130802522924650">"此應用程式將可同步手機和所選裝置的資訊，例如來電者的名稱。"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"允許"</string> <string name="consent_no" msgid="2640796915611404382">"不允許"</string> <string name="consent_back" msgid="2560683030046918882">"返回"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"串流播放手機應用程式內容"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"串流播放手機中的應用程式和其他系統功能"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-zh-rTW/strings.xml b/packages/CompanionDeviceManager/res/values-zh-rTW/strings.xml index c0ce4196ae1b..33c1f2ab679f 100644 --- a/packages/CompanionDeviceManager/res/values-zh-rTW/strings.xml +++ b/packages/CompanionDeviceManager/res/values-zh-rTW/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"隨附裝置管理工具"</string> - <string name="confirmation_title" msgid="8024993972587946678">"允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」<strong></strong>存取「<xliff:g id="DEVICE_NAME">%2$s</xliff:g>」<strong></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"手錶"</string> <string name="chooser_title" msgid="2262294130493605839">"選擇要讓「<xliff:g id="APP_NAME">%2$s</xliff:g>」<strong></strong>管理的<xliff:g id="PROFILE_NAME">%1$s</xliff:g>"</string> - <string name="summary_watch" msgid="6566922405914995759">"你必須使用這個應用程式，才能管理「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。「<xliff:g id="APP_NAME">%2$s</xliff:g>」將可同步資訊 (例如來電者名稱)、存取通知及在通知上執行操作，並取得電話、簡訊、聯絡人、日曆、通話記錄、麥克風和鄰近裝置權限。"</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"你必須使用這個應用程式，才能管理「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。「<xliff:g id="APP_NAME">%2$s</xliff:g>」將可同步資訊 (例如來電者名稱)，並取得以下權限："</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"要允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」<strong></strong>管理「<xliff:g id="DEVICE_NAME">%2$s</xliff:g>」<strong></strong>嗎？"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"眼鏡"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"你必須使用這個應用程式，才能管理「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。「<xliff:g id="APP_NAME">%2$s</xliff:g>」將可存取通知及在通知上執行操作，並取得電話、簡訊、聯絡人、麥克風和鄰近裝置權限。"</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"這個應用程式將可在手機上取得以下權限："</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」<strong></strong>存取手機中的這項資訊"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"跨裝置服務"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」正在代表你的「<xliff:g id="DEVICE_TYPE">%2$s</xliff:g>」要求必要權限，以便在裝置之間串流傳輸應用程式內容"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"要允許「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」<strong></strong>執行這項操作嗎？"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」正在代表「<xliff:g id="DEVICE_NAME">%2$s</xliff:g>」要求必要權限，才能在鄰近裝置上串流播放應用程式和其他系統功能"</string> <string name="profile_name_generic" msgid="6851028682723034988">"裝置"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"這個應用程式將可在手機和「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」之間同步資訊，例如來電者名稱。"</string> - <string name="summary_generic" msgid="4988130802522924650">"這個應用程式將可在手機和指定裝置之間同步資訊，例如來電者名稱。"</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"允許"</string> <string name="consent_no" msgid="2640796915611404382">"不允許"</string> <string name="consent_back" msgid="2560683030046918882">"返回"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"串流傳輸手機應用程式內容"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"串流播放手機中的應用程式和其他系統功能"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values-zu/strings.xml b/packages/CompanionDeviceManager/res/values-zu/strings.xml index 39b458c56bb0..5a3de1c7a10d 100644 --- a/packages/CompanionDeviceManager/res/values-zu/strings.xml +++ b/packages/CompanionDeviceManager/res/values-zu/strings.xml @@ -17,15 +17,19 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4470785958457506021">"Isiphathi sedivayisi esihambisanayo"</string> - <string name="confirmation_title" msgid="8024993972587946678">"Vumela i-<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ukuthi ifinyelele i-<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> + <!-- no translation found for confirmation_title (4593465730772390351) --> + <skip /> <string name="profile_name_watch" msgid="576290739483672360">"buka"</string> <string name="chooser_title" msgid="2262294130493605839">"Khetha i-<xliff:g id="PROFILE_NAME">%1$s</xliff:g> ezophathwa yi-<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong>"</string> - <string name="summary_watch" msgid="6566922405914995759">"I-app iyadingeka ukuphatha i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> yakho. I-<xliff:g id="APP_NAME">%2$s</xliff:g> izovunyelwa ukuvumelanisa ulwazi, njengegama lomuntu othile ofonayo, ukusebenzisana nezaziso zakho futhi ufinyelele Ifoni yakho, i-SMS, Oxhumana Nabo, Ikhalenda, Amarekhodi Amakholi nezimvume zamadivayisi aseduze."</string> - <string name="summary_watch_single_device" msgid="7443464525873186735">"I-app iyadingeka ukuphatha i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> yakho. I-<xliff:g id="APP_NAME">%2$s</xliff:g> izovunyelwa ukuvumelanisa ulwazi, njengegama lomuntu othile ofonayo, futhi ufinyelele lezi zimvume:"</string> + <!-- no translation found for summary_watch (898569637110705523) --> + <skip /> + <!-- no translation found for summary_watch_single_device (3001383718181475756) --> + <skip /> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Vumela i-<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ukuthi ifinyelele i-<strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong>"</string> <string name="profile_name_glasses" msgid="8488394059007275998">"Izingilazi"</string> <string name="summary_glasses_multi_device" msgid="615259525961937348">"Le app iyadingeka ukuphatha i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>. I-<xliff:g id="APP_NAME">%2$s</xliff:g> izovunyelwa ukuthi ihlanganyele nezaziso zakho futhi ifinyelele kufoni yakho, i-SMS, Oxhumana nabo, Imakrofoni Nezimvume zamadivayisi aseduze."</string> - <string name="summary_glasses_single_device" msgid="5783761806783565716">"Le-app izovunyelwa ukufinyelela lezi zimvume kufoni yakho:"</string> + <!-- no translation found for summary_glasses_single_device (403955999347676820) --> + <skip /> <string name="title_app_streaming" msgid="2270331024626446950">"Vumela i-<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> ifinyelele lolu lwazi kusukela efonini yakho"</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Amasevisi amadivayisi amaningi"</string> <string name="helper_summary_app_streaming" msgid="5977509499890099">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> icela imvume esikhundleni se-<xliff:g id="DEVICE_TYPE">%2$s</xliff:g> yakho ukuze isakaze-bukhoma ama-app phakathi kwamadivayisi akho"</string> @@ -38,8 +42,10 @@ <string name="title_nearby_device_streaming" msgid="7269956847378799794">"Vumela i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ukwenza lesi senzo?"</string> <string name="helper_summary_nearby_device_streaming" msgid="2063965070936844876">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> icela imvume esikhundleni se-<xliff:g id="DEVICE_NAME">%2$s</xliff:g> ukusakaza ama-app nezinye izakhi zesistimu kumadivayisi aseduze"</string> <string name="profile_name_generic" msgid="6851028682723034988">"idivayisi"</string> - <string name="summary_generic_single_device" msgid="4735072202474939111">"Le app izokwazi ukuvumelanisa ulwazi, njengegama lomuntu othile ofonayo, phakathi kwefoni yakho ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="summary_generic" msgid="4988130802522924650">"Le app izokwazi ukuvumelanisa ulwazi, njengegama lomuntu othile ofonayo, phakathi kwefoni yakho nedivayisi ekhethiwe."</string> + <!-- no translation found for summary_generic_single_device (4181180669689590417) --> + <skip /> + <!-- no translation found for summary_generic (1761976003668044801) --> + <skip /> <string name="consent_yes" msgid="8344487259618762872">"Vumela"</string> <string name="consent_no" msgid="2640796915611404382">"Ungavumeli"</string> <string name="consent_back" msgid="2560683030046918882">"Emuva"</string> @@ -69,4 +75,8 @@ <string name="permission_app_streaming_summary" msgid="606923325679670624">"Sakaza ama-app wefoni yakho"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"Sakaza ama-app nezinye izakhi zesistimu kusuka kufoni yakho"</string> + <!-- no translation found for device_type (8268703872070046263) --> + <skip /> + <!-- no translation found for device_type (5038791954983067774) --> + <skip /> </resources> diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index d87abb98ebde..ebfb86d4d6ba 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -34,7 +34,7 @@ <string name="summary_watch">This app is needed to manage your <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>. <xliff:g id="app_name" example="Android Wear">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions.</string> <!-- Description of the privileges the application will get if associated with the companion device of WATCH profile for singleDevice(type) [CHAR LIMIT=NONE] --> - <string name="summary_watch_single_device">This app will be allowed to sync info, like the name of someone calling, and access these permissions on your <xliff:g id="device_name" example="phone">%1$s</xliff:g></string> + <string name="summary_watch_single_device">This app will be allowed to sync info, like the name of someone calling, and access these permissions on your <xliff:g id="device_type" example="phone">%1$s</xliff:g></string> <!-- ================= DEVICE_PROFILE_GLASSES ================= --> @@ -48,7 +48,7 @@ <string name="summary_glasses_multi_device">This app is needed to manage <xliff:g id="device_name" example="My Glasses">%1$s</xliff:g>. <xliff:g id="app_name" example="Glasses">%2$s</xliff:g> will be allowed to interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions.</string> <!-- Description of the privileges the application will get if associated with the companion device of GLASSES profile for singleDevice(type) [CHAR LIMIT=NONE] --> - <string name="summary_glasses_single_device">This app will be allowed to access these permissions on your <xliff:g id="device_name" example="phone">%1$s</xliff:g></string> + <string name="summary_glasses_single_device">This app will be allowed to access these permissions on your <xliff:g id="device_type" example="phone">%1$s</xliff:g></string> <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= --> @@ -59,7 +59,7 @@ <string name="helper_title_app_streaming">Cross-device services</string> <!-- Description of the helper dialog for APP_STREAMING profile. [CHAR LIMIT=NONE] --> - <string name="helper_summary_app_streaming"><xliff:g id="app_name" example="GMS">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_type" example="Chromebook">%2$s</xliff:g> to stream apps between your devices</string> + <string name="helper_summary_app_streaming"><xliff:g id="app_name" example="GMS">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="display_name" example="Chromebook">%2$s</xliff:g> to stream apps between your devices</string> <!-- ================= DEVICE_PROFILE_AUTOMOTIVE_PROJECTION ================= --> @@ -81,7 +81,7 @@ <string name="helper_title_computer">Google Play services</string> <!-- Description of the helper dialog for COMPUTER profile. [CHAR LIMIT=NONE] --> - <string name="helper_summary_computer"><xliff:g id="app_name" example="GMS">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_type" example="Chromebook">%2$s</xliff:g> to access your phone\u2019s photos, media, and notifications</string> + <string name="helper_summary_computer"><xliff:g id="app_name" example="GMS">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="display_name" example="Chromebook">%2$s</xliff:g> to access your phone\u2019s photos, media, and notifications</string> <!-- ================= DEVICE_PROFILE_NEARBY_DEVICE_STREAMING ================= --> diff --git a/packages/CredentialManager/res/values-af/strings.xml b/packages/CredentialManager/res/values-af/strings.xml index b4e22fd23bff..9def248b1fd7 100644 --- a/packages/CredentialManager/res/values-af/strings.xml +++ b/packages/CredentialManager/res/values-af/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Verbeterde rekeningsekuriteit"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Elke sleutel is uitsluitlik gekoppel aan die app of webwerf waarvoor dit geskep is, en daarom kan jy nooit per ongeluk by ’n bedrieglike app of webwerf aanmeld nie. En omdat bedieners net publieke sleutels hou, is kuberkrakery baie moeiliker."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Moeitevrye oorgang"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Wagwoorde sal steeds saam met wagwoordsleutels beskikbaar wees soos ons na ’n wagwoordlose toekoms beweeg."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Wagwoorde sal steeds saam met wagwoordsleutels beskikbaar wees terwyl ons na ’n wagwoordlose toekoms beweeg."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Kies waar om jou <xliff:g id="CREATETYPES">%1$s</xliff:g> te stoor"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Kies ’n wagwoordbestuurder om jou inligting te stoor en volgende keer vinniger aan te meld"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Skep wagwoordsleutel vir <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gebruik jou gestoorde wagwoordsleutel vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Gebruik jou gestoorde aanmelding vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Kies ’n gestoorde aanmelding vir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Kies ’n opsie vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Meld op ’n ander manier aan"</string> <string name="snackbar_action" msgid="37373514216505085">"Bekyk opsies"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Bestuur aanmeldings"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Van ’n ander toestel af"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Gebruik ’n ander toestel"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Versoek is deur <xliff:g id="APP_NAME">%1$s</xliff:g> gekanselleer"</string> </resources> diff --git a/packages/CredentialManager/res/values-am/strings.xml b/packages/CredentialManager/res/values-am/strings.xml index 19a80a5e9610..ca7584f27151 100644 --- a/packages/CredentialManager/res/values-am/strings.xml +++ b/packages/CredentialManager/res/values-am/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"የተሻሻለ የመለያ ደህንነት"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ወደ አጭበርባሪ መተግበሪያ ወይም ድር ጣቢያ በስህተት መቼም መግባት እንዳይችሉ እያንዳንዱ ቁልፍ ከተፈጠረለት መተግበሪያ ወይም ድር ጣቢያ ጋር ለሚመለከተው ተወስኖ የተገናኘ ነው። በተጨማሪም አገልጋዮች ይፋዊ ቁልፎችን ብቻ ስለሚጠብቁ ሰርጎ መግባት የበለጠ ከባድ ነው።"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"እንከን አልባ ትርጉም"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"ወደ የይለፍ ቃል የሌለው ወደፊት ስንሄድ የይለፍ ቃላት አሁንም ከይለፍ ቁልፎች ጎን ለጎን ይገኛሉ"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"ወደ የይለፍ ቃል የሌለው ወደፊት ስንሄድ የይለፍ ቃላት ከይለፍ ቁልፎች ጎን ለጎን ይገኛሉ።"</string> <string name="choose_provider_title" msgid="8870795677024868108">"የእርስዎን <xliff:g id="CREATETYPES">%1$s</xliff:g> የት እንደሚያስቀምጡ ይምረጡ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"መረጃዎን ለማስቀመጥ እና በቀጣይ ጊዜ በፍጥነት በመለያ ለመግባት የሚስጥር ቁልፍ አስተዳዳሪን ይምረጡ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"ለ<xliff:g id="APPNAME">%1$s</xliff:g> የይለፍ ቁልፍ ይፈጠር?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"ለ<xliff:g id="APP_NAME">%1$s</xliff:g> የተቀመጠ መግቢያ ይጠቀሙ"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"በሌላ መንገድ ይግቡ"</string> <string name="snackbar_action" msgid="37373514216505085">"አማራጮችን አሳይ"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ቀጥል"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"መግቢያዎችን ያስተዳድሩ"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"ከሌላ መሣሪያ"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"የተለየ መሣሪያ ይጠቀሙ"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"ጥያቄ በ<xliff:g id="APP_NAME">%1$s</xliff:g> ተሰርዟል"</string> </resources> diff --git a/packages/CredentialManager/res/values-ar/strings.xml b/packages/CredentialManager/res/values-ar/strings.xml index ec62751ba5ec..ef8c6f049361 100644 --- a/packages/CredentialManager/res/values-ar/strings.xml +++ b/packages/CredentialManager/res/values-ar/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"تحسين أمان الحساب"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"يرتبط كل مفتاح حصريًا بالتطبيق أو الموقع الإلكتروني الذي تم إنشاؤه من أجله، لذلك لا يمكن أبدًا أن تسجّل الدخول إلى تطبيق أو موقع إلكتروني احتيالي عن طريق الخطأ. بالإضافة إلى ذلك، تكون عملية الاختراق أكثر صعوبة لأن الخوادم تحتفظ بالمفاتيح العامة فقط."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"النقل السلس"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"بينما ننطلق نحو مستقبل بدون كلمات مرور، ستظل كلمات المرور متوفّرة إلى جانب مفاتيح المرور."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"بينما ننطلق نحو مستقبل بدون كلمات مرور، ستظل كلمات المرور متوفّرة إلى جانب مفاتيح المرور."</string> <string name="choose_provider_title" msgid="8870795677024868108">"اختيار المكان الذي تريد حفظ <xliff:g id="CREATETYPES">%1$s</xliff:g> فيه"</string> <string name="choose_provider_body" msgid="4967074531845147434">"اختَر مدير كلمات مرور لحفظ معلوماتك وتسجيل الدخول بشكل أسرع في المرة القادمة."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"هل تريد إنشاء مفتاح مرور لتطبيق \"<xliff:g id="APPNAME">%1$s</xliff:g>\"؟"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"اختيار بيانات اعتماد تسجيل دخول محفوظة لـ \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"تسجيل الدخول بطريقة أخرى"</string> <string name="snackbar_action" msgid="37373514216505085">"عرض الخيارات"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"متابعة"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"إداراة عمليات تسجيل الدخول"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"من جهاز آخر"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"استخدام جهاز مختلف"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"تم إلغاء الطلب بواسطة \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"."</string> </resources> diff --git a/packages/CredentialManager/res/values-as/strings.xml b/packages/CredentialManager/res/values-as/strings.xml index 41eba93b1e60..0a6d5d072d29 100644 --- a/packages/CredentialManager/res/values-as/strings.xml +++ b/packages/CredentialManager/res/values-as/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"একাউণ্টৰ উন্নত সুৰক্ষা"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"প্ৰতিটো চাবি বিশেষভাৱে সেই এপ্ অথবা ৱেবছাইটৰ সৈতে লিংক কৰা হয় যাৰ বাবে সেইটো সৃষ্টি কৰা হৈছে, সেয়ে আপুনি কেতিয়াও ভুলতে কোনো প্ৰৱঞ্চনামূলক এপ্ অথবা ৱেবছাইটত ছাইন ইন কৰিব নোৱাৰে। ইয়াৰ উপৰিও, কেৱল ৰাজহুৱা চাবিসমূহ ৰখা ছাৰ্ভাৰৰ ক্ষেত্ৰত হেক কৰাটো বহুত কঠিন হৈ পৰে।"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"বাধাহীন স্থানান্তৰণ"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"আমি পাছৱৰ্ডবিহীন ভৱিষ্যতৰ দিশে আগবঢ়াৰ লগে লগে পাছকীৰ লগতে পাছৱৰ্ডসমূহো উপলব্ধ হ’ব"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"আমি পাছৱৰ্ডবিহীন ভৱিষ্যতৰ দিশে আগবঢ়াৰ লগে লগে পাছকীৰ লগতে পাছৱৰ্ডসমূহো উপলব্ধ হ’ব।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"আপোনাৰ <xliff:g id="CREATETYPES">%1$s</xliff:g> ক’ত ছেভ কৰিব লাগে সেয়া বাছনি কৰক"</string> <string name="choose_provider_body" msgid="4967074531845147434">"আপোনাৰ তথ্য ছেভ কৰি পৰৱৰ্তী সময়ত দ্ৰুতভাৱে ছাইন ইন কৰিবলৈ এটা পাছৱৰ্ড পৰিচালক বাছনি কৰক"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g>ৰ বাবে পাছকী সৃষ্টি কৰিবনে?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে আপোনাৰ ছেভ হৈ থকা পাছকী ব্যৱহাৰ কৰিবনে?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে আপোনাৰ ছেভ হৈ থকা ছাইন ইন তথ্য ব্যৱহাৰ কৰিবনে?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে ছেভ হৈ থকা এটা ছাইন ইন বাছনি কৰক"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে এটা বিকল্প বাছনি কৰিবনে?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"অন্য উপায়েৰে ছাইন ইন কৰক"</string> <string name="snackbar_action" msgid="37373514216505085">"বিকল্পসমূহ চাওক"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"ছাইন ইন পৰিচালনা কৰক"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"অন্য এটা ডিভাইচৰ পৰা"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"অন্য এটা ডিভাইচ ব্যৱহাৰ কৰক"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ অনুৰোধটো বাতিল কৰিছে"</string> </resources> diff --git a/packages/CredentialManager/res/values-az/strings.xml b/packages/CredentialManager/res/values-az/strings.xml index 0c274f0d52ce..97ffd43916ad 100644 --- a/packages/CredentialManager/res/values-az/strings.xml +++ b/packages/CredentialManager/res/values-az/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Təkmilləşdirilmiş hesab təhlükəsizliyi"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Hər bir açar eksklüziv olaraq onların yaradıldığı tətbiq və ya vebsaytla əlaqələndirilib, ona görə də heç vaxt səhvən saxta tətbiqə və ya vebsayta daxil ola bilməzsiniz. Üstəlik, yalnız ictimai açarları saxlayan serverlərlə hekinq daha çətindir."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Rahat keçid"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Paroldan istifadə azalsa da, parollar yenə də giriş açarları ilə yanaşı əlçatan olacaq"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Parolsuz gələcəyə doğru irəlilədikcə parollar hələ də giriş açarları ilə yanaşı əlçatan olacaq."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> elementinin saxlanacağı yeri seçin"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Məlumatlarınızı yadda saxlamaq və növbəti dəfə daha sürətli daxil olmaq üçün parol meneceri seçin"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> üçün giriş açarı yaradılsın?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün yadda saxlanmış girişi seçin"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Başqa üsulla daxil olun"</string> <string name="snackbar_action" msgid="37373514216505085">"Seçimlərə baxın"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Davam edin"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Girişləri idarə edin"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Başqa cihazdan"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Başqa cihaz istifadə edin"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> sorğunu ləğv etdi"</string> </resources> diff --git a/packages/CredentialManager/res/values-b+sr+Latn/strings.xml b/packages/CredentialManager/res/values-b+sr+Latn/strings.xml index adc2d0c0ed24..fb23ee125644 100644 --- a/packages/CredentialManager/res/values-b+sr+Latn/strings.xml +++ b/packages/CredentialManager/res/values-b+sr+Latn/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Poboljšana bezbednost naloga"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Svaki ključ je isključivo povezan sa aplikacijom ili veb-sajtom za koje je napravljen, pa nikad ne možete greškom da se prijavite u aplikaciju ili na veb-sajt koji služe za prevaru. Osim toga, sa serverima koji čuvaju samo javne ključeve hakovanje je mnogo teže."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Besprekoran prelaz"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Kako se krećemo ka budućnosti bez lozinki, lozinke će i dalje biti dostupne uz pristupne kodove"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Kako se krećemo ka budućnosti bez lozinki, lozinke će i dalje biti dostupne uz pristupne kodove."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Odaberite gde ćete sačuvati: <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Izaberite menadžera lozinki da biste sačuvali podatke i brže se prijavili sledeći put"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Želite da napravite pristupni kôd za: <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Želite da koristite sačuvani pristupni kôd za: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Želite da koristite sačuvane podatke za prijavljivanje za: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Odaberite sačuvano prijavljivanje za: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Želite da odaberete opciju za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Prijavite se na drugi način"</string> <string name="snackbar_action" msgid="37373514216505085">"Prikaži opcije"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Upravljajte prijavljivanjima"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Sa drugog uređaja"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Koristi drugi uređaj"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Zahtve je otkazala aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-be/strings.xml b/packages/CredentialManager/res/values-be/strings.xml index 50c4f721a56c..12b90ee27008 100644 --- a/packages/CredentialManager/res/values-be/strings.xml +++ b/packages/CredentialManager/res/values-be/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Павышаная бяспека ўліковага запісу"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Кожны ключ звязаны толькі з праграмай або вэб-сайтам, для якіх ён быў створаны, таму вы не зможаце памылкова ўвайсці ў праграму ці на вэб-сайт, створаныя ў мэтах махлярства. Акрамя таго, на серверах захоўваюцца толькі адкрытыя ключы, таму правесці ўзлом намнога складаней."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Плаўны пераход"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Хоць мы ўжо рухаемся ў бок будучыні без выкарыстання пароляў, яны па-ранейшаму застануцца даступнымі нароўні з ключамі доступу."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Хоць мы ўжо рухаемся ў бок будучыні без выкарыстання пароляў, яны па-ранейшаму застануцца даступнымі нароўні з ключамі доступу."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Выберыце, куды захаваць <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Выберыце менеджар пароляў, каб захаваць свае даныя і забяспечыць хуткі ўваход у наступныя разы"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Стварыце ключ доступу да праграмы \"<xliff:g id="APPNAME">%1$s</xliff:g>\""</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Выберыце захаваны спосаб уваходу для праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Увайсці іншым спосабам"</string> <string name="snackbar_action" msgid="37373514216505085">"Праглядзець варыянты"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Далей"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Кіраваць спосабамі ўваходу"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"З іншай прылады"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Скарыстаць іншую прыладу"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Запыт скасаваны праграмай \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> </resources> diff --git a/packages/CredentialManager/res/values-bg/strings.xml b/packages/CredentialManager/res/values-bg/strings.xml index ec4732accf0f..f22c83e08107 100644 --- a/packages/CredentialManager/res/values-bg/strings.xml +++ b/packages/CredentialManager/res/values-bg/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Подобрена сигурност на профила"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Всеки ключ е свързан само с приложението или уебсайта, за които е създаден. Затова не е възможно да влезете в измамно приложение или уебсайт по погрешка. Освен това сървърите съхраняват само публичните ключове, което значително затруднява опитите за хакерство."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Безпроблемен преход"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Паролите ще продължат да са налице заедно с кодовете за достъп по пътя ни към бъдеще без пароли"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Паролите ще продължат да са налице заедно с кодовете за достъп по пътя ни към бъдеще без пароли."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Изберете къде да запазите своите <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Изберете мениджър на пароли, в който да се запазят данните ви, така че следващия път да влезете по-бързо в профила си"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Да се създаде ли код за достъп за <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Изберете запазени данни за вход за <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Влизане в профила по друг начин"</string> <string name="snackbar_action" msgid="37373514216505085">"Преглед на опциите"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Напред"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Управление на данните за вход"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"От друго устройство"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Използване на друго устройство"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Заявката е анулирана от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-bn/strings.xml b/packages/CredentialManager/res/values-bn/strings.xml index 021c80c3d7a5..c1a74fc316f7 100644 --- a/packages/CredentialManager/res/values-bn/strings.xml +++ b/packages/CredentialManager/res/values-bn/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"অ্যাকাউন্টের জন্য উন্নত সুরক্ষা"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"প্রতিটি \'কী\' যে অ্যাপ বা ওয়েবসাইটের জন্য তৈরি করা হয়েছে, সেগুলির সাথে এই \'কী\' বিশেষভাবে লিঙ্ক করা থাকে। তাই কখনই আপনি ভুলবশত কোনও ভুয়ো অ্যাপ বা ওয়েবসাইটে সাইন-ইন করতে পারবেন না। পাশাপাশি, যেসব সার্ভারে শুধু সর্বজনীন \'কী\' রয়েছে, তা হ্যাক করা খুবই কঠিন।"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"নির্বিঘ্ন ট্রানজিশন"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"আমরা পাসওয়ার্ডবিহীন ভবিষ্যতের দিকে এগিয়ে গেলেও, এখনও \'পাসকী\'-এর পাশাপাশি পাসওয়ার্ড ব্যবহার করা যাবে"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"আমরা পাসওয়ার্ডবিহীন ভবিষ্যতের দিকে এগিয়ে গেলেও, এখনও \'পাসকী\'-এর পাশাপাশি পাসওয়ার্ড ব্যবহার করা যাবে।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"আপনার <xliff:g id="CREATETYPES">%1$s</xliff:g> কোথায় সেভ করবেন তা বেছে নিন"</string> <string name="choose_provider_body" msgid="4967074531845147434">"আপনার তথ্য সেভ করতে একটি Password Manager বেছে নিন এবং পরের বার আরও দ্রুত সাইন-ইন করুন"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g>-এর জন্য \'পাসকী\' তৈরি করবেন?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর জন্য সাইন-ইন করা সম্পর্কিত ক্রেডেনশিয়াল বেছে নিন"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"অন্যভাবে সাইন-ইন করুন"</string> <string name="snackbar_action" msgid="37373514216505085">"বিকল্প দেখুন"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"চালিয়ে যান"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"সাইন-ইন করার ক্রেডেনশিয়াল ম্যানেজ করুন"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"অন্য ডিভাইস থেকে"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"আলাদা ডিভাইস ব্যবহার করুন"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> দ্বারা অনুরোধ বাতিল করা হয়েছে"</string> </resources> diff --git a/packages/CredentialManager/res/values-bs/strings.xml b/packages/CredentialManager/res/values-bs/strings.xml index 897d016889ed..7884e9fda4db 100644 --- a/packages/CredentialManager/res/values-bs/strings.xml +++ b/packages/CredentialManager/res/values-bs/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Poboljšana sigurnost računa"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Svaki ključ je isključivo povezan s aplikacijom ili web lokacijom za koju je kreiran, tako da se nikada ne možete greškom prijaviti u prevarantsku aplikaciju ili na prevarantsku web lokaciju. Osim toga, hakiranje je puno teže zahvaljujući serverima koji čuvaju samo javne ključeve."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Neometani prijelaz"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Kako se krećemo prema budućnosti bez lozinki, lozinke će i dalje biti dostupne uz pristupne ključeve"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Kako se krećemo prema budućnosti bez lozinki, lozinke će i dalje biti dostupne uz pristupne ključeve."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Odaberite gdje će se pohranjivati <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Odaberite upravitelja lozinki da sačuvate svoje informacije i brže se prijavite sljedeći put"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Kreirati pristupni ključ za aplikaciju <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Koristiti sačuvani pristupni ključ za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Koristiti sačuvanu prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Odaberite sačuvanu prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Želite li odabrati opciju za <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Prijavite se na drugi način"</string> <string name="snackbar_action" msgid="37373514216505085">"Prikaži opcije"</string> diff --git a/packages/CredentialManager/res/values-ca/strings.xml b/packages/CredentialManager/res/values-ca/strings.xml index 7d0f568ae20b..5e956a0fbc7a 100644 --- a/packages/CredentialManager/res/values-ca/strings.xml +++ b/packages/CredentialManager/res/values-ca/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Seguretat dels comptes millorada"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada clau està exclusivament enllaçada a l\'aplicació o al lloc web per als quals s\'ha creat. D\'aquesta manera, mai iniciaràs la sessió en una aplicació o un lloc web fraudulents per error. A més, com que els servidors només conserven les claus públiques, el hacking és molt més difícil."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transició fluida"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Tot i que avancem cap a un futur sense contrasenyes, continuaran estant disponibles juntament amb les claus d\'accés."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Tot i que avancem cap a un futur sense contrasenyes, continuaran estant disponibles juntament amb les claus d\'accés."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Tria on vols desar les <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un gestor de contrasenyes per desar la teva informació i iniciar la sessió més ràpidament la pròxima vegada"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vols crear la clau d\'accés per a <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Tria un inici de sessió desat per a <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Inicia la sessió d\'una altra manera"</string> <string name="snackbar_action" msgid="37373514216505085">"Mostra les opcions"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continua"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Gestiona els inicis de sessió"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Des d\'un altre dispositiu"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Utilitza un dispositiu diferent"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ha cancel·lat la sol·licitud"</string> </resources> diff --git a/packages/CredentialManager/res/values-cs/strings.xml b/packages/CredentialManager/res/values-cs/strings.xml index 498e86e01433..4a7b64342967 100644 --- a/packages/CredentialManager/res/values-cs/strings.xml +++ b/packages/CredentialManager/res/values-cs/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Vylepšené zabezpečení účtu"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Každý klíč je propojen výhradně s aplikací nebo webem, pro které byl vytvořen, takže se nikdy nemůžete omylem přihlásit k podvodné aplikaci nebo webu. Protože na serverech jsou uloženy pouze veřejné klíče, je hackování navíc mnohem obtížnější."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Bezproblémový přechod"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Ačkoliv směřujeme k budoucnosti bez hesel, vedle přístupových klíčů budou stále k dispozici i hesla"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Ačkoliv směřujeme k budoucnosti bez hesel, vedle přístupových klíčů budou stále k dispozici i hesla."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Určete, kam ukládat <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Vyberte správce hesel k uložení svých údajů, abyste se příště mohli přihlásit rychleji"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vytvořit přístupový klíč pro aplikaci <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Vyberte uložené přihlášení pro <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Přihlásit se jinak"</string> <string name="snackbar_action" msgid="37373514216505085">"Zobrazit možnosti"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Pokračovat"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Spravovat přihlášení"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Z jiného zařízení"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Použít jiné zařízení"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> žádost zrušila"</string> </resources> diff --git a/packages/CredentialManager/res/values-da/strings.xml b/packages/CredentialManager/res/values-da/strings.xml index 8ab42949546a..fe728dd12ad5 100644 --- a/packages/CredentialManager/res/values-da/strings.xml +++ b/packages/CredentialManager/res/values-da/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Forbedret kontosikkerhed"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Hver nøgle er udelukkende tilknyttet den app eller det website, som nøglen blev oprettet til. På denne måde kan du aldrig logge ind i en svigagtig app eller på et svigagtigt website ved en fejl. Og da serverne kun opbevarer offentlige nøgler, er kontoer meget sværere at hacke."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Problemfri overgang"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Selvom vi nærmer os en fremtid, hvor adgangskoder er mindre fremtrædende, kan de stadig bruges i samspil med adgangsnøgler."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Selvom vi nærmer os en fremtid, hvor adgangskoder er mindre fremtrædende, kan de stadig bruges i samspil med adgangsnøgler."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Vælg, hvor du vil gemme dine <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Vælg en adgangskodeadministrator for at gemme dine oplysninger, så du kan logge ind hurtigere næste gang"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vil du oprette en adgangsnøgle til <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Vælg en gemt loginmetode til <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Log ind på en anden måde"</string> <string name="snackbar_action" msgid="37373514216505085">"Se valgmuligheder"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Fortsæt"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Administrer loginmetoder"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Fra en anden enhed"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Brug en anden enhed"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Anmodningen blev annulleret af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-de/strings.xml b/packages/CredentialManager/res/values-de/strings.xml index 9e943edb262a..d48b548c84eb 100644 --- a/packages/CredentialManager/res/values-de/strings.xml +++ b/packages/CredentialManager/res/values-de/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Verbesserte Kontosicherheit"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Jeder Schlüssel ist ausschließlich mit der App oder Website verknüpft, für die er erstellt wurde. Du kannst dich also nicht aus Versehen bei einer betrügerischen App oder Website anmelden. Da auf Servern nur öffentliche Schlüssel verwaltet werden, wird das Hacking außerdem erheblich erschwert."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Nahtlose Umstellung"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Auch wenn wir uns auf eine passwortlose Zukunft zubewegen, werden neben Passkeys weiter Passwörter verfügbar sein."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Auch wenn wir uns auf eine passwortlose Zukunft zubewegen, werden neben Passkeys weiter Passwörter verfügbar sein."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Wähle aus, wo deine <xliff:g id="CREATETYPES">%1$s</xliff:g> gespeichert werden sollen"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Du kannst einen Passwortmanager auswählen, um deine Anmeldedaten zu speichern, damit du dich nächstes Mal schneller anmelden kannst"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Passkey für <xliff:g id="APPNAME">%1$s</xliff:g> erstellen?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Gespeicherte Anmeldedaten für <xliff:g id="APP_NAME">%1$s</xliff:g> auswählen"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Andere Anmeldeoption auswählen"</string> <string name="snackbar_action" msgid="37373514216505085">"Optionen ansehen"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Weiter"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Anmeldedaten verwalten"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Von einem anderen Gerät"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Anderes Gerät verwenden"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Anfrage abgebrochen von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-el/strings.xml b/packages/CredentialManager/res/values-el/strings.xml index fae58e292604..a163954fb89b 100644 --- a/packages/CredentialManager/res/values-el/strings.xml +++ b/packages/CredentialManager/res/values-el/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Βελτιωμένη ασφάλεια λογαριασμού"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Κάθε κλειδί συνδέεται αποκλειστικά με την εφαρμογή ή τον ιστότοπο για τον οποίο δημιουργήθηκε ώστε να μην συνδέεστε ποτέ κατά λάθος σε μη νόμιμες εφαρμογές ή ιστοτόπους. Επιπλέον, οι παραβιάσεις είναι πολύ πιο δύσκολες, επειδή οι διακομιστές διατηρούν μόνο δημόσια κλειδιά."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Απρόσκοπτη μετάβαση"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Καθώς κινούμαστε προς ένα μέλλον χωρίς κωδικούς πρόσβασης, οι κωδικοί πρόσβασης θα εξακολουθούν να είναι διαθέσιμοι μαζί με τα κλειδιά πρόσβασης"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Καθώς κινούμαστε προς ένα μέλλον χωρίς κωδικούς πρόσβασης, οι κωδικοί πρόσβασης θα εξακολουθούν να είναι διαθέσιμοι μαζί με τα κλειδιά πρόσβασης."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Επιλέξτε πού θα αποθηκεύονται τα <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Επιλέξτε ένα πρόγραμμα διαχείρισης κωδικών πρόσβασης για να αποθηκεύσετε τα στοιχεία σας και να συνδεθείτε πιο γρήγορα την επόμενη φορά."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Δημιουργία κλειδιού πρόσβασης για <xliff:g id="APPNAME">%1$s</xliff:g>;"</string> @@ -54,6 +54,7 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Επιλογή αποθηκευμένων στοιχείων σύνδεσης για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <string name="get_dialog_title_use_info_on" msgid="8863708099535435146">"Να χρησιμοποιηθούν αυτές οι πληροφορίες στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Σύνδεση με άλλον τρόπο"</string> <string name="snackbar_action" msgid="37373514216505085">"Προβολή επιλογών"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Συνέχεια"</string> diff --git a/packages/CredentialManager/res/values-en-rAU/strings.xml b/packages/CredentialManager/res/values-en-rAU/strings.xml index f87bee44ad5a..44193666298f 100644 --- a/packages/CredentialManager/res/values-en-rAU/strings.xml +++ b/packages/CredentialManager/res/values-en-rAU/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Improved account security"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Each key is exclusively linked with the app or website it was created for, so you can never sign in to a fraudulent app or website by mistake. Plus, with servers only keeping public keys, hacking is a lot harder."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Seamless transition"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"As we move towards a passwordless future, passwords will still be available alongside passkeys"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Create passkey for <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choose a saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Sign in another way"</string> <string name="snackbar_action" msgid="37373514216505085">"View options"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continue"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Manage sign-ins"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"From another device"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Use a different device"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Request cancelled by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-en-rCA/strings.xml b/packages/CredentialManager/res/values-en-rCA/strings.xml index f297bd924536..b08425c9d79b 100644 --- a/packages/CredentialManager/res/values-en-rCA/strings.xml +++ b/packages/CredentialManager/res/values-en-rCA/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Improved account security"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Each key is exclusively linked with the app or website they were created for, so you can never sign in to a fraudulent app or website by mistake. Plus, with servers only keeping public keys, hacking is a lot harder."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Seamless transition"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"As we move towards a passwordless future, passwords will still be available alongside passkeys"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Create passkey for <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -53,6 +53,7 @@ <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Use your saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choose a saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Choose an option for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="get_dialog_title_use_info_on" msgid="8863708099535435146">"Use this info on <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Sign in another way"</string> <string name="snackbar_action" msgid="37373514216505085">"View options"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continue"</string> diff --git a/packages/CredentialManager/res/values-en-rGB/strings.xml b/packages/CredentialManager/res/values-en-rGB/strings.xml index f87bee44ad5a..44193666298f 100644 --- a/packages/CredentialManager/res/values-en-rGB/strings.xml +++ b/packages/CredentialManager/res/values-en-rGB/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Improved account security"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Each key is exclusively linked with the app or website it was created for, so you can never sign in to a fraudulent app or website by mistake. Plus, with servers only keeping public keys, hacking is a lot harder."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Seamless transition"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"As we move towards a passwordless future, passwords will still be available alongside passkeys"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Create passkey for <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choose a saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Sign in another way"</string> <string name="snackbar_action" msgid="37373514216505085">"View options"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continue"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Manage sign-ins"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"From another device"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Use a different device"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Request cancelled by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-en-rIN/strings.xml b/packages/CredentialManager/res/values-en-rIN/strings.xml index f87bee44ad5a..44193666298f 100644 --- a/packages/CredentialManager/res/values-en-rIN/strings.xml +++ b/packages/CredentialManager/res/values-en-rIN/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Improved account security"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Each key is exclusively linked with the app or website it was created for, so you can never sign in to a fraudulent app or website by mistake. Plus, with servers only keeping public keys, hacking is a lot harder."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Seamless transition"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"As we move towards a passwordless future, passwords will still be available alongside passkeys"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Create passkey for <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choose a saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Sign in another way"</string> <string name="snackbar_action" msgid="37373514216505085">"View options"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continue"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Manage sign-ins"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"From another device"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Use a different device"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Request cancelled by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-en-rXC/strings.xml b/packages/CredentialManager/res/values-en-rXC/strings.xml index 66cb1762b2a2..e2f2dc3b3ffe 100644 --- a/packages/CredentialManager/res/values-en-rXC/strings.xml +++ b/packages/CredentialManager/res/values-en-rXC/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Improved account security"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Each key is exclusively linked with the app or website they were created for, so you can never sign in to a fraudulent app or website by mistake. Plus, with servers only keeping public keys, hacking is a lot harder."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Seamless transition"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"As we move towards a passwordless future, passwords will still be available alongside passkeys"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Create passkey for <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -53,6 +53,7 @@ <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Use your saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choose a saved sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Choose an option for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="get_dialog_title_use_info_on" msgid="8863708099535435146">"Use this info on <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Sign in another way"</string> <string name="snackbar_action" msgid="37373514216505085">"View options"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continue"</string> diff --git a/packages/CredentialManager/res/values-es-rUS/strings.xml b/packages/CredentialManager/res/values-es-rUS/strings.xml index c4e68e0e21e7..d8dd5ed46c7f 100644 --- a/packages/CredentialManager/res/values-es-rUS/strings.xml +++ b/packages/CredentialManager/res/values-es-rUS/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Mayor seguridad para las cuentas"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada llave está vinculada exclusivamente con el sitio web o la app para la que fue creada, por lo que nunca podrás acceder por error a una app o sitio web fraudulentos. Además, como los servidores solo guardan claves públicas, hackearlas es mucho más difícil."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transición fluida"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"A medida que avanzamos hacia un futuro sin contraseñas, estas seguirán estando disponibles junto a las llaves de acceso"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"A medida que avanzamos hacia un futuro sin contraseñas, estas seguirán estando disponibles junto a las llaves de acceso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Elige dónde guardar tus <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un administrador de contraseñas para guardar tu información y acceder más rápido la próxima vez"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"¿Quieres crear una llave de acceso para <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Elige un acceso guardado para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Acceder de otra forma"</string> <string name="snackbar_action" msgid="37373514216505085">"Ver opciones"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continuar"</string> diff --git a/packages/CredentialManager/res/values-es/strings.xml b/packages/CredentialManager/res/values-es/strings.xml index 3cefa6c67983..73c3b0d22e2d 100644 --- a/packages/CredentialManager/res/values-es/strings.xml +++ b/packages/CredentialManager/res/values-es/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Seguridad de las cuentas mejorada"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada llave está vinculada exclusivamente con la aplicación o sitio web para los que se crearon, por lo que nunca puedes iniciar sesión en una aplicación o sitio web fraudulentos por error. Además, dado que los servidores solo mantienen claves públicas, es muy difícil que las pirateen."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transición fluida"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Aunque nos dirigimos hacia un mundo sin contraseñas, estas seguirán estando disponibles junto con las llaves de acceso"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Aunque nos dirigimos hacia un mundo sin contraseñas, estas seguirán estando disponibles junto con las llaves de acceso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Elige dónde guardar tus <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un gestor de contraseñas para guardar tu información e iniciar sesión más rápido la próxima vez"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"¿Crear llave de acceso para <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Elige un inicio de sesión guardado para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Iniciar sesión de otra manera"</string> <string name="snackbar_action" msgid="37373514216505085">"Ver opciones"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continuar"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Gestionar inicios de sesión"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"De otro dispositivo"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Usar otro dispositivo"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ha cancelado la solicitud"</string> </resources> diff --git a/packages/CredentialManager/res/values-et/strings.xml b/packages/CredentialManager/res/values-et/strings.xml index 4d577e78edfa..6f7094153356 100644 --- a/packages/CredentialManager/res/values-et/strings.xml +++ b/packages/CredentialManager/res/values-et/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Konto täiustatud turvalisus"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Iga võti on lingitud vaid rakenduse või veebisaidiga, mille jaoks see loodi, seega ei saa te petturlikku rakendusse või veebisaidile kunagi kogemata sisse logida. Ja kuna serverid säilitavad vaid avalikke võtmeid, on häkkimine palju keerulisem."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Sujuv üleminek"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Liigume paroolivaba tuleviku poole, kuid paroolid jäävad pääsuvõtmete kõrval siiski kättesaadavaks"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Liikudes paroolivaba tuleviku poole, jäävad paroolid pääsuvõtmete kõrval siiski kättesaadavaks."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Valige, kuhu soovite oma <xliff:g id="CREATETYPES">%1$s</xliff:g> salvestada"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Valige paroolihaldur, et salvestada oma teave ja järgmisel korral kiiremini sisse logida"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Kas luua rakenduse <xliff:g id="APPNAME">%1$s</xliff:g> jaoks pääsuvõti?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Kas kasutada rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks salvestatud pääsuvõtit?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Kas kasutada rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks salvestatud sisselogimisandmeid?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Valige rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks salvestatud sisselogimisandmed"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Kas teha valik rakendusele <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Logige sisse muul viisil"</string> <string name="snackbar_action" msgid="37373514216505085">"Kuva valikud"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Sisselogimisandmete haldamine"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Muus seadmes"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Kasuta teist seadet"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> tühistas taotluse"</string> </resources> diff --git a/packages/CredentialManager/res/values-eu/strings.xml b/packages/CredentialManager/res/values-eu/strings.xml index 1655cf5fc6b1..3f08b61ad830 100644 --- a/packages/CredentialManager/res/values-eu/strings.xml +++ b/packages/CredentialManager/res/values-eu/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Kontuaren segurtasun areagotua"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Gako bakoitza harekin batera erabili behar den aplikazioarekin edo webgunearekin soilik lotzen da. Hala, ezingo duzu inoiz hasi saioa nahi gabe iruzurrezko aplikazio edo webgune batean. Gainera, zerbitzarietan gako publikoak soilik gordetzen direnez, askoz zailagoa da sarbide-gakoak hackeatzea."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Etenik gabeko trantsizioa"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Pasahitzik gabeko etorkizun baterantz goazen arren, pasahitzek sarbide-gakoen bizikide izaten jarraituko dute"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Pasahitzik gabeko etorkizun baterantz goazen arren, pasahitzek sarbide-gakoen bizikide izaten jarraituko dute."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Aukeratu non gorde <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Hautatu informazioa gordetzeko pasahitz-kudeatzaile bat eta hasi saioa bizkorrago hurrengoan"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> atzitzeko sarbide-gako bat sortu nahi duzu?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Aukeratu <xliff:g id="APP_NAME">%1$s</xliff:g> aplikaziorako gorde dituzun kredentzialak"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Hasi saioa beste modu batean"</string> <string name="snackbar_action" msgid="37373514216505085">"Ikusi aukerak"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Egin aurrera"</string> diff --git a/packages/CredentialManager/res/values-fa/strings.xml b/packages/CredentialManager/res/values-fa/strings.xml index 81fef8a66d3d..a1d24460946b 100644 --- a/packages/CredentialManager/res/values-fa/strings.xml +++ b/packages/CredentialManager/res/values-fa/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"بهبود امنیت حساب"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"هر کلید منحصراً با برنامه یا وبسایتی که برای آن ایجاد شده است پیوند داده میشود، بنابراین هرگز نمیتوانید به اشتباه وارد برنامه یا وبسایت تقلبی شوید. بهعلاوه، باتوجهبه اینکه سرورها فقط کلیدهای عمومی را نگه میدارند، رخنهگری (هک کردن) بسیار سختتر است."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"انتقال یکپارچه"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"درحالیکه بهسوی آیندهای بیگذرواژه حرکت میکنیم، گذرواژهها همچنان در کنار گذرکلیدها دردسترس خواهند بود"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"درحالیکه بهسوی آیندهای بیگذرواژه حرکت میکنیم، گذرواژهها همچنان در کنار گذرکلیدها دردسترس خواهند بود"</string> <string name="choose_provider_title" msgid="8870795677024868108">"جایی را برای ذخیره کردن <xliff:g id="CREATETYPES">%1$s</xliff:g> انتخاب کنید"</string> <string name="choose_provider_body" msgid="4967074531845147434">"مدیر گذرواژهای انتخاب کنید تا اطلاعاتتان را ذخیره کنید و دفعه بعد سریعتر به سیستم وارد شوید"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"برای <xliff:g id="APPNAME">%1$s</xliff:g> گذرکلید ایجاد شود؟"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"انتخاب ورود به سیستم ذخیرهشده برای <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ورود به سیستم به روشی دیگر"</string> <string name="snackbar_action" msgid="37373514216505085">"مشاهده گزینهها"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ادامه"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"مدیریت ورود به سیستمها"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"از دستگاهی دیگر"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"استفاده از دستگاه دیگری"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"درخواست را <xliff:g id="APP_NAME">%1$s</xliff:g> لغو کرد"</string> </resources> diff --git a/packages/CredentialManager/res/values-fi/strings.xml b/packages/CredentialManager/res/values-fi/strings.xml index 04c7fe378cf2..562741ed2a04 100644 --- a/packages/CredentialManager/res/values-fi/strings.xml +++ b/packages/CredentialManager/res/values-fi/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Parempi tilin tietoturva"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Kukin avain yhdistetään vain sovellukseen tai sivustoon, jota varten se on luotu, joten et voi koskaan kirjautua vilpilliseen sovellukseen tai sivustolle vahingossa. Lisäksi palvelimet säilyttävät vain julkisia avaimia, mikä tekee hakkeroinnista paljon vaikeampaa."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Saumaton siirtymä"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Kehitys kulkee kohti salasanatonta tulevaisuutta, mutta salasanat ovat edelleen käytettävissä avainkoodien ohella"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Kehitys kulkee kohti salasanatonta tulevaisuutta, mutta salasanat ovat edelleen käytettävissä avainkoodien ohella."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Valitse, minne <xliff:g id="CREATETYPES">%1$s</xliff:g> tallennetaan"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Valitse salasanojen ylläpitotyökalu, niin voit tallentaa tietosi ja kirjautua ensi kerralla nopeammin sisään"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Luodaanko avainkoodi (<xliff:g id="APPNAME">%1$s</xliff:g>)?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Valitse tallennetut kirjautumistiedot (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Kirjaudu sisään toisella tavalla"</string> <string name="snackbar_action" msgid="37373514216505085">"Katseluasetukset"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Jatka"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Muuta kirjautumistietoja"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Toiselta laitteelta"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Käytä toista laitetta"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> hylkäsi pyynnön"</string> </resources> diff --git a/packages/CredentialManager/res/values-fr-rCA/strings.xml b/packages/CredentialManager/res/values-fr-rCA/strings.xml index 8f39dd326872..af6076538c18 100644 --- a/packages/CredentialManager/res/values-fr-rCA/strings.xml +++ b/packages/CredentialManager/res/values-fr-rCA/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Sécurité accrue du compte"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Chaque clé est exclusivement liée à l\'application ou au site Web pour lequel elle a été créée, de sorte que vous ne pourrez jamais vous connecter par erreur à une application ou à un site Web frauduleux. En outre, comme les serveurs ne conservent que les clés publiques, le piratage informatique est beaucoup plus difficile."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transition fluide"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"À mesure que nous nous dirigeons vers un avenir sans mots de passe, ceux-ci continueront d\'être utilisés parallèlement aux clés d\'accès."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"À mesure que nous nous dirigeons vers un avenir sans mot de passe, les mots de passe seront toujours utilisés parallèlement aux clés d\'accès."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choisir où enregistrer vos <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Sélectionnez un gestionnaire de mots de passe pour enregistrer vos renseignements et vous connecter plus rapidement la prochaine fois"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Créer une clé d\'accès pour <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Utiliser votre clé d\'accès enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Utiliser votre connexion enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choisir une connexion enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Choisir une option pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Se connecter d\'une autre manière"</string> <string name="snackbar_action" msgid="37373514216505085">"Afficher les options"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Gérer les connexions"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"À partir d\'un autre appareil"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Utiliser un autre appareil"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Demande annulée par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-fr/strings.xml b/packages/CredentialManager/res/values-fr/strings.xml index e0537c76247b..293738d18738 100644 --- a/packages/CredentialManager/res/values-fr/strings.xml +++ b/packages/CredentialManager/res/values-fr/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Des comptes plus sécurisés"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Chaque clé est liée exclusivement à l\'appli ou au site Web pour lequel elle a été créée, pour que vous ne puissiez jamais vous connecter par erreur à une appli ou un site Web frauduleux. De plus, le piratage est bien plus difficile, car les serveurs ne conservent que les clés publiques."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Une transition fluide"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Nous nous dirigeons vers un futur sans mots de passe, mais ceux-ci resteront disponibles en plus des clés d\'accès"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Nous nous dirigeons vers un futur sans mots de passe, mais ceux-ci resteront disponibles en plus des clés d\'accès."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choisissez où enregistrer vos <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Sélectionnez un gestionnaire de mots de passe pour enregistrer vos informations et vous connecter plus rapidement la prochaine fois"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Créer une clé d\'accès pour <xliff:g id="APPNAME">%1$s</xliff:g> ?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Choisir des informations de connexion enregistrées pour <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Se connecter d\'une autre manière"</string> <string name="snackbar_action" msgid="37373514216505085">"Voir les options"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continuer"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Gérer les connexions"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Depuis un autre appareil"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Utiliser un autre appareil"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Requête annulée par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-gl/strings.xml b/packages/CredentialManager/res/values-gl/strings.xml index f7da57e4dc10..f5d5a54c54bb 100644 --- a/packages/CredentialManager/res/values-gl/strings.xml +++ b/packages/CredentialManager/res/values-gl/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Mellora na seguranza das contas"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada clave está vinculada de xeito exclusivo coa aplicación ou o sitio web para o que foi creada, de tal forma que nunca poidas iniciar sesión nunha aplicación ou un sitio web fraudulentos por erro. Ademais, como os servidores só gardan as claves públicas, resultan moito máis difíciles de piratear."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transición fluída"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Durante este percorrido cara a un futuro sen contrasinais, estes seguirán estando dispoñibles a canda as claves de acceso"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Durante este percorrido cara a un futuro sen contrasinais, estes seguirán estando dispoñibles a canda as claves de acceso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolle onde queres gardar: <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un xestor de contrasinais para gardar a túa información e iniciar sesión máis rápido a próxima vez"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Queres crear unha clave de acceso para <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Escolle un método de inicio de sesión gardado para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Iniciar sesión doutra forma"</string> <string name="snackbar_action" msgid="37373514216505085">"Ver opcións"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continuar"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Xestionar os métodos de inicio de sesión"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Doutro dispositivo"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Usar outro dispositivo"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> cancelou a solicitude"</string> </resources> diff --git a/packages/CredentialManager/res/values-gu/strings.xml b/packages/CredentialManager/res/values-gu/strings.xml index 234742e99c17..ea7809756d41 100644 --- a/packages/CredentialManager/res/values-gu/strings.xml +++ b/packages/CredentialManager/res/values-gu/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"બહેતર બનાવેલી એકાઉન્ટની સુરક્ષા"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"દરેક કીને જે ઍપ અથવા વેબસાઇટ માટે બનાવવામાં આવી હોય તેની સાથે તે વિશેષ રીતે લિંક થયેલી છે, તેથી તમારાથી ક્યારેય ભૂલથી કપટપૂર્ણ ઍપ અથવા વેબસાઇટ પર સાઇન ઇન ન થાય. ઉપરાંત, સર્વર માત્ર જાહેર કી રાખે છે, હૅકિંગ ઘણું મુશ્કેલ છે."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"વિક્ષેપરહિત ટ્રાન્ઝિશન"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"આપણે પાસવર્ડ રહિત ભવિષ્ય તરફ આગળ વધી રહ્યાં છીએ, છતાં પાસકીની સાથોસાથ હજી પણ પાસવર્ડ ઉપલબ્ધ રહેશે"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"આપણે પાસવર્ડ રહિત ભવિષ્ય તરફ આગળ વધી રહ્યાં છીએ, છતાં પાસકીની સાથોસાથ હજી પણ પાસવર્ડ ઉપલબ્ધ રહેશે."</string> <string name="choose_provider_title" msgid="8870795677024868108">"તમારી <xliff:g id="CREATETYPES">%1$s</xliff:g> ક્યાં સાચવવી તે પસંદ કરો"</string> <string name="choose_provider_body" msgid="4967074531845147434">"તમારી માહિતી સાચવવા માટે પાસવર્ડ મેનેજર પસંદ કરો અને આગલી વખતે વધુ ઝડપથી સાઇન ઇન કરો"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> માટે પાસકી બનાવીએ?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે શું તમારી સાચવેલી પાસકીનો ઉપયોગ કરીએ?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે શું તમારા સાચવેલા સાઇન-ઇનનો ઉપયોગ કરીએ?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે કોઈ સાચવેલું સાઇન-ઇન પસંદ કરો"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g>નો વિકલ્પ પસંદ કરીએ?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"કોઈ અન્ય રીતે સાઇન ઇન કરો"</string> <string name="snackbar_action" msgid="37373514216505085">"વ્યૂના વિકલ્પો"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"સાઇન-ઇન મેનેજ કરો"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"કોઈ અન્ય ડિવાઇસમાંથી"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"કોઈ અન્ય ડિવાઇસનો ઉપયોગ કરો"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> દ્વારા વિનંતી રદ કરવામાં આવી"</string> </resources> diff --git a/packages/CredentialManager/res/values-hi/strings.xml b/packages/CredentialManager/res/values-hi/strings.xml index 7e00a8c31a44..5b07bdae4586 100644 --- a/packages/CredentialManager/res/values-hi/strings.xml +++ b/packages/CredentialManager/res/values-hi/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"खाते की बेहतर सुरक्षा"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"हर कुंजी खास तौर पर उस ऐप्लिकेशन या वेबसाइट से लिंक होती है जिसके लिए उसे बनाया गया है. ऐसा इसलिए किया जाता है, ताकि कोई भी व्यक्ति धोखाधड़ी करने वाले ऐप्लिकेशन या वेबसाइट पर कभी भी गलती से साइन इन न करे. साथ ही, सर्वर के पास सिर्फ़ सार्वजनिक कुंजी होती हैं, इसलिए पूरी कुंजी को हैक करना काफ़ी मुश्किल होता है."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"आसान ट्रांज़िशन"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"आने वाले समय में, बिना पासवर्ड के टेक्नोलॉजी का इस्तेमाल किया जा सकेगा. हालांकि, पासकी के साथ पासवर्ड भी इस्तेमाल किए जा सकेंगे"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"आने वाले समय में बिना पासवर्ड वाली टेक्नोलॉजी यानी पासकी का इस्तेमाल बढ़ेगा, हालांकि इसके साथ-साथ पासवर्ड भी इस्तेमाल किए जा सकेंगे."</string> <string name="choose_provider_title" msgid="8870795677024868108">"चुनें कि अपनी <xliff:g id="CREATETYPES">%1$s</xliff:g> कहां सेव करनी हैं"</string> <string name="choose_provider_body" msgid="4967074531845147434">"अपनी जानकारी सेव करने के लिए, पासवर्ड मैनेजर चुनें और अगली बार ज़्यादा तेज़ी से साइन इन करें"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"क्या आपको <xliff:g id="APPNAME">%1$s</xliff:g> के लिए पासकी बनानी है?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> पर साइन इन करने के लिए, सेव की गई पासकी का इस्तेमाल करना है?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> पर साइन इन करने के लिए, सेव की गई जानकारी का इस्तेमाल करना है?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> पर साइन इन करने के लिए, सेव की गई जानकारी में से चुनें"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> में साइन इन करने के लिए सेव किए गए विकल्पों में से किसी को चुनना है?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"किसी दूसरे तरीके से साइन इन करें"</string> <string name="snackbar_action" msgid="37373514216505085">"विकल्प देखें"</string> diff --git a/packages/CredentialManager/res/values-hr/strings.xml b/packages/CredentialManager/res/values-hr/strings.xml index c7ca34ac85ae..d9ac2491ee0a 100644 --- a/packages/CredentialManager/res/values-hr/strings.xml +++ b/packages/CredentialManager/res/values-hr/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Poboljšana sigurnost računa"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Svaki je ključ povezan isključivo s aplikacijom ili web-lokacijom za koju je izrađen, stoga se nikad ne možete pogreškom prijaviti u prijevarnu aplikaciju ili na web-lokaciju. Osim toga, kad je riječ o poslužiteljima na kojem se nalaze samo javni ključevi, hakiranje je mnogo teže."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Besprijekorni prijelaz"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Kako idemo u smjeru budućnosti bez zaporki, one će i dalje biti dostupne uz pristupne ključeve"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Kako idemo u smjeru budućnosti bez zaporki, one će i dalje biti dostupne uz pristupne ključeve."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Odaberite gdje će se spremati <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Odaberite upravitelja zaporki kako biste spremili svoje informacije i drugi se put brže prijavili"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Želite li izraditi pristupni ključ za <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Želite li upotrijebiti spremljeni pristupni ključ za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Želite li upotrijebiti spremljene podatke za prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Odaberite spremljene podatke za prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Želite li odabrati opciju za <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Prijavite se na neki drugi način"</string> <string name="snackbar_action" msgid="37373514216505085">"Prikaži opcije"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Upravljanje prijavama"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Na drugom uređaju"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Upotrijebite drugi uređaj"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Zahtjev je otkazala aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-hu/strings.xml b/packages/CredentialManager/res/values-hu/strings.xml index c277f233583f..92fa38869aff 100644 --- a/packages/CredentialManager/res/values-hu/strings.xml +++ b/packages/CredentialManager/res/values-hu/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Nagyobb fiókbiztonság"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Minden kulcs kizárólag ahhoz az alkalmazáshoz vagy weboldalhoz kapcsolódik, amelyhez létrehozták, így soha nem fordulhat elő, hogy Ön tévedésből csalárd alkalmazásba vagy webhelyre jelentkezik be. Ráadásul – mivel a szerverek csak nyilvános kulcsokat tárolnak – a hackelés jóval nehezebb."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Zökkenőmentes átmenet"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Miközben a jelszó nélküli jövő felé haladunk, a jelszavak továbbra is rendelkezésre állnak majd az azonosítókulcsok mellett."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Miközben a jelszó nélküli jövő felé haladunk, a jelszavak továbbra is rendelkezésre állnak majd az azonosítókulcsok mellett."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Válassza ki, hogy hova szeretné menteni <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Válasszon jelszókezelőt, hogy menthesse az adatait, és gyorsabban jelentkezhessen be a következő alkalommal."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Létrehoz azonosítókulcsot a következőhöz: <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Mentett bejelentkezési adatok választása a következő számára: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Bejelentkezés más módon"</string> <string name="snackbar_action" msgid="37373514216505085">"Lehetőségek megtekintése"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Folytatás"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Bejelentkezési adatok kezelése"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Másik eszközről"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Másik eszköz használata"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"A kérelmet törölte a(z) <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-hy/strings.xml b/packages/CredentialManager/res/values-hy/strings.xml index 9a4e9180619f..80947cc98844 100644 --- a/packages/CredentialManager/res/values-hy/strings.xml +++ b/packages/CredentialManager/res/values-hy/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Հաշվի բարելավված անվտանգություն"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Յուրաքանչյուր բանալի բացառապես կապված է հավելվածի կամ կայքի հետ, որի համար այն ստեղծվել է, ուստի դուք երբեք չեք կարող սխալմամբ մուտք գործել կեղծ հավելված կամ կայք։ Բացի այդ՝ սերվերներում պահվում են միայն բաց բանալիներ, ինչը զգալիորեն դժվարացնում է կոտրումը։"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Սահուն անցում"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Թեև մենք առանց գաղտնաբառերի ապագայի ճանապարհին ենք, դրանք դեռ հասանելի կլինեն անցաբառերի հետ մեկտեղ"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Թեև մենք առանց գաղտնաբառերի ապագայի ճանապարհին ենք, դրանք դեռ հասանելի կլինեն անցաբառերի հետ մեկտեղ։"</string> <string name="choose_provider_title" msgid="8870795677024868108">"Նշեք, թե որտեղ եք ուզում պահել ձեր <xliff:g id="CREATETYPES">%1$s</xliff:g>ը"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Ընտրեք գաղտնաբառերի կառավարիչ՝ ձեր տեղեկությունները պահելու և հաջորդ անգամ ավելի արագ մուտք գործելու համար"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Ստեղծե՞լ անցաբառ <xliff:g id="APPNAME">%1$s</xliff:g> հավելվածի համար"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Ընտրեք մուտքի պահված տվյալներ <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի համար"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Մուտք գործել այլ եղանակով"</string> <string name="snackbar_action" msgid="37373514216505085">"Դիտել տարբերակները"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Շարունակել"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Մուտքի կառավարում"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Մեկ այլ սարքից"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Օգտագործել այլ սարք"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Հարցումը չեղարկվել է <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի կողմից"</string> </resources> diff --git a/packages/CredentialManager/res/values-in/strings.xml b/packages/CredentialManager/res/values-in/strings.xml index c77cf4907a43..f72c36d383c6 100644 --- a/packages/CredentialManager/res/values-in/strings.xml +++ b/packages/CredentialManager/res/values-in/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Keamanan akun yang ditingkatkan"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Setiap kunci ditautkan secara eksklusif dengan aplikasi atau situs tempatnya dibuat, sehingga Anda tidak akan login ke aplikasi atau situs yang menipu secara tidak sengaja. Selain itu, peretasan lebih sulit dilakukan karena server hanya menyimpan kunci publik."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transisi yang lancar"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Seiring kita menuju masa depan tanpa sandi, sandi akan tetap tersedia bersama kunci sandi"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Sandi akan tetap tersedia bersama kunci sandi seiring perjalanan menuju era di mana sandi tidak diperlukan lagi."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Pilih tempat penyimpanan <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pilih pengelola sandi untuk menyimpan info Anda dan login lebih cepat lain kali"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Buat kunci sandi untuk <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Pilih info login tersimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Login dengan cara lain"</string> <string name="snackbar_action" msgid="37373514216505085">"Lihat opsi"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Lanjutkan"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Kelola login"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Dari perangkat lain"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Gunakan perangkat lain"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Permintaan dibatalkan oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-is/strings.xml b/packages/CredentialManager/res/values-is/strings.xml index 375a1c544f86..fa2d0b5b576b 100644 --- a/packages/CredentialManager/res/values-is/strings.xml +++ b/packages/CredentialManager/res/values-is/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Bætt reikningsöryggi"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Hver lykill er eingöngu tengdur forritinu eða vefsvæðinu sem hann var búinn til fyrir. Því er engin hætta á að þú skráir þig óvart inn á sviksamlegt forrit eða vefsvæði. Einnig er erfiðara að hakka þegar þjónar geyma aðeins opinbera lykla."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Snurðulaus skipti"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Við stefnum að framtíð án aðgangsorða en aðgangsorð verða áfram í boði samhliða aðgangslyklum"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Við stefnum að framtíð án aðgangsorða en aðgangsorð verða áfram í boði samhliða aðgangslyklum."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Veldu hvar þú vilt vista <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Veldu aðgangsorðastjórnun til að vista upplýsingarnar og vera fljótari að skrá þig inn næst"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Viltu búa til aðgangslykil fyrir <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Veldu vistaða innskráningu fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Skrá inn með öðrum hætti"</string> <string name="snackbar_action" msgid="37373514216505085">"Skoða valkosti"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Áfram"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Stjórna innskráningu"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Úr öðru tæki"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Nota annað tæki"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> hætti við beiðnina"</string> </resources> diff --git a/packages/CredentialManager/res/values-it/strings.xml b/packages/CredentialManager/res/values-it/strings.xml index 49eb54704cd2..a45f39a35941 100644 --- a/packages/CredentialManager/res/values-it/strings.xml +++ b/packages/CredentialManager/res/values-it/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Account ancora più sicuri"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Ogni chiave è collegata in modo esclusivo all\'app o al sito web per cui è stata creata, quindi non puoi mai accedere a un\'app o un sito web fraudolenti per sbaglio. Inoltre, le compromissioni diventano molto più difficili perché i server conservano soltanto le chiavi pubbliche."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transizione graduale"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Mentre ci dirigiamo verso un futuro senza password, queste ultime saranno ancora disponibili insieme alle passkey."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Il futuro sarà senza password, ma per ora saranno ancora disponibili insieme alle passkey."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Scegli dove salvare le <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Seleziona un gestore delle password per salvare i tuoi dati e accedere più velocemente la prossima volta"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vuoi creare una passkey per <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Vuoi usare la passkey salvata per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Vuoi usare l\'accesso salvato per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Scegli un accesso salvato per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Vuoi scegliere un\'opzione per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Accedi in un altro modo"</string> <string name="snackbar_action" msgid="37373514216505085">"Visualizza opzioni"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Gestisci gli accessi"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Da un altro dispositivo"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Usa un dispositivo diverso"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Richiesta annullata da <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-iw/strings.xml b/packages/CredentialManager/res/values-iw/strings.xml index d87c4f424530..b18753339c67 100644 --- a/packages/CredentialManager/res/values-iw/strings.xml +++ b/packages/CredentialManager/res/values-iw/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"אבטחה טובה יותר של החשבון"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"כל מפתח מקושר אך ורק לאפליקציה או לאתר שעבורם הוא נוצר, ולכן אף פעם אי אפשר להיכנס בטעות לחשבון באפליקציה או באתר שמטרתם להונות. בנוסף, כיוון שהשרתים שומרים רק מפתחות ציבוריים, קשה יותר לפרוץ לחשבון."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"מעבר חלק"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"אנחנו מתקדמים לעבר עתיד ללא סיסמאות, אבל עדיין אפשר יהיה להשתמש בסיסמאות וגם במפתחות גישה"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"אנחנו מתקדמים לעבר עתיד ללא סיסמאות, אבל עדיין אפשר יהיה להשתמש בסיסמאות וגם במפתחות גישה."</string> <string name="choose_provider_title" msgid="8870795677024868108">"בחירת המקום לשמירה של <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"אפשר לבחור באחד משירותי ניהול הסיסמאות כדי לשמור את הפרטים ולהיכנס לחשבון מהר יותר בפעם הבאה"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"ליצור מפתח גישה ל-<xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"בחירת פרטי כניסה שמורים עבור <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"כניסה בדרך אחרת"</string> <string name="snackbar_action" msgid="37373514216505085">"הצגת האפשרויות"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"המשך"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"ניהול כניסות"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"ממכשיר אחר"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"צריך להשתמש במכשיר אחר"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> ביטלה את הבקשה"</string> </resources> diff --git a/packages/CredentialManager/res/values-ja/strings.xml b/packages/CredentialManager/res/values-ja/strings.xml index 2bb7e9ca461a..f930d2a3afae 100644 --- a/packages/CredentialManager/res/values-ja/strings.xml +++ b/packages/CredentialManager/res/values-ja/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"アカウントのセキュリティを強化"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"作成された各鍵は、対象となるアプリまたはウェブサイトのみとリンクされるため、間違って不正なアプリやウェブサイトにログインすることはありません。さらに、公開鍵はサーバーのみに保存されるため、ハッキングのリスクも大幅に抑えられます。"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"シームレスな移行"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"将来的にパスワードレスに移行するにあたり、パスワードもパスキーと並行して引き続きご利用いただけます"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"将来的にパスワードレスに移行するにあたり、パスワードもパスキーと並行して引き続きご利用いただけます。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g>の保存先を選択"</string> <string name="choose_provider_body" msgid="4967074531845147434">"パスワード マネージャーを選択して情報を保存しておくと、次回からすばやくログインできます"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> のパスキーを作成しますか？"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> の保存したパスキーを使用しますか？"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> の保存したログイン情報を使用しますか？"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> の保存したログイン情報の選択"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> のオプションを選択しますか？"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"別の方法でログイン"</string> <string name="snackbar_action" msgid="37373514216505085">"オプションを表示"</string> diff --git a/packages/CredentialManager/res/values-ka/strings.xml b/packages/CredentialManager/res/values-ka/strings.xml index 0f638ef5d7b8..a53bb502da42 100644 --- a/packages/CredentialManager/res/values-ka/strings.xml +++ b/packages/CredentialManager/res/values-ka/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ანგარიშის გაუმჯობესებული უსაფრთხოება"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"თითოეული გასაღები დაკავშირებულია მხოლოდ აპთან ან ვებსაიტთან, რომელთათვისაც ის შეიქმნა, ამიტომაც შემთხვევით ვერასდროს შეხვალთ თაღლითურ აპში თუ ვებსაიტზე. ამასთანავე, სერვერები ინახავს მხოლოდ საჯარო გასაღებებს, რაც ართულებს გატეხვის ალბათობას."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"დაუბრკოლებელი გადასვლა"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"უპაროლო მომავალში გადასვლის პროცესის პარალელურად პაროლები კვლავ ხელმისაწვდომი იქნება, წვდომის გასაღებებთან ერთად"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"უპაროლო მომავალში პაროლები კვლავ ხელმისაწვდომი იქნება, წვდომის გასაღებებთან ერთად."</string> <string name="choose_provider_title" msgid="8870795677024868108">"აირჩიეთ სად შეინახოთ თქვენი <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"აირჩიეთ პაროლების მმართველი თქვენი ინფორმაციის შესანახად, რომ მომავალში უფრო სწრაფად შეხვიდეთ."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"შექმნით წვდომის გასაღებს <xliff:g id="APPNAME">%1$s</xliff:g> აპისთვის?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"აირჩიეთ სისტემაში შესვლის ინფორმაცია აპისთვის: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"სხვა ხერხით შესვლა"</string> <string name="snackbar_action" msgid="37373514216505085">"პარამეტრების ნახვა"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"გაგრძელება"</string> diff --git a/packages/CredentialManager/res/values-kk/strings.xml b/packages/CredentialManager/res/values-kk/strings.xml index a4703e827242..9635d8a3ebea 100644 --- a/packages/CredentialManager/res/values-kk/strings.xml +++ b/packages/CredentialManager/res/values-kk/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Аккаунттың қосымша қауіпсіздігі"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Әрбір кілт өзі арнайы жасалған қолданбамен немесе веб-сайтпен ғана байланысты болады, сондықтан алаяқтар қолданбасына немесе веб-сайтына байқаусызда кіру мүмкін емес. Онымен қоса тек ашық кілттер сақталатын серверлер арқасында хакерлердің бұзып кіруі айтарлықтай қиындады."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Оңай ауысу"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Құпия сөзсіз болашақ жақын болғанына қарамастан, келешекте құпия сөздерді кіру кілттерімен қатар қолдана беруге болады."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Құпия сөзсіз болашақ жақын болғанына қарамастан, келешекте құпия сөздерді кіру кілттерімен қатар қолдана беруге болады."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> қайда сақталатынын таңдаңыз"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Мәліметіңізді сақтап, келесіде жылдам кіру үшін құпия сөз менеджерін таңдаңыз."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> үшін кіру кілтін жасау керек пе?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> үшін сақталған тіркелу деректерін таңдаңыз"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Басқаша кіру"</string> <string name="snackbar_action" msgid="37373514216505085">"Опцияларды көру"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Жалғастыру"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Кіру әрекеттерін басқару"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Басқа құрылғыдан жасау"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Басқа құрылғыны пайдалану"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы сұрауды тоқтатты."</string> </resources> diff --git a/packages/CredentialManager/res/values-km/strings.xml b/packages/CredentialManager/res/values-km/strings.xml index 97067c5f7e33..b1c3f5e17ac8 100644 --- a/packages/CredentialManager/res/values-km/strings.xml +++ b/packages/CredentialManager/res/values-km/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"សុវត្ថិភាពគណនីដែលប្រសើរឡើង"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"កូដនីមួយៗត្រូវបានភ្ជាប់ផ្តាច់មុខជាមួយកម្មវិធី ឬគេហទំព័រដែលវាត្រូវបានបង្កើតឡើង ដូច្នេះអ្នកមិនអាចចូលទៅក្នុងកម្មវិធី ឬគេហទំព័រក្លែងបន្លំដោយច្រឡំបានឡើយ។ លើសពីនេះ ជាមួយនឹងម៉ាស៊ីនមេដែលរក្សាតែកូដសាធារណៈប៉ុណ្ណោះ ការលួចចូលគឺពិបាកខ្លាំង។"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"ដំណើរផ្លាស់ប្ដូរយ៉ាងរលូន"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"នៅពេលដែលយើងឈានទៅរកអនាគតដែលគ្មានពាក្យសម្ងាត់ ពាក្យសម្ងាត់នៅតែអាចប្រើបានរួមជាមួយកូដសម្ងាត់"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"នៅពេលដែលយើងឈានទៅរកអនាគតដែលគ្មានពាក្យសម្ងាត់ ពាក្យសម្ងាត់នៅតែអាចប្រើបានរួមជាមួយកូដសម្ងាត់។"</string> <string name="choose_provider_title" msgid="8870795677024868108">"ជ្រើសរើសកន្លែងដែលត្រូវរក្សាទុក<xliff:g id="CREATETYPES">%1$s</xliff:g>របស់អ្នក"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ជ្រើសរើសកម្មវិធីគ្រប់គ្រងពាក្យសម្ងាត់ ដើម្បីរក្សាទុកព័ត៌មានរបស់អ្នក និងចូលគណនីបានកាន់តែរហ័សនៅពេលលើកក្រោយ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"បង្កើតកូដសម្ងាត់សម្រាប់ <xliff:g id="APPNAME">%1$s</xliff:g> ឬ?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"ប្រើកូដសម្ងាត់ដែលបានរក្សាទុករបស់អ្នកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"ប្រើការចូលគណនីដែលបានរក្សាទុករបស់អ្នកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"ជ្រើសរើសការចូលគណនីដែលបានរក្សាទុកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"ជ្រើសរើសជម្រើសសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ចូលគណនីដោយប្រើវិធីផ្សេងទៀត"</string> <string name="snackbar_action" msgid="37373514216505085">"មើលជម្រើស"</string> diff --git a/packages/CredentialManager/res/values-kn/strings.xml b/packages/CredentialManager/res/values-kn/strings.xml index ae6c8efa738f..327535f2af74 100644 --- a/packages/CredentialManager/res/values-kn/strings.xml +++ b/packages/CredentialManager/res/values-kn/strings.xml @@ -20,8 +20,8 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ಸುಧಾರಿತ ಖಾತೆಯ ಭದ್ರತೆ"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ಪ್ರತಿಯೊಂದು ಕೀಯನ್ನು ಯಾವ ಆ್ಯಪ್ ಅಥವಾ ವೆಬ್ಸೈಟ್ಗಾಗಿ ರಚಿಸಲಾಗಿದೆಯೋ ಅದರೊಂದಿಗೆ ಮಾತ್ರ ಲಿಂಕ್ ಮಾಡಲಾಗುತ್ತದೆ. ಆದ್ದರಿಂದ ನೀವು ಎಂದಿಗೂ ತಪ್ಪಾಗಿ ವಂಚನೆಯ ಆ್ಯಪ್ ಅಥವಾ ವೆಬ್ಸೈಟ್ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಜೊತೆಗೆ, ಸರ್ವರ್ಗಳು ಸಾರ್ವಜನಿಕ ಕೀಗಳನ್ನು ಮಾತ್ರ ಇಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ, ಹ್ಯಾಕಿಂಗ್ ಮಾಡುವುದು ತುಂಬಾ ಕಷ್ಟಕರವಾಗಿದೆ."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"ಅಡಚಣೆರಹಿತ ಪರಿವರ್ತನೆ"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"ನಾವು ಪಾಸ್ವರ್ಡ್ ರಹಿತ ಭವಿಷ್ಯದತ್ತ ಸಾಗುತ್ತಿರುವಾಗ, ಪಾಸ್ಕೀಗಳ ಜೊತೆಗೆ ಪಾಸ್ವರ್ಡ್ಗಳು ಇನ್ನೂ ಲಭ್ಯವಿರುತ್ತವೆ"</string> - <string name="choose_provider_title" msgid="8870795677024868108">"ನಿಮ್ಮ <xliff:g id="CREATETYPES">%1$s</xliff:g> ಅನ್ನು ಎಲ್ಲಿ ಉಳಿಸಬೇಕು ಎಂದು ಆರಿಸಿ"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"ನಾವು ಪಾಸ್ವರ್ಡ್ ರಹಿತ ತಂತ್ರಜ್ಞಾನದ ಕಡೆಗೆ ಸಾಗುತ್ತಿರುವಾಗ, ಪಾಸ್ಕೀಗಳ ಜೊತೆಗೆ ಪಾಸ್ವರ್ಡ್ಗಳು ಇನ್ನೂ ಲಭ್ಯವಿರುತ್ತವೆ."</string> + <string name="choose_provider_title" msgid="8870795677024868108">"ನಿಮ್ಮ <xliff:g id="CREATETYPES">%1$s</xliff:g> ಎಲ್ಲಿ ಸೇವ್ ಆಗಬೇಕು ಎಂಬುದನ್ನು ಆರಿಸಿ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ನಿಮ್ಮ ಮಾಹಿತಿಯನ್ನು ಉಳಿಸಲು ಪಾಸ್ವರ್ಡ್ ನಿರ್ವಾಹಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ ಹಾಗೂ ಮುಂದಿನ ಬಾರಿ ವೇಗವಾಗಿ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> ಗಾಗಿ ಪಾಸ್ಕೀ ಅನ್ನು ರಚಿಸುವುದೇ?"</string> <string name="choose_create_option_password_title" msgid="7097275038523578687">"<xliff:g id="APPNAME">%1$s</xliff:g> ಗಾಗಿ ಪಾಸ್ವರ್ಡ್ ಉಳಿಸುವುದೇ?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ಉಳಿಸಲಾದ ಸೈನ್-ಇನ್ ಮಾಹಿತಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ಬೇರೆ ವಿಧಾನದಲ್ಲಿ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string> <string name="snackbar_action" msgid="37373514216505085">"ಆಯ್ಕೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ಮುಂದುವರಿಸಿ"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"ಸೈನ್-ಇನ್ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"ಮತ್ತೊಂದು ಸಾಧನದಿಂದ"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"ಬೇರೆ ಸಾಧನವನ್ನು ಬಳಸಿ"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಂದ ವಿನಂತಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"</string> </resources> diff --git a/packages/CredentialManager/res/values-ko/strings.xml b/packages/CredentialManager/res/values-ko/strings.xml index 4834eaf9e223..3ce02453227e 100644 --- a/packages/CredentialManager/res/values-ko/strings.xml +++ b/packages/CredentialManager/res/values-ko/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"계정 보안 향상"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"각 키는 생성 시 대상으로 설정된 앱 또는 웹사이트와 단독으로 연결되어 있으므로 실수로 사기 앱 또는 웹사이트에 로그인할 일이 없습니다. 또한 서버에만 공개 키가 보관되므로 해킹이 더욱 까다롭습니다."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"원활한 이전"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"비밀번호가 필요 없는 미래로 나아가는 동안에도 비밀번호는 여전히 패스키와 함께 사용될 것입니다."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"비밀번호 없는 미래로 나아가는 과정에서 비밀번호는 여전히 패스키와 함께 사용될 것입니다."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> 저장 위치 선택"</string> <string name="choose_provider_body" msgid="4967074531845147434">"정보를 저장해서 다음에 더 빠르게 로그인하려면 비밀번호 관리자를 선택하세요."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g>의 패스키를 만드시겠습니까?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> 앱용 저장된 로그인 정보 선택"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"다른 방법으로 로그인"</string> <string name="snackbar_action" msgid="37373514216505085">"옵션 보기"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"계속"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"로그인 관리"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"다른 기기에서"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"다른 기기 사용"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g>에 의해 요청이 취소됨"</string> </resources> diff --git a/packages/CredentialManager/res/values-ky/strings.xml b/packages/CredentialManager/res/values-ky/strings.xml index afbac7954005..7d828998aa86 100644 --- a/packages/CredentialManager/res/values-ky/strings.xml +++ b/packages/CredentialManager/res/values-ky/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Аккаунттун коопсуздугу жакшыртылды"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Ар бир ачкыч өзү арналган колдонмо же вебсайт менен гана байланыштырылгандыктан, эч качан шылуундардын колдонмолоруна же вебсайттарына жаңылыштык менен кирип албайсыз. Мындан тышкары, серверлерде жалпыга ачык ачкычтар гана сакталгандыктан, хакерлик кылуу кыйла кыйын."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Тез которулуу"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Сырсөзсүз келечекти көздөй баратсак да, аларды киргизүүчү ачкычтар менен бирге колдоно берүүгө болот"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Сырсөзсүз келечекти көздөй баратсак да, аларды киргизүүчү ачкычтар менен бирге колдоно берүүгө болот."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> кайда сакталарын тандаңыз"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Маалыматыңызды сактоо жана кийинки жолу тезирээк кирүү үчүн сырсөздөрдү башкаргычты тандаңыз"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> колдонмосуна киргизүүчү ачкыч түзөсүзбү?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна кирүү үчүн сакталган ачкычты колдоносузбу?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн сакталган кирүү параметрин колдоносузбу?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн кирүү маалыматын тандаңыз"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн параметр тандайсызбы?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Башка жол менен кирүү"</string> <string name="snackbar_action" msgid="37373514216505085">"Параметрлерди көрүү"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Кирүү параметрлерин тескөө"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Башка түзмөктөн"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Башка түзмөктү колдонуу"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Сурамды <xliff:g id="APP_NAME">%1$s</xliff:g> жокко чыгарды"</string> </resources> diff --git a/packages/CredentialManager/res/values-lo/strings.xml b/packages/CredentialManager/res/values-lo/strings.xml index 5c99c2516049..75726ea86fb4 100644 --- a/packages/CredentialManager/res/values-lo/strings.xml +++ b/packages/CredentialManager/res/values-lo/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ປັບປຸງຄວາມປອດໄພບັນຊີ"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ກະແຈແຕ່ລະອັນແມ່ນລິ້ງເຈາະຈົງກັບແອັບ ຫຼື ເວັບໄຊທີ່ພວກມັນຖືກສ້າງໃຫ້, ດັ່ງນັ້ນທ່ານຈະບໍ່ສາມາດເຂົ້າສູ່ລະບົບຫາແອັບ ຫຼື ເວັບໄຊສໍ້ໂກງຕ່າງໆໂດຍບໍ່ໄດ້ຕັ້ງໃຈໄດ້. ນອກຈາກນັ້ນ, ເຊີບເວີຍັງມີການເກັບກະແຈສາທາລະນະໄວ້ເທົ່ານັ້ນ, ການແຮັກຈຶ່ງເປັນເລື່ອງຍາກຂຶ້ນຫຼາຍ."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"ການປ່ຽນຜ່ານທີ່ຕໍ່ເນື່ອງ"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"ໃນຂະນະທີ່ພວກເຮົາກ້າວໄປສູ່ອະນາຄົດທີ່ບໍ່ຕ້ອງໃຊ້ລະຫັດຜ່ານ, ລະຫັດຜ່ານຈະຍັງຄົງໃຊ້ໄດ້ຄວບຄູ່ໄປກັບກະແຈຜ່ານ"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"ໃນຂະນະທີ່ພວກເຮົາກ້າວໄປສູ່ອະນາຄົດທີ່ບໍ່ຕ້ອງໃຊ້ລະຫັດຜ່ານ, ລະຫັດຜ່ານຈະຍັງຄົງໃຊ້ໄດ້ຄວບຄູ່ໄປກັບກະແຈຜ່ານ."</string> <string name="choose_provider_title" msgid="8870795677024868108">"ເລືອກບ່ອນທີ່ຈະບັນທຶກ <xliff:g id="CREATETYPES">%1$s</xliff:g> ຂອງທ່ານ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ເລືອກຕົວຈັດການລະຫັດຜ່ານເພື່ອບັນທຶກຂໍ້ມູນຂອງທ່ານ ແລະ ເຂົ້າສູ່ລະບົບໄວຂຶ້ນໃນເທື່ອຕໍ່ໄປ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"ສ້າງກະແຈຜ່ານສຳລັບ <xliff:g id="APPNAME">%1$s</xliff:g> ບໍ?"</string> @@ -52,8 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"ໃຊ້ກະແຈຜ່ານທີ່ບັນທຶກໄວ້ຂອງທ່ານສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"ໃຊ້ການເຂົ້າສູ່ລະບົບທີ່ບັນທຶກໄວ້ຂອງທ່ານສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"ເລືອກການເຂົ້າສູ່ລະບົບທີ່ບັນທຶກໄວ້ສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> - <skip /> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"ເລືອກຕົວເລືອກສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> + <string name="get_dialog_title_use_info_on" msgid="8863708099535435146">"ໃຊ້ຂໍ້ມູນນີ້ຢູ່ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ເຂົ້າສູ່ລະບົບດ້ວຍວິທີອື່ນ"</string> <string name="snackbar_action" msgid="37373514216505085">"ເບິ່ງຕົວເລືອກ"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ສືບຕໍ່"</string> diff --git a/packages/CredentialManager/res/values-lt/strings.xml b/packages/CredentialManager/res/values-lt/strings.xml index 7dcd9d0b942c..ed2db46ba45e 100644 --- a/packages/CredentialManager/res/values-lt/strings.xml +++ b/packages/CredentialManager/res/values-lt/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Geresnė paskyros sauga"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Kiekvienas raktas išskirtinai susietas su programa ar svetaine, kuriai buvo sukurtas, todėl niekada per klaidą neprisijungsite prie apgavikiškos programos ar svetainės. Be to, viešieji raktai laikomi tik serveriuose, todėl įsilaužti tampa gerokai sudėtingiau."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Sklandus perėjimas"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Kol stengiamės padaryti, kad ateityje nereikėtų naudoti slaptažodžių, jie vis dar bus pasiekiami kartu su „passkey“."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Kol stengiamės padaryti, kad ateityje nereikėtų naudoti slaptažodžių, jie vis dar bus pasiekiami kartu su slaptaisiais raktais."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Pasirinkite, kur išsaugoti „<xliff:g id="CREATETYPES">%1$s</xliff:g>“"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pasirinkite slaptažodžių tvarkyklę, kurią naudodami galėsite išsaugoti informaciją ir kitą kartą prisijungti greičiau"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Sukurti „passkey“, skirtą „<xliff:g id="APPNAME">%1$s</xliff:g>“?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Pasirinkite išsaugotą prisijungimo informaciją programai „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Prisijungti kitu būdu"</string> <string name="snackbar_action" msgid="37373514216505085">"Peržiūrėti parinktis"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Tęsti"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Tvarkyti prisijungimo informaciją"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Naudojant kitą įrenginį"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Naudoti kitą įrenginį"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Užklausą atšaukė „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string> </resources> diff --git a/packages/CredentialManager/res/values-lv/strings.xml b/packages/CredentialManager/res/values-lv/strings.xml index d68124fa737d..c1ae23092fbc 100644 --- a/packages/CredentialManager/res/values-lv/strings.xml +++ b/packages/CredentialManager/res/values-lv/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Uzlabota kontu drošība"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Katra atslēga ir saistīta tikai ar to lietotni vai vietni, kurai tā tika izveidota, tādēļ jūs nevarēsiet nejauši pierakstīties krāpnieciskā lietotnē vai vietnē. Turklāt uzlaušanu ievērojami sarežģī tas, ka serveros tiek glabātas tikai publiskās atslēgas."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Ērta pāreja"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Kamēr notiek pāreja uz darbu bez parolēm, tās joprojām būs pieejamas līdztekus piekļuves atslēgām."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Lai arī pamazām notiek pāreja uz darbu bez parolēm, tās joprojām būs pieejamas līdzās piekļuves atslēgām."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Izvēlieties, kur saglabāt savas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Lai saglabātu informāciju un nākamreiz varētu pierakstīties ātrāk, atlasiet paroļu pārvaldnieku."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vai izveidot piekļuves atslēgu lietotnei <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Saglabātas pierakstīšanās informācijas izvēle lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Pierakstīties citā veidā"</string> <string name="snackbar_action" msgid="37373514216505085">"Skatīt opcijas"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Turpināt"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Pierakstīšanās informācijas pārvaldība"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"No citas ierīces"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Izmantot citu ierīci"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> atcēla pieprasījumu"</string> </resources> diff --git a/packages/CredentialManager/res/values-mk/strings.xml b/packages/CredentialManager/res/values-mk/strings.xml index 0249a8677d07..969912b139d1 100644 --- a/packages/CredentialManager/res/values-mk/strings.xml +++ b/packages/CredentialManager/res/values-mk/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Подобрена безбедност на сметката"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Секој клуч е поврзан само со апликацијата или веб-сајтот за кој бил создаден за да не може никогаш по грешка да се најавите на измамничка апликација или веб-сајт. Плус, кога серверите ги чуваат само јавните клучеви, хакирањето е многу потешко."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Беспрекорна транзиција"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Иако се движиме кон иднина без лозинки, лозинките сепак ќе бидат достапни покрај криптографските клучеви"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Како што се движиме кон иднина без лозинки, лозинките сепак ќе бидат достапни покрај криптографските клучеви."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Изберете каде да ги зачувате вашите <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Изберете управник со лозинки за да ги зачувате вашите податоци и да се најавите побрзо следниот пат"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Да се создаде криптографски клуч за <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Изберете зачувано најавување за <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Најавете се на друг начин"</string> <string name="snackbar_action" msgid="37373514216505085">"Прикажи ги опциите"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Продолжи"</string> diff --git a/packages/CredentialManager/res/values-ml/strings.xml b/packages/CredentialManager/res/values-ml/strings.xml index 9fcb24dbd6e2..498c9b0e3a9c 100644 --- a/packages/CredentialManager/res/values-ml/strings.xml +++ b/packages/CredentialManager/res/values-ml/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"മെച്ചപ്പെടുത്തിയ അക്കൗണ്ട് സുരക്ഷ"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ഓരോ കീയും ഏത് ആപ്പിന് അല്ലെങ്കിൽ വെബ്സൈറ്റിന് വേണ്ടിയാണോ സൃഷ്ടിച്ചത്, അതുമായി മാത്രം ലിങ്ക് ചെയ്തിരിക്കുന്നു, അതുകൊണ്ട് നിങ്ങൾ ഒരിക്കലും വഞ്ചനാപരമായ ഒരു ആപ്പിലേക്കോ വെബ്സൈറ്റിലേക്കോ അബദ്ധവശാൽ സൈൻ ഇൻ ചെയ്യില്ല. ഇതോടൊപ്പം, സെർവറുകളിൽ എല്ലാവർക്കുമായുള്ള കീകൾ മാത്രം സൂക്ഷിക്കുന്നതിനാൽ ഹാക്ക് ചെയ്യാൻ വളരെ ബുദ്ധിമുട്ടാണ്."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"ആയാസരഹിതമായ മാറ്റം"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"നമ്മൾ പാസ്വേഡ് രഹിത ഭാവിയിലേക്ക് ചുവടുവെച്ചുകൊണ്ടിരിക്കുകയാണ് എങ്കിലും, പാസ്കീകൾക്കൊപ്പം പാസ്വേഡുകൾ തുടർന്നും ലഭ്യമായിരിക്കും"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"നമ്മൾ പാസ്വേഡ് രഹിത ഭാവിയിലേക്ക് ചുവടുവെച്ചുകൊണ്ടിരിക്കുകയാണ് എങ്കിലും, പാസ്കീകൾക്കൊപ്പം പാസ്വേഡുകൾ തുടർന്നും ലഭ്യമായിരിക്കും."</string> <string name="choose_provider_title" msgid="8870795677024868108">"നിങ്ങളുടെ <xliff:g id="CREATETYPES">%1$s</xliff:g> എവിടെയാണ് സംരക്ഷിക്കേണ്ടതെന്ന് തിരഞ്ഞെടുക്കുക"</string> <string name="choose_provider_body" msgid="4967074531845147434">"നിങ്ങളുടെ വിവരങ്ങൾ സംരക്ഷിക്കാനും അടുത്ത തവണ വേഗത്തിൽ സൈൻ ഇൻ ചെയ്യാനും ഒരു പാസ്വേഡ് മാനേജർ തിരഞ്ഞെടുക്കുക"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> എന്നതിനായി പാസ്കീ സൃഷ്ടിക്കണോ?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി നിങ്ങൾ സംരക്ഷിച്ച പാസ്കീ ഉപയോഗിക്കണോ?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി നിങ്ങൾ സംരക്ഷിച്ച സൈൻ ഇൻ ഉപയോഗിക്കണോ?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി ഒരു സംരക്ഷിച്ച സൈൻ ഇൻ തിരഞ്ഞെടുക്കുക"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്ന ആപ്പിനായി ഒരു ഓപ്ഷൻ തിരഞ്ഞെടുക്കണോ?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"മറ്റൊരു രീതിയിൽ സൈൻ ഇൻ ചെയ്യുക"</string> <string name="snackbar_action" msgid="37373514216505085">"ഓപ്ഷനുകൾ കാണുക"</string> diff --git a/packages/CredentialManager/res/values-mn/strings.xml b/packages/CredentialManager/res/values-mn/strings.xml index aebffa152599..f8bd3586449b 100644 --- a/packages/CredentialManager/res/values-mn/strings.xml +++ b/packages/CredentialManager/res/values-mn/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Бүртгэлийн сайжруулсан аюулгүй байдал"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Түлхүүр тус бүрийг тэдгээрийг зориулж үүсгэсэн апп эсвэл вебсайттай нь тусгайлан холбодог бөгөөд ингэснээр та залилан мэхэлсэн апп эсвэл вебсайтад санамсаргүй байдлаар хэзээ ч нэвтрэхгүй. Түүнчлэн зөвхөн нийтийн түлхүүрийг хадгалж буй серверүүдийг хакердахад илүү хэцүү байдаг."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Саадгүй шилжилт"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Бид нууц үггүй ирээдүй рүү урагшлахын зэрэгцээ нууц үг нь passkey-н хамт боломжтой хэвээр байна"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Бид нууц үггүй ирээдүй рүү урагшлахын хэрээр нууц үг нь passkey-н хамтаар боломжтой хэвээр байх болно."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g>-г хаана хадгалахаа сонгоно уу"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Мэдээллээ хадгалж, дараагийн удаа илүү хурдан нэвтрэхийн тулд нууц үгний менежерийг сонгоно уу"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g>-д passkey үүсгэх үү?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д өөрийн хадгалсан passkey-г ашиглах уу?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д хадгалсан нэвтрэх мэдээллээ ашиглах уу?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д зориулж хадгалсан нэвтрэх мэдээллийг сонгоно уу"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д сонголт хийх үү?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Өөр аргаар нэвтрэх"</string> <string name="snackbar_action" msgid="37373514216505085">"Сонголт харах"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Нэвтрэлтийг удирдах"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Өөр төхөөрөмжөөс"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Өөр төхөөрөмж ашиглах"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Хүсэлтийг <xliff:g id="APP_NAME">%1$s</xliff:g> цуцалсан"</string> </resources> diff --git a/packages/CredentialManager/res/values-mr/strings.xml b/packages/CredentialManager/res/values-mr/strings.xml index 036b748e85fb..4e3c46e27e57 100644 --- a/packages/CredentialManager/res/values-mr/strings.xml +++ b/packages/CredentialManager/res/values-mr/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"सुधारित खाते सुरक्षा"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"प्रत्येक की ज्यांच्यासाठी बनवली आहे फक्त त्या अॅप किंवा वेबसाइटसोबत लिंक केलेली असते, ज्यमुळे तुम्ही कधीच कपटपूर्ण अॅप किंवा वेबसाइटवर चुकूनही साइन इन करणार नाही. तसेच, सर्व्हर फक्त सार्वजनिक की स्टोअर करत असल्यामुळे, हॅक करणे खूप अवघड आहे."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"अखंड संक्रमण"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"पासवर्ड न वापरणाऱ्या भविष्यात पुढे जाताना, पासवर्ड तरीही पासकीच्या बरोबरीने उपलब्ध असतील"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"पासवर्ड न वापरणाऱ्या भविष्यात पुढे जाताना, पासवर्ड तरीही पासकीच्या बरोबरीने उपलब्ध असतील."</string> <string name="choose_provider_title" msgid="8870795677024868108">"तुमची <xliff:g id="CREATETYPES">%1$s</xliff:g> कुठे सेव्ह करायची ते निवडा"</string> <string name="choose_provider_body" msgid="4967074531845147434">"तुमची माहिती सेव्ह करण्यासाठी आणि पुढच्या वेळी जलद साइन इन करण्याकरिता Password Manager निवडा"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> साठी पासकी तयार करायची का?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी तुमची सेव्ह केलेली पासकी वापरायची का?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी तुमचे सेव्ह केलेले साइन-इन वापरायचे का?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी सेव्ह केलेले साइन-इन निवडा"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी पर्याय निवडा?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"दुसऱ्या मार्गाने साइन इन करा"</string> <string name="snackbar_action" msgid="37373514216505085">"पर्याय पहा"</string> diff --git a/packages/CredentialManager/res/values-ms/strings.xml b/packages/CredentialManager/res/values-ms/strings.xml index e332db28939f..f7cd421133df 100644 --- a/packages/CredentialManager/res/values-ms/strings.xml +++ b/packages/CredentialManager/res/values-ms/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Keselamatan akaun yang dipertingkatkan"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Setiap kunci dipautkan secara eksklusif dengan apl atau laman web kunci dicipta, jadi anda tidak boleh log masuk ke apl atau laman web penipuan secara tidak sengaja. Selain itu, dengan pelayan yang hanya menyimpan kunci awam, penggodaman menjadi jauh lebih sukar."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Peralihan yang lancar"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Walaupun kita semakin menghampiri masa hadapan tanpa kata laluan, kata laluan masih akan tersedia bersama dengan kunci laluan"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Semasa kita bergerak menuju ke arah masa depan tanpa kata laluan, kata laluan masih akan tersedia bersama dengan kunci laluan."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Pilih tempat untuk menyimpan <xliff:g id="CREATETYPES">%1$s</xliff:g> anda"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pilih Password Manager untuk menyimpan maklumat anda dan log masuk lebih pantas pada kali seterusnya"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Cipta kunci laluan untuk <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gunakan kunci laluan anda yang telah disimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Gunakan maklumat log masuk anda yang telah disimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Pilih log masuk yang telah disimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Pilih satu pilihan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Log masuk menggunakan cara lain"</string> <string name="snackbar_action" msgid="37373514216505085">"Lihat pilihan"</string> diff --git a/packages/CredentialManager/res/values-my/strings.xml b/packages/CredentialManager/res/values-my/strings.xml index 82ff5af59133..85ce79e9699f 100644 --- a/packages/CredentialManager/res/values-my/strings.xml +++ b/packages/CredentialManager/res/values-my/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ပိုကောင်းသော အကောင့်လုံခြုံရေး"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ကီးတစ်ခုစီကို ၎င်းအတွက် ပြုလုပ်ထားသော အက်ပ် (သို့) ဝဘ်ဆိုက်နှင့် သီးသန့်လင့်ခ်ချိတ်ထားသဖြင့် လိမ်လည်သော အက်ပ် (သို့) ဝဘ်ဆိုက်သို့ မည်သည့်အခါတွင်မှ မှားယွင်း၍ လက်မှတ်ထိုးဝင်နိုင်မည်မဟုတ်ပါ။ ထို့အပြင် ဆာဗာသီးသန့် သိမ်းထားသော အများသုံးကီးများကို ဟက်လုပ်ရန် ပိုခက်ခဲသည်။"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"အလိုအလျောက် ကူးပြောင်းခြင်း"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"စကားဝှက်မသုံးသော အနာဂတ်ဆီသို့ ရှေ့ဆက်ရာတွင် လျှို့ဝှက်ကီးများနှင့်အတူ စကားဝှက်များကို ဆက်လက်သုံးနိုင်မည်"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"စကားဝှက်မသုံးခြင်း အနာဂတ်ဆီသို့ ရှေ့ဆက်ရာတွင် လျှို့ဝှက်ကီးများနှင့်အတူ စကားဝှက်များကို ဆက်လက်အသုံးပြုနိုင်ပါမည်။"</string> <string name="choose_provider_title" msgid="8870795677024868108">"သင်၏ <xliff:g id="CREATETYPES">%1$s</xliff:g> သိမ်းရန်နေရာ ရွေးခြင်း"</string> <string name="choose_provider_body" msgid="4967074531845147434">"သင့်အချက်အလက်သိမ်းပြီး နောက်တစ်ကြိမ်၌ ပိုမိုမြန်ဆန်စွာ လက်မှတ်ထိုးဝင်ရန် စကားဝှက်မန်နေဂျာကို ရွေးပါ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> အတွက် လျှို့ဝှက်ကီးပြုလုပ်မလား။"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် သိမ်းထားသော လက်မှတ်ထိုးဝင်မှုကို ရွေးပါ"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"နောက်တစ်နည်းဖြင့် လက်မှတ်ထိုးဝင်ရန်"</string> <string name="snackbar_action" msgid="37373514216505085">"ရွေးစရာများကို ကြည့်ရန်"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ရှေ့ဆက်ရန်"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"လက်မှတ်ထိုးဝင်မှုများ စီမံခြင်း"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"စက်နောက်တစ်ခုမှ"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"အခြားစက်သုံးရန်"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"တောင်းဆိုချက်ကို <xliff:g id="APP_NAME">%1$s</xliff:g> က ပယ်ဖျက်လိုက်သည်"</string> </resources> diff --git a/packages/CredentialManager/res/values-nb/strings.xml b/packages/CredentialManager/res/values-nb/strings.xml index fd3c6684fc41..b7f4aa5cd552 100644 --- a/packages/CredentialManager/res/values-nb/strings.xml +++ b/packages/CredentialManager/res/values-nb/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Forbedret kontosikkerhet"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Hver nøkkel er eksklusivt tilknyttet appen eller nettstedet den er laget for. Dermed kan du aldri logge på falske apper eller nettsteder ved et uhell. Og siden tjenerne bare har offentlige nøkler, blir det mye vanskeligere å hacke deg."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Sømløs overgang"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Vi går mot en fremtid uten passord, men passord fortsetter å være tilgjengelige ved siden av tilgangsnøkler"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Vi går mot en fremtid uten passord, men passord fortsetter å være tilgjengelige ved siden av tilgangsnøkler."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Velg hvor du vil lagre <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Velg et verktøy for passordlagring for å lagre informasjonen din og logge på raskere neste gang"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vil du opprette en tilgangsnøkkel for <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Velg en lagret pålogging for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Bruk en annen påloggingsmetode"</string> <string name="snackbar_action" msgid="37373514216505085">"Se alternativene"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Fortsett"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Administrer pålogginger"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Fra en annen enhet"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Bruk en annen enhet"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Forespørselen er kansellert av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-ne/strings.xml b/packages/CredentialManager/res/values-ne/strings.xml index d32a2b4d7735..d181aa37aa07 100644 --- a/packages/CredentialManager/res/values-ne/strings.xml +++ b/packages/CredentialManager/res/values-ne/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"खाताको सुदृढ सुरक्षा"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"तपाईं कहिले पनि गल्तीले कुनै कपटपूर्ण एप वा वेबसाइटमा लग इन गर्न नसक्नुहोस् भन्नाका लागि हरेक की जुन एप वा वेबसाइटको लागि बनाइएको थियो त्यसलाई खास गरी सोही एप वा वेबसाइटसँग लिंक गरिन्छ। यसका साथै, सर्भरहरूले सार्वजनिक की मात्र राख्ने भएकाले ह्याक गर्न झनै कठिन हुन्छ।"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"निर्बाध ट्रान्जिसन"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"हामी पासवर्डरहित भविष्यतर्फ बढ्दै गर्दा पासकीका साथसाथै पासवर्ड पनि उपलब्ध भइरहने छन्"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"हामी पासवर्डरहित भविष्यतर्फ बढ्दै गर्दा पासकीका साथसाथै पासवर्ड पनि उपलब्ध हुने छ।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"तपाईं आफ्ना <xliff:g id="CREATETYPES">%1$s</xliff:g> कहाँ सेभ गर्न चाहनुहुन्छ भन्ने कुरा छनौट गर्नुहोस्"</string> <string name="choose_provider_body" msgid="4967074531845147434">"कुनै पासवर्ड म्यानेजरमा आफ्नो जानकारी सेभ गरी अर्को पटक अझ छिटो साइन इन गर्नुहोस्"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> को पासकी बनाउने हो?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्नका लागि सेभ गरिएका साइन इनसम्बन्धी जानकारी छनौट गर्नुहोस्"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"अर्कै विधि प्रयोग गरी साइन इन गर्नुहोस्"</string> <string name="snackbar_action" msgid="37373514216505085">"विकल्पहरू हेर्नुहोस्"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"जारी राख्नुहोस्"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"साइन इनसम्बन्धी विकल्पहरू व्यवस्थापन गर्नुहोस्"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"अर्को डिभाइसका लागि"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"अर्कै डिभाइस प्रयोग गरी हेर्नुहोस्"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले अनुरोध रद्द गरेको छ"</string> </resources> diff --git a/packages/CredentialManager/res/values-nl/strings.xml b/packages/CredentialManager/res/values-nl/strings.xml index 4b1313099e64..c26a8e51e183 100644 --- a/packages/CredentialManager/res/values-nl/strings.xml +++ b/packages/CredentialManager/res/values-nl/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Verbeterde accountbeveiliging"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Elke sleutel is exclusief gekoppeld aan de app of website waarvoor deze is gemaakt. Je kunt dus nooit per ongeluk inloggen bij een bedrieglijke app of website. Bovendien bewaren servers alleen openbare sleutels, wat hacken een stuk lastiger maakt."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Naadloze overgang"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"We zijn op weg naar een toekomst zonder wachtwoorden, maar je kunt ze nog steeds gebruiken naast toegangssleutels."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"We zijn op weg naar een wachtwoordloze toekomst, maar naast toegangssleutels kun je nog steeds gebruikmaken van wachtwoorden."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Kiezen waar je je <xliff:g id="CREATETYPES">%1$s</xliff:g> wilt opslaan"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecteer een wachtwoordmanager om je informatie op te slaan en de volgende keer sneller in te loggen"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Toegangssleutel maken voor <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Opgeslagen inloggegevens kiezen voor <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Op een andere manier inloggen"</string> <string name="snackbar_action" msgid="37373514216505085">"Opties bekijken"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Doorgaan"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Inloggegevens beheren"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Via een ander apparaat"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Een ander apparaat gebruiken"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Verzoek geannuleerd door <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-or/strings.xml b/packages/CredentialManager/res/values-or/strings.xml index 068b4150e488..75cc974a168b 100644 --- a/packages/CredentialManager/res/values-or/strings.xml +++ b/packages/CredentialManager/res/values-or/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ଉନ୍ନତ ଆକାଉଣ୍ଟ ସୁରକ୍ଷା"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ପ୍ରତ୍ୟେକ କୀ\'କୁ ସେହି ଆପ କିମ୍ବା ୱେବସାଇଟ ସହ ଏକ୍ସକ୍ଲୁସିଭ ଭାବେ ଲିଙ୍କ କରାଯାଏ ଯେଉଁଥିପାଇଁ ଏହାକୁ ତିଆରି କରାଯାଇଛି, ଫଳରେ ଆପଣ ଭୁଲବଶତଃ କୌଣସି ପ୍ରତାରଣାମୂଳକ ଆପ କିମ୍ବା ୱେବସାଇଟରେ କେବେ ବି ସାଇନ ଇନ କରିପାରିବେ ନାହିଁ। ଏହା ସହ, କେବଳ ସର୍ଭରଗୁଡ଼ିକ ସାର୍ବଜନୀନ କୀ ରଖୁଥିବା ଯୋଗୁଁ ଏହାକୁ ହେକ କରିବା ବହୁତ କଷ୍ଟକର।"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"ବାଧାରହିତ ଟ୍ରାଞ୍ଜିସନ"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"ଆମେ ଏକ ପାସୱାର୍ଡବିହୀନ ଭବିଷ୍ୟତ ଆଡ଼କୁ ମୁଭ କରୁଥିବା ଯୋଗୁଁ ଏବେ ବି ପାସକୀଗୁଡ଼ିକ ସହିତ ପାସୱାର୍ଡ ଉପଲବ୍ଧ ହେବ"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"ଆମେ ଏକ ପାସୱାର୍ଡ ବିହୀନ ଭବିଷ୍ୟତ ଆଡ଼କୁ ମୁଭ କରୁଥିବା ଯୋଗୁଁ ଏବେ ବି ପାସକୀଗୁଡ଼ିକ ସହିତ ପାସୱାର୍ଡ ଉପଲବ୍ଧ ହେବ।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"ଆପଣଙ୍କ <xliff:g id="CREATETYPES">%1$s</xliff:g> କେଉଁଠାରେ ସେଭ କରିବେ ତାହା ବାଛନ୍ତୁ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ଆପଣଙ୍କ ସୂଚନା ସେଭ କରି ପରବର୍ତ୍ତୀ ସମୟରେ ଶୀଘ୍ର ସାଇନ ଇନ କରିବା ପାଇଁ ଏକ Password Manager ଚୟନ କରନ୍ତୁ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> ପାଇଁ ପାସକୀ ତିଆରି କରିବେ?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ସେଭ କରାଯାଇଥିବା ଏକ ସାଇନ-ଇନ ବାଛନ୍ତୁ"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ଅନ୍ୟ ଏକ ଉପାୟରେ ସାଇନ ଇନ କରନ୍ତୁ"</string> <string name="snackbar_action" msgid="37373514216505085">"ବିକଳ୍ପଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ଜାରି ରଖନ୍ତୁ"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"ସାଇନ-ଇନ ପରିଚାଳନା କରନ୍ତୁ"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"ଅନ୍ୟ ଏକ ଡିଭାଇସରୁ"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"ଏକ ଭିନ୍ନ ଡିଭାଇସ ବ୍ୟବହାର କରନ୍ତୁ"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଦ୍ୱାରା ଅନୁରୋଧ ବାତିଲ ହୋଇଛି"</string> </resources> diff --git a/packages/CredentialManager/res/values-pa/strings.xml b/packages/CredentialManager/res/values-pa/strings.xml index c023fbd6a35c..b7797dae73be 100644 --- a/packages/CredentialManager/res/values-pa/strings.xml +++ b/packages/CredentialManager/res/values-pa/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ਬਿਹਤਰ ਖਾਤਾ ਸੁਰੱਖਿਆ"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ਹਰੇਕ ਕੁੰਜੀ ਖਾਸ ਤੌਰ \'ਤੇ ਉਸ ਐਪ ਜਾਂ ਵੈੱਬਸਾਈਟ ਨਾਲ ਲਿੰਕ ਹੁੰਦੀ ਹੈ ਜਿਸ ਲਈ ਉਹ ਬਣਾਈ ਗਈ ਸੀ, ਇਸ ਲਈ ਤੁਸੀਂ ਕਦੇ ਵੀ ਗਲਤੀ ਨਾਲ ਕਿਸੇ ਧੋਖਾਧੜੀ ਵਾਲੀ ਐਪ ਜਾਂ ਵੈੱਬਸਾਈਟ \'ਤੇ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਇਸ ਤੋਂ ਇਲਾਵਾ, ਸਿਰਫ਼ ਜਨਤਕ ਕੁੰਜੀਆਂ ਵਾਲੇ ਸਰਵਰਾਂ \'ਤੇ, ਹੈਕਿੰਗ ਕਰਨਾ ਬਹੁਤ ਔਖਾ ਹੁੰਦਾ ਹੈ।"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"ਸਹਿਜ ਪਰਿਵਰਤਨ"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"ਜਿਵੇਂ ਕਿ ਅਸੀਂ ਪਾਸਵਰਡ-ਰਹਿਤ ਭਵਿੱਖ ਵੱਲ ਵਧ ਰਹੇ ਹਾਂ, ਪਰ ਪਾਸਕੀਆਂ ਦੇ ਨਾਲ ਪਾਸਵਰਡ ਹਾਲੇ ਵੀ ਉਪਲਬਧ ਹੋਣਗੇ"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"ਹਾਲਾਂਕਿ, ਅਸੀਂ ਪਾਸਵਰਡ ਰਹਿਤ ਭਵਿੱਖ ਵੱਲ ਵਧ ਰਹੇ ਹਾਂ, ਪਰ ਪਾਸਕੀਆਂ ਦੇ ਨਾਲ ਪਾਸਵਰਡ ਹਾਲੇ ਵੀ ਉਪਲਬਧ ਹੋਣਗੇ।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"ਚੁਣੋ ਕਿ ਆਪਣੀਆਂ <xliff:g id="CREATETYPES">%1$s</xliff:g> ਨੂੰ ਕਿੱਥੇ ਰੱਖਿਅਤ ਕਰਨਾ ਹੈ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਰੱਖਿਅਤ ਕਰਨ ਅਤੇ ਅਗਲੀ ਵਾਰ ਤੇਜ਼ੀ ਨਾਲ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਪ੍ਰਬੰਧਕ ਚੁਣੋ"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"ਕੀ <xliff:g id="APPNAME">%1$s</xliff:g> ਲਈ ਪਾਸਕੀ ਬਣਾਉਣੀ ਹੈ?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਰੱਖਿਅਤ ਕੀਤੀ ਸਾਈਨ-ਇਨ ਜਾਣਕਾਰੀ ਚੁਣੋ"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ਕਿਸੇ ਹੋਰ ਤਰੀਕੇ ਨਾਲ ਸਾਈਨ-ਇਨ ਕਰੋ"</string> <string name="snackbar_action" msgid="37373514216505085">"ਵਿਕਲਪ ਦੇਖੋ"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ਜਾਰੀ ਰੱਖੋ"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"ਸਾਈਨ-ਇਨਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"ਹੋਰ ਡੀਵਾਈਸ ਤੋਂ"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"ਵੱਖਰੇ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਬੇਨਤੀ ਰੱਦ ਕੀਤੀ ਗਈ"</string> </resources> diff --git a/packages/CredentialManager/res/values-pl/strings.xml b/packages/CredentialManager/res/values-pl/strings.xml index 0c844624a7ab..03a547fe94fa 100644 --- a/packages/CredentialManager/res/values-pl/strings.xml +++ b/packages/CredentialManager/res/values-pl/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Zwiększone bezpieczeństwo konta"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Każdy klucz jest połączony wyłącznie z aplikacją lub stroną, dla której został utworzony, więc nie zalogujesz się przypadkowo w fałszywej aplikacji ani na fałszywej stronie. Ponadto na serwerach są przechowywane wyłącznie klucze publiczne, co znacznie utrudnia hakowanie."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Płynne przechodzenie"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"W czasie przechodzenia na technologie niewymagające haseł możliwość stosowania haseł – niezależnie od kluczy – wciąż będzie dostępna"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"W czasie przechodzenia na technologie niewymagające haseł możliwość stosowania haseł – niezależnie od kluczy – wciąż będzie dostępna."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Wybierz, gdzie zapisywać <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Wybierz menedżera haseł, aby zapisywać informacje i logować się szybciej"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Utworzyć klucz dla aplikacji <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Wybierz zapisane dane logowania dla aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Zaloguj się w inny sposób"</string> <string name="snackbar_action" msgid="37373514216505085">"Wyświetl opcje"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Dalej"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Zarządzanie danymi logowania"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Na innym urządzeniu"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Użyj innego urządzenia"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Żądanie anulowane przez aplikację <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-pt-rBR/strings.xml b/packages/CredentialManager/res/values-pt-rBR/strings.xml index 6e90159c4e55..a7f1de13ea3a 100644 --- a/packages/CredentialManager/res/values-pt-rBR/strings.xml +++ b/packages/CredentialManager/res/values-pt-rBR/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Mais segurança para sua conta"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada chave está vinculada exclusivamente ao app ou site para a qual foi criada. Isso impede que você faça login em um app ou site fraudulento por engano. Além disso, os servidores mantêm apenas chaves públicas, dificultando qualquer invasão."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transição simplificada"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Estamos avançando rumo a um futuro sem senhas, mas elas ainda vão estar disponíveis junto às chaves de acesso"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Estamos avançando em direção a um futuro sem senhas, mas elas ainda vão estar disponíveis junto às chaves de acesso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolha onde salvar suas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecione um gerenciador de senhas para salvar suas informações e fazer login mais rapidamente na próxima vez"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Criar uma chave de acesso para o app <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Usar sua chave de acesso salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Usar suas informações de login salvas para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Escolher um login salvo para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Escolher uma opção para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Fazer login de outra forma"</string> <string name="snackbar_action" msgid="37373514216505085">"Conferir opções"</string> diff --git a/packages/CredentialManager/res/values-pt-rPT/strings.xml b/packages/CredentialManager/res/values-pt-rPT/strings.xml index 19672d494b9b..8ca0baf188c6 100644 --- a/packages/CredentialManager/res/values-pt-rPT/strings.xml +++ b/packages/CredentialManager/res/values-pt-rPT/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Segurança melhorada nas contas"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada chave é exclusivamente associada à app ou ao Website para o qual foi criada, por isso, nunca pode iniciar sessão numa app ou num Website fraudulento acidentalmente. Além disso, os servidores só mantêm chaves públicas, o que dificulta a pirataria."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transição sem complicações"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"À medida que avançamos para um futuro sem palavras-passe, as palavras-passe continuam disponíveis juntamente com as chaves de acesso"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"À medida que avançamos para um futuro sem palavras-passe, as palavras-passe continuam disponíveis juntamente com as chaves de acesso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolha onde guardar as suas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecione um gestor de palavras-passe para guardar as suas informações e iniciar sessão mais rapidamente da próxima vez"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Criar uma chave de acesso para a app <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,8 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Usar a sua chave de acesso guardada na app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Usar o seu início de sessão guardado na app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Escolha um início de sessão guardado para a app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> - <skip /> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Escolher uma opção para a app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="get_dialog_title_use_info_on" msgid="8863708099535435146">"Usar estas informações na app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Iniciar sessão de outra forma"</string> <string name="snackbar_action" msgid="37373514216505085">"Ver opções"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continuar"</string> diff --git a/packages/CredentialManager/res/values-pt/strings.xml b/packages/CredentialManager/res/values-pt/strings.xml index 6e90159c4e55..a7f1de13ea3a 100644 --- a/packages/CredentialManager/res/values-pt/strings.xml +++ b/packages/CredentialManager/res/values-pt/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Mais segurança para sua conta"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Cada chave está vinculada exclusivamente ao app ou site para a qual foi criada. Isso impede que você faça login em um app ou site fraudulento por engano. Além disso, os servidores mantêm apenas chaves públicas, dificultando qualquer invasão."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Transição simplificada"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Estamos avançando rumo a um futuro sem senhas, mas elas ainda vão estar disponíveis junto às chaves de acesso"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Estamos avançando em direção a um futuro sem senhas, mas elas ainda vão estar disponíveis junto às chaves de acesso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolha onde salvar suas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecione um gerenciador de senhas para salvar suas informações e fazer login mais rapidamente na próxima vez"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Criar uma chave de acesso para o app <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Usar sua chave de acesso salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Usar suas informações de login salvas para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Escolher um login salvo para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Escolher uma opção para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Fazer login de outra forma"</string> <string name="snackbar_action" msgid="37373514216505085">"Conferir opções"</string> diff --git a/packages/CredentialManager/res/values-ro/strings.xml b/packages/CredentialManager/res/values-ro/strings.xml index 5f72f84a048b..a9e76dea707b 100644 --- a/packages/CredentialManager/res/values-ro/strings.xml +++ b/packages/CredentialManager/res/values-ro/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Securitate îmbunătățită a contului"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Fiecare cheie este conectată în mod exclusiv cu aplicația sau site-ul pentru care a fost creată, prin urmare nu te poți conecta niciodată din greșeală la o aplicație sau un site fraudulos. În plus, întrucât pe servere sunt stocate doar chei publice, hackingul este mult mai dificil."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Tranziție fluidă"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Ne îndreptăm spre un viitor fără parole, în care parolele vor fi disponibile pe lângă cheile de acces"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Ne îndreptăm spre un viitor fără parole, însă acestea sunt încă disponibile, alături de cheile de acces."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Alege unde dorești să salvezi <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selectează un manager de parole pentru a salva informațiile și a te conecta mai rapid data viitoare"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Creezi o cheie de acces pentru <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Alege o conectare salvată pentru <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Conectează-te altfel"</string> <string name="snackbar_action" msgid="37373514216505085">"Afișează opțiunile"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Continuă"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Gestionează acreditările"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"De pe alt dispozitiv"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Folosește alt dispozitiv"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Solicitare anulată de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-ru/strings.xml b/packages/CredentialManager/res/values-ru/strings.xml index 8baddbd80ed2..2694fa556200 100644 --- a/packages/CredentialManager/res/values-ru/strings.xml +++ b/packages/CredentialManager/res/values-ru/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Повышенная безопасность аккаунта"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Каждый ключ связан только с тем приложением или сайтом, для которого был создан, поэтому вы не сможете по ошибке войти в приложение или на сайт мошенников. Кроме того, на серверах хранятся только открытые ключи, что служит дополнительной защитой от взлома."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Плавный переход"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Хотя мы движемся к будущему без паролей, их по-прежнему можно будет использовать наряду с ключами доступа."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Хотя движение к будущему без паролей уже началось, их по-прежнему можно будет использовать наряду с ключами доступа."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Укажите, куда нужно сохранить <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Выберите менеджер паролей, чтобы сохранять учетные данные и быстро выполнять вход."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Создать ключ доступа для приложения \"<xliff:g id="APPNAME">%1$s</xliff:g>\"?"</string> @@ -32,7 +32,7 @@ <string name="passwords" msgid="5419394230391253816">"пароли"</string> <string name="sign_ins" msgid="4710739369149469208">"входы"</string> <string name="sign_in_info" msgid="2627704710674232328">"учетные данные"</string> - <string name="save_credential_to_title" msgid="3172811692275634301">"Сохранить <xliff:g id="CREDENTIALTYPES">%1$s</xliff:g> в"</string> + <string name="save_credential_to_title" msgid="3172811692275634301">"Где сохранить <xliff:g id="CREDENTIALTYPES">%1$s</xliff:g>"</string> <string name="create_passkey_in_other_device_title" msgid="9195411122362461390">"Создать ключ доступа на другом устройстве?"</string> <string name="use_provider_for_all_title" msgid="4201020195058980757">"Всегда входить с помощью приложения \"<xliff:g id="PROVIDERINFODISPLAYNAME">%1$s</xliff:g>\"?"</string> <string name="use_provider_for_all_description" msgid="1998772715863958997">"В этом менеджере паролей пользователь <xliff:g id="USERNAME">%1$s</xliff:g> сможет сохранять пароли и ключи доступа для быстрого входа."</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Использовать сохраненный ключ доступа для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Использовать сохраненные учетные данные для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Выберите сохраненные данные для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Выберите данные для входа в приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Войти другим способом"</string> <string name="snackbar_action" msgid="37373514216505085">"Показать варианты"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Управление входом"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"С другого устройства"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Использовать другое устройство"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" отменило запрос."</string> </resources> diff --git a/packages/CredentialManager/res/values-si/strings.xml b/packages/CredentialManager/res/values-si/strings.xml index 1b3b4edf960e..fc0391efd5dd 100644 --- a/packages/CredentialManager/res/values-si/strings.xml +++ b/packages/CredentialManager/res/values-si/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"වැඩිදියුණු කළ ගිණුම් ආරක්ෂාව"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"සෑම යතුරක්ම ඒවා නිර්මාණය කරන ලද යෙදුම හෝ වෙබ් අඩවිය සමග අනන්ය වශයෙන්ම සම්බන්ධ කර ඇත, එබැවින් ඔබට කිසි විටෙක වැරදීමකින් වංචනික යෙදුමකට හෝ වෙබ් අඩවියකට පුරනය විය නොහැක. ඊට අමතරව, සේවාදායකයින් පොදු යතුරු තබා ගැනීමත් සමග, අනවසරයෙන් ඇතුළුවීම වඩා දුෂ්කරය."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"බාධාවකින් තොර සංක්රමණය"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"අපි මුරපද රහිත අනාගතයක් කරා ගමන් කරන විට, මුරයතුරු සමග මුරපද තවමත් පවතිනු ඇත"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"අපි මුරපද රහිත අනාගතයක් කරා ගමන් කරන විට, මුරයතුරු සමග මුරපද තවමත් පවතී."</string> <string name="choose_provider_title" msgid="8870795677024868108">"ඔබේ <xliff:g id="CREATETYPES">%1$s</xliff:g> සුරැකිය යුතු ස්ථානය තෝරා ගන්න"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ඔබේ තතු සුරැකීමට සහ මීළඟ වතාවේ වේගයෙන් පුරනය වීමට මුරපද කළමනාකරුවෙකු තෝරන්න"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> සඳහා මුරයතුර තනන්න ද?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා ඔබේ සුරැකි මුරයතුර භාවිතා කරන්න ද?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා ඔබේ සුරැකි පුරනය භාවිතා කරන්න ද?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා සුරැකි පුරනයක් තෝරා ගන්න"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා විකල්පයක් තෝරන්නද?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"වෙනත් ආකාරයකින් පුරන්න"</string> <string name="snackbar_action" msgid="37373514216505085">"විකල්ප බලන්න"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"පුරනය වීම් කළමනාකරණය කරන්න"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"වෙනත් උපාංගයකින්"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"වෙනස් උපාංගයක් භාවිතා කරන්න"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> විසින් ඉල්ලීම අවලංගු කරන ලදී"</string> </resources> diff --git a/packages/CredentialManager/res/values-sk/strings.xml b/packages/CredentialManager/res/values-sk/strings.xml index 965529067d02..fd20696b74cf 100644 --- a/packages/CredentialManager/res/values-sk/strings.xml +++ b/packages/CredentialManager/res/values-sk/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Lepšie zabezpečenie účtu"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Každý kľúč je výhradne prepojený s aplikáciou alebo webom, pre ktorý bol vytvorený, takže sa nikdy nemôžete omylom prihlásiť do podvodnej aplikácie alebo na podvodnom webe. Servery navyše uchovávajú iba verejné kľúče, čím podstatne sťažujú hackovanie."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Plynulý prechod"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Hoci smerujeme k budúcnosti bez hesiel, popri prístupových kľúčoch budú naďalej k dispozícii i heslá."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Blížime sa k budúcnosti bez hesiel, ale heslá budú popri prístupových kľúčoch stále k dispozícii."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Vyberte, kam sa majú ukladať <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Vyberte správcu hesiel, do ktorého sa budú ukladať vaše údaje, aby ste sa nabudúce mohli rýchlejšie prihlásiť"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Chcete vytvoriť prístupový kľúč pre aplikáciu <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Chcete pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g> použiť uložený prístupový kľúč?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Chcete pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g> použiť uložené prihlasovacie údaje?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Vyberte uložené prihlasovacie údaje pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Chcete pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g> vybrať možnosť?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Prihlásiť sa inak"</string> <string name="snackbar_action" msgid="37373514216505085">"Zobraziť možnosti"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Spravovať prihlasovacie údaje"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Z iného zariadenia"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Použiť iné zariadenie"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Požiadavku zrušila aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-sl/strings.xml b/packages/CredentialManager/res/values-sl/strings.xml index 433a06d05ee8..36dbf6e6aa1b 100644 --- a/packages/CredentialManager/res/values-sl/strings.xml +++ b/packages/CredentialManager/res/values-sl/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Večja varnost računov"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Vsak ključ je neločljivo povezan z aplikacijo ali spletnim mestom, za katero je bil ustvarjen, zato se nikoli ne morete pomotoma prijaviti v goljufivo aplikacijo ali spletno mesto. Poleg tega so v strežnikih shranjeni le javni ključi, zato je vdiranje v račune precej oteženo."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Prehod brez zapletov"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Na poti v prihodnost brez gesel bodo poleg ključev za dostop še vedno v uporabi tudi gesla."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Na poti v prihodnost brez gesel bodo poleg ključev za dostop še vedno v uporabi tudi gesla."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Izbira mesta za shranjevanje <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Izberite upravitelja gesel za shranjevanje podatkov za prijavo, da se boste naslednjič lahko hitreje prijavili."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Želite ustvariti ključ za dostop do aplikacije <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Izberite shranjene podatke za prijavo v aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Prijava na drug način"</string> <string name="snackbar_action" msgid="37373514216505085">"Prikaz možnosti"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Naprej"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Upravljanje podatkov za prijavo"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Iz druge naprave"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Uporaba druge naprave"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Zahtevo je preklicala aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-sq/strings.xml b/packages/CredentialManager/res/values-sq/strings.xml index 7697fbde5b03..a3b29eed96e5 100644 --- a/packages/CredentialManager/res/values-sq/strings.xml +++ b/packages/CredentialManager/res/values-sq/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Siguri e përmirësuar e llogarisë"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Secili çelës është i lidhur ekskluzivisht me aplikacionin ose sajtin e uebit për të cilin është krijuar, kështu që nuk do të identifikohesh asnjëherë gabimisht në një aplikacion ose sajt uebi mashtrues. Gjithashtu, me serverët që mbajnë vetëm çelësa publikë, pirateria informatike është shumë më e vështirë."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Kalim i thjeshtuar"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Teksa shkojmë drejt një të ardhmeje pa fjalëkalime, këto të fundit do të ofrohen ende së bashku me çelësat e kalimit"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Teksa shkojmë drejt një të ardhmeje pa fjalëkalime, këto të fundit do të ofrohen ende së bashku me çelësat e kalimit."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Zgjidh se ku t\'i ruash <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Zgjidh një menaxher fjalëkalimesh për të ruajtur informacionet e tua dhe për t\'u identifikuar më shpejt herën tjetër"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Të krijohet çelësi i kalimit për <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Të përdoret fjalëkalimi yt i ruajtur për <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Të përdoret identifikimi yt i ruajtur për <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Zgjidh një identifikim të ruajtur për <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Të zgjidhet një opsion për <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Identifikohu me një mënyrë tjetër"</string> <string name="snackbar_action" msgid="37373514216505085">"Shiko opsionet"</string> diff --git a/packages/CredentialManager/res/values-sr/strings.xml b/packages/CredentialManager/res/values-sr/strings.xml index 2827df389097..698b3675273a 100644 --- a/packages/CredentialManager/res/values-sr/strings.xml +++ b/packages/CredentialManager/res/values-sr/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Побољшана безбедност налога"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Сваки кључ је искључиво повезан са апликацијом или веб-сајтом за које је направљен, па никад не можете грешком да се пријавите у апликацију или на веб-сајт који служе за превару. Осим тога, са серверима који чувају само јавне кључеве хаковање је много теже."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Беспрекоран прелаз"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Како се крећемо ка будућности без лозинки, лозинке ће и даље бити доступне уз приступне кодове"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Како се крећемо ка будућности без лозинки, лозинке ће и даље бити доступне уз приступне кодове."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Одаберите где ћете сачувати: <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Изаберите менаџера лозинки да бисте сачували податке и брже се пријавили следећи пут"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Желите да направите приступни кôд за: <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Желите да користите сачувани приступни кôд за: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Желите да користите сачуване податке за пријављивање за: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Одаберите сачувано пријављивање за: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Желите да одаберете опцију за апликацију <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Пријавите се на други начин"</string> <string name="snackbar_action" msgid="37373514216505085">"Прикажи опције"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Управљајте пријављивањима"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Са другог уређаја"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Користи други уређај"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Захтве је отказала апликација <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-sv/strings.xml b/packages/CredentialManager/res/values-sv/strings.xml index b78de0cb2b54..55127013d50e 100644 --- a/packages/CredentialManager/res/values-sv/strings.xml +++ b/packages/CredentialManager/res/values-sv/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Förbättrad kontosäkerhet"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Varje nyckel är exklusivt länkad till appen eller webbplatsen den skapades för, så du kan aldrig logga in i en bedräglig app eller webbplats av misstag. Hackning blir dessutom mycket svårare eftersom servrar bara behåller offentliga nycklar."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"En sömlös övergång"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Medan vi beger oss mot en lösenordslös framtid kommer lösenord fortfarande att vara tillgängliga utöver nycklar"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Medan vi beger oss mot en lösenordslös framtid kommer lösenord fortfarande att vara tillgängliga utöver nycklar."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Välj var du vill spara <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Välj en lösenordshanterare för att spara dina uppgifter och logga in snabbare nästa gång"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Vill du skapa en nyckel för <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Välj en sparad inloggning för <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Logga in på ett annat sätt"</string> <string name="snackbar_action" msgid="37373514216505085">"Visa alternativ"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Fortsätt"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Hantera inloggningar"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Via en annan enhet"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Använd en annan enhet"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Begäran avbruten av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-sw/strings.xml b/packages/CredentialManager/res/values-sw/strings.xml index 43564c76f7a9..065765d02a43 100644 --- a/packages/CredentialManager/res/values-sw/strings.xml +++ b/packages/CredentialManager/res/values-sw/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Ulinzi wa akaunti ulioboreshwa"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Kila ufunguo umeunganishwa kwa upekee na programu au tovuti husika, kwa hivyo kamwe huwezi kuingia katika akaunti ya programu au tovuti ya kilaghai kwa bahati mbaya. Pia, kwa kuwa seva huhifadhi tu funguo za umma, udukuzi si rahisi."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Mabadiliko rahisi"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Tunavyoelekea katika enzi isiyo ya manenosiri, manenosiri yataendelea kupatikana pamoja na funguo za siri"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Tunavyoelekea katika enzi isiyo ya manenosiri, manenosiri yataendelea kupatikana pamoja na funguo za siri."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Chagua ambako unahifadhi <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Chagua kidhibiti cha manenosiri ili uhifadhi taarifa zako na uingie kwenye akaunti kwa urahisi wakati mwingine"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Ungependa kuunda ufunguo wa siri kwa ajili ya <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Ungependa kutumia ufunguo wa siri uliohifadhiwa wa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Ungependa kutumia kitambulisho kilichohifadhiwa cha kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Chagua vitambulisho vilivyohifadhiwa kwa ajili ya kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Ungependa kuteua chaguo la <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Ingia katika akaunti kwa kutumia njia nyingine"</string> <string name="snackbar_action" msgid="37373514216505085">"Angalia chaguo"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Dhibiti michakato ya kuingia katika akaunti"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Kutoka kwenye kifaa kingine"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Tumia kifaa tofauti"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Ombi lilighairiwa na <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-ta/strings.xml b/packages/CredentialManager/res/values-ta/strings.xml index f4eb46c8b931..9c99f483f035 100644 --- a/packages/CredentialManager/res/values-ta/strings.xml +++ b/packages/CredentialManager/res/values-ta/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"மேம்படுத்தப்பட்ட கணக்குப் பாதுகாப்பு"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ஒவ்வொரு குறியீடும் எந்த ஆப்ஸ்/இணையதளத்திற்காக உருவாக்கப்பட்டதோ அதனுடன் மட்டுமே இணைக்கப்பட்டிருக்கும். இது மோசடியான ஆப்ஸ்/இணையதளத்தில் நீங்கள் தவறுதலாக உள்நுழைவதைத் தடுக்கும். அத்துடன், சேவையகங்களில் பொதுக் குறியீடுகள் மட்டுமே சேமிக்கப்படுவதால் கணக்கை ஹேக் செய்வது மிகக் கடினமாகும்."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"தடையற்ற டிரான்ஸிஷன்"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"கடவுச்சொல்லற்ற எதிர்காலத்தை நோக்கி நாம் பயணிக்கிறோம். கடவுச்சாவிகளைப் பயன்படுத்தும் இதே வேளையில் கடவுச்சொற்களையும் பயன்படுத்த முடியும்"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"கடவுச்சொல்லற்ற எதிர்காலத்தை நோக்கி நாம் பயணிக்கிறோம். கடவுச்சாவிகளைப் பயன்படுத்தும் இதே வேளையில் கடவுச்சொற்களையும் பயன்படுத்த முடியும்."</string> <string name="choose_provider_title" msgid="8870795677024868108">"உங்கள் <xliff:g id="CREATETYPES">%1$s</xliff:g> எங்கே சேமிக்கப்பட வேண்டும் என்பதைத் தேர்வுசெய்யுங்கள்"</string> <string name="choose_provider_body" msgid="4967074531845147434">"உங்கள் தகவல்களைச் சேமித்து அடுத்த முறை விரைவாக உள்நுழைய ஒரு கடவுச்சொல் நிர்வாகியைத் தேர்வுசெய்யுங்கள்"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> ஆப்ஸுக்கான கடவுச்சாவியை உருவாக்கவா?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸுக்கு ஏற்கெனவே சேமிக்கப்பட்ட உள்நுழைவுத் தகவலைத் தேர்வுசெய்யவும்"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"வேறு முறையில் உள்நுழைக"</string> <string name="snackbar_action" msgid="37373514216505085">"விருப்பங்களைக் காட்டு"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"தொடர்க"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"உள்நுழைவுகளை நிர்வகித்தல்"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"மற்றொரு சாதனத்திலிருந்து பயன்படுத்து"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"வேறு சாதனத்தைப் பயன்படுத்து"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸால் கோரிக்கை ரத்துசெய்யப்பட்டது"</string> </resources> diff --git a/packages/CredentialManager/res/values-te/strings.xml b/packages/CredentialManager/res/values-te/strings.xml index 297e559def78..9a9eafd5ff28 100644 --- a/packages/CredentialManager/res/values-te/strings.xml +++ b/packages/CredentialManager/res/values-te/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"మెరుగైన ఖాతా సెక్యూరిటీ"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ప్రతి కీ దానిని క్రియేట్ చేసిన యాప్ లేదా వెబ్సైట్తో ప్రత్యేకంగా లింక్ చేయబడి ఉంటుంది, కాబట్టి మీరు పొరపాటున కూడా మోసపూరిత యాప్ లేదా వెబ్సైట్కు సైన్ ఇన్ చేయలేరు. అంతే కాకుండా, సర్వర్లు పబ్లిక్ కీలను మాత్రమే స్టోర్ చేయడం వల్ల, హ్యాకింగ్ చేయడం చాలా కష్టం."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"అవాంతరాలు లేని పరివర్తన"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"మనం భవిష్యత్తులో పాస్వర్డ్ రహిత టెక్నాలజీని ఉపయోగించినా, పాస్-కీలతో పాటు పాస్వర్డ్లు కూడా అందుబాటులో ఉంటాయి"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"మనం భవిష్యత్తులో పాస్వర్డ్ రహిత టెక్నాలజీని ఉపయోగించినా, పాస్కీలతో పాటు పాస్వర్డ్లు కూడా అందుబాటులో ఉంటాయి."</string> <string name="choose_provider_title" msgid="8870795677024868108">"మీ <xliff:g id="CREATETYPES">%1$s</xliff:g> ఎక్కడ సేవ్ చేయాలో ఎంచుకోండి"</string> <string name="choose_provider_body" msgid="4967074531845147434">"తర్వాతిసారి మరింత వేగంగా సైన్ ఇన్ చేసేందుకు వీలుగా మీ సమాచారాన్ని సేవ్ చేయడం కోసం ఒక పాస్వర్డ్ మేనేజర్ను ఎంచుకోండి"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> కోసం పాస్-కీని క్రియేట్ చేయాలా?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం సేవ్ చేసిన సైన్ ఇన్ వివరాలను ఎంచుకోండి"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"మరొక పద్ధతిలో సైన్ ఇన్ చేయండి"</string> <string name="snackbar_action" msgid="37373514216505085">"ఆప్షన్లను చూడండి"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"కొనసాగించండి"</string> diff --git a/packages/CredentialManager/res/values-th/strings.xml b/packages/CredentialManager/res/values-th/strings.xml index 446d307e2a16..0f6ab5a11cc9 100644 --- a/packages/CredentialManager/res/values-th/strings.xml +++ b/packages/CredentialManager/res/values-th/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"ความปลอดภัยของบัญชีที่เพิ่มมากขึ้น"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"คีย์ที่สร้างขึ้นแต่ละคีย์จะลิงก์กับแอปหรือเว็บไซต์ที่ใช้งานคีย์ดังกล่าวเท่านั้น ดังนั้นจึงไม่มีการลงชื่อเข้าใช้แอปเว็บไซต์ที่เป็นการฉ้อโกงโดยไม่ตั้งใจเกิดขึ้น นอกจากนี้ เซิร์ฟเวอร์จะบันทึกเฉพาะคีย์สาธารณะ จึงทำให้แฮ็กได้ยากขึ้น"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"การเปลี่ยนผ่านอย่างราบรื่น"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"ในขณะที่เราก้าวไปสู่อนาคตที่ไม่ต้องใช้รหัสผ่านนั้น รหัสผ่านจะยังคงใช้ได้อยู่ควบคู่ไปกับการเปลี่ยนไปใช้พาสคีย์"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"ในขณะที่เราก้าวไปสู่อนาคตที่ไม่ต้องใช้รหัสผ่านนั้น รหัสผ่านจะยังคงใช้ได้อยู่ควบคู่ไปกับการเปลี่ยนไปใช้พาสคีย์"</string> <string name="choose_provider_title" msgid="8870795677024868108">"เลือกว่าต้องการบันทึก<xliff:g id="CREATETYPES">%1$s</xliff:g>ไว้ที่ใด"</string> <string name="choose_provider_body" msgid="4967074531845147434">"เลือกเครื่องมือจัดการรหัสผ่านเพื่อบันทึกข้อมูลและลงชื่อเข้าใช้เร็วขึ้นในครั้งถัดไป"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"สร้างพาสคีย์สำหรับ <xliff:g id="APPNAME">%1$s</xliff:g> ไหม"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"เลือกการลงชื่อเข้าใช้ที่บันทึกไว้สำหรับ \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"ลงชื่อเข้าใช้ด้วยวิธีอื่น"</string> <string name="snackbar_action" msgid="37373514216505085">"ดูตัวเลือก"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"ต่อไป"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"จัดการการลงชื่อเข้าใช้"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"จากอุปกรณ์อื่น"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"ใช้อุปกรณ์อื่น"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"ยกเลิกคำขอแล้วโดย <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/res/values-tl/strings.xml b/packages/CredentialManager/res/values-tl/strings.xml index e9c9ef592522..269d479f5977 100644 --- a/packages/CredentialManager/res/values-tl/strings.xml +++ b/packages/CredentialManager/res/values-tl/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Pinahusay na seguridad sa account"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Eksklusibong naka-link sa app o website kung para saan ginawa ang bawat key, kaya hindi ka makakapag-sign in sa isang mapanlokong app o website nang hindi sinasadya. Bukod pa rito, dahil mga pampublikong key lang ang itinatabi ng mga server, lubos na mas mahirap ang pag-hack."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Madaling transition"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Habang papalapit tayo sa panahon kung saan hindi na gagamit ng mga password, magiging available pa rin ang mga password kasama ng mga passkey"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Habang lumalayo tayo sa mga password, magiging available pa rin ang mga password kasama ng mga passkey."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Piliin kung saan mo ise-save ang iyong <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pumili ng password manager para ma-save ang iyong impormasyon at makapag-sign in nang mas mabilis sa susunod na pagkakataon"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Gumawa ng passkey para sa <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Pumili ng naka-save na sign-in para sa <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Mag-sign in sa ibang paraan"</string> <string name="snackbar_action" msgid="37373514216505085">"Mga opsyon sa view"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Magpatuloy"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Pamahalaan ang mga sign-in"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Mula sa ibang device"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Gumamit ng ibang device"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Kinansela ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang kahilingan"</string> </resources> diff --git a/packages/CredentialManager/res/values-tr/strings.xml b/packages/CredentialManager/res/values-tr/strings.xml index 1398e8d79f3f..857516c8432c 100644 --- a/packages/CredentialManager/res/values-tr/strings.xml +++ b/packages/CredentialManager/res/values-tr/strings.xml @@ -20,18 +20,18 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Daha iyi hesap güvenliği"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Her anahtar, oluşturulduğu uygulama veya web sitesiyle özel olarak bağlantılı olduğu için sahte bir uygulamaya veya web sitesine hiçbir zaman yanlışlıkla giriş yapamazsınız. Ayrıca, sunucularda yalnızca ortak anahtarlar saklandığı için saldırıya uğramak daha zordur."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Sorunsuz geçiş"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Şifresiz bir geleceğe doğru ilerlerken şifreler, şifre anahtarlarıyla birlikte kullanılmaya devam edecektir."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Şifresiz bir geleceğe doğru ilerlerken şifreler, şifre anahtarlarıyla birlikte kullanılmaya devam edecektir."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> kaydedileceği yeri seçin"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Bilgilerinizi kaydedip bir dahaki sefere daha hızlı oturum açmak için bir şifre yöneticisi seçin"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> için şifre anahtarı oluşturulsun mu?"</string> <string name="choose_create_option_password_title" msgid="7097275038523578687">"<xliff:g id="APPNAME">%1$s</xliff:g> için şifre kaydedilsin mi?"</string> <string name="choose_create_option_sign_in_title" msgid="4124872317613421249">"<xliff:g id="APPNAME">%1$s</xliff:g> için oturum açma bilgileri kaydedilsin mi?"</string> <string name="passkey" msgid="632353688396759522">"Şifre anahtarı"</string> - <string name="password" msgid="6738570945182936667">"şifre"</string> + <string name="password" msgid="6738570945182936667">"Şifre"</string> <string name="passkeys" msgid="5733880786866559847">"Şifre anahtarlarınızın"</string> <string name="passwords" msgid="5419394230391253816">"şifreler"</string> <string name="sign_ins" msgid="4710739369149469208">"oturum aç"</string> - <string name="sign_in_info" msgid="2627704710674232328">"oturum açma bilgileri"</string> + <string name="sign_in_info" msgid="2627704710674232328">"Oturum açma bilgileri"</string> <string name="save_credential_to_title" msgid="3172811692275634301">"<xliff:g id="CREDENTIALTYPES">%1$s</xliff:g> nereye kaydedilsin?"</string> <string name="create_passkey_in_other_device_title" msgid="9195411122362461390">"Başka bir cihazda şifre anahtarı oluşturulsun mu?"</string> <string name="use_provider_for_all_title" msgid="4201020195058980757">"Tüm oturum açma işlemlerinizde <xliff:g id="PROVIDERINFODISPLAYNAME">%1$s</xliff:g> kullanılsın mı?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> için kayıtlı oturum açma bilgilerini kullanın"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Başka bir yöntemle oturum aç"</string> <string name="snackbar_action" msgid="37373514216505085">"Seçenekleri göster"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Devam"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Oturum açma bilgilerini yönetin"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Başka bir cihazdan"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Farklı bir cihaz kullan"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"İstek, <xliff:g id="APP_NAME">%1$s</xliff:g> tarafından iptal edildi"</string> </resources> diff --git a/packages/CredentialManager/res/values-uk/strings.xml b/packages/CredentialManager/res/values-uk/strings.xml index c5c1c2c457bf..6684c436fce2 100644 --- a/packages/CredentialManager/res/values-uk/strings.xml +++ b/packages/CredentialManager/res/values-uk/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Підвищена безпека облікового запису"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Кожен ключ зв’язано виключно з додатком або веб-сайтом, для якого його створено, тому ви ніколи не зможете помилково ввійти в шахрайський додаток чи на шахрайський веб-сайт. Крім того, коли на серверах зберігаються лише відкриті ключі, зламати захист набагато складніше."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Плавний перехід"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"На шляху до безпарольного майбутнього паролі й надалі будуть використовуватися паралельно з ключами"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"На шляху до безпарольного майбутнього паролі й надалі будуть використовуватися паралельно з ключами."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Виберіть, де зберігати <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Виберіть менеджер паролів, щоб зберігати свої дані й надалі входити в облікові записи швидше"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Створити ключ доступу для додатка <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Виберіть збережені дані для входу в додаток <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Увійти іншим способом"</string> <string name="snackbar_action" msgid="37373514216505085">"Переглянути варіанти"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Продовжити"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Керування даними для входу"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"З іншого пристрою"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Використовувати інший пристрій"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> скасував запит"</string> </resources> diff --git a/packages/CredentialManager/res/values-ur/strings.xml b/packages/CredentialManager/res/values-ur/strings.xml index b1a3b0f4ff4d..0600a8d5f036 100644 --- a/packages/CredentialManager/res/values-ur/strings.xml +++ b/packages/CredentialManager/res/values-ur/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"بہتر کردہ اکاؤنٹ کی سیکیورٹی"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"ہر کلید خصوصی طور پر اس ایپ یا ویب سائٹ سے منسلک ہے جس کے لیے اسے تخلیق کیا گیا تھا، اس لیے آپ کبھی بھی غلطی سے کسی پر فریب ایپ یا ویب سائٹ میں سائن ان نہیں کر سکتے ہیں۔ اس کے علاوہ، چونکہ سرورز صرف عوامی کلید رکھتے ہیں، اس لیے ہیکنگ بہت مشکل ہے۔"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"آسان ٹرانزیشن"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"چونکہ ہم بغیر پاس ورڈ والے مستقبل کی طرف جا رہے ہیں اس کے باوجود پاس ورڈز پاس کیز کے ساتھ ہی دستیاب ہوں گے"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"چونکہ ہم بغیر پاس ورڈ والے مستقبل کی طرف جا رہے ہیں اس کے باوجود پاس ورڈز پاس کیز کے ساتھ ہی دستیاب ہوں گے۔"</string> <string name="choose_provider_title" msgid="8870795677024868108">"منتخب کریں کہ آپ کی <xliff:g id="CREATETYPES">%1$s</xliff:g> کو کہاں محفوظ کرنا ہے"</string> <string name="choose_provider_body" msgid="4967074531845147434">"اپنی معلومات کو محفوظ کرنے اور اگلی بار تیزی سے سائن ان کرنے کے لیے پاس ورڈ مینیجر منتخب کریں"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> کے لیے پاس کی تخلیق کریں؟"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے اپنی محفوظ کردہ پاس کی استعمال کریں؟"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے اپنے محفوظ کردہ سائن ان کو استعمال کریں؟"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے محفوظ کردہ سائن انز منتخب کریں"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے ایک اختیار منتخب کریں؟"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"دوسرے طریقے سے سائن ان کریں"</string> <string name="snackbar_action" msgid="37373514216505085">"اختیارات دیکھیں"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"سائن انز کا نظم کریں"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"دوسرے آلے سے"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"ایک مختلف آلہ استعمال کریں"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> نے درخواست منسوخ کر دی"</string> </resources> diff --git a/packages/CredentialManager/res/values-uz/strings.xml b/packages/CredentialManager/res/values-uz/strings.xml index b2425ebcb47a..4a77350ad083 100644 --- a/packages/CredentialManager/res/values-uz/strings.xml +++ b/packages/CredentialManager/res/values-uz/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Hisob xavfsizligi yaxshilandi"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Har bir kalit faqat ular uchun yaratilgan ilova yoki veb-sayt bilan ulangan, shuning uchun siz hech qachon xatolik bilan soxta ilova yoki veb-saytga kira olmaysiz. Shuningdek, serverlar bilan faqat ochiq kalitlarni saqlagan holda, buzib kirish ancha qiyinroq boʻladi."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Uzluksiz oʻtish"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Parolsiz kelajak sari borayotganimizda, parollar kodlar bilan birga ishlatilishda davom etadi"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Parolsiz kelajak sari borayotganimizda, parollar kodlar bilan birga ishlatilishda davom etadi."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Bu <xliff:g id="CREATETYPES">%1$s</xliff:g> qayerga saqlanishini tanlang"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Maʼlumotlaringizni saqlash va keyingi safar tez kirish uchun parollar menejerini tanlang"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"<xliff:g id="APPNAME">%1$s</xliff:g> uchun kod yaratilsinmi?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"<xliff:g id="APP_NAME">%1$s</xliff:g> hisob maʼlumotlarini tanlang"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Boshqa usul orqali kirish"</string> <string name="snackbar_action" msgid="37373514216505085">"Variantlarni ochish"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Davom etish"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Hisob maʼlumotlarini boshqarish"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Boshqa qurilmada"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Boshqa qurilmadan foydalanish"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Soʻrovni <xliff:g id="APP_NAME">%1$s</xliff:g> bekor qilgan"</string> </resources> diff --git a/packages/CredentialManager/res/values-vi/strings.xml b/packages/CredentialManager/res/values-vi/strings.xml index f0f7a3b4a5db..da3ce4cf1414 100644 --- a/packages/CredentialManager/res/values-vi/strings.xml +++ b/packages/CredentialManager/res/values-vi/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Cải thiện tính bảo mật của tài khoản"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Mỗi khoá được liên kết riêng với ứng dụng hoặc trang web mà khoá đó được tạo. Vì vậy, bạn sẽ không bao giờ đăng nhập nhầm vào một ứng dụng hoặc trang web lừa đảo. Ngoài ra, với các máy chủ chỉ lưu giữ khoá công khai, việc xâm nhập càng khó hơn nhiều."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Chuyển đổi liền mạch"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Trong quá trình chúng tôi hướng đến tương lai không dùng mật khẩu, bạn vẫn sẽ dùng được mật khẩu cùng với mã xác thực"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Trong quá trình chúng tôi hướng đến tương lai không dùng mật khẩu, bạn vẫn sẽ dùng được mật khẩu cùng với mã xác thực."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Chọn vị trí lưu <xliff:g id="CREATETYPES">%1$s</xliff:g> của bạn"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Hãy chọn một trình quản lý mật khẩu để lưu thông tin của bạn và đăng nhập nhanh hơn trong lần tới"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Tạo mã xác thực cho <xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Chọn thông tin đăng nhập đã lưu cho <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Đăng nhập bằng cách khác"</string> <string name="snackbar_action" msgid="37373514216505085">"Xem các lựa chọn"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"Tiếp tục"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Quản lý thông tin đăng nhập"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Từ một thiết bị khác"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Dùng thiết bị khác"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g> đã huỷ yêu cầu"</string> </resources> diff --git a/packages/CredentialManager/res/values-zh-rCN/strings.xml b/packages/CredentialManager/res/values-zh-rCN/strings.xml index aabc6decaa30..b6338dc1fed2 100644 --- a/packages/CredentialManager/res/values-zh-rCN/strings.xml +++ b/packages/CredentialManager/res/values-zh-rCN/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"提升了帐号安全性"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"每个密钥都是专为特定应用或网站创建的，且仅与各自对应的网站或应用关联，因此您绝不会错误地登录任何欺诈性应用或网站。另外，由于服务器只保留公钥，黑客入侵的难度会大大增加。"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"无缝转换"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"我们正在迈向一个无密码的未来，但在此过程中，密码仍会与通行密钥并存"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"在我们向无密码未来迈进的过程中，密码仍会与通行密钥并行使用。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"选择保存<xliff:g id="CREATETYPES">%1$s</xliff:g>的位置"</string> <string name="choose_provider_body" msgid="4967074531845147434">"请选择一款密码管理工具来保存您的信息，以便下次更快地登录"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"要为“<xliff:g id="APPNAME">%1$s</xliff:g>”创建通行密钥吗？"</string> @@ -54,6 +54,8 @@ <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"为<xliff:g id="APP_NAME">%1$s</xliff:g>选择已保存的登录信息"</string> <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> <skip /> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> + <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"使用其他登录方式"</string> <string name="snackbar_action" msgid="37373514216505085">"查看选项"</string> <string name="get_dialog_button_label_continue" msgid="6446201694794283870">"继续"</string> @@ -66,6 +68,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"管理登录信息"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"通过另一台设备"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"使用其他设备"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"<xliff:g id="APP_NAME">%1$s</xliff:g>已取消请求"</string> </resources> diff --git a/packages/CredentialManager/res/values-zh-rHK/strings.xml b/packages/CredentialManager/res/values-zh-rHK/strings.xml index c3419a47cd3f..b4ae8f39f1d2 100644 --- a/packages/CredentialManager/res/values-zh-rHK/strings.xml +++ b/packages/CredentialManager/res/values-zh-rHK/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"提升帳戶安全性"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"系統會為應用程式或網站建立專用的對應金鑰，因此您不會錯誤登入欺詐的應用程式或網站。此外，伺服器上只會保留公開金鑰，因此可大幅降低駭客入侵的風險。"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"流暢轉換"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"我們將會改用無密碼技術，而密碼仍可與密鑰並行使用"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"我們將會改用無密碼技術，而密碼仍可與密鑰並行使用。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"選擇儲存<xliff:g id="CREATETYPES">%1$s</xliff:g>的位置"</string> <string name="choose_provider_body" msgid="4967074531845147434">"選取密碼管理工具即可儲存自己的資料，縮短下次登入的時間"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"要為「<xliff:g id="APPNAME">%1$s</xliff:g>」建立密鑰嗎？"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密鑰嗎？"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」登入資料嗎？"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"選擇已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」登入資料"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"要選擇適用於「<xliff:g id="APP_NAME">%1$s</xliff:g>」的項目嗎？"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"使用其他方式登入"</string> <string name="snackbar_action" msgid="37373514216505085">"查看選項"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"管理登入資料"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"透過其他裝置"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"使用其他裝置"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」已取消要求"</string> </resources> diff --git a/packages/CredentialManager/res/values-zh-rTW/strings.xml b/packages/CredentialManager/res/values-zh-rTW/strings.xml index cd77bcb9b735..a79f7cfd8cb1 100644 --- a/packages/CredentialManager/res/values-zh-rTW/strings.xml +++ b/packages/CredentialManager/res/values-zh-rTW/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"提升帳戶安全性"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"系統會為應用程式或網站建立專屬的對應金鑰，因此你不會意外登入詐騙應用程式或網站。此外，伺服器上只存放公開金鑰，可大幅降低駭客入侵的風險。"</string> <string name="seamless_transition_title" msgid="5335622196351371961">"流暢轉換"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"即使現在已邁入無密碼時代，密碼仍可與密碼金鑰並用"</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"我們日後將改採無密碼技術，密碼仍可與密碼金鑰並行使用。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"選擇要將<xliff:g id="CREATETYPES">%1$s</xliff:g>存在哪裡"</string> <string name="choose_provider_body" msgid="4967074531845147434">"選取密碼管理工具並儲存資訊，下次就能更快登入"</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"要為「<xliff:g id="APPNAME">%1$s</xliff:g>」建立密碼金鑰嗎？"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密碼金鑰嗎？"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」登入資訊嗎？"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"選擇已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」登入資訊"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"要選擇適用於「<xliff:g id="APP_NAME">%1$s</xliff:g>」的項目嗎？"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"使用其他方式登入"</string> <string name="snackbar_action" msgid="37373514216505085">"查看選項"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"管理登入資訊"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"透過其他裝置"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"使用其他裝置"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"要求已由 <xliff:g id="APP_NAME">%1$s</xliff:g> 取消"</string> </resources> diff --git a/packages/CredentialManager/res/values-zu/strings.xml b/packages/CredentialManager/res/values-zu/strings.xml index 2927282fdff1..2a419829dce9 100644 --- a/packages/CredentialManager/res/values-zu/strings.xml +++ b/packages/CredentialManager/res/values-zu/strings.xml @@ -20,7 +20,7 @@ <string name="improved_account_security_title" msgid="1069841917893513424">"Ukuvikeleka kwe-akhawunti okuthuthukisiwe"</string> <string name="improved_account_security_detail" msgid="9123750251551844860">"Ukhiye ngamunye olinkwe ngokukhethekile ne-app noma iwebhusayithi usungulelwe yona, ngakho awukwazi ukungena ngemvume ku-app noma kuwebhusayithi yomgunyathi ngephutha. Futhi, ngamaseva agcina okhiye basesidlangalaleni kuphela, ukugebengu be-inthanethi bunzima kakhulu."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Ushintsho olulula"</string> - <string name="seamless_transition_detail" msgid="3440478759491650823">"Njengoba siya ekusaseni elingenaphasiwedi, amagama ayimfihlo asazotholakala eceleni kokhiye bokudlula."</string> + <string name="seamless_transition_detail" msgid="4475509237171739843">"Njengoba sibhekela kwikusasa elingenaphasiwedi, amagama ayimfihlo asazotholakala eceleni kokhiye bokudlula."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Khetha lapho ongagcina khona i-<xliff:g id="CREATETYPES">%1$s</xliff:g> yakho"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Khetha isiphathi sephasiwedi ukuze ulondoloze ulwazi lwakho futhi ungene ngemvume ngokushesha ngesikhathi esizayo."</string> <string name="choose_create_option_passkey_title" msgid="5220979185879006862">"Sungula ukhiye wokudlula we-<xliff:g id="APPNAME">%1$s</xliff:g>?"</string> @@ -52,7 +52,8 @@ <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Sebenzisa ukhiye wakho wokungena olondoloziwe <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_sign_in_for" msgid="5283099528915572980">"Sebenzisa ukungena kwakho ngemvume okulondoloziwe <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_sign_in_for" msgid="1361715440877613701">"Khetha ukungena ngemvume okulondoloziwe kwakho <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for get_dialog_title_choose_option_for (4976380044745029107) --> + <string name="get_dialog_title_choose_option_for" msgid="4976380044745029107">"Khetha ongakhetha kukho kwe-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <!-- no translation found for get_dialog_title_use_info_on (8863708099535435146) --> <skip /> <string name="get_dialog_use_saved_passkey_for" msgid="4618100798664888512">"Ngena ngemvume ngenye indlela"</string> <string name="snackbar_action" msgid="37373514216505085">"Buka okungakhethwa kukho"</string> @@ -66,6 +67,5 @@ <string name="get_dialog_heading_manage_sign_ins" msgid="3522556476480676782">"Phatha ukungena ngemvume"</string> <string name="get_dialog_heading_from_another_device" msgid="1166697017046724072">"Kusukela kwenye idivayisi"</string> <string name="get_dialog_option_headline_use_a_different_device" msgid="8201578814988047549">"Sebenzisa idivayisi ehlukile"</string> - <!-- no translation found for request_cancelled_by (3735222326886267820) --> - <skip /> + <string name="request_cancelled_by" msgid="3735222326886267820">"Isicelo sikhanselwe yi-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> </resources> diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt index 452455c9838c..e53e956c317c 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt @@ -18,14 +18,8 @@ package com.android.credentialmanager import android.content.Context import android.content.Intent -import android.credentials.CreateCredentialRequest -import android.credentials.Credential.TYPE_PASSWORD_CREDENTIAL -import android.credentials.CredentialOption -import android.credentials.GetCredentialRequest -import android.credentials.ui.AuthenticationEntry import android.credentials.ui.CancelUiRequest import android.credentials.ui.Constants -import android.credentials.ui.Entry import android.credentials.ui.CreateCredentialProviderData import android.credentials.ui.GetCredentialProviderData import android.credentials.ui.DisabledProviderData @@ -35,23 +29,16 @@ import android.credentials.ui.BaseDialogResult import android.credentials.ui.ProviderPendingIntentResponse import android.credentials.ui.UserSelectionDialogResult import android.os.IBinder -import android.os.Binder import android.os.Bundle import android.os.ResultReceiver +import android.util.Log import com.android.credentialmanager.createflow.DisabledProviderInfo import com.android.credentialmanager.createflow.EnabledProviderInfo import com.android.credentialmanager.createflow.RequestDisplayInfo import com.android.credentialmanager.getflow.GetCredentialUiState import com.android.credentialmanager.getflow.findAutoSelectEntry -import androidx.credentials.CreateCredentialRequest.DisplayInfo -import androidx.credentials.CreatePublicKeyCredentialRequest -import androidx.credentials.CreatePasswordRequest -import androidx.credentials.GetPasswordOption -import androidx.credentials.GetPublicKeyCredentialOption import com.android.credentialmanager.common.ProviderActivityState -import java.time.Instant - /** * Client for interacting with Credential Manager. Also holds data inputs from it. * @@ -63,7 +50,7 @@ class CredentialManagerRepo( intent: Intent, userConfigRepo: UserConfigRepo, ) { - val requestInfo: RequestInfo + val requestInfo: RequestInfo? private val providerEnabledList: List<ProviderData> private val providerDisabledList: List<DisabledProviderData>? // TODO: require non-null. @@ -75,27 +62,30 @@ class CredentialManagerRepo( requestInfo = intent.extras?.getParcelable( RequestInfo.EXTRA_REQUEST_INFO, RequestInfo::class.java - ) ?: testGetRequestInfo() + ) - val originName: String? = when (requestInfo.type) { + val originName: String? = when (requestInfo?.type) { RequestInfo.TYPE_CREATE -> requestInfo.createCredentialRequest?.origin RequestInfo.TYPE_GET -> requestInfo.getCredentialRequest?.origin else -> null } - providerEnabledList = when (requestInfo.type) { + providerEnabledList = when (requestInfo?.type) { RequestInfo.TYPE_CREATE -> intent.extras?.getParcelableArrayList( ProviderData.EXTRA_ENABLED_PROVIDER_DATA_LIST, CreateCredentialProviderData::class.java - ) ?: testCreateCredentialEnabledProviderList() + ) ?: emptyList() RequestInfo.TYPE_GET -> intent.extras?.getParcelableArrayList( ProviderData.EXTRA_ENABLED_PROVIDER_DATA_LIST, GetCredentialProviderData::class.java - ) ?: testGetCredentialProviderList() + ) ?: emptyList() else -> { - throw IllegalStateException("Unrecognized request type: ${requestInfo.type}") + Log.d( + com.android.credentialmanager.common.Constants.LOG_TAG, + "Unrecognized request type: ${requestInfo?.type}") + emptyList() } } @@ -103,7 +93,7 @@ class CredentialManagerRepo( intent.extras?.getParcelableArrayList( ProviderData.EXTRA_DISABLED_PROVIDER_DATA_LIST, DisabledProviderData::class.java - ) ?: testDisabledProviderList() + ) resultReceiver = intent.getParcelableExtra( Constants.EXTRA_RESULT_RECEIVER, @@ -115,7 +105,7 @@ class CredentialManagerRepo( CancelUiRequestState(getAppLabel(context.getPackageManager(), it.appPackageName)) } - initialUiState = when (requestInfo.type) { + initialUiState = when (requestInfo?.type) { RequestInfo.TYPE_CREATE -> { val defaultProviderId = userConfigRepo.getDefaultProviderId() val isPasskeyFirstUse = userConfigRepo.getIsPasskeyFirstUse() @@ -151,7 +141,17 @@ class CredentialManagerRepo( cancelRequestState = cancelUiRequestState ) } - else -> throw IllegalStateException("Unrecognized request type: ${requestInfo.type}") + else -> { + if (cancellationRequest != null) { + UiState( + createCredentialUiState = null, + getCredentialUiState = null, + cancelRequestState = cancelUiRequestState, + ) + } else { + throw IllegalStateException("Unrecognized request type: ${requestInfo?.type}") + } + } } } @@ -174,7 +174,7 @@ class CredentialManagerRepo( } fun onCancel(cancelCode: Int) { - sendCancellationCode(cancelCode, requestInfo.token, resultReceiver) + sendCancellationCode(cancelCode, requestInfo?.token, resultReceiver) } fun onOptionSelected( @@ -185,7 +185,7 @@ class CredentialManagerRepo( resultData: Intent? = null, ) { val userSelectionDialogResult = UserSelectionDialogResult( - requestInfo.token, + requestInfo?.token, providerId, entryKey, entrySubkey, @@ -213,10 +213,9 @@ class CredentialManagerRepo( // IMPORTANT: new invocation should be mindful that this method can throw. private fun getCreateProviderEnableListInitialUiState(): List<EnabledProviderInfo> { - val providerEnabledList = CreateFlowUtils.toEnabledProviderList( + return CreateFlowUtils.toEnabledProviderList( providerEnabledList as List<CreateCredentialProviderData>, context ) - return providerEnabledList } private fun getCreateProviderDisableListInitialUiState(): List<DisabledProviderInfo> { @@ -253,242 +252,4 @@ class CredentialManagerRepo( ) } } - - // TODO: below are prototype functionalities. To be removed for productionization. - private fun testCreateCredentialEnabledProviderList(): List<CreateCredentialProviderData> { - return listOf( - CreateCredentialProviderData - .Builder("io.enpass.app") - .setSaveEntries( - listOf<Entry>( - CreateTestUtils.newCreateEntry( - context, - "key1", "subkey-1", "elisa.beckett@gmail.com", - 20, 7, 27, Instant.ofEpochSecond(10L), - "You can use your passkey on this or other devices. It is saved to " + - "the Password Manager for elisa.beckett@gmail.com." - ), - CreateTestUtils.newCreateEntry( - context, - "key1", "subkey-2", "elisa.work@google.com", - 20, 7, 27, Instant.ofEpochSecond(12L), - null - ), - ) - ).setRemoteEntry( - CreateTestUtils.newRemoteCreateEntry(context, "key2", "subkey-1") - ).build(), - CreateCredentialProviderData - .Builder("com.dashlane") - .setSaveEntries( - listOf<Entry>( - CreateTestUtils.newCreateEntry( - context, - "key1", "subkey-3", "elisa.beckett@dashlane.com", - 20, 7, 27, Instant.ofEpochSecond(11L), - null - ), - CreateTestUtils.newCreateEntry( - context, - "key1", "subkey-4", "elisa.work@dashlane.com", - 20, 7, 27, Instant.ofEpochSecond(14L), - "You can use your passkey on this or other devices. It is saved to " + - "the Password Manager for elisa.work@dashlane.com" - ), - ) - ).build(), - ) - } - - private fun testDisabledProviderList(): List<DisabledProviderData>? { - return listOf( - DisabledProviderData("com.lastpass.lpandroid"), - DisabledProviderData("com.google.android.youtube") - ) - } - - private fun testGetCredentialProviderList(): List<GetCredentialProviderData> { - return listOf( - GetCredentialProviderData.Builder("io.enpass.app") - .setCredentialEntries( - listOf( - GetTestUtils.newPasswordEntry( - context, "key1", "subkey-1", "elisa.family@outlook.com", null, - Instant.ofEpochSecond(8000L) - ), - GetTestUtils.newPasskeyEntry( - context, "key1", "subkey-1", "elisa.bakery@gmail.com", "Elisa Beckett", - null - ), - GetTestUtils.newPasswordEntry( - context, "key1", "subkey-2", "elisa.bakery@gmail.com", null, - Instant.ofEpochSecond(10000L) - ), - GetTestUtils.newPasskeyEntry( - context, "key1", "subkey-3", "elisa.family@outlook.com", - "Elisa Beckett", Instant.ofEpochSecond(500L) - ), - ) - ).setAuthenticationEntries( - listOf( - GetTestUtils.newAuthenticationEntry( - context, "key2", "subkey-1", "locked-user1@gmail.com", - AuthenticationEntry.STATUS_LOCKED - ), - GetTestUtils.newAuthenticationEntry( - context, "key2", "subkey-2", "locked-user2@gmail.com", - AuthenticationEntry.STATUS_UNLOCKED_BUT_EMPTY_MOST_RECENT - ), - ) - ).setActionChips( - listOf( - GetTestUtils.newActionEntry( - context, "key3", "subkey-1", - "Open Google Password Manager", "elisa.beckett@gmail.com" - ), - GetTestUtils.newActionEntry( - context, "key3", "subkey-2", - "Open Google Password Manager", "beckett-family@gmail.com" - ), - ) - ).setRemoteEntry( - GetTestUtils.newRemoteCredentialEntry(context, "key4", "subkey-1") - ).build(), - GetCredentialProviderData.Builder("com.dashlane") - .setCredentialEntries( - listOf<Entry>( - GetTestUtils.newPasswordEntry( - context, "key1", "subkey-2", "elisa.family@outlook.com", null, - Instant.ofEpochSecond(9000L) - ), - GetTestUtils.newPasswordEntry( - context, "key1", "subkey-3", "elisa.work@outlook.com", null, - Instant.ofEpochSecond(11000L) - ), - ) - ).setAuthenticationEntries( - listOf( - GetTestUtils.newAuthenticationEntry( - context, "key2", "subkey-1", "foo@email.com", - AuthenticationEntry.STATUS_UNLOCKED_BUT_EMPTY_LESS_RECENT, - ) - ) - ).setActionChips( - listOf( - GetTestUtils.newActionEntry( - context, "key3", "subkey-1", "Open Enpass", - "Manage passwords" - ), - ) - ).build(), - ) - } - - private fun testCreatePasskeyRequestInfo(): RequestInfo { - val request = CreatePublicKeyCredentialRequest( - "{\"extensions\": {\n" + - " \"webauthn.loc\": true\n" + - " },\n" + - " \"attestation\": \"direct\",\n" + - " \"challenge\":" + - " \"-rSQHXSQUdaK1N-La5bE-JPt6EVAW4SxX1K_tXhZ_Gk\",\n" + - " \"user\": {\n" + - " \"displayName\": \"testName\",\n" + - " \"name\": \"credManTesting@gmail.com\",\n" + - " \"id\": \"eD4o2KoXLpgegAtnM5cDhhUPvvk2\"\n" + - " },\n" + - " \"excludeCredentials\": [],\n" + - " \"rp\": {\n" + - " \"name\": \"Address Book\",\n" + - " \"id\": \"addressbook-c7876.uc.r.appspot.com\"\n" + - " },\n" + - " \"timeout\": 60000,\n" + - " \"pubKeyCredParams\": [\n" + - " {\n" + - " \"type\": \"public-key\",\n" + - " \"alg\": -7\n" + - " },\n" + - " {\n" + - " \"type\": \"public-key\",\n" + - " \"alg\": -257\n" + - " },\n" + - " {\n" + - " \"type\": \"public-key\",\n" + - " \"alg\": -37\n" + - " }\n" + - " ],\n" + - " \"authenticatorSelection\": {\n" + - " \"residentKey\": \"required\",\n" + - " \"requireResidentKey\": true\n" + - " }}", - preferImmediatelyAvailableCredentials = true, - ) - val credentialData = request.credentialData - return RequestInfo.newCreateRequestInfo( - Binder(), - CreateCredentialRequest.Builder("androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL", - credentialData, Bundle()) - .setIsSystemProviderRequired(false) - .setAlwaysSendAppInfoToProvider(true) - .build(), - "com.google.android.youtube" - ) - } - - private fun testCreatePasswordRequestInfo(): RequestInfo { - val request = CreatePasswordRequest("beckett-bakert@gmail.com", "password123") - return RequestInfo.newCreateRequestInfo( - Binder(), - CreateCredentialRequest.Builder(TYPE_PASSWORD_CREDENTIAL, - request.credentialData, request.candidateQueryData) - .setIsSystemProviderRequired(false) - .setAlwaysSendAppInfoToProvider(true) - .build(), - "com.google.android.youtube" - ) - } - - private fun testCreateOtherCredentialRequestInfo(): RequestInfo { - val data = Bundle() - val displayInfo = DisplayInfo("my-username00", "Joe") - data.putBundle( - "androidx.credentials.BUNDLE_KEY_REQUEST_DISPLAY_INFO", - displayInfo.toBundle() - ) - return RequestInfo.newCreateRequestInfo( - Binder(), - CreateCredentialRequest.Builder("other-sign-ins", data, Bundle()) - .setIsSystemProviderRequired(false) - .setAlwaysSendAppInfoToProvider(true) - .build(), - "com.google.android.youtube" - ) - } - - private fun testGetRequestInfo(): RequestInfo { - val passwordOption = GetPasswordOption() - val passkeyOption = GetPublicKeyCredentialOption( - "json", preferImmediatelyAvailableCredentials = false) - return RequestInfo.newGetRequestInfo( - Binder(), - GetCredentialRequest.Builder( - Bundle() - ).addCredentialOption( - CredentialOption.Builder( - passwordOption.type, - passwordOption.requestData, - passwordOption.candidateQueryData, - ).setIsSystemProviderRequired(passwordOption.isSystemProviderRequired) - .build() - ).addCredentialOption( - CredentialOption.Builder( - passkeyOption.type, - passkeyOption.requestData, - passkeyOption.candidateQueryData, - ).setIsSystemProviderRequired(passkeyOption.isSystemProviderRequired) - .build() - ).build(), - "com.google.android.youtube" - ) - } } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt index 2efe1bee43cc..24f92c00c772 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0N * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -74,7 +74,6 @@ class CredentialSelectorActivity : ComponentActivity() { override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) - Log.d(Constants.LOG_TAG, "Existing activity received new intent") try { val viewModel: CredentialSelectorViewModel by viewModels() val (isCancellationRequest, shouldShowCancellationUi, appDisplayName) = @@ -111,7 +110,7 @@ class CredentialSelectorActivity : ComponentActivity() { ?: return Triple(false, false, null) if (viewModel != null && !viewModel.shouldCancelCurrentUi(cancelUiRequest.token)) { // Cancellation was for a different request, don't cancel the current UI. - return Triple(false, false, null) + return Triple(true, false, null) } val shouldShowCancellationUi = cancelUiRequest.shouldShowCancellationUi() Log.d( diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt index 7eb3bf46b493..29ec970966d6 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt @@ -69,7 +69,7 @@ class CredentialSelectorViewModel( init{ uiMetrics.logNormal(LifecycleEvent.CREDMAN_ACTIVITY_INIT, - credManRepo.requestInfo.appPackageName) + credManRepo.requestInfo?.appPackageName) } /**************************************************************************/ @@ -97,10 +97,10 @@ class CredentialSelectorViewModel( this.credManRepo = credManRepo uiState = credManRepo.initState() - if (this.credManRepo.requestInfo.token != credManRepo.requestInfo.token) { + if (this.credManRepo.requestInfo?.token != credManRepo.requestInfo?.token) { this.uiMetrics.resetInstanceId() this.uiMetrics.logNormal(LifecycleEvent.CREDMAN_ACTIVITY_NEW_REQUEST, - credManRepo.requestInfo.appPackageName) + credManRepo.requestInfo?.appPackageName) } } @@ -174,14 +174,14 @@ class CredentialSelectorViewModel( private fun onInternalError() { Log.w(Constants.LOG_TAG, "UI closed due to illegal internal state") this.uiMetrics.logNormal(LifecycleEvent.CREDMAN_ACTIVITY_INTERNAL_ERROR, - credManRepo.requestInfo.appPackageName) + credManRepo.requestInfo?.appPackageName) credManRepo.onParsingFailureCancel() uiState = uiState.copy(dialogState = DialogState.COMPLETE) } /** Return true if the current UI's request token matches the UI cancellation request token. */ fun shouldCancelCurrentUi(cancelRequestToken: IBinder): Boolean { - return credManRepo.requestInfo.token.equals(cancelRequestToken) + return credManRepo.requestInfo?.token?.equals(cancelRequestToken) ?: false } /**************************************************************************/ @@ -405,6 +405,6 @@ class CredentialSelectorViewModel( @Composable fun logUiEvent(uiEventEnum: UiEventEnum) { - this.uiMetrics.log(uiEventEnum, credManRepo.requestInfo.appPackageName) + this.uiMetrics.log(uiEventEnum, credManRepo.requestInfo?.appPackageName) } }
\ No newline at end of file diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index 43da9807231b..ca891294576b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -188,11 +188,11 @@ class GetFlowUtils { } fun toRequestDisplayInfo( - requestInfo: RequestInfo, + requestInfo: RequestInfo?, context: Context, originName: String?, ): com.android.credentialmanager.getflow.RequestDisplayInfo? { - val getCredentialRequest = requestInfo.getCredentialRequest ?: return null + val getCredentialRequest = requestInfo?.getCredentialRequest ?: return null val preferImmediatelyAvailableCredentials = getCredentialRequest.credentialOptions.any { val credentialOptionJetpack = CredentialOption.createFrom( it.type, @@ -210,7 +210,11 @@ class GetFlowUtils { appName = originName ?: getAppLabel(context.packageManager, requestInfo.appPackageName) ?: return null, - preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials + preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials, + preferIdentityDocUi = getCredentialRequest.data.getBoolean( + // TODO(b/276777444): replace with direct library constant reference once + // exposed. + "androidx.credentials.BUNDLE_KEY_PREFER_IDENTITY_DOC_UI"), ) } @@ -241,7 +245,7 @@ class GetFlowUtils { userName = credentialEntry.username.toString(), displayName = credentialEntry.displayName?.toString(), icon = credentialEntry.icon.loadDrawable(context), - shouldTintIcon = credentialEntry.isDefaultIcon ?: false, + shouldTintIcon = credentialEntry.isDefaultIcon, lastUsedTimeMillis = credentialEntry.lastUsedTime, isAutoSelectable = credentialEntry.isAutoSelectAllowed && credentialEntry.autoSelectAllowedFromOption, @@ -450,10 +454,13 @@ class CreateFlowUtils { } fun toRequestDisplayInfo( - requestInfo: RequestInfo, + requestInfo: RequestInfo?, context: Context, originName: String?, ): RequestDisplayInfo? { + if (requestInfo == null) { + return null + } val appLabel = originName ?: getAppLabel(context.packageManager, requestInfo.appPackageName) ?: return null diff --git a/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt b/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt deleted file mode 100644 index 1f99500a3ea7..000000000000 --- a/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT 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.credentialmanager - -import android.app.PendingIntent -import android.app.slice.Slice -import android.app.slice.SliceSpec -import android.content.Context -import android.content.Intent -import android.credentials.Credential.TYPE_PASSWORD_CREDENTIAL -import android.credentials.ui.AuthenticationEntry -import android.credentials.ui.Entry -import android.net.Uri -import android.os.Bundle -import android.provider.Settings -import androidx.credentials.provider.BeginGetPasswordOption -import androidx.credentials.provider.BeginGetPublicKeyCredentialOption -import androidx.credentials.provider.CreateEntry -import androidx.credentials.provider.PasswordCredentialEntry -import androidx.credentials.provider.PublicKeyCredentialEntry -import androidx.credentials.provider.RemoteEntry - -import java.time.Instant - -// TODO: remove once testing is complete -class GetTestUtils { - companion object { - internal fun newAuthenticationEntry( - context: Context, - key: String, - subkey: String, - title: String, - status: Int - ): AuthenticationEntry { - val slice = Slice.Builder( - Uri.EMPTY, SliceSpec("AuthenticationAction", 0) - ) - val intent = Intent(Settings.ACTION_SYNC_SETTINGS) - val pendingIntent = - PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) - slice.addAction( - pendingIntent, - Slice.Builder(slice) - .addHints(listOf("androidx.credentials.provider.authenticationAction" + - ".SLICE_HINT_PENDING_INTENT")) - .build(), - /*subType=*/null - ) - slice.addText( - title, - null, - listOf("androidx.credentials.provider.authenticationAction.SLICE_HINT_TITLE") - ) - return AuthenticationEntry( - key, - subkey, - slice.build(), - status - ) - } - - internal fun newRemoteCredentialEntry( - context: Context, - key: String, - subkey: String, - ): Entry { - val intent = Intent(Settings.ACTION_SYNC_SETTINGS) - val pendingIntent = - PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) - return Entry( - key, - subkey, - RemoteEntry.toSlice(RemoteEntry(pendingIntent)) - ) - } - - internal fun newActionEntry( - context: Context, - key: String, - subkey: String, - text: String, - subtext: String? = null, - ): Entry { - val intent = Intent(Settings.ACTION_SYNC_SETTINGS) - val pendingIntent = - PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) - val sliceBuilder = Slice.Builder(Uri.EMPTY, SliceSpec("Action", 0)) - .addText( - text, /*subType=*/null, - listOf("androidx.credentials.provider.action.HINT_ACTION_TITLE") - ) - .addText( - subtext, /*subType=*/null, - listOf("androidx.credentials.provider.action.HINT_ACTION_SUBTEXT") - ) - sliceBuilder.addAction( - pendingIntent, - Slice.Builder(sliceBuilder) - .addHints( - listOf("androidx.credentials.provider.action.SLICE_HINT_PENDING_INTENT") - ) - .build(), - /*subType=*/null - ) - return Entry( - key, - subkey, - sliceBuilder.build() - ) - } - - internal fun newPasswordEntry( - context: Context, - key: String, - subkey: String, - userName: String, - userDisplayName: String?, - lastUsedTime: Instant?, - ): Entry { - val intent = Intent("com.androidauth.androidvault.CONFIRM_PASSWORD") - .setPackage("com.androidauth.androidvault") - intent.putExtra("provider_extra_sample", "testprovider") - val pendingIntent = PendingIntent.getActivity( - context, 1, - intent, (PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT - or PendingIntent.FLAG_ONE_SHOT) - ) - val passwordEntry = PasswordCredentialEntry.Builder( - context, userName, pendingIntent, BeginGetPasswordOption(Bundle(), "id")) - .setDisplayName(userDisplayName).setLastUsedTime(lastUsedTime).build() - return Entry(key, subkey, passwordEntry.slice, Intent()) - } - - internal fun newPasskeyEntry( - context: Context, - key: String, - subkey: String, - userName: String, - userDisplayName: String?, - lastUsedTime: Instant?, - isAutoSelectAllowed: Boolean = false, - ): Entry { - val intent = Intent(Settings.ACTION_SYNC_SETTINGS) - val pendingIntent = - PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) - val candidateQueryData = Bundle() - candidateQueryData.putBoolean( - "androidx.credentials.BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED", - isAutoSelectAllowed - ) - val passkeyEntry = PublicKeyCredentialEntry.Builder( - context, - userName, - pendingIntent, - BeginGetPublicKeyCredentialOption(candidateQueryData, "id", "requestjson") - ).setDisplayName(userDisplayName).setLastUsedTime(lastUsedTime) - .setAutoSelectAllowed(isAutoSelectAllowed).build() - return Entry(key, subkey, passkeyEntry.slice, Intent()) - } - } -} - -class CreateTestUtils { - companion object { - private const val TYPE_TOTAL_CREDENTIAL = "TOTAL_CREDENTIAL_COUNT_TYPE" - private const val SLICE_HINT_ACCOUNT_NAME = - "androidx.credentials.provider.createEntry.SLICE_HINT_USER_PROVIDER_ACCOUNT_NAME" - private const val SLICE_HINT_NOTE = - "androidx.credentials.provider.createEntry.SLICE_HINT_NOTE" - private const val SLICE_HINT_ICON = - "androidx.credentials.provider.createEntry.SLICE_HINT_PROFILE_ICON" - private const val SLICE_HINT_CREDENTIAL_COUNT_INFORMATION = - "androidx.credentials.provider.createEntry.SLICE_HINT_CREDENTIAL_COUNT_INFORMATION" - private const val SLICE_HINT_LAST_USED_TIME_MILLIS = - "androidx.credentials.provider.createEntry.SLICE_HINT_LAST_USED_TIME_MILLIS" - private const val SLICE_HINT_PENDING_INTENT = - "androidx.credentials.provider.createEntry.SLICE_HINT_PENDING_INTENT" - - internal fun newCreateEntry( - context: Context, - key: String, - subkey: String, - providerUserDisplayName: String, - passwordCount: Int?, - passkeyCount: Int?, - totalCredentialCount: Int?, - lastUsedTime: Instant?, - footerDescription: String?, - ): Entry { - val intent = Intent("com.androidauth.androidvault.CONFIRM_PASSWORD") - .setPackage("com.androidauth.androidvault") - intent.putExtra("provider_extra_sample", "testprovider") - val pendingIntent = PendingIntent.getActivity( - context, 1, - intent, (PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT - or PendingIntent.FLAG_ONE_SHOT) - ) - val credCountMap = mutableMapOf<String, Int>() - passwordCount?.let { credCountMap.put(TYPE_PASSWORD_CREDENTIAL, it) } - passkeyCount?.let { - credCountMap.put("androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL", it) - } - totalCredentialCount?.let { credCountMap.put(TYPE_TOTAL_CREDENTIAL, it) } - return Entry( - key, - subkey, - CreateEntry.toSlice( - CreateEntry( - accountName = providerUserDisplayName, - pendingIntent = pendingIntent, - description = footerDescription, - lastUsedTime = lastUsedTime, - icon = null, - passwordCredentialCount = passwordCount, - publicKeyCredentialCount = passkeyCount, - totalCredentialCount = totalCredentialCount, - ) - ), - Intent() - ) - } - - internal fun newRemoteCreateEntry( - context: Context, - key: String, - subkey: String, - ): Entry { - val intent = Intent(Settings.ACTION_SYNC_SETTINGS) - val pendingIntent = - PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) - return Entry( - key, - subkey, - RemoteEntry.toSlice(RemoteEntry(pendingIntent)) - ) - } - } -}
\ No newline at end of file diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/material/ModalBottomSheet.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/material/ModalBottomSheet.kt index 307d95313ec8..10a75d436a5b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/material/ModalBottomSheet.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/material/ModalBottomSheet.kt @@ -316,7 +316,7 @@ fun ModalBottomSheetLayout( rememberModalBottomSheetState(Hidden), sheetShape: Shape = MaterialTheme.shapes.large, sheetElevation: Dp = ModalBottomSheetDefaults.Elevation, - sheetBackgroundColor: Color = MaterialTheme.colorScheme.surface, + sheetBackgroundColor: Color, sheetContentColor: Color = contentColorFor(sheetBackgroundColor), content: @Composable () -> Unit ) { diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/BottomSheet.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/BottomSheet.kt index edc902e41e9a..53731f06816a 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/BottomSheet.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/BottomSheet.kt @@ -22,6 +22,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import com.android.compose.rememberSystemUiController import com.android.credentialmanager.common.material.ModalBottomSheetLayout import com.android.credentialmanager.common.material.ModalBottomSheetValue import com.android.credentialmanager.common.material.rememberModalBottomSheetState @@ -38,6 +39,12 @@ fun ModalBottomSheet( initialValue = ModalBottomSheetValue.Expanded, skipHalfExpanded = true ) + val sysUiController = rememberSystemUiController() + if (state.targetValue == ModalBottomSheetValue.Hidden) { + setTransparentSystemBarsColor(sysUiController) + } else { + setBottomSheetSystemBarsColor(sysUiController) + } ModalBottomSheetLayout( sheetBackgroundColor = LocalAndroidColorScheme.current.colorSurfaceBright, modifier = Modifier.background(Color.Transparent), diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt index 7a720b1e858b..0623ff629812 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt @@ -32,7 +32,6 @@ import androidx.compose.material.icons.outlined.Lock import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SuggestionChip import androidx.compose.material3.SuggestionChipDefaults import androidx.compose.material3.TopAppBar @@ -155,7 +154,7 @@ fun Entry( // Decorative purpose only. contentDescription = null, modifier = Modifier.size(24.dp), - tint = MaterialTheme.colorScheme.onSurfaceVariant, + tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant, ) } } @@ -169,7 +168,7 @@ fun Entry( Icon( modifier = iconSize, bitmap = iconImageBitmap, - tint = MaterialTheme.colorScheme.onSurfaceVariant, + tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant, // Decorative purpose only. contentDescription = null, ) @@ -193,7 +192,7 @@ fun Entry( Icon( modifier = iconSize, imageVector = iconImageVector, - tint = MaterialTheme.colorScheme.onSurfaceVariant, + tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant, // Decorative purpose only. contentDescription = null, ) @@ -205,7 +204,7 @@ fun Entry( Icon( modifier = iconSize, painter = iconPainter, - tint = MaterialTheme.colorScheme.onSurfaceVariant, + tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant, // Decorative purpose only. contentDescription = null, ) @@ -217,9 +216,8 @@ fun Entry( border = null, colors = SuggestionChipDefaults.suggestionChipColors( containerColor = LocalAndroidColorScheme.current.colorSurfaceContainerHigh, - // TODO: remove? - labelColor = MaterialTheme.colorScheme.onSurfaceVariant, - iconContentColor = MaterialTheme.colorScheme.onSurfaceVariant, + labelColor = LocalAndroidColorScheme.current.colorOnSurfaceVariant, + iconContentColor = LocalAndroidColorScheme.current.colorOnSurfaceVariant, ), ) } @@ -282,7 +280,7 @@ fun PasskeyBenefitRow( Icon( modifier = Modifier.size(24.dp), painter = leadingIconPainter, - tint = MaterialTheme.colorScheme.onSurfaceVariant, + tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant, // Decorative purpose only. contentDescription = null, ) @@ -341,7 +339,7 @@ fun MoreOptionTopAppBar( R.string.accessibility_back_arrow_button ), modifier = Modifier.size(24.dp).autoMirrored(), - tint = MaterialTheme.colorScheme.onSurfaceVariant, + tint = LocalAndroidColorScheme.current.colorOnSurfaceVariant, ) } } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SectionHeader.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SectionHeader.kt index 358122809985..14bf4f23384b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SectionHeader.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SectionHeader.kt @@ -20,20 +20,20 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp +import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme @Composable fun CredentialListSectionHeader(text: String) { - InternalSectionHeader(text, MaterialTheme.colorScheme.onSurfaceVariant) + InternalSectionHeader(text, LocalAndroidColorScheme.current.colorOnSurfaceVariant) } @Composable fun MoreAboutPasskeySectionHeader(text: String) { - InternalSectionHeader(text, MaterialTheme.colorScheme.onSurface) + InternalSectionHeader(text, LocalAndroidColorScheme.current.colorOnSurface) } @Composable diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt index dfff3d694877..244b604a87f9 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/SnackBar.kt @@ -37,6 +37,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalAccessibilityManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import com.android.compose.rememberSystemUiController import com.android.credentialmanager.R import com.android.credentialmanager.common.material.Scrim import com.android.credentialmanager.ui.theme.Shapes @@ -49,6 +50,8 @@ fun Snackbar( onDismiss: () -> Unit, dismissOnTimeout: Boolean = false, ) { + val sysUiController = rememberSystemUiController() + setTransparentSystemBarsColor(sysUiController) BoxWithConstraints { Box(Modifier.fillMaxSize()) { Scrim( diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt index 22871bcbe767..61c03b4041f5 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/ui/Texts.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow +import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme /** * The headline for a screen. E.g. "Create a passkey for X", "Choose a saved sign-in for X". @@ -35,7 +36,7 @@ fun HeadlineText(text: String, modifier: Modifier = Modifier) { Text( modifier = modifier.wrapContentSize(), text = text, - color = MaterialTheme.colorScheme.onSurface, + color = LocalAndroidColorScheme.current.colorOnSurface, textAlign = TextAlign.Center, style = MaterialTheme.typography.headlineSmall, ) @@ -49,7 +50,7 @@ fun BodyMediumText(text: String, modifier: Modifier = Modifier) { Text( modifier = modifier.wrapContentSize(), text = text, - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = LocalAndroidColorScheme.current.colorOnSurfaceVariant, style = MaterialTheme.typography.bodyMedium, ) } @@ -62,7 +63,7 @@ fun BodySmallText(text: String, modifier: Modifier = Modifier, enforceOneLine: B Text( modifier = modifier.wrapContentSize(), text = text, - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = LocalAndroidColorScheme.current.colorOnSurfaceVariant, style = MaterialTheme.typography.bodySmall, overflow = TextOverflow.Ellipsis, maxLines = if (enforceOneLine) 1 else Int.MAX_VALUE @@ -77,7 +78,7 @@ fun LargeTitleText(text: String, modifier: Modifier = Modifier) { Text( modifier = modifier.wrapContentSize(), text = text, - color = MaterialTheme.colorScheme.onSurface, + color = LocalAndroidColorScheme.current.colorOnSurface, style = MaterialTheme.typography.titleLarge, ) } @@ -90,7 +91,7 @@ fun SmallTitleText(text: String, modifier: Modifier = Modifier, enforceOneLine: Text( modifier = modifier.wrapContentSize(), text = text, - color = MaterialTheme.colorScheme.onSurface, + color = LocalAndroidColorScheme.current.colorOnSurface, style = MaterialTheme.typography.titleSmall, overflow = TextOverflow.Ellipsis, maxLines = if (enforceOneLine) 1 else Int.MAX_VALUE @@ -145,7 +146,7 @@ fun LargeLabelTextOnSurfaceVariant(text: String, modifier: Modifier = Modifier) modifier = modifier.wrapContentSize(), text = text, textAlign = TextAlign.Center, - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = LocalAndroidColorScheme.current.colorOnSurfaceVariant, style = MaterialTheme.typography.labelLarge, ) } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt index ed4cc959543b..66d7db896247 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt @@ -30,7 +30,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.material3.Divider -import androidx.compose.material3.MaterialTheme import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material.icons.filled.Add @@ -46,7 +45,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.graphics.drawable.toBitmap -import com.android.compose.rememberSystemUiController import com.android.credentialmanager.CredentialSelectorViewModel import com.android.credentialmanager.R import com.android.credentialmanager.common.BaseEntry @@ -67,8 +65,8 @@ import com.android.credentialmanager.common.ui.MoreOptionTopAppBar import com.android.credentialmanager.common.ui.SheetContainerCard import com.android.credentialmanager.common.ui.PasskeyBenefitRow import com.android.credentialmanager.common.ui.HeadlineText -import com.android.credentialmanager.common.ui.setBottomSheetSystemBarsColor import com.android.credentialmanager.logging.CreateCredentialEvent +import com.android.credentialmanager.ui.theme.LocalAndroidColorScheme import com.android.internal.logging.UiEventLogger.UiEventEnum @Composable @@ -77,8 +75,6 @@ fun CreateCredentialScreen( createCredentialUiState: CreateCredentialUiState, providerActivityLauncher: ManagedActivityResultLauncher<IntentSenderRequest, ActivityResult> ) { - val sysUiController = rememberSystemUiController() - setBottomSheetSystemBarsColor(sysUiController) ModalBottomSheet( sheetContent = { // Hide the sheet content as opposed to the whole bottom sheet to maintain the scrim @@ -563,7 +559,7 @@ fun CreationSelectionCard( item { Divider( thickness = 1.dp, - color = MaterialTheme.colorScheme.outlineVariant, + color = LocalAndroidColorScheme.current.colorOutlineVariant, modifier = Modifier.padding(vertical = 16.dp) ) } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt index c27ac943bca7..6d7ecd70eb0b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt @@ -41,7 +41,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.graphics.drawable.toBitmap -import com.android.compose.rememberSystemUiController import com.android.credentialmanager.CredentialSelectorViewModel import com.android.credentialmanager.R import com.android.credentialmanager.common.BaseEntry @@ -62,8 +61,6 @@ import com.android.credentialmanager.common.ui.CredentialListSectionHeader import com.android.credentialmanager.common.ui.HeadlineIcon import com.android.credentialmanager.common.ui.LargeLabelTextOnSurfaceVariant import com.android.credentialmanager.common.ui.Snackbar -import com.android.credentialmanager.common.ui.setTransparentSystemBarsColor -import com.android.credentialmanager.common.ui.setBottomSheetSystemBarsColor import com.android.credentialmanager.logging.GetCredentialEvent import com.android.internal.logging.UiEventLogger.UiEventEnum @@ -73,9 +70,7 @@ fun GetCredentialScreen( getCredentialUiState: GetCredentialUiState, providerActivityLauncher: ManagedActivityResultLauncher<IntentSenderRequest, ActivityResult> ) { - val sysUiController = rememberSystemUiController() if (getCredentialUiState.currentScreenState == GetScreenState.REMOTE_ONLY) { - setTransparentSystemBarsColor(sysUiController) RemoteCredentialSnackBarScreen( onClick = viewModel::getFlowOnMoreOptionOnSnackBarSelected, onCancel = viewModel::onUserCancel, @@ -84,7 +79,6 @@ fun GetCredentialScreen( viewModel.uiMetrics.log(GetCredentialEvent.CREDMAN_GET_CRED_SCREEN_REMOTE_ONLY) } else if (getCredentialUiState.currentScreenState == GetScreenState.UNLOCKED_AUTH_ENTRIES_ONLY) { - setTransparentSystemBarsColor(sysUiController) EmptyAuthEntrySnackBarScreen( authenticationEntryList = getCredentialUiState.providerDisplayInfo.authenticationEntryList, @@ -95,7 +89,6 @@ fun GetCredentialScreen( viewModel.uiMetrics.log(GetCredentialEvent .CREDMAN_GET_CRED_SCREEN_UNLOCKED_AUTH_ENTRIES_ONLY) } else { - setBottomSheetSystemBarsColor(sysUiController) ModalBottomSheet( sheetContent = { // Hide the sheet content as opposed to the whole bottom sheet to maintain the scrim diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt index 7a8679038579..c9c62a48d130 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt @@ -42,7 +42,7 @@ internal fun hasContentToDisplay(state: GetCredentialUiState): Boolean { } internal fun isFallbackScreen(state: GetCredentialUiState): Boolean { - return false + return state.requestDisplayInfo.preferIdentityDocUi } internal fun findAutoSelectEntry(providerDisplayInfo: ProviderDisplayInfo): CredentialEntryInfo? { @@ -172,6 +172,7 @@ class ActionEntryInfo( data class RequestDisplayInfo( val appName: String, val preferImmediatelyAvailableCredentials: Boolean, + val preferIdentityDocUi: Boolean, ) /** diff --git a/packages/CredentialManager/src/com/android/credentialmanager/logging/UIMetrics.kt b/packages/CredentialManager/src/com/android/credentialmanager/logging/UIMetrics.kt index 035c1e4bc6c6..9d38b7f3204b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/logging/UIMetrics.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/logging/UIMetrics.kt @@ -43,7 +43,7 @@ class UIMetrics() { } @Composable - fun log(event: UiEventLogger.UiEventEnum, packageName: String) { + fun log(event: UiEventLogger.UiEventEnum, packageName: String?) { val instanceId: InstanceId = mInstanceId LaunchedEffect(true) { mUiEventLogger.logWithInstanceId(event, /*uid=*/0, packageName, instanceId) @@ -51,13 +51,13 @@ class UIMetrics() { } @Composable - fun log(event: UiEventLogger.UiEventEnum, instanceId: InstanceId, packageName: String) { + fun log(event: UiEventLogger.UiEventEnum, instanceId: InstanceId, packageName: String?) { LaunchedEffect(true) { mUiEventLogger.logWithInstanceId(event, /*uid=*/0, packageName, instanceId) } } - fun logNormal(event: UiEventLogger.UiEventEnum, packageName: String) { + fun logNormal(event: UiEventLogger.UiEventEnum, packageName: String?) { mUiEventLogger.logWithInstanceId(event, /*uid=*/0, packageName, mInstanceId) } } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/ui/theme/AndroidColorScheme.kt b/packages/CredentialManager/src/com/android/credentialmanager/ui/theme/AndroidColorScheme.kt index 8928e1869838..a33904d30393 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/ui/theme/AndroidColorScheme.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/ui/theme/AndroidColorScheme.kt @@ -42,6 +42,9 @@ val LocalAndroidColorScheme = class AndroidColorScheme internal constructor(context: Context) { val colorSurfaceBright = getColor(context, R.attr.materialColorSurfaceBright) val colorSurfaceContainerHigh = getColor(context, R.attr.materialColorSurfaceContainerHigh) + val colorOutlineVariant = getColor(context, R.attr.materialColorOutlineVariant) + val colorOnSurface = getColor(context, R.attr.materialColorOnSurface) + val colorOnSurfaceVariant = getColor(context, R.attr.materialColorOnSurfaceVariant) companion object { fun getColor(context: Context, attr: Int): Color { diff --git a/packages/PackageInstaller/res/values-de/strings.xml b/packages/PackageInstaller/res/values-de/strings.xml index 1332c940eca2..bb557087b6b3 100644 --- a/packages/PackageInstaller/res/values-de/strings.xml +++ b/packages/PackageInstaller/res/values-de/strings.xml @@ -26,8 +26,7 @@ <string name="install_done" msgid="5987363587661783896">"App wurde installiert."</string> <string name="install_confirm_question" msgid="7663733664476363311">"Möchtest du diese App installieren?"</string> <string name="install_confirm_question_update" msgid="3348888852318388584">"Möchtest du diese App aktualisieren?"</string> - <!-- no translation found for install_confirm_question_update_owner_reminder (3750986542284587290) --> - <skip /> + <string name="install_confirm_question_update_owner_reminder" msgid="3750986542284587290">"Diese App mit einem Update von <xliff:g id="NEW_UPDATE_OWNER">%1$s</xliff:g> aktualisieren?\n\nSie erhält normalerweise Updates von <xliff:g id="EXISTING_UPDATE_OWNER">%2$s</xliff:g>. Wenn du ein Update von einer anderen Quelle verwendest, erhältst du möglicherweise zukünftige Updates von beliebigen Quellen auf deinem Smartphone. Die Funktionalität der App kann sich ändern."</string> <string name="install_failed" msgid="5777824004474125469">"App wurde nicht installiert."</string> <string name="install_failed_blocked" msgid="8512284352994752094">"Die Installation des Pakets wurde blockiert."</string> <string name="install_failed_conflict" msgid="3493184212162521426">"Die App wurde nicht installiert, da das Paket in Konflikt mit einem bestehenden Paket steht."</string> @@ -43,8 +42,7 @@ <string name="unknown_apps_user_restriction_dlg_text" msgid="151020786933988344">"Dieser Nutzer darf keine unbekannten Apps installieren"</string> <string name="install_apps_user_restriction_dlg_text" msgid="2154119597001074022">"Dieser Nutzer darf keine Apps installieren"</string> <string name="ok" msgid="7871959885003339302">"Ok"</string> - <!-- no translation found for update_anyway (8792432341346261969) --> - <skip /> + <string name="update_anyway" msgid="8792432341346261969">"Trotzdem aktualisieren"</string> <string name="manage_applications" msgid="5400164782453975580">"Apps verwalten"</string> <string name="out_of_space_dlg_title" msgid="4156690013884649502">"Kein freier Speicher vorhanden"</string> <string name="out_of_space_dlg_text" msgid="8727714096031856231">"<xliff:g id="APP_NAME">%1$s</xliff:g> konnte nicht installiert werden. Gib Speicherplatz frei und versuche es noch einmal."</string> diff --git a/packages/PackageInstaller/res/values-hi/strings.xml b/packages/PackageInstaller/res/values-hi/strings.xml index 63ee8378f3ac..48fabd16ea71 100644 --- a/packages/PackageInstaller/res/values-hi/strings.xml +++ b/packages/PackageInstaller/res/values-hi/strings.xml @@ -26,8 +26,7 @@ <string name="install_done" msgid="5987363587661783896">"ऐप्लिकेशन इंस्टॉल हो गया."</string> <string name="install_confirm_question" msgid="7663733664476363311">"क्या आपको यह ऐप्लिकेशन इंस्टॉल करना है?"</string> <string name="install_confirm_question_update" msgid="3348888852318388584">"क्या आप इस ऐप्लिकेशन को अपडेट करना चाहते हैं?"</string> - <!-- no translation found for install_confirm_question_update_owner_reminder (3750986542284587290) --> - <skip /> + <string name="install_confirm_question_update_owner_reminder" msgid="3750986542284587290">"क्या इस ऐप्लिकेशन को <xliff:g id="NEW_UPDATE_OWNER">%1$s</xliff:g> से अपडेट करना है?\n\nआम तौर पर, इस ऐप्लिकेशन को <xliff:g id="EXISTING_UPDATE_OWNER">%2$s</xliff:g> से अपडेट मिलते हैं. किसी दूसरे सोर्स से अपडेट करने पर, आपको आगे से अपने फ़ोन पर किसी भी सोर्स से अपडेट मिल सकते हैं. ऐप्लिकेशन की मुख्य सुविधाएं और उनके काम करने का तरीका बदल सकता है."</string> <string name="install_failed" msgid="5777824004474125469">"ऐप्लिकेशन इंस्टॉल नहीं हुआ."</string> <string name="install_failed_blocked" msgid="8512284352994752094">"पैकेज को इंस्टॉल होने से ब्लॉक किया हुआ है."</string> <string name="install_failed_conflict" msgid="3493184212162521426">"ऐप्लिकेशन इंस्टॉल नहीं हुआ क्योंकि पैकेज का किसी मौजूदा पैकेज से विरोध है."</string> @@ -43,8 +42,7 @@ <string name="unknown_apps_user_restriction_dlg_text" msgid="151020786933988344">"यह उपयोगकर्ता अनजान ऐप्लिकेशन इंस्टॉल नहीं कर सकता"</string> <string name="install_apps_user_restriction_dlg_text" msgid="2154119597001074022">"इस उपयोगकर्ता को ऐप्लिकेशन इंस्टॉल करने की अनुमति नहीं है"</string> <string name="ok" msgid="7871959885003339302">"ठीक है"</string> - <!-- no translation found for update_anyway (8792432341346261969) --> - <skip /> + <string name="update_anyway" msgid="8792432341346261969">"फिर भी अपडेट करें"</string> <string name="manage_applications" msgid="5400164782453975580">"ऐप्लिकेशन प्रबंधित करें"</string> <string name="out_of_space_dlg_title" msgid="4156690013884649502">"जगह नहीं है"</string> <string name="out_of_space_dlg_text" msgid="8727714096031856231">"<xliff:g id="APP_NAME">%1$s</xliff:g> को इंस्टॉल नहीं किया जा सका. थोड़ी जगह खाली करें और फिर से कोशिश करें."</string> diff --git a/packages/SettingsLib/AppPreference/res/values-en-rCA/strings.xml b/packages/SettingsLib/AppPreference/res/values-en-rCA/strings.xml new file mode 100644 index 000000000000..595fea362cb9 --- /dev/null +++ b/packages/SettingsLib/AppPreference/res/values-en-rCA/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="install_type_instant" msgid="7217305006127216917">"Instant app"</string> +</resources> diff --git a/packages/SettingsLib/AppPreference/res/values-en-rXC/strings.xml b/packages/SettingsLib/AppPreference/res/values-en-rXC/strings.xml new file mode 100644 index 000000000000..ba37e36e4456 --- /dev/null +++ b/packages/SettingsLib/AppPreference/res/values-en-rXC/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="install_type_instant" msgid="7217305006127216917">"Instant app"</string> +</resources> diff --git a/packages/SettingsLib/ProfileSelector/res/values-en-rCA/strings.xml b/packages/SettingsLib/ProfileSelector/res/values-en-rCA/strings.xml new file mode 100644 index 000000000000..478e6035b1d1 --- /dev/null +++ b/packages/SettingsLib/ProfileSelector/res/values-en-rCA/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2022 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="settingslib_category_personal" msgid="1142302328104700620">"Personal"</string> + <string name="settingslib_category_work" msgid="4867750733682444676">"Work"</string> +</resources> diff --git a/packages/SettingsLib/ProfileSelector/res/values-en-rXC/strings.xml b/packages/SettingsLib/ProfileSelector/res/values-en-rXC/strings.xml new file mode 100644 index 000000000000..89b718341f2b --- /dev/null +++ b/packages/SettingsLib/ProfileSelector/res/values-en-rXC/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2022 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="settingslib_category_personal" msgid="1142302328104700620">"Personal"</string> + <string name="settingslib_category_work" msgid="4867750733682444676">"Work"</string> +</resources> diff --git a/packages/SettingsLib/res/drawable/ic_dock_device.xml b/packages/SettingsLib/res/drawable/ic_dock_device.xml new file mode 100644 index 000000000000..96a4900f361f --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_dock_device.xml @@ -0,0 +1,26 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="#000000" + android:pathData="M480,280Q497,280 508.5,268.5Q520,257 520,240Q520,223 508.5,211.5Q497,200 480,200Q463,200 451.5,211.5Q440,223 440,240Q440,257 451.5,268.5Q463,280 480,280ZM120,720Q87,720 63.5,696.5Q40,673 40,640L60,160Q60,127 83.5,103.5Q107,80 140,80L820,80Q853,80 876.5,103.5Q900,127 900,160L920,640Q920,673 896.5,696.5Q873,720 840,720L120,720ZM120,640L840,640Q840,640 840,640Q840,640 840,640L820,160Q820,160 820,160Q820,160 820,160L140,160Q140,160 140,160Q140,160 140,160L120,640Q120,640 120,640Q120,640 120,640ZM320,880Q259,880 209.5,850Q160,820 160,765L160,720L240,720L240,760Q253,780 274.5,790Q296,800 320,800L640,800Q664,800 685.5,790.5Q707,781 720,761L720,720L800,720L800,765Q800,820 750.5,850Q701,880 640,880L320,880ZM480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Z"/> +</vector>
\ No newline at end of file diff --git a/packages/SettingsLib/res/values-kn/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml index 353c7cc72ae9..8071be45e578 100644 --- a/packages/SettingsLib/res/values-kn/strings.xml +++ b/packages/SettingsLib/res/values-kn/strings.xml @@ -571,7 +571,7 @@ <string name="user_add_user_item_title" msgid="2394272381086965029">"ಬಳಕೆದಾರ"</string> <string name="user_add_profile_item_title" msgid="3111051717414643029">"ನಿರ್ಬಂಧಿಸಿದ ಪ್ರೊಫೈಲ್"</string> <string name="user_add_user_title" msgid="5457079143694924885">"ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸುವುದೇ?"</string> - <string name="user_add_user_message_long" msgid="1527434966294733380">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್ಗಳು, ವಾಲ್ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಿಕೊಳ್ಳಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ ವೈ-ಫೈ ರೀತಿಯ ಸಾಧನ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬಳಕೆದಾರರು ಸರಿಹೊಂದಿಸಬಹುದು.\n\nನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗೆ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು. ಪ್ರವೇಶಿಸುವಿಕೆ ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಹೊಸ ಬಳಕೆದಾರರಿಗೆ ವರ್ಗಾವಣೆ ಆಗದಿರಬಹುದು."</string> + <string name="user_add_user_message_long" msgid="1527434966294733380">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್ಗಳು, ವಾಲ್ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಿಕೊಳ್ಳಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ ವೈ-ಫೈ ರೀತಿಯ ಸಾಧನ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬಳಕೆದಾರರು ಸರಿಹೊಂದಿಸಬಹುದು.\n\nನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗೆ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು. ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಹೊಸ ಬಳಕೆದಾರರಿಗೆ ವರ್ಗಾವಣೆ ಆಗದಿರಬಹುದು."</string> <string name="user_add_user_message_short" msgid="3295959985795716166">"ನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು."</string> <string name="user_grant_admin_title" msgid="5565796912475193314">"ಈ ಬಳಕೆದಾರರಿಗೆ ನಿರ್ವಾಹಕ ಸೌಲಭ್ಯ ನೀಡಬೇಕೆ?"</string> <string name="user_grant_admin_message" msgid="7925257971286380976">"ನಿರ್ವಾಹಕರಾಗಿ, ಅವರು ಇತರ ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಲು, ಸಾಧನ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಮತ್ತು ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 6640b4363df5..814fa639ceca 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -571,7 +571,7 @@ <string name="user_add_user_item_title" msgid="2394272381086965029">"Uporabnik"</string> <string name="user_add_profile_item_title" msgid="3111051717414643029">"Omejen profil"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Želite dodati uporabnika?"</string> - <string name="user_add_user_message_long" msgid="1527434966294733380">"To napravo lahko delite z drugimi tako, da ustvarite dodatne uporabnike. Vsak ima svoj prostor, ki ga lahko prilagodi z aplikacijami, ozadji in drugim. Uporabniki lahko tudi prilagodijo nastavitve naprave, ki vplivajo na vse, na primer nastavitve omrežja Wi-Fi.\n\nKo dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike. Nastavitve in storitve funkcij za ljudi s posebnimi potrebami morda ne bodo prenesene v prostor novega uporabnika."</string> + <string name="user_add_user_message_long" msgid="1527434966294733380">"To napravo lahko delite z drugimi tako, da ustvarite dodatne uporabnike. Vsak ima svoj prostor, ki ga lahko prilagodi z aplikacijami, ozadji in drugim. Uporabniki lahko tudi prilagodijo nastavitve naprave, ki vplivajo na vse, na primer nastavitve omrežja Wi-Fi.\n\nKo dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike. Nastavitve in storitve za dostopnost morda ne bodo prenesene v prostor novega uporabnika."</string> <string name="user_add_user_message_short" msgid="3295959985795716166">"Ko dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string> <string name="user_grant_admin_title" msgid="5565796912475193314">"Naj ta uporabnik dobi skrbniške pravice?"</string> <string name="user_grant_admin_message" msgid="7925257971286380976">"Skrbniške pravice omogočajo upravljanje drugih uporabnikov, spreminjanje nastavitev naprave in ponastavitev naprave na tovarniške nastavitve."</string> diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml index 0512a0d6ca0f..d8004332248d 100644 --- a/packages/SettingsLib/res/values-te/strings.xml +++ b/packages/SettingsLib/res/values-te/strings.xml @@ -310,7 +310,7 @@ <string name="dev_logpersist_clear_warning_title" msgid="8631859265777337991">"లాగర్ నిరంతర నిల్వలోని డేటాను తీసివేయాలా?"</string> <string name="dev_logpersist_clear_warning_message" msgid="6447590867594287413">"మేము నిరంతర లాగర్తో ఇక పర్యవేక్షించనప్పుడు, మీ పరికరంలోని లాగర్ డేటాను మేము తొలగించాల్సి ఉంటుంది."</string> <string name="select_logpersist_title" msgid="447071974007104196">"పరికరంలో లాగర్ డేటా నిరంతరం స్టోర్ చేయి"</string> - <string name="select_logpersist_dialog_title" msgid="7745193591195485594">"పరికరంలో నిరంతరం నిల్వ చేయాల్సిన లాగ్ బఫర్లను ఎంచుకోండి"</string> + <string name="select_logpersist_dialog_title" msgid="7745193591195485594">"పరికరంలో నిరంతరం స్టోరేజ్ చేయాల్సిన లాగ్ బఫర్లను ఎంచుకోండి"</string> <string name="select_usb_configuration_title" msgid="6339801314922294586">"USB కాన్ఫిగరేషన్ని ఎంచుకోండి"</string> <string name="select_usb_configuration_dialog_title" msgid="3579567144722589237">"USB కాన్ఫిగరేషన్ని ఎంచుకోండి"</string> <string name="allow_mock_location" msgid="2102650981552527884">"డమ్మీ లొకేషన్లను అనుమతించండి"</string> @@ -576,7 +576,7 @@ <string name="user_grant_admin_title" msgid="5565796912475193314">"వీరికి అడ్మిన్ హక్కు ఇవ్వాలా?"</string> <string name="user_grant_admin_message" msgid="7925257971286380976">"ఒక అడ్మిన్గా, వారు ఇతర యూజర్లను మేనేజ్ చేయగలరు, పరికర సెట్టింగ్లను ఎడిట్ చేయగలరు, పరికరాన్ని ఫ్యాక్టరీ రీసెట్ చేయగలరు."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"యూజర్ను ఇప్పుడే సెటప్ చేయాలా?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"పరికరాన్ని తీసుకోవడానికి వ్యక్తి అందుబాటులో ఉన్నారని నిర్ధారించుకొని, ఆపై వారికి నిల్వ స్థలాన్ని సెటప్ చేయండి"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"పరికరాన్ని తీసుకోవడానికి వ్యక్తి అందుబాటులో ఉన్నారని నిర్ధారించుకొని, ఆపై వారికి స్టోరేజ్ స్థలాన్ని సెటప్ చేయండి"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"ఇప్పుడు ప్రొఫైల్ను సెటప్ చేయాలా?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"ఇప్పుడే సెటప్ చేయి"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"ఇప్పుడు కాదు"</string> diff --git a/packages/SettingsLib/res/values-ur/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml index e3b95ae51852..60d5f113cdc6 100644 --- a/packages/SettingsLib/res/values-ur/strings.xml +++ b/packages/SettingsLib/res/values-ur/strings.xml @@ -254,7 +254,7 @@ <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"براہ کرم ایک Wi-Fi نیٹ ورک سے منسلک ہوں"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb، ڈیبگ، dev"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"بگ رپورٹ کا شارٹ کٹ"</string> - <string name="bugreport_in_power_summary" msgid="1885529649381831775">"بگ رپورٹ لینے کیلئے پاور مینو میں ایک بٹن دکھائیں"</string> + <string name="bugreport_in_power_summary" msgid="1885529649381831775">"بگ رپورٹ لینے کیلئے پاور مینیو میں ایک بٹن دکھائیں"</string> <string name="keep_screen_on" msgid="1187161672348797558">"بیدار رکھیں"</string> <string name="keep_screen_on_summary" msgid="1510731514101925829">"چارج ہوتے وقت اسکرین کبھی بھی سلیپ وضع میں نہيں جائے گی"</string> <string name="bt_hci_snoop_log" msgid="7291287955649081448">"بلوٹوتھ HCI کا جاسوسی لاگ فعال کریں"</string> @@ -501,7 +501,7 @@ <string name="screen_zoom_summary_very_large" msgid="7317423942896999029">"قدرے بڑا"</string> <string name="screen_zoom_summary_extremely_large" msgid="1438045624562358554">"سب سے بڑا"</string> <string name="screen_zoom_summary_custom" msgid="3468154096832912210">"حسب ضرورت (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> - <string name="content_description_menu_button" msgid="6254844309171779931">"مینو"</string> + <string name="content_description_menu_button" msgid="6254844309171779931">"مینیو"</string> <string name="retail_demo_reset_message" msgid="5392824901108195463">"ڈیمو موڈ میں فیکٹری ری سیٹ کیلئے پاس ورڈ درج کریں"</string> <string name="retail_demo_reset_next" msgid="3688129033843885362">"اگلا"</string> <string name="retail_demo_reset_title" msgid="1866911701095959800">"پاس ورڈ درکار ہے"</string> diff --git a/packages/SettingsLib/res/values-uz/arrays.xml b/packages/SettingsLib/res/values-uz/arrays.xml index 4b08f47664d4..da14d78538db 100644 --- a/packages/SettingsLib/res/values-uz/arrays.xml +++ b/packages/SettingsLib/res/values-uz/arrays.xml @@ -59,7 +59,7 @@ <item msgid="6421717003037072581">"Har doim HDCP tekshiruvidan foydalanilsin"</item> </string-array> <string-array name="bt_hci_snoop_log_entries"> - <item msgid="695678520785580527">"Yoqilmagan"</item> + <item msgid="695678520785580527">"Oʻchiq"</item> <item msgid="6336372935919715515">"Filtrlar yoniq"</item> <item msgid="2779123106632690576">"Yoniq"</item> </string-array> @@ -171,7 +171,7 @@ <item msgid="5001852592115448348">", faol (telefon)"</item> </string-array> <string-array name="select_logd_size_titles"> - <item msgid="1191094707770726722">"Yoqilmagan"</item> + <item msgid="1191094707770726722">"Oʻchiq"</item> <item msgid="7839165897132179888">"64 KB"</item> <item msgid="2715700596495505626">"256 KB"</item> <item msgid="7099386891713159947">"1 MB"</item> @@ -179,13 +179,13 @@ <item msgid="6078203297886482480">"8 MB"</item> </string-array> <string-array name="select_logd_size_lowram_titles"> - <item msgid="1145807928339101085">"Yoqilmagan"</item> + <item msgid="1145807928339101085">"Oʻchiq"</item> <item msgid="4064786181089783077">"64 KB"</item> <item msgid="3052710745383602630">"256 KB"</item> <item msgid="3691785423374588514">"1 MB"</item> </string-array> <string-array name="select_logd_size_summaries"> - <item msgid="409235464399258501">"Yoqilmagan"</item> + <item msgid="409235464399258501">"Oʻchiq"</item> <item msgid="4195153527464162486">"Bufer: maks. 64 KB"</item> <item msgid="7464037639415220106">"Bufer: maks. 256 KB"</item> <item msgid="8539423820514360724">"Bufer: maks. 1 MB"</item> @@ -193,13 +193,13 @@ <item msgid="2983219471251787208">"Bufer: maksimum 8 MB"</item> </string-array> <string-array name="select_logpersist_titles"> - <item msgid="704720725704372366">"Yoqilmagan"</item> + <item msgid="704720725704372366">"Oʻchiq"</item> <item msgid="6014837961827347618">"Hammasi"</item> <item msgid="7387060437894578132">"Radiodan boshqa hammasi"</item> <item msgid="7300881231043255746">"faqat yadro"</item> </string-array> <string-array name="select_logpersist_summaries"> - <item msgid="97587758561106269">"Yoqilmagan"</item> + <item msgid="97587758561106269">"Oʻchiq"</item> <item msgid="7126170197336963369">"Barcha jurnallar buferi"</item> <item msgid="7167543126036181392">"Radio jurnallar buferidan tashqari hammasi"</item> <item msgid="5135340178556563979">"faqat yadro jurnali buferi"</item> @@ -262,7 +262,7 @@ <item msgid="5023908510820531131">"“<xliff:g id="AS_TYPED_COMMAND">adb shell dumpsys gfxinfo</xliff:g>” buyrug‘ida"</item> </string-array> <string-array name="debug_hw_overdraw_entries"> - <item msgid="1968128556747588800">"Yoqilmagan"</item> + <item msgid="1968128556747588800">"Oʻchiq"</item> <item msgid="3033215374382962216">"Ortiqcha chizilgan joylarni ko‘rsatish"</item> <item msgid="3474333938380896988">"Muayyan rangdagi hududlarni ajratib belgilash"</item> </string-array> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 503a3e02af9b..93a21b78ba04 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -51,7 +51,7 @@ <string name="wifi_security_eap_suiteb" msgid="415842785991698142">"WPA3-Enterprise 192-bit"</string> <string name="wifi_remembered" msgid="3266709779723179188">"Saqlangan"</string> <string name="wifi_disconnected" msgid="7054450256284661757">"Ulanmagan"</string> - <string name="wifi_disabled_generic" msgid="2651916945380294607">"Yoqilmagan"</string> + <string name="wifi_disabled_generic" msgid="2651916945380294607">"Oʻchiq"</string> <string name="wifi_disabled_network_failure" msgid="2660396183242399585">"IP manzilini sozlab bo‘lmadi"</string> <string name="wifi_disabled_password_failure" msgid="6892387079613226738">"Tekshiruvda muammo"</string> <string name="wifi_cant_connect" msgid="5718417542623056783">"Tarmoqqa ulanilmadi"</string> @@ -294,7 +294,7 @@ <string name="bluetooth_select_a2dp_codec_streaming_label" msgid="2040810756832027227">"Translatsiya: <xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string> <string name="select_private_dns_configuration_title" msgid="7887550926056143018">"Shaxsiy DNS"</string> <string name="select_private_dns_configuration_dialog_title" msgid="3731422918335951912">"Shaxsiy DNS rejimini tanlang"</string> - <string name="private_dns_mode_off" msgid="7065962499349997041">"Yoqilmagan"</string> + <string name="private_dns_mode_off" msgid="7065962499349997041">"Oʻchiq"</string> <string name="private_dns_mode_opportunistic" msgid="1947864819060442354">"Avtomatik"</string> <string name="private_dns_mode_provider" msgid="3619040641762557028">"Shaxsiy DNS provayderining host nomi"</string> <string name="private_dns_mode_provider_hostname_hint" msgid="6564868953748514595">"DNS provayderining host nomini kiriting"</string> @@ -435,7 +435,7 @@ <string name="select_webview_provider_toast_text" msgid="8512254949169359848">"Bu variant endi yaroqsiz. Qaytadan urining."</string> <string name="picture_color_mode" msgid="1013807330552931903">"Rang rejimi"</string> <string name="picture_color_mode_desc" msgid="151780973768136200">"sRGB ranglaridan foydalanish"</string> - <string name="daltonizer_mode_disabled" msgid="403424372812399228">"Yoqilmagan"</string> + <string name="daltonizer_mode_disabled" msgid="403424372812399228">"Oʻchiq"</string> <string name="daltonizer_mode_monochromacy" msgid="362060873835885014">"Monoxrom"</string> <string name="daltonizer_mode_deuteranomaly" msgid="3507284319584683963">"Deyteranomaliya (qizil/yashil)"</string> <string name="daltonizer_mode_protanomaly" msgid="7805583306666608440">"Protanomaliya (qizil/yashil)"</string> @@ -483,7 +483,7 @@ <string name="battery_info_status_full_charged" msgid="3536054261505567948">"Toʻliq quvvatlandi"</string> <string name="disabled_by_admin_summary_text" msgid="5343911767402923057">"Administrator tomonidan boshqariladi"</string> <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Cheklangan sozlama tomonidan boshqariladi"</string> - <string name="disabled" msgid="8017887509554714950">"Yoqilmagan"</string> + <string name="disabled" msgid="8017887509554714950">"Oʻchiq"</string> <string name="external_source_trusted" msgid="1146522036773132905">"Ruxsat berilgan"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ruxsat berilmagan"</string> <string name="install_other_apps" msgid="3232595082023199454">"Notanish ilovalarni o‘rnatish"</string> @@ -571,7 +571,7 @@ <string name="user_add_user_item_title" msgid="2394272381086965029">"Foydalanuvchi"</string> <string name="user_add_profile_item_title" msgid="3111051717414643029">"Cheklangan profil"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Foydalanuvchi qo‘shilsinmi?"</string> - <string name="user_add_user_message_long" msgid="1527434966294733380">"Bu qurilmadan bir necha kishi alohida foydalanuvchilar qo‘shib foydalanishi mumkin. Har bir foydalanuvchiga diskda joy ajratiladi, tayinlangan hajm ilovalar, ekran foni rasmi, va hokazolarga taqsimlanishi mumkin. Foydalanuvchilar Wi-Fi kabi sozlamalarni o‘zgartirsa, qolganlarda ham aks etishi mumkin. \n\nYangi profil qo‘shilgach, uni sozlash lozim.\n\nQurilmaning istalgan foydalanuvchisi ilovalarni barcha hisoblar uchun yangilashi mumkin. Maxsus imkoniyatlar sozlamalari va xizmatlar yangi foydalanuvchiga o‘tkazilmasligi mumkin."</string> + <string name="user_add_user_message_long" msgid="1527434966294733380">"Bu qurilmadan bir necha kishi alohida foydalanuvchilar qo‘shib foydalanishi mumkin. Har bir foydalanuvchiga diskda joy ajratiladi, tayinlangan hajm ilovalar, ekran foni rasmi, va hokazolarga taqsimlanishi mumkin. Foydalanuvchilar Wi-Fi kabi sozlamalarni o‘zgartirsa, qolganlarda ham aks etishi mumkin. \n\nYangi profil qo‘shilgach, uni sozlash lozim.\n\nQurilmaning istalgan foydalanuvchisi ilovalarni barcha hisoblar uchun yangilashi mumkin. Qulayliklar sozlamalari va xizmatlar yangi foydalanuvchiga o‘tkazilmasligi mumkin."</string> <string name="user_add_user_message_short" msgid="3295959985795716166">"Yangi profil qo‘shilgach, uni sozlash lozim.\n\nQurilmaning istalgan foydalanuvchisi ilovalarni barcha hisoblar uchun yangilashi mumkin."</string> <string name="user_grant_admin_title" msgid="5565796912475193314">"Foydalanuvchiga admin huquqi berilsinmi?"</string> <string name="user_grant_admin_message" msgid="7925257971286380976">"Administrator sifatida ular boshqa foydalanuvchilarni boshqarish, qurilma sozlamalarini oʻzgartirish va qurilmani zavod sozlamalariga qaytarish huquqiga ega boʻladi."</string> @@ -627,7 +627,7 @@ <string name="failed_attempts_now_wiping_profile" msgid="7626589520888963129">"Juda koʻp marta muvaffaqiyatsiz urindingiz. Bu ish profili va undagi maʼlumotlar oʻchirib tashlanadi."</string> <string name="failed_attempts_now_wiping_dialog_dismiss" msgid="2749889771223578925">"Yopish"</string> <string name="cached_apps_freezer_device_default" msgid="2616594131750144342">"Qurilma standarti"</string> - <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"Yoqilmagan"</string> + <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"Oʻchiq"</string> <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"Yoniq"</string> <string name="cached_apps_freezer_reboot_dialog_text" msgid="695330563489230096">"Oʻzgarishlar kuchga kirishi uchun qurilmani oʻchirib yoqing. Buni hozir yoki keyinroq bajarishingiz mumkin."</string> <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"Simli quloqlik"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/media/DeviceIconUtil.java b/packages/SettingsLib/src/com/android/settingslib/media/DeviceIconUtil.java index 6c0eab3fb016..e38e041a87dc 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/DeviceIconUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/DeviceIconUtil.java @@ -55,7 +55,7 @@ public class DeviceIconUtil { new Device( AudioDeviceInfo.TYPE_DOCK, MediaRoute2Info.TYPE_DOCK, - R.drawable.ic_headphone), + R.drawable.ic_dock_device), new Device( AudioDeviceInfo.TYPE_HDMI, MediaRoute2Info.TYPE_HDMI, diff --git a/packages/SettingsProvider/res/values-te/strings.xml b/packages/SettingsProvider/res/values-te/strings.xml index fa2191f56477..95be5c5e9a5d 100644 --- a/packages/SettingsProvider/res/values-te/strings.xml +++ b/packages/SettingsProvider/res/values-te/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="4567566098528588863">"సెట్టింగ్ల నిల్వ"</string> + <string name="app_label" msgid="4567566098528588863">"సెట్టింగ్ల స్టోరేజ్"</string> <string name="wifi_softap_config_change" msgid="5688373762357941645">"హాట్స్పాట్ సెట్టింగ్లు మార్చబడ్డాయి"</string> <string name="wifi_softap_config_change_summary" msgid="8946397286141531087">"వివరాలను చూడటానికి ట్యాప్ చేయండి"</string> </resources> diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 59cd7a051fad..a93cd62e6301 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -43,6 +43,8 @@ <bool name="def_install_non_market_apps">false</bool> <!-- 0 == off, 3 == on --> <integer name="def_location_mode">3</integer> + <!-- 0 == off, 1 == on--> + <integer name="def_paired_device_location_mode">1</integer> <bool name="assisted_gps_enabled">true</bool> <bool name="def_netstats_enabled">true</bool> <bool name="def_usb_mass_storage_enabled">true</bool> diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index e50f52229a16..41ce58eb7b4e 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -103,5 +103,7 @@ public class GlobalSettings { Settings.Global.Wearable.UPGRADE_DATA_MIGRATION_STATUS, Settings.Global.HDR_CONVERSION_MODE, Settings.Global.HDR_FORCE_CONVERSION_TYPE, + Settings.Global.Wearable.RTL_SWIPE_TO_DISMISS_ENABLED_DEV, + Settings.Global.Wearable.REDUCE_MOTION, }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index d5386c1d75ac..a1c01723ad55 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -285,7 +285,6 @@ public class GlobalSettingsValidators { })); VALIDATORS.put(Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.SIDE_BUTTON, BOOLEAN_VALIDATOR); - VALIDATORS.put(Global.Wearable.BUTTON_SET, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.ANDROID_WEAR_VERSION, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.SYSTEM_CAPABILITIES, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.SYSTEM_EDITION, ANY_INTEGER_VALIDATOR); @@ -345,6 +344,7 @@ public class GlobalSettingsValidators { String.valueOf(Global.Wearable.HFP_CLIENT_DISABLED) })); VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR); + VALIDATORS.put(Global.Wearable.COMPANION_APP_NAME, ANY_STRING_VALIDATOR); VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.OEM_SETUP_VERSION, ANY_INTEGER_VALIDATOR); VALIDATORS.put( @@ -404,16 +404,6 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.BEDTIME_HARD_MODE, BOOLEAN_VALIDATOR); - VALIDATORS.put( - Global.Wearable.EARLY_UPDATES_STATUS, - new DiscreteValueValidator( - new String[] { - String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_NOT_STARTED), - String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_STARTED), - String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SUCCESS), - String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SKIPPED), - String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED), - })); VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.SCREENSHOT_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.UPGRADE_DATA_MIGRATION_STATUS, @@ -423,5 +413,22 @@ public class GlobalSettingsValidators { String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_PENDING), String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_DONE) })); + VALIDATORS.put(Global.Wearable.DISABLE_AOD_WHILE_PLUGGED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.NETWORK_LOCATION_OPT_IN, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_STATUS, + new InclusiveIntegerRangeValidator( + Global.Wearable.PHONE_SWITCHING_STATUS_NOT_STARTED, + Global.Wearable.PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS)); + VALIDATORS.put(Global.Wearable.REDUCE_MOTION, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.RTL_SWIPE_TO_DISMISS_ENABLED_DEV, BOOLEAN_VALIDATOR); + VALIDATORS.put( + Global.Wearable.TETHER_CONFIG_STATE, + new DiscreteValueValidator( + new String[] { + String.valueOf(Global.Wearable.TETHERED_CONFIG_UNKNOWN), + String.valueOf(Global.Wearable.TETHERED_CONFIG_STANDALONE), + String.valueOf(Global.Wearable.TETHERED_CONFIG_TETHERED) + })); + VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_SUPPORTED, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java b/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java index 80030f7a7a47..02ec486a0205 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java @@ -20,14 +20,19 @@ import android.annotation.NonNull; import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; +import android.providers.settings.BackingStoreProto; +import android.providers.settings.CacheEntryProto; +import android.providers.settings.GenerationRegistryProto; import android.util.ArrayMap; import android.util.MemoryIntArray; import android.util.Slog; +import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import java.io.IOException; +import java.io.PrintWriter; /** * This class tracks changes for config/global/secure/system tables @@ -292,4 +297,94 @@ final class GenerationRegistry { int getMaxNumBackingStores() { return mMaxNumBackingStore; } + + public void dumpProto(ProtoOutputStream proto) { + synchronized (mLock) { + final int numBackingStores = mKeyToBackingStoreMap.size(); + proto.write(GenerationRegistryProto.NUM_BACKING_STORES, numBackingStores); + proto.write(GenerationRegistryProto.NUM_MAX_BACKING_STORES, getMaxNumBackingStores()); + + for (int i = 0; i < numBackingStores; i++) { + final long token = proto.start(GenerationRegistryProto.BACKING_STORES); + final int key = mKeyToBackingStoreMap.keyAt(i); + proto.write(BackingStoreProto.KEY, key); + try { + proto.write(BackingStoreProto.BACKING_STORE_SIZE, + mKeyToBackingStoreMap.valueAt(i).size()); + } catch (IOException ignore) { + } + proto.write(BackingStoreProto.NUM_CACHED_ENTRIES, + mKeyToIndexMapMap.get(key).size()); + final ArrayMap<String, Integer> indexMap = mKeyToIndexMapMap.get(key); + final MemoryIntArray backingStore = getBackingStoreLocked(key, + /* createIfNotExist= */ false); + if (indexMap == null || backingStore == null) { + continue; + } + for (String setting : indexMap.keySet()) { + try { + final int index = getKeyIndexLocked(key, setting, mKeyToIndexMapMap, + backingStore, /* createIfNotExist= */ false); + if (index < 0) { + continue; + } + final long cacheEntryToken = proto.start( + BackingStoreProto.CACHE_ENTRIES); + final int generation = backingStore.get(index); + proto.write(CacheEntryProto.NAME, + setting.equals(DEFAULT_MAP_KEY_FOR_UNSET_SETTINGS) + ? "UNSET" : setting); + proto.write(CacheEntryProto.GENERATION, generation); + proto.end(cacheEntryToken); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + proto.end(token); + } + + } + } + + public void dump(PrintWriter pw) { + pw.println("GENERATION REGISTRY"); + pw.println("Maximum number of backing stores:" + getMaxNumBackingStores()); + synchronized (mLock) { + final int numBackingStores = mKeyToBackingStoreMap.size(); + pw.println("Number of backing stores:" + numBackingStores); + for (int i = 0; i < numBackingStores; i++) { + final int key = mKeyToBackingStoreMap.keyAt(i); + pw.print("_Backing store for type:"); pw.print(SettingsState.settingTypeToString( + SettingsState.getTypeFromKey(key))); + pw.print(" user:"); pw.print(SettingsState.getUserIdFromKey(key)); + try { + pw.print(" size:" + mKeyToBackingStoreMap.valueAt(i).size()); + } catch (IOException ignore) { + } + pw.println(" cachedEntries:" + mKeyToIndexMapMap.get(key).size()); + final ArrayMap<String, Integer> indexMap = mKeyToIndexMapMap.get(key); + final MemoryIntArray backingStore = getBackingStoreLocked(key, + /* createIfNotExist= */ false); + if (indexMap == null || backingStore == null) { + continue; + } + for (String setting : indexMap.keySet()) { + try { + final int index = getKeyIndexLocked(key, setting, mKeyToIndexMapMap, + backingStore, /* createIfNotExist= */ false); + if (index < 0) { + continue; + } + final int generation = backingStore.get(index); + pw.print(" setting: "); pw.print( + setting.equals(DEFAULT_MAP_KEY_FOR_UNSET_SETTINGS) + ? "UNSET" : setting); + pw.println(" generation:" + generation); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + } + } }
\ No newline at end of file diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index d49627e5334a..d3a9e91c3da8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -120,6 +120,17 @@ class SettingsProtoDumpUtil { dumpProtoUserSettingsLocked(proto, SettingsServiceDumpProto.USER_SETTINGS, settingsRegistry, UserHandle.of(users.keyAt(i))); } + + // Generation registry + dumpProtoGenerationRegistryLocked(proto, SettingsServiceDumpProto.GENERATION_REGISTRY, + settingsRegistry); + } + + private static void dumpProtoGenerationRegistryLocked(@NonNull ProtoOutputStream proto, + long fieldId, SettingsProvider.SettingsRegistry settingsRegistry) { + final long token = proto.start(fieldId); + settingsRegistry.getGenerationRegistry().dumpProto(proto); + proto.end(token); } /** diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 3e1b597094d2..284b06b86cb6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -900,6 +900,7 @@ public class SettingsProvider extends ContentProvider { } finally { Binder.restoreCallingIdentity(identity); } + mSettingsRegistry.mGenerationRegistry.dump(pw); } } @@ -3747,7 +3748,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 216; + private static final int SETTINGS_VERSION = 218; private final int mUserId; @@ -5333,74 +5334,73 @@ public class SettingsProvider extends ContentProvider { if (currentVersion == 203) { // Version 203: initialize entries migrated from wear settings provide. - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.HAS_PAY_TOKENS, false); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.GMS_CHECKIN_TIMEOUT_MIN, 6); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.HOTWORD_DETECTION_ENABLED, getContext() .getResources() .getBoolean(R.bool.def_wearable_hotwordDetectionEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.SMART_REPLIES_ENABLED, true); Setting locationMode = getSecureSettingsLocked(userId).getSettingLocked(Secure.LOCATION_MODE); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.OBTAIN_PAIRED_DEVICE_LOCATION, !locationMode.isNull() && !Integer.toString(Secure.LOCATION_MODE_OFF) .equals(locationMode.getValue())); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY, Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.BUG_REPORT, "user".equals(Build.TYPE) // is user build? ? Global.Wearable.BUG_REPORT_DISABLED : Global.Wearable.BUG_REPORT_ENABLED); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.SMART_ILLUMINATE_ENABLED, getContext() .getResources() .getBoolean(R.bool.def_wearable_smartIlluminateEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.CLOCKWORK_AUTO_TIME, Global.Wearable.SYNC_TIME_FROM_PHONE); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.CLOCKWORK_AUTO_TIME_ZONE, Global.Wearable.SYNC_TIME_ZONE_FROM_PHONE); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.CLOCKWORK_24HR_TIME, false); - initGlobalSettingsDefaultValForWearLocked(Global.Wearable.AUTO_WIFI, true); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked(Global.Wearable.AUTO_WIFI, true); + initGlobalSettingsDefaultValLocked( Global.Wearable.WIFI_POWER_SAVE, getContext() .getResources() .getInteger( R.integer .def_wearable_offChargerWifiUsageLimitMinutes)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS, 0L); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.SETUP_SKIPPED, Global.Wearable.SETUP_SKIPPED_UNKNOWN); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.LAST_CALL_FORWARD_ACTION, Global.Wearable.CALL_FORWARD_NO_LAST_ACTION); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED, getContext() .getResources() .getBoolean(R.bool.def_wearable_muteWhenOffBodyEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.WEAR_OS_VERSION_STRING, ""); - initGlobalSettingsDefaultValForWearLocked(Global.Wearable.BUTTON_SET, false); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.SIDE_BUTTON, getContext() .getResources() .getBoolean(R.bool.def_wearable_sideButtonPresent)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.ANDROID_WEAR_VERSION, Long.parseLong( getContext() @@ -5409,55 +5409,55 @@ public class SettingsProvider extends ContentProvider { final int editionGlobal = 1; final int editionLocal = 2; boolean isLe = getContext().getPackageManager().hasSystemFeature("cn.google"); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.SYSTEM_EDITION, isLe ? editionLocal : editionGlobal); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.SYSTEM_CAPABILITIES, getWearSystemCapabilities(isLe)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.WEAR_PLATFORM_MR_NUMBER, SystemProperties.getInt("ro.cw_build.platform_mr", 0)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.MOBILE_SIGNAL_DETECTOR, getContext() .getResources() .getBoolean(R.bool.def_wearable_mobileSignalDetectorAllowed)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.AMBIENT_ENABLED, getContext() .getResources() .getBoolean(R.bool.def_wearable_ambientEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.AMBIENT_TILT_TO_WAKE, getContext() .getResources() .getBoolean(R.bool.def_wearable_tiltToWakeEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.AMBIENT_LOW_BIT_ENABLED_DEV, false); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.AMBIENT_TOUCH_TO_WAKE, getContext() .getResources() .getBoolean(R.bool.def_wearable_touchToWakeEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.AMBIENT_TILT_TO_BRIGHT, getContext() .getResources() .getBoolean(R.bool.def_wearable_tiltToBrightEnabled)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Global.Wearable.DECOMPOSABLE_WATCHFACE, false); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.AMBIENT_FORCE_WHEN_DOCKED, SystemProperties.getBoolean("ro.ambient.force_when_docked", false)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.AMBIENT_LOW_BIT_ENABLED, SystemProperties.getBoolean("ro.ambient.low_bit_enabled", false)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN, SystemProperties.getInt("ro.ambient.plugged_timeout_min", -1)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE, Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE_UNKNOWN); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.USER_HFP_CLIENT_SETTING, Settings.Global.Wearable.HFP_CLIENT_UNSET); Setting disabledProfileSetting = @@ -5467,7 +5467,7 @@ public class SettingsProvider extends ContentProvider { disabledProfileSetting.isNull() ? 0 : Long.parseLong(disabledProfileSetting.getValue()); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.COMPANION_OS_VERSION, Settings.Global.Wearable.COMPANION_OS_VERSION_UNDEFINED); final boolean defaultBurnInProtectionEnabled = @@ -5481,17 +5481,17 @@ public class SettingsProvider extends ContentProvider { .config_enableBurnInProtection); final boolean forceBurnInProtection = SystemProperties.getBoolean("persist.debug.force_burn_in", false); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.BURN_IN_PROTECTION_ENABLED, defaultBurnInProtectionEnabled || forceBurnInProtection); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE, getContext() .getResources() .getString( com.android.internal.R.string.config_wearSysUiPackage)); - initGlobalSettingsDefaultValForWearLocked( + initGlobalSettingsDefaultValLocked( Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY, getContext() .getResources() @@ -5621,63 +5621,16 @@ public class SettingsProvider extends ContentProvider { currentVersion = 210; } if (currentVersion == 210) { - final SettingsState secureSettings = getSecureSettingsLocked(userId); - final Setting currentSetting = secureSettings.getSettingLocked( - Secure.STATUS_BAR_SHOW_VIBRATE_ICON); - if (currentSetting.isNull()) { - final int defaultValueVibrateIconEnabled = getContext().getResources() - .getInteger(R.integer.def_statusBarVibrateIconEnabled); - secureSettings.insertSettingOverrideableByRestoreLocked( - Secure.STATUS_BAR_SHOW_VIBRATE_ICON, - String.valueOf(defaultValueVibrateIconEnabled), - null /* tag */, true /* makeDefault */, - SettingsState.SYSTEM_PACKAGE_NAME); - } + // Unused. Moved to version 217. currentVersion = 211; } if (currentVersion == 211) { - // Version 211: Set default value for - // Secure#LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS - final SettingsState secureSettings = getSecureSettingsLocked(userId); - final Setting lockScreenUnseenSetting = secureSettings - .getSettingLocked(Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS); - if (lockScreenUnseenSetting.isNull()) { - final boolean defSetting = getContext().getResources() - .getBoolean(R.bool.def_lock_screen_show_only_unseen_notifications); - secureSettings.insertSettingOverrideableByRestoreLocked( - Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, - defSetting ? "1" : "0", - null /* tag */, - true /* makeDefault */, - SettingsState.SYSTEM_PACKAGE_NAME); - } - + // Unused. Moved to version 217. currentVersion = 212; } if (currentVersion == 212) { - final SettingsState globalSettings = getGlobalSettingsLocked(); - final SettingsState secureSettings = getSecureSettingsLocked(userId); - - final Setting bugReportInPowerMenu = globalSettings.getSettingLocked( - Global.BUGREPORT_IN_POWER_MENU); - - if (!bugReportInPowerMenu.isNull()) { - Slog.i(LOG_TAG, "Setting bugreport_in_power_menu to " - + bugReportInPowerMenu.getValue() + " in Secure settings."); - secureSettings.insertSettingLocked( - Secure.BUGREPORT_IN_POWER_MENU, - bugReportInPowerMenu.getValue(), null /* tag */, - false /* makeDefault */, SettingsState.SYSTEM_PACKAGE_NAME); - - // set global bug_report_in_power_menu setting to null since it's deprecated - Slog.i(LOG_TAG, "Setting bugreport_in_power_menu to null" - + " in Global settings since it's deprecated."); - globalSettings.insertSettingLocked( - Global.BUGREPORT_IN_POWER_MENU, null /* value */, null /* tag */, - true /* makeDefault */, SettingsState.SYSTEM_PACKAGE_NAME); - } - + // Unused. Moved to version 217. currentVersion = 213; } @@ -5710,7 +5663,7 @@ public class SettingsProvider extends ContentProvider { .getSettingLocked(Settings.Secure.CREDENTIAL_SERVICE); if (currentSetting.isNull()) { final int resourceId = - com.android.internal.R.string.config_defaultCredentialProviderService; + com.android.internal.R.array.config_defaultCredentialProviderService; final Resources resources = getContext().getResources(); // If the config has not be defined we might get an exception. We also get // values from both the string array type and the single string in case the @@ -5770,6 +5723,122 @@ public class SettingsProvider extends ContentProvider { currentVersion = 216; } + if (currentVersion == 216) { + // Version 216: Set a default value for Credential Manager service. + // We are doing this migration again because of an incorrect setting. + + final SettingsState secureSettings = getSecureSettingsLocked(userId); + final Setting currentSetting = secureSettings + .getSettingLocked(Settings.Secure.CREDENTIAL_SERVICE); + if (currentSetting.isNull()) { + final int resourceId = + com.android.internal.R.array.config_defaultCredentialProviderService; + final Resources resources = getContext().getResources(); + // If the config has not be defined we might get an exception. + final List<String> providers = new ArrayList<>(); + try { + providers.addAll(Arrays.asList(resources.getStringArray(resourceId))); + } catch (Resources.NotFoundException e) { + Slog.w(LOG_TAG, + "Get default array Cred Provider not found: " + e.toString()); + } + + if (!providers.isEmpty()) { + final String defaultValue = String.join(":", providers); + Slog.d(LOG_TAG, "Setting [" + defaultValue + "] as CredMan Service " + + "for user " + userId); + secureSettings.insertSettingOverrideableByRestoreLocked( + Settings.Secure.CREDENTIAL_SERVICE, defaultValue, null, true, + SettingsState.SYSTEM_PACKAGE_NAME); + } + } + + currentVersion = 217; + } + + if (currentVersion == 217) { + // Version 217: merge and rebase wear settings init logic. + + final SettingsState secureSettings = getSecureSettingsLocked(userId); + final SettingsState globalSettings = getGlobalSettingsLocked(); + + // Following init logic is moved from version 210 to this version in order to + // resolve version conflict with wear branch. + final Setting currentSetting = secureSettings.getSettingLocked( + Secure.STATUS_BAR_SHOW_VIBRATE_ICON); + if (currentSetting.isNull()) { + final int defaultValueVibrateIconEnabled = getContext().getResources() + .getInteger(R.integer.def_statusBarVibrateIconEnabled); + secureSettings.insertSettingOverrideableByRestoreLocked( + Secure.STATUS_BAR_SHOW_VIBRATE_ICON, + String.valueOf(defaultValueVibrateIconEnabled), + null /* tag */, true /* makeDefault */, + SettingsState.SYSTEM_PACKAGE_NAME); + } + + // Set default value for Secure#LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS + // Following init logic is moved from version 211 to this version in order to + // resolve version conflict with wear branch. + final Setting lockScreenUnseenSetting = secureSettings + .getSettingLocked(Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS); + if (lockScreenUnseenSetting.isNull()) { + final boolean defSetting = getContext().getResources() + .getBoolean(R.bool.def_lock_screen_show_only_unseen_notifications); + secureSettings.insertSettingOverrideableByRestoreLocked( + Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, + defSetting ? "1" : "0", + null /* tag */, + true /* makeDefault */, + SettingsState.SYSTEM_PACKAGE_NAME); + } + + // Following init logic is moved from version 212 to this version in order to + // resolve version conflict with wear branch. + final Setting bugReportInPowerMenu = globalSettings.getSettingLocked( + Global.BUGREPORT_IN_POWER_MENU); + + if (!bugReportInPowerMenu.isNull()) { + Slog.i(LOG_TAG, "Setting bugreport_in_power_menu to " + + bugReportInPowerMenu.getValue() + " in Secure settings."); + secureSettings.insertSettingLocked( + Secure.BUGREPORT_IN_POWER_MENU, + bugReportInPowerMenu.getValue(), null /* tag */, + false /* makeDefault */, SettingsState.SYSTEM_PACKAGE_NAME); + + // set global bug_report_in_power_menu setting to null since it's deprecated + Slog.i(LOG_TAG, "Setting bugreport_in_power_menu to null" + + " in Global settings since it's deprecated."); + globalSettings.insertSettingLocked( + Global.BUGREPORT_IN_POWER_MENU, null /* value */, null /* tag */, + true /* makeDefault */, SettingsState.SYSTEM_PACKAGE_NAME); + } + + // Following init logic is rebased from wear OS branch. + // Initialize default value of tether configuration to unknown. + initGlobalSettingsDefaultValLocked( + Settings.Global.Wearable.TETHER_CONFIG_STATE, + Global.Wearable.TETHERED_CONFIG_UNKNOWN); + // Init paired device location setting from resources. + initGlobalSettingsDefaultValLocked( + Global.Wearable.OBTAIN_PAIRED_DEVICE_LOCATION, + getContext() + .getResources() + .getInteger(R.integer.def_paired_device_location_mode)); + // Init media packages from resources. + final String mediaControlsPackage = getContext().getResources().getString( + com.android.internal.R.string.config_wearMediaControlsPackage); + final String mediaSessionsPackage = getContext().getResources().getString( + com.android.internal.R.string.config_wearMediaSessionsPackage); + initGlobalSettingsDefaultValLocked( + Global.Wearable.WEAR_MEDIA_CONTROLS_PACKAGE, + mediaControlsPackage); + initGlobalSettingsDefaultValLocked( + Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE, + mediaSessionsPackage); + + currentVersion = 218; + } + // vXXX: Add new settings above this point. if (currentVersion != newVersion) { @@ -5787,19 +5856,19 @@ public class SettingsProvider extends ContentProvider { return currentVersion; } - private void initGlobalSettingsDefaultValForWearLocked(String key, boolean val) { - initGlobalSettingsDefaultValForWearLocked(key, val ? "1" : "0"); + private void initGlobalSettingsDefaultValLocked(String key, boolean val) { + initGlobalSettingsDefaultValLocked(key, val ? "1" : "0"); } - private void initGlobalSettingsDefaultValForWearLocked(String key, int val) { - initGlobalSettingsDefaultValForWearLocked(key, String.valueOf(val)); + private void initGlobalSettingsDefaultValLocked(String key, int val) { + initGlobalSettingsDefaultValLocked(key, String.valueOf(val)); } - private void initGlobalSettingsDefaultValForWearLocked(String key, long val) { - initGlobalSettingsDefaultValForWearLocked(key, String.valueOf(val)); + private void initGlobalSettingsDefaultValLocked(String key, long val) { + initGlobalSettingsDefaultValLocked(key, String.valueOf(val)); } - private void initGlobalSettingsDefaultValForWearLocked(String key, String val) { + private void initGlobalSettingsDefaultValLocked(String key, String val) { final SettingsState globalSettings = getGlobalSettingsLocked(); Setting currentSetting = globalSettings.getSettingLocked(key); if (currentSetting.isNull()) { @@ -6024,5 +6093,10 @@ public class SettingsProvider extends ContentProvider { return !a11yButtonTargetsSettings.isNull() && !TextUtils.isEmpty(a11yButtonTargetsSettings.getValue()); } + + @NonNull + public GenerationRegistry getGenerationRegistry() { + return mGenerationRegistry; + } } } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespacePrefixes.java b/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespacePrefixes.java index 28f25e0cc407..bd99a8bbb09f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespacePrefixes.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespacePrefixes.java @@ -34,6 +34,143 @@ final class WritableNamespacePrefixes { new ArraySet<String>(Arrays.asList( "app_compat_overrides", "game_overlay", - "namespace1" + "namespace1", + "accessibility", + "activity_manager", + "activity_manager_native_boot", + "adaptive_charging", + "adservices", + "aiai_controlled_releases", + "alarm_manager", + "app_cloning", + "app_compat", + "app_compat_overrides", + "app_hibernation", + "app_standby", + "appsearch", + "arc_app_compat", + "astrea_controlled_releases", + "attention_manager_service", + "auto_pin_confirmation", + "autofill", + "backup_and_restore", + "base", + "battery_saver", + "biometrics", + "bluetooth", + "bluetooth_native", + "camera_native", + "captive_portal_login", + "car", + "cellular_security", + "clipboard", + "codegen_feature_flag_extractor", + "companion", + "configuration", + "connectivity", + "connectivity_thermal_power_manager", + "constrain_display_apis", + "content_capture", + "credential_manager", + "device_idle", + "device_personalization_services", + "device_policy_manager", + "devicelock", + "display_manager", + "dropbox", + "edgetpu_native", + "exo", + "flipendo", + "game_driver", + "game_overlay", + "gantry", + "halyard_demo", + "haptics", + "hdmi_control", + "health_fitness", + "input", + "input_method", + "input_native", + "input_native_boot", + "intelligence_bubbles", + "interaction_jank_monitor", + "ipsec", + "jobscheduler", + "kiwi", + "latency_tracker", + "launcher", + "launcher_lily", + "leaked_animator", + "lmkd_native", + "location", + "logcat_manager", + "low_power_standby", + "media", + "media_better_together", + "media_native", + "memory_safety_native", + "memory_safety_native_boot", + "mglru_native", + "nearby", + "netd_native", + "nnapi_native", + "notification_assistant", + "odad", + "on_device_abuse", + "on_device_personalization", + "oslo", + "ota", + "package_manager_service", + "permissions", + "privacy", + "private_compute_services", + "profcollect_native_boot", + "remote_auth", + "remote_key_provisioning_native", + "rollback", + "rollback_boot", + "rotation_resolver", + "runtime", + "runtime_native", + "runtime_native_boot", + "sdk_sandbox", + "settings_stats", + "shared", + "shared_native", + "shared_native_boot", + "statsd_java", + "statsd_java_boot", + "statsd_native", + "statsd_native_boot", + "storage_native_boot", + "surface_flinger_native_boot", + "swcodec_native", + "system_scheduler", + "system_server_watchdog", + "system_time", + "systemui", + "tare", + "telephony", + "testing", + "tethering", + "text", + "textclassifier", + "touchflow_native", + "tv_hdr_output_control", + "twoshay_native", + "uwb", + "vcn", + "vendor_system_native", + "vendor_system_native_boot", + "virtualization_framework_native", + "vpn", + "wallpaper_content", + "wear", + "wearable_sensing", + "widget", + "wifi", + "window_manager", + "window_manager_native_boot", + "wrong" )); } diff --git a/packages/SettingsProvider/test/AndroidManifest.xml b/packages/SettingsProvider/test/AndroidManifest.xml index ebdf9b1a2791..6464c127f9d5 100644 --- a/packages/SettingsProvider/test/AndroidManifest.xml +++ b/packages/SettingsProvider/test/AndroidManifest.xml @@ -20,7 +20,8 @@ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" /> <uses-permission android:name="android.permission.WRITE_SETTINGS"/> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"/> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/> diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 19f1a86ec90c..a202e1614b67 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -627,7 +627,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.STEM_3_DATA, Settings.Global.Wearable.STEM_3_DEFAULT_DATA, Settings.Global.Wearable.WEAR_OS_VERSION_STRING, - Settings.Global.Wearable.BUTTON_SET, Settings.Global.Wearable.SIDE_BUTTON, Settings.Global.Wearable.ANDROID_WEAR_VERSION, Settings.Global.Wearable.SYSTEM_CAPABILITIES, @@ -643,6 +642,7 @@ public class SettingsBackupTest { Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE, Settings.Global.Wearable.COMPANION_BLE_ROLE, Settings.Global.Wearable.COMPANION_NAME, + Settings.Global.Wearable.COMPANION_APP_NAME, Settings.Global.Wearable.USER_HFP_CLIENT_SETTING, Settings.Global.Wearable.COMPANION_OS_VERSION, Settings.Global.Wearable.ENABLE_ALL_LANGUAGES, @@ -662,13 +662,21 @@ public class SettingsBackupTest { Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, Settings.Global.Wearable.BEDTIME_MODE, Settings.Global.Wearable.BEDTIME_HARD_MODE, - Settings.Global.Wearable.EARLY_UPDATES_STATUS, Settings.Global.Wearable.RSB_WAKE_ENABLED, Settings.Global.Wearable.LOCK_SCREEN_STATE, Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED, Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE, Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED, - Settings.Global.Wearable.SCREENSHOT_ENABLED); + Settings.Global.Wearable.SCREENSHOT_ENABLED, + Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED, + Settings.Global.Wearable.NETWORK_LOCATION_OPT_IN, + Settings.Global.Wearable.CUSTOM_COLOR_FOREGROUND, + Settings.Global.Wearable.CUSTOM_COLOR_BACKGROUND, + Settings.Global.Wearable.PHONE_SWITCHING_STATUS, + Settings.Global.Wearable.TETHER_CONFIG_STATE, + Settings.Global.Wearable.PHONE_SWITCHING_SUPPORTED, + Settings.Global.Wearable.WEAR_MEDIA_CONTROLS_PACKAGE, + Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE); private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet( diff --git a/packages/Shell/res/values-as/strings.xml b/packages/Shell/res/values-as/strings.xml index 9b9db6e872be..f8895ee7d783 100644 --- a/packages/Shell/res/values-as/strings.xml +++ b/packages/Shell/res/values-as/strings.xml @@ -26,8 +26,8 @@ <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"আপোনাৰ বাগ সম্পৰ্কীয় অভিযোগ শ্বেয়াৰ কৰিবৰ বাবে বাছনি কৰক"</string> <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"আপোনাৰ বাগ সম্পর্কীয় অভিযোগ শ্বেয়াৰ কৰিবৰ বাবে ইয়াত টিপক"</string> <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"ষ্ক্ৰীণশ্বট নোলোৱাকৈ বাগ সম্পৰ্কীয় অভিযোগ শ্বেয়াৰ কৰিবলৈ বাছনি কৰক বা ষ্ক্ৰীণশ্বট লোৱা কাৰ্য সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক"</string> - <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"স্ক্ৰীণশ্বট নোলোৱাকৈ বাগ সম্পর্কীয় অভিযোগ শ্বেয়াৰ কৰিবলৈ ইয়াত টিপক বা স্ক্ৰীণশ্বট সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক"</string> - <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"স্ক্ৰীণশ্বট নোলোৱাকৈ বাগ সম্পর্কীয় অভিযোগ শ্বেয়াৰ কৰিবলৈ ইয়াত টিপক বা স্ক্ৰীণশ্বট সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক"</string> + <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"স্ক্ৰীনশ্বট নোলোৱাকৈ বাগ সম্পর্কীয় অভিযোগ শ্বেয়াৰ কৰিবলৈ ইয়াত টিপক বা স্ক্ৰীনশ্বট সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক"</string> + <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"স্ক্ৰীনশ্বট নোলোৱাকৈ বাগ সম্পর্কীয় অভিযোগ শ্বেয়াৰ কৰিবলৈ ইয়াত টিপক বা স্ক্ৰীনশ্বট সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক"</string> <string name="bugreport_confirm" msgid="5917407234515812495">"বাগ সম্পর্কীয় অভিযোগত ছিষ্টেমৰ বিভিন্ন লগ ফাইল থাকে, ইয়াৰ ভিতৰত আপুনি স্পর্শকাতৰ বুলি গণ্য কৰা ডেটা (যেনে এপৰ ব্যৱহাৰ আৰু অৱস্থান সম্পৰ্কীয় তথ্য) অন্তর্ভুক্ত হ\'ব পাৰে। কেৱল আপোনাৰ বিশ্বাসী লোক বা এপৰ সৈতেহে বাগ সম্পর্কীয় অভিযোগ শ্বেয়াৰ কৰিব।"</string> <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"পুনৰাই নেদেখুৱাব"</string> <string name="bugreport_storage_title" msgid="5332488144740527109">"বাগ সম্পর্কীয় প্ৰতিবেদনসমূহ"</string> @@ -35,9 +35,9 @@ <string name="bugreport_add_details_to_zip_failed" msgid="1302931926486712371">"বাগ সম্পর্কীয় অভিযোগৰ বিৱৰণ জিপ ফাইলত যোগ কৰিব পৰা নগ\'ল"</string> <string name="bugreport_unnamed" msgid="2800582406842092709">"নামবিহীন"</string> <string name="bugreport_info_action" msgid="2158204228510576227">"সবিশেষ"</string> - <string name="bugreport_screenshot_action" msgid="8677781721940614995">"স্ক্ৰীণশ্বট"</string> - <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"স্ক্ৰীণশ্বট সফলতাৰে লোৱা হ\'ল৷"</string> - <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"স্ক্ৰীণশ্বট ল\'ব পৰা নগ\'ল।"</string> + <string name="bugreport_screenshot_action" msgid="8677781721940614995">"স্ক্ৰীনশ্বট"</string> + <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"স্ক্ৰীনশ্বট সফলতাৰে লোৱা হ\'ল৷"</string> + <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"স্ক্ৰীনশ্বট ল\'ব পৰা নগ\'ল।"</string> <string name="bugreport_info_dialog_title" msgid="1355948594292983332">"বাগ সম্পর্কীয় অভিযোগৰ বিৱৰণ <xliff:g id="ID">#%d</xliff:g>"</string> <string name="bugreport_info_name" msgid="4414036021935139527">"ফাইলৰ নাম"</string> <string name="bugreport_info_title" msgid="2306030793918239804">"বাগৰ শিৰোনাম"</string> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 067efe97f6b6..e069a9ac776b 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -455,7 +455,8 @@ public class BugreportProgressService extends Service { intent.putExtra(DevicePolicyManager.EXTRA_REMOTE_BUGREPORT_HASH, bugreportHash); intent.putExtra(DevicePolicyManager.EXTRA_REMOTE_BUGREPORT_NONCE, nonce); intent.putExtra(EXTRA_BUGREPORT, bugreportFileName); - context.sendBroadcast(intent, android.Manifest.permission.DUMP); + context.sendBroadcastAsUser(intent, UserHandle.SYSTEM, + android.Manifest.permission.DUMP); } /** diff --git a/packages/StatementService/res/values-en-rCA/strings.xml b/packages/StatementService/res/values-en-rCA/strings.xml new file mode 100644 index 000000000000..deb3d4cf5996 --- /dev/null +++ b/packages/StatementService/res/values-en-rCA/strings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="service_name" msgid="5049486369463670924">"Intent Filter Verification Service"</string> +</resources> diff --git a/packages/StatementService/res/values-en-rXC/strings.xml b/packages/StatementService/res/values-en-rXC/strings.xml new file mode 100644 index 000000000000..146db341961b --- /dev/null +++ b/packages/StatementService/res/values-en-rXC/strings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="service_name" msgid="5049486369463670924">"Intent Filter Verification Service"</string> +</resources> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index ff570524ca0e..36a0b5dd72b8 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -872,6 +872,20 @@ </intent-filter> </activity> + <activity + android:name=".contrast.ContrastDialogActivity" + android:label="@string/quick_settings_contrast_label" + android:theme="@style/Theme.SystemUI.ContrastDialog" + android:finishOnCloseSystemDialogs="true" + android:launchMode="singleInstance" + android:excludeFromRecents="true" + android:exported="true"> + <intent-filter> + <action android:name="com.android.intent.action.SHOW_CONTRAST_DIALOG" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + <activity android:name=".ForegroundServicesDialog" android:process=":fgservices" android:excludeFromRecents="true" diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-af/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-af/strings.xml index eb65a77072d9..cbb5ad732b2b 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-af/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-af/strings.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Toeganklikheid- kieslys"</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Toeganklikheid-kieslys"</string> <string name="accessibility_menu_intro" msgid="3164193281544042394">"Die Toeganklikheidkieslys bied ’n groot kieslys op die skerm om jou toestel te beheer. Jy kan jou toestel sluit, volume en helderheid beheer, skermskote neem, en meer."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistent"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Toeganklikheidinstellings"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Toeganklikheid-instellings"</string> <string name="power_label" msgid="7699720321491287839">"Krag"</string> <string name="power_utterance" msgid="7444296686402104807">"Kragopsies"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"Onlangse programme"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"Onlangse apps"</string> <string name="lockscreen_label" msgid="648347953557887087">"Sluitskerm"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Kitsinstellings"</string> <string name="notifications_label" msgid="6829741046963013567">"Kennisgewings"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ar/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ar/strings.xml index 4560425ca5a2..29a09d53e781 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ar/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ar/strings.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"قائمة \"تسهيل الاستخدام\""</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"قائمة \"تسهيل الاستخدام\" هي قائمة كبيرة تظهر على الشاشة وتتيح لك التحكّم في جهازك. يمكنك من خلال هذه القائمة قفل جهازك والتحكّم في مستوى الصوت والسطوع وتسجيل لقطات الشاشة وغير ذلك."</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"قائمة تسهيل الاستخدام"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"\"قائمة تسهيل الاستخدام\" هي قائمة كبيرة تظهر على الشاشة وتتيح لك التحكّم في جهازك. يمكنك من خلال هذه القائمة قفل جهازك والتحكّم في مستوى الصوت والسطوع وتسجيل لقطات الشاشة وغير ذلك."</string> <string name="assistant_label" msgid="6796392082252272356">"مساعِد"</string> <string name="assistant_utterance" msgid="65509599221141377">"مساعد Google"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"إعدادات \"سهولة الاستخدام\""</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"إعدادات تسهيل الاستخدام"</string> <string name="power_label" msgid="7699720321491287839">"زر التشغيل"</string> <string name="power_utterance" msgid="7444296686402104807">"خيارات التشغيل"</string> <string name="recent_apps_label" msgid="6583276995616385847">"التطبيقات المستخدمة مؤخرًا"</string> @@ -20,12 +20,12 @@ <string name="brightness_down_label" msgid="7115662941913272072">"خفض مستوى السطوع"</string> <string name="previous_button_content_description" msgid="840869171117765966">"الانتقال إلى الشاشة السابقة"</string> <string name="next_button_content_description" msgid="6810058269847364406">"الانتقال إلى الشاشة التالية"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"توفّر قائمة \"تسهيل الاستخدام\" قائمةً كبيرةً تُعرض على الشاشة تتيح لك الحكّم في جهازك. يمكنك من خلال هذه القائمة قفل جهازك أو التحكّم في مستوى الصوت والسطوع وتسجيل لقطات الشاشة وغير ذلك."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"توفّر \"قائمة تسهيل الاستخدام\" قائمةً كبيرةً تُعرض على الشاشة وتتيح لك التحكّم في جهازك. يمكنك من خلال هذه القائمة قفل جهازك أو التحكّم في مستوى الصوت والسطوع وتسجيل لقطات الشاشة وغير ذلك."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"التحكُّم في جهازك من خلال قائمة كبيرة الحجم"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"إعدادات قائمة \"سهولة الاستخدام\""</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"إعدادات \"قائمة تسهيل الاستخدام\""</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"الأزرار الكبيرة"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"زيادة حجم أزرار قائمة \"سهولة الاستخدام\""</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"زيادة حجم أزرار \"قائمة تسهيل الاستخدام\""</string> <string name="pref_help_title" msgid="6871558837025010641">"مساعدة"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"السطوع <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"مستوى صوت الموسيقى <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"السطوع %%<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"مستوى صوت الموسيقى %%<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-as/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-as/strings.xml index ec7beb355767..1ed78d689383 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-as/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-as/strings.xml @@ -8,12 +8,12 @@ <string name="a11y_settings_label" msgid="3977714687248445050">"সাধ্য সুবিধাৰ ছেটিং"</string> <string name="power_label" msgid="7699720321491287839">"অন/অফ"</string> <string name="power_utterance" msgid="7444296686402104807">"অন/অফ বুটামৰ বিকল্পসমূহ"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"শেহতীয়া এপসমূহ"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"শেহতীয়া এপ্সমূহ"</string> <string name="lockscreen_label" msgid="648347953557887087">"লক স্ক্ৰীন"</string> <string name="quick_settings_label" msgid="2999117381487601865">"ক্ষিপ্ৰ ছেটিং"</string> <string name="notifications_label" msgid="6829741046963013567">"জাননীসমূহ"</string> - <string name="screenshot_label" msgid="863978141223970162">"স্ক্ৰীণশ্বট"</string> - <string name="screenshot_utterance" msgid="1430760563401895074">"স্ক্ৰীণশ্বট লওক"</string> + <string name="screenshot_label" msgid="863978141223970162">"স্ক্ৰীনশ্বট"</string> + <string name="screenshot_utterance" msgid="1430760563401895074">"স্ক্ৰীনশ্বট লওক"</string> <string name="volume_up_label" msgid="8592766918780362870">"ভলিউম বঢ়াওক"</string> <string name="volume_down_label" msgid="8574981863656447346">"ভলিউম কমাওক"</string> <string name="brightness_up_label" msgid="8010753822854544846">"উজ্জ্বলতা বঢ়াওক"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-b+sr+Latn/strings.xml index 3ec174987e7e..d051bb7a66a0 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-b+sr+Latn/strings.xml @@ -27,5 +27,5 @@ <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Povećajte veličinu dugmadi u meniju za pristupačnost"</string> <string name="pref_help_title" msgid="6871558837025010641">"Pomoć"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Osvetljenost: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Jačina zvuka muzike: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Jačina muzike: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-bs/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-bs/strings.xml index 03a3436fa731..749a6f283288 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-bs/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-bs/strings.xml @@ -16,8 +16,8 @@ <string name="screenshot_utterance" msgid="1430760563401895074">"Napravi snimak ekrana"</string> <string name="volume_up_label" msgid="8592766918780362870">"Pojačaj zvuk"</string> <string name="volume_down_label" msgid="8574981863656447346">"Utišaj zvuk"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"Jače osvjetljenje"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"Slabije osvjetljenje"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"Posvijetli"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"Zatamni"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Idi na prethodni ekran"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Idi na sljedeći ekran"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Meni za pristupačnost pruža veliki meni na ekranu za upravljanje uređajem. Možete zaključati uređaj, kontrolirati jačinu zvuka i osvjetljenje, praviti snimke ekrana i drugo."</string> @@ -27,5 +27,5 @@ <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Povećajte dugmad menija za pristupačnost"</string> <string name="pref_help_title" msgid="6871558837025010641">"Pomoć"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Osvjetljenje: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Jačina zvuka muzike: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Jačina muzike: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ca/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ca/strings.xml index 1c4f5a2ef498..2dc2c7ca49f0 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ca/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ca/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menú d\'accessibilitat"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"El menú d\'accessibilitat t\'ofereix un menú gran en pantalla perquè controlis el dispositiu. Pots bloquejar-lo, controlar-ne el volum i la brillantor, fer captures de pantalla i molt més."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"El menú d\'accessibilitat t\'ofereix un menú gran en pantalla per controlar el dispositiu. Pots bloquejar el dispositiu, controlar-ne el volum i la brillantor, fer captures de pantalla i molt més."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistent"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Configuració d\'accessibilitat"</string> @@ -20,7 +20,7 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Disminueix la brillantor"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Ves a la pantalla anterior"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Ves a la pantalla següent"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"El menú d\'accessibilitat t\'ofereix un menú gran en pantalla perquè controlis el dispositiu. Pots bloquejar-lo, controlar-ne el volum i la brillantor, fer captures de pantalla i molt més."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"El menú d\'accessibilitat t\'ofereix un menú gran en pantalla per controlar el dispositiu. Pots bloquejar el dispositiu, controlar-ne el volum i la brillantor, fer captures de pantalla i molt més."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Controla el dispositiu amb un menú gran"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Config. del menú d\'accessibilitat"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Botons grans"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-de/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-de/strings.xml index 7f7df4f8c68c..9214197ee9bd 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-de/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-de/strings.xml @@ -10,8 +10,8 @@ <string name="power_utterance" msgid="7444296686402104807">"Optionen für Ein-/Aus-Taste"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Kürzlich geöffnete Apps"</string> <string name="lockscreen_label" msgid="648347953557887087">"Sperrbildschirm"</string> - <string name="quick_settings_label" msgid="2999117381487601865">"Schnelleinstellungen"</string> - <string name="notifications_label" msgid="6829741046963013567">"Benachrichtigungen"</string> + <string name="quick_settings_label" msgid="2999117381487601865">"Schnelleinstellungen"</string> + <string name="notifications_label" msgid="6829741046963013567">"Benachrichtigungen"</string> <string name="screenshot_label" msgid="863978141223970162">"Screenshot"</string> <string name="screenshot_utterance" msgid="1430760563401895074">"Screenshot erstellen"</string> <string name="volume_up_label" msgid="8592766918780362870">"Lautstärke erhöhen"</string> @@ -22,9 +22,9 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Zum nächsten Bildschirm"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Über das Menü „Bedienungshilfen“ lässt sich ein großes Menü zur Bedienung deines Geräts auf dem Bildschirm öffnen. Du kannst beispielsweise das Gerät sperren, die Lautstärke und Helligkeit anpassen und Screenshots machen."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Gerät mit großem Menü steuern"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Menüeinstellungen für Bedienungshilfen"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Menüeinstellungen f. Bedienungshilfen"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Große Schaltflächen"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Schaltflächen für das Menü \"Bedienungshilfen\" vergrößern"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Schaltflächen für das Menü „Bedienungshilfen“ vergrößern"</string> <string name="pref_help_title" msgid="6871558837025010641">"Hilfe"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Helligkeit: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Musiklautstärke: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rAU/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rAU/strings.xml index b09c34ddd480..46702917a7a3 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rAU/strings.xml @@ -5,7 +5,7 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"The Accessibility menu provides a large on-screen menu to control your device. You can lock your device, control volume and brightness, take screenshots and more."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Accessibility Settings"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Accessibility settings"</string> <string name="power_label" msgid="7699720321491287839">"Power"</string> <string name="power_utterance" msgid="7444296686402104807">"Power options"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Recent apps"</string> @@ -22,10 +22,10 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Go to next screen"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"The Accessibility menu provides a large on-screen menu to control your device. You can lock your device, control volume and brightness, take screenshots and more."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Control device via large menu"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Accessibility Menu Settings"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Accessibility menu settings"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Large buttons"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Increase size of Accessibility Menu Buttons"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Increase size of Accessibility menu buttons"</string> <string name="pref_help_title" msgid="6871558837025010641">"Help"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"Brightness <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Music volume <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"Brightness <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Music volume <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rGB/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rGB/strings.xml index b09c34ddd480..46702917a7a3 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rGB/strings.xml @@ -5,7 +5,7 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"The Accessibility menu provides a large on-screen menu to control your device. You can lock your device, control volume and brightness, take screenshots and more."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Accessibility Settings"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Accessibility settings"</string> <string name="power_label" msgid="7699720321491287839">"Power"</string> <string name="power_utterance" msgid="7444296686402104807">"Power options"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Recent apps"</string> @@ -22,10 +22,10 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Go to next screen"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"The Accessibility menu provides a large on-screen menu to control your device. You can lock your device, control volume and brightness, take screenshots and more."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Control device via large menu"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Accessibility Menu Settings"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Accessibility menu settings"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Large buttons"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Increase size of Accessibility Menu Buttons"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Increase size of Accessibility menu buttons"</string> <string name="pref_help_title" msgid="6871558837025010641">"Help"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"Brightness <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Music volume <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"Brightness <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Music volume <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rIN/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rIN/strings.xml index b09c34ddd480..46702917a7a3 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-en-rIN/strings.xml @@ -5,7 +5,7 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"The Accessibility menu provides a large on-screen menu to control your device. You can lock your device, control volume and brightness, take screenshots and more."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Accessibility Settings"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Accessibility settings"</string> <string name="power_label" msgid="7699720321491287839">"Power"</string> <string name="power_utterance" msgid="7444296686402104807">"Power options"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Recent apps"</string> @@ -22,10 +22,10 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Go to next screen"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"The Accessibility menu provides a large on-screen menu to control your device. You can lock your device, control volume and brightness, take screenshots and more."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Control device via large menu"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Accessibility Menu Settings"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Accessibility menu settings"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Large buttons"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Increase size of Accessibility Menu Buttons"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Increase size of Accessibility menu buttons"</string> <string name="pref_help_title" msgid="6871558837025010641">"Help"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"Brightness <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Music volume <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"Brightness <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Music volume <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-es-rUS/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-es-rUS/strings.xml index 03c235bafaa4..42499586bd84 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-es-rUS/strings.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menú de Accesibilidad"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"El menú de Accesibilidad es un menú de gran tamaño que se muestra en la pantalla y te permite controlar tu dispositivo. Puedes bloquearlo, controlar el volumen y el brillo, realizar capturas de pantalla y mucho más."</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menú de accesibilidad"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"El Menú de accesibilidad es un menú de gran tamaño que se muestra en pantalla y te permite controlar tu dispositivo para bloquearlo, controlar su volumen y brillo, realizar capturas de pantalla y mucho más."</string> <string name="assistant_label" msgid="6796392082252272356">"Asistente"</string> <string name="assistant_utterance" msgid="65509599221141377">"Asistente"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Configuración de accesibilidad"</string> <string name="power_label" msgid="7699720321491287839">"Encendido"</string> <string name="power_utterance" msgid="7444296686402104807">"Opciones de encendido"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Apps recientes"</string> - <string name="lockscreen_label" msgid="648347953557887087">"Pantalla de bloqueo"</string> + <string name="lockscreen_label" msgid="648347953557887087">"Bloquear pantalla"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Configuración rápida"</string> <string name="notifications_label" msgid="6829741046963013567">"Notificaciones"</string> <string name="screenshot_label" msgid="863978141223970162">"Captura de pantalla"</string> @@ -21,10 +21,10 @@ <string name="previous_button_content_description" msgid="840869171117765966">"Ir a la pantalla anterior"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Ir a la siguiente pantalla"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"El menú de Accesibilidad es un menú de gran tamaño que se muestra en la pantalla y te permite controlar tu dispositivo. Puedes bloquearlo, controlar el volumen y el brillo, realizar capturas de pantalla y mucho más."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"Controlar el dispositivo mediante el menú ampliado"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Configuración del menú de accesibilidad"</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"Controla el dispositivo con un menú de gran tamaño"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Configuración del Menú de accesibilidad"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Botones grandes"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumenta el tamaño de los botones del menú de accesibilidad"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumenta el tamaño de los botones del Menú de accesibilidad"</string> <string name="pref_help_title" msgid="6871558837025010641">"Ayuda"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Brillo: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Volumen de la música: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-es/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-es/strings.xml index a00ba8a0d903..b97df645dee7 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-es/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-es/strings.xml @@ -6,10 +6,10 @@ <string name="assistant_label" msgid="6796392082252272356">"Asistente"</string> <string name="assistant_utterance" msgid="65509599221141377">"Asistente"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Ajustes de accesibilidad"</string> - <string name="power_label" msgid="7699720321491287839">"Encender"</string> + <string name="power_label" msgid="7699720321491287839">"Encendido"</string> <string name="power_utterance" msgid="7444296686402104807">"Opciones de encendido"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Aplicaciones recientes"</string> - <string name="lockscreen_label" msgid="648347953557887087">"Pantalla de bloqueo"</string> + <string name="lockscreen_label" msgid="648347953557887087">"Bloquear pantalla"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Ajustes rápidos"</string> <string name="notifications_label" msgid="6829741046963013567">"Notificaciones"</string> <string name="screenshot_label" msgid="863978141223970162">"Captura de pantalla"</string> @@ -24,7 +24,7 @@ <string name="accessibility_menu_summary" msgid="340071398148208130">"Controla el dispositivo con un menú de gran tamaño"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Ajustes del menú de accesibilidad"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Botones grandes"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumentar el tamaño de los botones del menú de accesibilidad"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumenta el tamaño de los botones del menú de accesibilidad"</string> <string name="pref_help_title" msgid="6871558837025010641">"Ayuda"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Brillo: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Volumen de la música: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-fa/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-fa/strings.xml index 9e1e8b20766b..49d8f6965540 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-fa/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-fa/strings.xml @@ -6,8 +6,8 @@ <string name="assistant_label" msgid="6796392082252272356">"دستیار"</string> <string name="assistant_utterance" msgid="65509599221141377">"دستیار"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"تنظیمات دسترسپذیری"</string> - <string name="power_label" msgid="7699720321491287839">"نیرو"</string> - <string name="power_utterance" msgid="7444296686402104807">"گزینههای نیرو"</string> + <string name="power_label" msgid="7699720321491287839">"دکمه روشن/خاموش"</string> + <string name="power_utterance" msgid="7444296686402104807">"گزینههای دکمه روشن/خاموش"</string> <string name="recent_apps_label" msgid="6583276995616385847">"برنامههای اخیر"</string> <string name="lockscreen_label" msgid="648347953557887087">"صفحه قفل"</string> <string name="quick_settings_label" msgid="2999117381487601865">"تنظیمات سریع"</string> @@ -20,7 +20,7 @@ <string name="brightness_down_label" msgid="7115662941913272072">"کاهش روشنایی"</string> <string name="previous_button_content_description" msgid="840869171117765966">"رفتن به صفحه قبل"</string> <string name="next_button_content_description" msgid="6810058269847364406">"رفتن به صفحه بعد"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"«منوی دسترسپذیری» منوی بزرگی را روی صفحه برای کنترل دستگاه ارائه میدهد. میتوانید دستگاه را قفل کنید، میزان صدا و روشنایی را کنترل کنید، نماگرفت ثبت کنید، و کارهای بیشتری انجام دهید."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"«منوی دسترسپذیری» منوی بزرگی را روی صفحه برای کنترل دستگاه ارائه میدهد. میتوانید دستگاه را قفل کنید، میزان صدا و روشنایی را کنترل کنید، از صفحه نمایش عکس بگیرید، و کارهای بیشتری انجام دهید."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"کنترل دستگاه ازطریق منوی بزرگ"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"تنظیمات منوی دسترسپذیری"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"دکمههای بزرگ"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-fi/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-fi/strings.xml index 8ab880c14d15..5e317394cb31 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-fi/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-fi/strings.xml @@ -5,7 +5,7 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"Saavutettavuusvalikko on suuri näyttövalikko, josta voit ohjata laitettasi. Voit esimerkiksi lukita laitteen, säätää äänenvoimakkuutta ja kirkkautta sekä ottaa kuvakaappauksia."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Esteettömyysasetukset"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Saavutettavuusasetukset"</string> <string name="power_label" msgid="7699720321491287839">"Virta"</string> <string name="power_utterance" msgid="7444296686402104807">"Virta-asetukset"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Viimeaikaiset sovellukset"</string> @@ -22,9 +22,9 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Siirry seuraavalle näytölle"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Saavutettavuusvalikko on suuri näyttövalikko, josta voit ohjata laitettasi. Voit esimerkiksi lukita laitteen, säätää äänenvoimakkuutta ja kirkkautta sekä ottaa kuvakaappauksia."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Ohjaa laitetta suurella valikolla"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Esteettömyysvalikon asetukset"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Saavutettavuusvalikon asetukset"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Suuret painikkeet"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Suurenna esteettömyysvalikon painikkeita"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Suurenna saavutettavuusvalikon painikkeita"</string> <string name="pref_help_title" msgid="6871558837025010641">"Ohje"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Kirkkaus <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Musiikin äänenvoimakkuus <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-fr-rCA/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-fr-rCA/strings.xml index 993a9fc740a4..87a95037178e 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-fr-rCA/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menu d\'accessibilité"</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menu Accessibilité"</string> <string name="accessibility_menu_intro" msgid="3164193281544042394">"Le menu Accessibilité propose un grand espace à l\'écran à l\'aide duquel vous pouvez contrôler votre appareil. Utilisez-le pour verrouiller votre appareil, régler le volume et la luminosité, prendre des captures d\'écran et plus."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> @@ -9,7 +9,7 @@ <string name="power_label" msgid="7699720321491287839">"Alimentation"</string> <string name="power_utterance" msgid="7444296686402104807">"Options d\'alimentation"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Applis récentes"</string> - <string name="lockscreen_label" msgid="648347953557887087">"Écran verrouillage"</string> + <string name="lockscreen_label" msgid="648347953557887087">"Écran de verrouillage"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Paramètres rapides"</string> <string name="notifications_label" msgid="6829741046963013567">"Notifications"</string> <string name="screenshot_label" msgid="863978141223970162">"Capture d\'écran"</string> @@ -21,10 +21,10 @@ <string name="previous_button_content_description" msgid="840869171117765966">"Aller à l\'écran précédent"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Aller à l\'écran suivant"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Le menu Accessibilité propose un grand espace à l\'écran à l\'aide duquel vous pouvez contrôler votre appareil. Utilisez-le pour verrouiller votre appareil, régler le volume et la luminosité, prendre des captures d\'écran et plus."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"Contrôlez l\'appareil à l\'aide d\'un menu de grande taille"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Paramètres du menu d\'accessibilité"</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"contrôler l\'appareil à l\'aide d\'un menu de grande taille"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Paramètres du menu Accessibilité"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Boutons de grande taille"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Augmenter la taille des boutons du menu d\'accessibilité"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Augmenter la taille des boutons du menu Accessibilité"</string> <string name="pref_help_title" msgid="6871558837025010641">"Aide"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Luminosité : <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Volume de la musique : <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-gl/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-gl/strings.xml index ceb8fe866307..5547d63bea98 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-gl/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-gl/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menú de accesibilidade"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"O menú de accesibilidade é un panel grande que aparece na pantalla co que podes controlar o dispositivo. Permíteche realizar varias accións, entre elas, bloquear o dispositivo, controlar o volume, axustar o brillo e facer capturas de pantalla."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"O menú de accesibilidade é un panel grande que aparece na pantalla co que podes controlar o dispositivo. Permíteche realizar varias accións, como bloquear o dispositivo, controlar o volume, axustar o brillo e facer capturas de pantalla."</string> <string name="assistant_label" msgid="6796392082252272356">"Asistente"</string> <string name="assistant_utterance" msgid="65509599221141377">"Asistente"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Accesibilidade (configuración)"</string> @@ -22,7 +22,7 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Ir á seguinte pantalla"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"O menú de accesibilidade é un panel grande que aparece na pantalla e permite controlar o dispositivo. Permíteche realizar varias accións, como bloquear o dispositivo, controlar o volume, axustar o brillo e facer capturas de pantalla."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Controla o dispositivo a través dun menú grande"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Configuración do menú de accesibilidade"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Axustes do menú de accesibilidade"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Botóns grandes"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumenta o tamaño dos botóns do menú de accesibilidade"</string> <string name="pref_help_title" msgid="6871558837025010641">"Axuda"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hi/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hi/strings.xml index a69b3fe98339..1cb9b5e3a73d 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hi/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hi/strings.xml @@ -24,7 +24,7 @@ <string name="accessibility_menu_summary" msgid="340071398148208130">"बड़े मेन्यू की मदद से डिवाइस को कंट्रोल करें"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"सुलभता मेन्यू सेटिंग"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"बड़े बटन"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"सुलभता मेन्यू के बटनाें का आकार बढ़ाएं"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"सुलभता मेन्यू के बटनाें का साइज़ बढ़ाएं"</string> <string name="pref_help_title" msgid="6871558837025010641">"सहायता"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"स्क्रीन की रोशनी <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"संगीत की आवाज़ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hr/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hr/strings.xml index 06e85501c808..1ae3213639e1 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hr/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hr/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Izbornik pristupačnosti"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Izbornik pristupačnosti pruža velik izbornik na zaslonu u svrhu upravljanja uređajem. Možete zaključati uređaj, upravljati glasnoćom i svjetlinom, izrađivati snimke zaslona i drugo."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Izbornik pristupačnosti veliki je zaslonski izbornik koji vam omogućuje upravljanje uređajem. Putem ovog izbornika možete zaključati uređaj, upravljati glasnoćom i svjetlinom, izrađivati snimke zaslona i drugo."</string> <string name="assistant_label" msgid="6796392082252272356">"Asistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Asistent"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Postavke pristupačnosti"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hu/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hu/strings.xml index f4787928f8f9..978deaa26c55 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hu/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hu/strings.xml @@ -9,7 +9,7 @@ <string name="power_label" msgid="7699720321491287839">"Bekapcsológomb"</string> <string name="power_utterance" msgid="7444296686402104807">"Bekapcsológomb beállításai"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Legutóbbi alkalmazások"</string> - <string name="lockscreen_label" msgid="648347953557887087">"Lezárási képernyő"</string> + <string name="lockscreen_label" msgid="648347953557887087">"Képernyő lezárása"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Gyorsbeállítások"</string> <string name="notifications_label" msgid="6829741046963013567">"Értesítések"</string> <string name="screenshot_label" msgid="863978141223970162">"Képernyőkép"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hy/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hy/strings.xml index 0a1c8225ae84..135d44326c66 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-hy/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-hy/strings.xml @@ -8,7 +8,7 @@ <string name="a11y_settings_label" msgid="3977714687248445050">"Հատուկ գործառույթների կարգավորումներ"</string> <string name="power_label" msgid="7699720321491287839">"Սնուցման կոճակ"</string> <string name="power_utterance" msgid="7444296686402104807">"Սնուցման կոճակի ընտրանքներ"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"Վերջին օգտագործած հավելվածները"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"Վերջին հավելվածներ"</string> <string name="lockscreen_label" msgid="648347953557887087">"Կողպէկրան"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Արագ կարգավորումներ"</string> <string name="notifications_label" msgid="6829741046963013567">"Ծանուցումներ"</string> @@ -17,7 +17,7 @@ <string name="volume_up_label" msgid="8592766918780362870">"Բարձրացնել ձայնը"</string> <string name="volume_down_label" msgid="8574981863656447346">"Իջեցնել ձայնը"</string> <string name="brightness_up_label" msgid="8010753822854544846">"Ավելացնել պայծառությունը"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"Պակասեցնել պայծառությունը"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"Նվազեցնել պայծառությունը"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Անցնել նախորդ էկրան"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Անցնել հաջորդ էկրան"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Հատուկ գործառույթների մեծ ընտրացանկը նախատեսված է ձեր սարքը կառավարելու համար: Դուք կարող եք կողպել ձեր հեռախոսը, կարգավորել պայծառությունը և ձայնի ուժգնությունը, սքրինշոթներ անել և այլն։"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-in/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-in/strings.xml index efb0999af852..5bb5e40a22e0 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-in/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-in/strings.xml @@ -16,8 +16,8 @@ <string name="screenshot_utterance" msgid="1430760563401895074">"Ambil screenshot"</string> <string name="volume_up_label" msgid="8592766918780362870">"Naikkan volume"</string> <string name="volume_down_label" msgid="8574981863656447346">"Turunkan volume"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"Tingkatkan kecerahan"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"Kurangi kecerahan"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"Naikkan kecerahan"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"Turunkan kecerahan"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Buka layar sebelumnya"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Buka layar berikutnya"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Menu Aksesibilitas menyediakan menu di layar dengan ukuran besar untuk mengontrol perangkat Anda. Anda dapat mengunci perangkat, mengontrol volume dan kecerahan, mengambil screenshot, dan banyak lagi."</string> @@ -26,6 +26,6 @@ <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Tombol besar"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Perbesar ukuran Tombol Menu Aksesibilitas"</string> <string name="pref_help_title" msgid="6871558837025010641">"Bantuan"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"Kecerahan <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Volume musik <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"Kecerahan <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Volume musik <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-it/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-it/strings.xml index 747472174a93..ef9e4a554785 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-it/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-it/strings.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menu Accessibilità"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Il Menu Accessibilità mostra sullo schermo un menu di grandi dimensioni per permetterti di controllare il dispositivo. Puoi bloccare il dispositivo, regolare il volume e la luminosità, acquisire screenshot e altro ancora."</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"menu Accessibilità"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Il menu Accessibilità mostra sullo schermo un menu di grandi dimensioni per permetterti di controllare il dispositivo. Puoi bloccare il dispositivo, regolare il volume e la luminosità, acquisire screenshot e altro ancora."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistente"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistente"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Impostazioni di accessibilità"</string> @@ -20,12 +20,12 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Diminuisci luminosità"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Vai alla schermata precedente"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Vai alla schermata successiva"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"Il Menu Accessibilità mostra sullo schermo un menu di grandi dimensioni per permetterti di controllare il dispositivo. Puoi bloccare il dispositivo, regolare il volume e la luminosità, acquisire screenshot e altro ancora."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"Il menu Accessibilità mostra sullo schermo un menu di grandi dimensioni per permetterti di controllare il dispositivo. Puoi bloccare il dispositivo, regolare il volume e la luminosità, acquisire screenshot e altro ancora."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Controlla il dispositivo tramite un menu di grandi dimensioni"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Impostazioni del menu Accessibilità"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Pulsanti grandi"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumenta le dimensioni dei pulsanti del menu Accessibilità"</string> <string name="pref_help_title" msgid="6871558837025010641">"Guida"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"Luminosità: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Volume musica: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"Luminosità: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Volume musica: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ja/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ja/strings.xml index 75fd81542183..cc6638bcf574 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ja/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ja/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"ユーザー補助機能メニュー"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"ユーザー補助メニューは、デバイスを操作するための画面上の大きなメニューです。デバイスのロック、音量や明るさの調節、スクリーンショットの撮影などを行えます。"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"ユーザー補助メニューは、デバイスを操作するために画面上に大きく表示されるメニューです。デバイスのロック、音量や明るさの調節、スクリーンショットの撮影などを行えます。"</string> <string name="assistant_label" msgid="6796392082252272356">"アシスタント"</string> <string name="assistant_utterance" msgid="65509599221141377">"アシスタント"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"ユーザー補助機能の設定"</string> @@ -20,8 +20,8 @@ <string name="brightness_down_label" msgid="7115662941913272072">"明るさを下げる"</string> <string name="previous_button_content_description" msgid="840869171117765966">"前の画面に移動"</string> <string name="next_button_content_description" msgid="6810058269847364406">"次の画面に移動"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"ユーザー補助メニューは、デバイスを操作するための画面上の大きなメニューです。デバイスのロック、音量や明るさの調節、スクリーンショットの撮影などを行えます。"</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"大きなメニューでデバイスを操作します"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"ユーザー補助メニューは、デバイスを操作するために画面上に大きく表示されるメニューです。デバイスのロック、音量や明るさの調節、スクリーンショットの撮影などを行えます。"</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"大きく表示されるメニューでデバイスを操作します"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"ユーザー補助機能メニューの設定"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"大きいボタン"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"ユーザー補助機能メニューのボタンを大きくする"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-kk/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-kk/strings.xml index 79ab05a2e484..68f3fae65dbb 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-kk/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-kk/strings.xml @@ -2,13 +2,13 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Арнайы мүмкіндіктер мәзірі"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Арнайы мүмкіндіктер мәзірінде құрылғыны басқаруға арналған үлкейтілген экран мәзірі бар. Ол арқылы құрылғыны құлыптай, дыбыс деңгейі мен түс ашықтығын басқара, скриншот түсіре және т.б. әрекеттерді орындай аласыз."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Арнайы мүмкіндіктер мәзірі – экранда үлкейтіліп берілген мәзір. Ол арқылы құрылғыны құлыптайсыз, дыбыс деңгейі мен түс ашықтығын басқарасыз, скриншот түсіресіз және т.б. әрекеттерді орындай аласыз."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Арнайы мүмкіндіктер параметрлері"</string> <string name="power_label" msgid="7699720321491287839">"Қуат түймесі"</string> <string name="power_utterance" msgid="7444296686402104807">"Қуат түймесінің опциялары"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"Соңғы пайдаланылған қолданбалар"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"Соңғы қолданбалар"</string> <string name="lockscreen_label" msgid="648347953557887087">"Құлып экраны"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Жылдам параметрлер"</string> <string name="notifications_label" msgid="6829741046963013567">"Хабарландырулар"</string> @@ -24,8 +24,8 @@ <string name="accessibility_menu_summary" msgid="340071398148208130">"Құрылғыны үлкейтілген экран мәзірі арқылы басқару"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Арнайы мүмкіндіктер мәзірі параметрлері"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Үлкен түймелер"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"\"Арнайы мүмкіндіктер\" мәзірі түймелерін үлкейту"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Арнайы мүмкіндіктер мәзірінің түймелерін үлкейту"</string> <string name="pref_help_title" msgid="6871558837025010641">"Анықтама"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Жарықтығы: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Музыканың дыбыс қаттылығы: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Музыканың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-kn/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-kn/strings.xml index 40b1f351f6fa..5d1f722aee0c 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-kn/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-kn/strings.xml @@ -9,7 +9,7 @@ <string name="power_label" msgid="7699720321491287839">"ಪವರ್ ಬಟನ್"</string> <string name="power_utterance" msgid="7444296686402104807">"ಪವರ್ ಆಯ್ಕೆಗಳು"</string> <string name="recent_apps_label" msgid="6583276995616385847">"ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string> - <string name="lockscreen_label" msgid="648347953557887087">"ಲಾಕ್ ಪರದೆ"</string> + <string name="lockscreen_label" msgid="648347953557887087">"ಲಾಕ್ ಸ್ಕ್ರೀನ್"</string> <string name="quick_settings_label" msgid="2999117381487601865">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="notifications_label" msgid="6829741046963013567">"ಅಧಿಸೂಚನೆಗಳು"</string> <string name="screenshot_label" msgid="863978141223970162">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string> @@ -26,6 +26,6 @@ <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"ದೊಡ್ಡ ಬಟನ್ಗಳು"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಮೆನು ಬಟನ್ಗಳ ಗಾತ್ರವನ್ನು ಹೆಚ್ಚಿಸಿ"</string> <string name="pref_help_title" msgid="6871558837025010641">"ಸಹಾಯ"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"ಪ್ರಕಾಶಮಾನ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"ಪ್ರಖರತೆ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"ಸಂಗೀತ ವಾಲ್ಯೂಮ್ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ky/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ky/strings.xml index f6711d35ab1f..fa8b587e62c7 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ky/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ky/strings.xml @@ -10,13 +10,13 @@ <string name="power_utterance" msgid="7444296686402104807">"Кубат параметрлери"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Акыркы колдонмолор"</string> <string name="lockscreen_label" msgid="648347953557887087">"Кулпуланган экран"</string> - <string name="quick_settings_label" msgid="2999117381487601865">"Ыкчам жөндөөлөр"</string> + <string name="quick_settings_label" msgid="2999117381487601865">"Ыкчам параметрлер"</string> <string name="notifications_label" msgid="6829741046963013567">"Билдирмелер"</string> <string name="screenshot_label" msgid="863978141223970162">"Скриншот"</string> <string name="screenshot_utterance" msgid="1430760563401895074">"Скриншот тартып алуу"</string> <string name="volume_up_label" msgid="8592766918780362870">"Катуулатуу"</string> <string name="volume_down_label" msgid="8574981863656447346">"Акырындатуу"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"Жарыктыгын көбөйтүү"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"Жарыгыраак"</string> <string name="brightness_down_label" msgid="7115662941913272072">"Күңүртүрөөк"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Мурунку экранга өтүү"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Кийинки экранга өтүү"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-mk/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-mk/strings.xml index 6ed7dfc8c559..d0267597e59e 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-mk/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-mk/strings.xml @@ -16,8 +16,8 @@ <string name="screenshot_utterance" msgid="1430760563401895074">"Направи слика од екранот"</string> <string name="volume_up_label" msgid="8592766918780362870">"Зголеми звук"</string> <string name="volume_down_label" msgid="8574981863656447346">"Намали звук"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"Осветлете"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"Затемнете"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"Осветли"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"Затемни"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Оди на претходниот екран"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Оди на следниот екран"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"„Менито за пристапност“ ви овозможува да го контролирате уредот преку големо мени на екранот. Може да го заклучите уредот, да ги контролирате јачината на звукот и осветленоста, да правите слики од екранот и друго."</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-mn/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-mn/strings.xml index b3575b1cd73e..7b64116ec47b 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-mn/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-mn/strings.xml @@ -5,14 +5,14 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"Хандалтын цэс нь танд төхөөрөмжөө том дэлгэцийн цэсээр хянах боломжийг олгоно. Та төхөөрөмжөө түгжих, дууны түвшин болон гэрэлтүүлгийг хянах, дэлгэцийн агшин авах болон бусад үйлдлийг хийж болно."</string> <string name="assistant_label" msgid="6796392082252272356">"Туслах"</string> <string name="assistant_utterance" msgid="65509599221141377">"Туслах"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Хүртээмжийн тохиргоо"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Хандалтын тохиргоо"</string> <string name="power_label" msgid="7699720321491287839">"Асаах/унтраах"</string> <string name="power_utterance" msgid="7444296686402104807">"Асаах/унтраах сонголт"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Саяхны апп"</string> <string name="lockscreen_label" msgid="648347953557887087">"Түгжигдсэн дэлгэц"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Шуурхай тохиргоо"</string> <string name="notifications_label" msgid="6829741046963013567">"Мэдэгдэл"</string> - <string name="screenshot_label" msgid="863978141223970162">"Дэлгэцний зургийг дарах"</string> + <string name="screenshot_label" msgid="863978141223970162">"Дэлгэцийн агшин"</string> <string name="screenshot_utterance" msgid="1430760563401895074">"Дэлгэцний зургийг дарах"</string> <string name="volume_up_label" msgid="8592766918780362870">"Дууны түвшнийг нэмэх"</string> <string name="volume_down_label" msgid="8574981863656447346">"Дууны түвшнийг багасгах"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-mr/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-mr/strings.xml index cc1193ed6b22..8220749e60ea 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-mr/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-mr/strings.xml @@ -27,5 +27,5 @@ <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"अॅक्सेसिबिलिटी मेनू बटणांचा आकार वाढवा"</string> <string name="pref_help_title" msgid="6871558837025010641">"मदत"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"ब्राइटनेस <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"गाण्याचा व्हॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"संगीताचा व्हॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ms/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ms/strings.xml index 75964c5b3db1..9c1ea75d90f3 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ms/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ms/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menu Kebolehaksesan"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Menu Kebolehcapaian menyediakan menu pada skrin yang besar untuk mengawal peranti anda. Anda boleh mengunci peranti anda, mengawal kelantangan dan kecerahan, mengambil tangkapan skrin dan banyak lagi."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Menu Kebolehaksesan menyediakan menu pada skrin yang besar untuk mengawal peranti anda. Anda boleh mengunci peranti anda, mengawal kelantangan dan kecerahan, mengambil tangkapan skrin dan banyak lagi."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Tetapan Kebolehaksesan"</string> @@ -20,7 +20,7 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Kurangkan kecerahan"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Pergi ke skrin sebelumnya"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Pergi ke skrin seterusnya"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"Menu Kebolehcapaian menyediakan menu pada skrin yang besar untuk mengawal peranti anda. Anda boleh mengunci peranti anda, mengawal kelantangan dan kecerahan, mengambil tangkapan skrin dan pelbagai lagi."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"Menu Kebolehaksesan menyediakan menu pada skrin yang besar untuk mengawal peranti anda. Anda boleh mengunci peranti anda, mengawal kelantangan dan kecerahan, mengambil tangkapan skrin dan pelbagai lagi."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Kawal peranti melalui menu besar"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Tetapan Menu Kebolehaksesan"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Butang besar"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-nb/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-nb/strings.xml index 33e726bc8314..a3e7ab0becd9 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-nb/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-nb/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Tilgjengelighetsmeny"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Med Tilgjengelighet-menyen får du en stor meny på skjermen for å kontrollere enheten. Du kan låse enheten, kontrollere volum og lysstyrke, ta skjermdumper med mer."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Med tilgjengelighetsmenyen får du en stor meny på skjermen for å kontrollere enheten. Du kan låse enheten, kontrollere volum og lysstyrke, ta skjermdumper med mer."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistent"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Tilgjengelighetsinnstillinger"</string> @@ -20,7 +20,7 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Lysstyrke ned"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Gå til forrige skjerm"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Gå til neste skjerm"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"Med Tilgjengelighet-menyen får du en stor meny på skjermen for å kontrollere enheten. Du kan låse enheten, kontrollere volum og lysstyrke, ta skjermdumper med mer."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"Med tilgjengelighetsmenyen får du en stor meny på skjermen for å kontrollere enheten. Du kan låse enheten, kontrollere volum og lysstyrke, ta skjermdumper med mer."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Kontroller enheten med en stor meny"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Innstillinger for Tilgjengelighetsmeny"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Store knapper"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ne/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ne/strings.xml index e77bb33acd12..10e36b872b04 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ne/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ne/strings.xml @@ -5,10 +5,10 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"तपाईं आफ्नो डिभाइस नियन्त्रण गर्न एक्सेसिबिलिटी मेनुमा गई ठुलो अन स्क्रिन मेनु खोल्न सक्नुहुन्छ। तपाईं आफ्नो डिभाइस लक गर्न, भोल्युम र चमक नियन्त्रण गर्न, स्क्रिनसटहरू लिन र थप कार्यहरू गर्न सक्नुहुन्छ।"</string> <string name="assistant_label" msgid="6796392082252272356">"सहायक"</string> <string name="assistant_utterance" msgid="65509599221141377">"सहायक"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"पहुँचसम्बन्धी सेटिङहरू"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"एक्सेसिबिलिटी सेटिङ"</string> <string name="power_label" msgid="7699720321491287839">"पावर बटन"</string> <string name="power_utterance" msgid="7444296686402104807">"पावर बटनका विकल्पहरू"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"हालका एपहरू"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"हालै चलाइएका एप"</string> <string name="lockscreen_label" msgid="648347953557887087">"लक स्क्रिन"</string> <string name="quick_settings_label" msgid="2999117381487601865">"द्रुत सेटिङहरू"</string> <string name="notifications_label" msgid="6829741046963013567">"सूचनाहरू"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-nl/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-nl/strings.xml index 3e42ffce88d3..a8d6a0bc090c 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-nl/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-nl/strings.xml @@ -20,11 +20,11 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Helderheid verlagen"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Ga naar vorig scherm"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Ga naar volgend scherm"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"Het toegankelijkheidsmenu is een groot menu op het scherm waarmee je je apparaat kunt bedienen. Je kunt onder meer je apparaat vergrendelen, het volume en de helderheid beheren en screenshots maken."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"Apparaat bedienen via groot menu"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"Het toegankelijkheidsmenu is een groot menu op het scherm waarmee je je apparaat kunt bedienen. Je kunt onder meer je apparaat vergrendelen, het volume en de helderheid aanpassen en screenshots maken."</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"Bedien apparaat via groot menu"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Instellingen toegankelijkheidsmenu"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Grote knoppen"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Knoppen in het toegankelijkheidsmenu vergroten"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Vergroot knoppen in het toegankelijkheidsmenu"</string> <string name="pref_help_title" msgid="6871558837025010641">"Hulp"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Helderheid <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Muziekvolume <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-or/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-or/strings.xml index 9b42865693c0..ba2259616075 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-or/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-or/strings.xml @@ -12,20 +12,20 @@ <string name="lockscreen_label" msgid="648347953557887087">"ସ୍କ୍ରୀନ୍ ଲକ୍ କରନ୍ତୁ"</string> <string name="quick_settings_label" msgid="2999117381487601865">"କ୍ୱିକ ସେଟିଂସ"</string> <string name="notifications_label" msgid="6829741046963013567">"ବିଜ୍ଞପ୍ତି"</string> - <string name="screenshot_label" msgid="863978141223970162">"ସ୍କ୍ରିନସଟ୍"</string> + <string name="screenshot_label" msgid="863978141223970162">"ସ୍କ୍ରିନସଟ"</string> <string name="screenshot_utterance" msgid="1430760563401895074">"ସ୍କ୍ରୀନଶଟ୍ ନିଅନ୍ତୁ"</string> <string name="volume_up_label" msgid="8592766918780362870">"ଭଲ୍ୟୁମ୍ ବଢ଼ାନ୍ତୁ"</string> <string name="volume_down_label" msgid="8574981863656447346">"ଭଲ୍ୟୁମ୍ କମାନ୍ତୁ"</string> <string name="brightness_up_label" msgid="8010753822854544846">"ଉଜ୍ଜ୍ୱଳତା ବଢ଼ାନ୍ତୁ"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"ଉଜ୍ଜ୍ୱଳତା କମ୍ କରନ୍ତୁ"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"ଉଜ୍ଜ୍ୱଳତା କମ କରନ୍ତୁ"</string> <string name="previous_button_content_description" msgid="840869171117765966">"ପୂର୍ବବର୍ତ୍ତୀ ସ୍କ୍ରିନ୍କୁ ଯାଆନ୍ତୁ"</string> <string name="next_button_content_description" msgid="6810058269847364406">"ପରବର୍ତ୍ତୀ ସ୍କ୍ରିନ୍କୁ ଯାଆନ୍ତୁ"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"ଆପଣଙ୍କ ଡିଭାଇସକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ଆକ୍ସେସିବିଲିଟୀ ମେନୁ ଏକ ବଡ଼ ଅନ-ସ୍କ୍ରିନ ମେନୁ ପ୍ରଦାନ କରେ। ଆପଣ ଆପଣଙ୍କ ଡିଭାଇସକୁ ଲକ କରିପାରିବେ, ଭଲ୍ୟୁମ ଓ ଉଜ୍ଜ୍ୱଳତାକୁ ନିୟନ୍ତ୍ରଣ କରିପାରିବେ, ସ୍କ୍ରିନସଟ ନେଇପାରିବେ ଏବଂ ଆହୁରି ଅନେକ କିଛି କରିପାରିବେ।"</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"ବଡ଼ ମେନୁ ମାଧ୍ୟମରେ ଡିଭାଇସକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"ଆକ୍ସେସିବିଲିଟୀ ମେନୁ ସେଟିଂସ"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"ବଡ଼ ବଟନ୍"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"ଆକ୍ସେସିବିଲିଟୀ ମେନୁ ବଟନ୍ର ଆକାର ବଢ଼ାନ୍ତୁ"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"ଆକ୍ସେସିବିଲିଟୀ ମେନୁ ବଟନର ଆକାର ବଢ଼ାନ୍ତୁ"</string> <string name="pref_help_title" msgid="6871558837025010641">"ସାହାଯ୍ୟ"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"ଉଜ୍ଜ୍ୱଳତା <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"ସଙ୍ଗୀତର ଭଲ୍ୟୁମ୍ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"ମ୍ୟୁଜିକର ଭଲ୍ୟୁମ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rBR/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rBR/strings.xml index caf15635cc53..160d310f5f7d 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rBR/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menu de acessibilidade"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"\"Acessibilidade\" é um grande menu mostrado na tela para controlar seu dispositivo. Você pode bloquear o dispositivo, controlar o volume e o brilho, fazer capturas de tela e muito mais."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"\"Acessibilidade\" é um menu grande mostrado na tela para controlar seu dispositivo. Você pode bloquear o dispositivo, controlar o volume e o brilho, fazer capturas de tela e muito mais."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistente"</string> <string name="assistant_utterance" msgid="65509599221141377">"Google Assistente"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Configurações de acessibilidade"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rPT/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rPT/strings.xml index d272c21dca7a..44aff75d1021 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt-rPT/strings.xml @@ -24,7 +24,7 @@ <string name="accessibility_menu_summary" msgid="340071398148208130">"Controle o dispositivo através do menu grande"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Definições do menu Acessibilidade"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Botões grandes"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumentar o tamanho dos botões do menu de acessibilidade"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Aumentar o tamanho dos botões do menu Acessibilidade"</string> <string name="pref_help_title" msgid="6871558837025010641">"Ajuda"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Brilho: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Volume da música: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt/strings.xml index caf15635cc53..160d310f5f7d 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-pt/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Menu de acessibilidade"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"\"Acessibilidade\" é um grande menu mostrado na tela para controlar seu dispositivo. Você pode bloquear o dispositivo, controlar o volume e o brilho, fazer capturas de tela e muito mais."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"\"Acessibilidade\" é um menu grande mostrado na tela para controlar seu dispositivo. Você pode bloquear o dispositivo, controlar o volume e o brilho, fazer capturas de tela e muito mais."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistente"</string> <string name="assistant_utterance" msgid="65509599221141377">"Google Assistente"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Configurações de acessibilidade"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ru/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ru/strings.xml index d99d57b87832..7614fb5b0db5 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ru/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ru/strings.xml @@ -5,7 +5,7 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"С помощью большого экранного меню специальных возможностей можно блокировать устройство, регулировать громкость звука и яркость экрана, делать скриншоты и выполнять другие действия."</string> <string name="assistant_label" msgid="6796392082252272356">"Ассистент"</string> <string name="assistant_utterance" msgid="65509599221141377">"Ассистент"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Настройки специальных возможностей"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Настройки спец. возможностей"</string> <string name="power_label" msgid="7699720321491287839">"Кнопка питания"</string> <string name="power_utterance" msgid="7444296686402104807">"Настройки кнопки питания"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Недавние приложения"</string> @@ -22,7 +22,7 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Перейти на следующий экран"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"С помощью большого экранного меню специальных возможностей можно блокировать устройство, регулировать громкость звука и яркость экрана, делать скриншоты и выполнять другие действия."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Управление устройством с помощью большого меню"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Настройки меню специальных возможностей"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Настройки меню спец. возможностей"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Увеличить кнопки"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Увеличить размер кнопок в меню специальных возможностей"</string> <string name="pref_help_title" msgid="6871558837025010641">"Справка"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sk/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sk/strings.xml index 6b9ac5c26a1e..c4bf89a4c443 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sk/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sk/strings.xml @@ -2,14 +2,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"Ponuka dostupnosti"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Ponuka dostupnosti spustí na obrazovke telefónu veľkú ponuku, pomocou ktorej môžete ovládať svoje zariadenie. Môžete ho uzamknúť, ovládať hlasitosť a jas, vytvárať snímky obrazovky a mnoho ďalšieho."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Ponukou dostupnosti sa rozumie veľká ponuka na obrazovke, pomocou ktorej môžete ovládať zariadenie. Môžete ho uzamknúť, ovládať hlasitosť a jas, vytvárať snímky obrazovky a mnoho ďalšieho."</string> <string name="assistant_label" msgid="6796392082252272356">"Asistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Asistent"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"Nastavenia dostupnosti"</string> <string name="power_label" msgid="7699720321491287839">"Vypínač"</string> <string name="power_utterance" msgid="7444296686402104807">"Možnosti vypínača"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Nedávne aplikácie"</string> - <string name="lockscreen_label" msgid="648347953557887087">"Uzamknutá obrazovka"</string> + <string name="lockscreen_label" msgid="648347953557887087">"Zamknúť obrazovku"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Rýchle nastavenia"</string> <string name="notifications_label" msgid="6829741046963013567">"Upozornenia"</string> <string name="screenshot_label" msgid="863978141223970162">"Snímka obrazovky"</string> @@ -22,9 +22,9 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Prejsť na ďalšiu obrazovku"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Ponuka dostupnosti spustí na obrazovke telefónu veľkú ponuku, pomocou ktorej môžete ovládať svoje zariadenie. Môžete ho uzamknúť, ovládať hlasitosť a jas, vytvárať snímky obrazovky a mnoho ďalšieho."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Ovládajte zariadenie pomocou veľkej ponuky"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Nastavenia ponuky Dostupnosť"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Nastavenia ponuky dostupnosti"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Veľké tlačidlá"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Zväčšiť tlačidlá ponuky Dostupnosť"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Zväčšiť tlačidlá ponuky dostupnosti"</string> <string name="pref_help_title" msgid="6871558837025010641">"Pomocník"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Jas: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Hlasitosť hudby: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sl/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sl/strings.xml index 8f63972c3846..c4f1b0f1decd 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sl/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sl/strings.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Meni s funkcijami za ljudi s posebnimi potrebami"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Meni s funkcijami za ljudi s posebnimi potrebami je velik zaslonski meni za upravljanje naprave. V njem lahko zaklenete napravo, nastavljate glasnost in svetlost, zajamete posnetke zaslona in drugo."</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Meni za dostopnost"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Meni za dostopnost je velik zaslonski meni za upravljanje naprave. V njem lahko zaklenete napravo, nastavljate glasnost in svetlost, zajamete posnetke zaslona in drugo."</string> <string name="assistant_label" msgid="6796392082252272356">"Pomočnik"</string> <string name="assistant_utterance" msgid="65509599221141377">"Pomočnik"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Nastavitve funkcij za ljudi s posebnimi potrebami"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Nastavitve dostopnosti"</string> <string name="power_label" msgid="7699720321491287839">"Vklop"</string> <string name="power_utterance" msgid="7444296686402104807">"Možnosti gumba za vklop"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Nedavne aplikacije"</string> @@ -20,11 +20,11 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Zmanjšanje svetlosti"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Na prejšnji zaslon"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Na naslednji zaslon"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"Meni s funkcijami za ljudi s posebnimi potrebami je velik zaslonski meni za upravljanje naprave. V njem lahko zaklenete napravo, nastavljate glasnost in svetlost, zajamete posnetke zaslona in drugo."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"Meni za dostopnost je velik zaslonski meni za upravljanje naprave. V njem lahko zaklenete napravo, nastavljate glasnost in svetlost, zajamete posnetke zaslona in drugo."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Upravljanje naprave prek velikega menija"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Nastavitve menija s funkcijami za ljudi s posebnimi potrebami"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Nastavitve menija za dostopnost"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Veliki gumbi"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Povečanje velikosti gumbov menija s funkcijami za ljudi s posebnimi potrebami"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Povečanje velikosti gumbov menija za dostopnost"</string> <string name="pref_help_title" msgid="6871558837025010641">"Pomoč"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Svetlost <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Glasnost glasbe <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sr/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sr/strings.xml index d510915560ba..e27447fccc6e 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sr/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sr/strings.xml @@ -27,5 +27,5 @@ <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Повећајте величину дугмади у менију за приступачност"</string> <string name="pref_help_title" msgid="6871558837025010641">"Помоћ"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Осветљеност: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"Јачина звука музике: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"Јачина музике: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sv/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sv/strings.xml index 24dbc3e00f6d..ef6966707fda 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sv/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sv/strings.xml @@ -5,7 +5,7 @@ <string name="accessibility_menu_intro" msgid="3164193281544042394">"Tillgänglighetsmenyn är en stor meny på skärmen som du kan styra enheten med. Du kan låsa enheten, ställa in volym och ljusstyrka, ta skärmbilder och annat."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistent"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Tillgänglighetsinställningar"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Tillgänglighetsinställningar"</string> <string name="power_label" msgid="7699720321491287839">"Styrka"</string> <string name="power_utterance" msgid="7444296686402104807">"Strömalternativ"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Senaste apparna"</string> @@ -21,7 +21,7 @@ <string name="previous_button_content_description" msgid="840869171117765966">"Tillbaka till föregående skärm"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Fortsätt till nästa skärm"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Tillgänglighetsmenyn är en stor meny på skärmen som du kan styra enheten med. Du kan låsa enheten, ställa in volym och ljusstyrka, ta skärmbilder och annat."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"Styra enheten via en stor meny"</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"Styr enheten via en stor meny"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Inställningar för tillgänglighetsmenyn"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Stora knappar"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Öka knapparnas storlek i tillgänglighetsmenyn"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sw/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sw/strings.xml index 77432db1439a..b8eef85b0d53 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-sw/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-sw/strings.xml @@ -17,7 +17,7 @@ <string name="volume_up_label" msgid="8592766918780362870">"Ongeza sauti"</string> <string name="volume_down_label" msgid="8574981863656447346">"Punguza sauti"</string> <string name="brightness_up_label" msgid="8010753822854544846">"Ongeza ung\'aavu"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"Punguza ung`aavu"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"Punguza ung\'aavu"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Nenda kwenye skrini iliyotangulia"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Nenda kwenye skrini inayofuata"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Menyu ya Ufikivu huonyesha menyu pana iliyo kwenye skrini ili udhibiti kifaa chako. Unaweza kufunga kifaa chako, kudhibiti sauti na ung\'avu, kupiga picha ya skrini na zaidi."</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ta/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ta/strings.xml index b61632dadf14..57bbc52cb1cf 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ta/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ta/strings.xml @@ -14,9 +14,9 @@ <string name="notifications_label" msgid="6829741046963013567">"அறிவிப்புகள்"</string> <string name="screenshot_label" msgid="863978141223970162">"ஸ்கிரீன்ஷாட்"</string> <string name="screenshot_utterance" msgid="1430760563401895074">"ஸ்கிரீன் ஷாட்டை எடுக்கும் பட்டன்"</string> - <string name="volume_up_label" msgid="8592766918780362870">"ஒலியளவை அதிகரிப்பதற்கான பட்டன்"</string> + <string name="volume_up_label" msgid="8592766918780362870">"ஒலியளவை அதிகரிக்கும்"</string> <string name="volume_down_label" msgid="8574981863656447346">"ஒலியளவைக் குறைக்கும்"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"ஒளிர்வை அதிகரிப்பதற்கான பட்டன்"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"ஒளிர்வை அதிகரிக்கும்"</string> <string name="brightness_down_label" msgid="7115662941913272072">"ஒளிர்வைக் குறைக்கும்"</string> <string name="previous_button_content_description" msgid="840869171117765966">"முந்தைய திரைக்குச் செல்வதற்கான பட்டன்"</string> <string name="next_button_content_description" msgid="6810058269847364406">"அடுத்த திரைக்குச் செல்வதற்கான பட்டன்"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-te/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-te/strings.xml index 4633a73b8980..827e6de27c3c 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-te/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-te/strings.xml @@ -2,10 +2,10 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"యాక్సెసిబిలిటీ మెనూ"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"మీ పరికరాన్ని కంట్రోల్ చేయడానికి యాక్సెసిబిలిటీ మెనూ, స్క్రీన్పై పెద్ద మెనూను అందిస్తుంది. మీరు మీ పరికరాన్ని లాక్ చేయవచ్చు, వాల్యూమ్ మరియు ప్రకాశాన్ని కంట్రోల్ చేయవచ్చు, స్క్రీన్షాట్లు తీసుకోవచ్చు, మరిన్ని చేయవచ్చు."</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"మీ పరికరాన్ని కంట్రోల్ చేయడానికి యాక్సెసిబిలిటీ మెనూ, స్క్రీన్పై పెద్ద మెనూను అందిస్తుంది. మీరు మీ పరికరాన్ని లాక్ చేయవచ్చు, వాల్యూమ్ను, బ్రైట్నెస్ను కంట్రోల్ చేయవచ్చు, స్క్రీన్షాట్లు తీసుకోవచ్చు, మరిన్ని చేయవచ్చు."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistant"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistant"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"యాక్సెస్ సామర్థ్య సెట్టింగ్లు"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"యాక్సెసిబిలిటీ సెట్టింగ్లు"</string> <string name="power_label" msgid="7699720321491287839">"పవర్"</string> <string name="power_utterance" msgid="7444296686402104807">"పవర్ ఎంపికలు"</string> <string name="recent_apps_label" msgid="6583276995616385847">"ఇటీవలి యాప్లు"</string> @@ -14,18 +14,18 @@ <string name="notifications_label" msgid="6829741046963013567">"నోటిఫికేషన్లు"</string> <string name="screenshot_label" msgid="863978141223970162">"స్క్రీన్షాట్"</string> <string name="screenshot_utterance" msgid="1430760563401895074">"స్క్రీన్షాట్ని తీయండి"</string> - <string name="volume_up_label" msgid="8592766918780362870">"వాల్యూమ్ పెంచు"</string> - <string name="volume_down_label" msgid="8574981863656447346">"వాల్యూమ్ తగ్గించు"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"ప్రకాశాన్ని పెంచుతుంది"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"ప్రకాశాన్ని తగ్గిస్తుంది"</string> + <string name="volume_up_label" msgid="8592766918780362870">"వాల్యూమ్ పెంచండి"</string> + <string name="volume_down_label" msgid="8574981863656447346">"వాల్యూమ్ తగ్గించండి"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"బ్రైట్నెస్ను పెంచండి"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"బ్రైట్నెస్ను తగ్గించండి"</string> <string name="previous_button_content_description" msgid="840869171117765966">"మునుపటి స్క్రీన్కు వెళ్లండి"</string> <string name="next_button_content_description" msgid="6810058269847364406">"తదుపరి స్క్రీన్కు వెళ్లండి"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"మీ పరికరాన్ని నియంత్రించడానికి యాక్సెసిబిలిటీ మెనూ, స్క్రీన్పై పెద్ద మెనూను అందిస్తుంది. మీరు మీ పరికరాన్ని లాక్ చేయవచ్చు, వాల్యూమ్ మరియు ప్రకాశాన్ని నియంత్రించవచ్చు, స్క్రీన్షాట్లు తీసుకోవచ్చు, మరిన్ని చేయవచ్చు."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"పెద్ద మెనూ ద్వారా పరికరాన్ని నియంత్రించండి"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"మీ పరికరాన్ని కంట్రోల్ చేయడానికి యాక్సెసిబిలిటీ మెనూ, స్క్రీన్పై పెద్ద మెనూను అందిస్తుంది. మీరు మీ పరికరాన్ని లాక్ చేయవచ్చు, వాల్యూమ్ను, బ్రైట్నెస్ను కంట్రోల్ చేయవచ్చు, స్క్రీన్షాట్లు తీసుకోవచ్చు, మరిన్ని చేయవచ్చు."</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"పెద్ద మెనూ ద్వారా పరికరాన్ని కంట్రోల్ చేయండి"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"యాక్సెసిబిలిటీ మెనూ సెట్టింగ్లు"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"పెద్ద బటన్లు"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"యాక్సెసిబిలిటీ మెనూ బటన్ల సైజ్ పెంచుతుంది"</string> <string name="pref_help_title" msgid="6871558837025010641">"సహాయం"</string> - <string name="brightness_percentage_label" msgid="7391554573977867369">"ప్రకాశం <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> - <string name="music_volume_percentage_label" msgid="398635599662604706">"సంగీతం వాల్యూమ్ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="brightness_percentage_label" msgid="7391554573977867369">"బ్రైట్నెస్ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> + <string name="music_volume_percentage_label" msgid="398635599662604706">"మ్యూజిక్ వాల్యూమ్ <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> </resources> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-tr/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-tr/strings.xml index a648e6b60e5f..38cc39505e86 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-tr/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-tr/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Erişilebilirlik Menüsü"</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Erişilebilirlik menüsü"</string> <string name="accessibility_menu_intro" msgid="3164193281544042394">"Erişilebilirlik menüsü, cihazınızı kontrol etmeniz için geniş bir ekran menüsü sağlar. Cihazınızı kilitleyebilir, ses düzeyini ve parlaklığı kontrol edebilir, ekran görüntüsü alabilir ve daha fazlasını yapabilirsiniz."</string> <string name="assistant_label" msgid="6796392082252272356">"Asistan"</string> <string name="assistant_utterance" msgid="65509599221141377">"Asistan"</string> @@ -24,7 +24,7 @@ <string name="accessibility_menu_summary" msgid="340071398148208130">"Cihazı geniş menüyle kontrol edin"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Erişilebilirlik Menüsü Ayarları"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Büyük düğmeler"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Erişilebilirlik Menüsündeki Düğmelerin boyutunu artır"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Erişilebilirlik menüsündeki düğmelerin boyutunu artır"</string> <string name="pref_help_title" msgid="6871558837025010641">"Yardım"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Parlaklık %%<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Müzik ses düzeyi %%<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml index a9d589b672b2..ee02b4a0e33a 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Меню спеціальних можливостей"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"За допомогою великого екранного меню спеціальних можливостей можна заблокувати пристрій, змінювати гучність і яскравість, робити знімки екрана та багато іншого."</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Меню функцій доступності"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"За допомогою великого екранного меню функцій доступності можна блокувати пристрій, змінювати гучність і яскравість, робити знімки екрана й багато іншого."</string> <string name="assistant_label" msgid="6796392082252272356">"Асистент"</string> <string name="assistant_utterance" msgid="65509599221141377">"Асистент"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Налаштування спеціальніх можливостей"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Налаштування функцій доступності"</string> <string name="power_label" msgid="7699720321491287839">"Живлення"</string> <string name="power_utterance" msgid="7444296686402104807">"Опції живлення"</string> <string name="recent_apps_label" msgid="6583276995616385847">"Нещодавні додатки"</string> - <string name="lockscreen_label" msgid="648347953557887087">"Заблокований екран"</string> + <string name="lockscreen_label" msgid="648347953557887087">"Блокування екрана"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Швидкі налаштування"</string> <string name="notifications_label" msgid="6829741046963013567">"Сповіщення"</string> <string name="screenshot_label" msgid="863978141223970162">"Знімок екрана"</string> @@ -20,11 +20,11 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Зменшити яскравість"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Перейти на попередній екран"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Перейти на наступний екран"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"За допомогою великого екранного меню спеціальних можливостей можна заблокувати пристрій, змінювати гучність і яскравість, робити знімки екрана та багато іншого."</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"За допомогою великого екранного меню функцій доступності можна блокувати пристрій, змінювати гучність і яскравість, робити знімки екрана й багато іншого."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Керування пристроєм за допомогою великого меню"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Налаштування \"Меню спеціальних можливостей\""</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Налаштування меню функцій доступності"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Великі кнопки"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Збільшити розмір кнопок меню спеціальних можливостей"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Збільшити розмір кнопок у меню функцій доступності"</string> <string name="pref_help_title" msgid="6871558837025010641">"Довідка"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Яскравість: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Гучність музики: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ur/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ur/strings.xml index c93286082542..620163ef249d 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-ur/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-ur/strings.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"ایکسیسبیلٹی مینو"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"اپنے آلے کو کنٹرول کرنے کے لیے ایکسیسبیلٹی مینو ایک بڑا آن اسکرین مینو فراہم کرتا ہے۔ آپ اپنا آلہ مقفل، والیوم اور چمک کو کنٹرول، اسکرین شاٹ لینے کے ساتھ اور مزید بہت کچھ کر سکتے ہیں۔"</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"ایکسیسبیلٹی مینیو"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"اپنے آلے کو کنٹرول کرنے کے لیے ایکسیسبیلٹی مینیو ایک بڑا آن اسکرین مینیو فراہم کرتا ہے۔ آپ اپنا آلہ مقفل، والیوم اور چمک کو کنٹرول، اسکرین شاٹ لینے کے ساتھ اور مزید بہت کچھ کر سکتے ہیں۔"</string> <string name="assistant_label" msgid="6796392082252272356">"اسسٹنٹ"</string> <string name="assistant_utterance" msgid="65509599221141377">"اسسٹنٹ"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"ایکسیسبیلٹی ترتیبات"</string> @@ -20,11 +20,11 @@ <string name="brightness_down_label" msgid="7115662941913272072">"چمک کم کرنے کا بٹن"</string> <string name="previous_button_content_description" msgid="840869171117765966">"پچھلی اسکرین پر جائیں"</string> <string name="next_button_content_description" msgid="6810058269847364406">"اگلی اسکرین پر جائیں"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"اپنے آلے کو کنٹرول کرنے کے لیے ایکسیسبیلٹی مینو ایک بڑا آن اسکرین مینو فراہم کرتا ہے۔ آپ اپنا آلہ مقفل، والیوم اور چمک کو کنٹرول، اسکرین شاٹ لینے کے ساتھ اور مزید بہت کچھ کر سکتے ہیں۔"</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"بڑے مینو کے ذریعے آلہ کنٹرول کریں"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"ایکسیسبیلٹی مینو کی ترتیبات"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"اپنے آلے کو کنٹرول کرنے کے لیے ایکسیسبیلٹی مینیو ایک بڑا آن اسکرین مینیو فراہم کرتا ہے۔ آپ اپنا آلہ مقفل، والیوم اور چمک کو کنٹرول، اسکرین شاٹ لینے کے ساتھ اور مزید بہت کچھ کر سکتے ہیں۔"</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"بڑے مینیو کے ذریعے آلہ کنٹرول کریں"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"ایکسیسبیلٹی مینیو کی ترتیبات"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"بڑے بٹنز"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"ایکسیسبیلٹی مینو بٹنز کا سائز بڑھائیں"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"ایکسیسبیلٹی مینیو بٹنز کا سائز بڑھائیں"</string> <string name="pref_help_title" msgid="6871558837025010641">"مدد"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"چمک %% <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"موسیقی کا والیوم %% <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-uz/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-uz/strings.xml index fa251b86ea7c..b10c953ddbb8 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-uz/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-uz/strings.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_menu_service_name" msgid="730136711554740131">"Maxsus imkoniyatlar menyusi"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"Maxsus imkoniyatlar menyusi telefoningizni boshqarish uchun katta menyuni taqdim etadi. Bu menyu orqali telefonni qulflash, ovoz balandligi va yorqinlikni boshqarish, skrinshotlar olish kabi amallarni bajarish mumkin."</string> + <string name="accessibility_menu_service_name" msgid="730136711554740131">"Qulayliklar menyusi"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"Qulayliklar menyusi telefoningizni boshqarish uchun katta menyuni taqdim etadi. Bu menyu orqali telefonni qulflash, ovoz balandligi va yorqinlikni boshqarish, skrinshotlar olish kabi amallarni bajarish mumkin."</string> <string name="assistant_label" msgid="6796392082252272356">"Assistent"</string> <string name="assistant_utterance" msgid="65509599221141377">"Assistent"</string> - <string name="a11y_settings_label" msgid="3977714687248445050">"Maxsus imkoniyatlar sozlamalari"</string> + <string name="a11y_settings_label" msgid="3977714687248445050">"Qulayliklar sozlamalari"</string> <string name="power_label" msgid="7699720321491287839">"Quvvat"</string> <string name="power_utterance" msgid="7444296686402104807">"Quvvat parametrlari"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"Yaqinda ishlatilgan ilovalar"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"Oxirgi ilovalar"</string> <string name="lockscreen_label" msgid="648347953557887087">"Ekran qulfi"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Tezkor sozlamalar"</string> <string name="notifications_label" msgid="6829741046963013567">"Bildirishnomalar"</string> @@ -20,11 +20,11 @@ <string name="brightness_down_label" msgid="7115662941913272072">"Yorqinlikni pasaytirish"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Avvalgi ekranni ochish"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Keyingi ekranni ochish"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"Maxsus imkoniyatlar menyusi telefoningizni boshqarish uchun katta menyuni taqdim etadi. Bu menyu orqali telefonni qulflash, ovoz balandligi va yorqinlikni boshqarish, skrinshotlar olish kabi amallarni bajarish mumkin."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"Katta menyu orqali qurilmani boshqarish"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Maxsus imkoniyatlar menyusi sozlamalari"</string> - <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Katta tugmalar"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Maxsus imkoniyatlar menyusi tugmalarini kattalashtirish"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"Qulayliklar menyusi telefoningizni boshqarish uchun katta menyuni taqdim etadi. Bu menyu orqali telefonni qulflash, ovoz balandligi va yorqinlikni boshqarish, skrinshotlar olish kabi amallarni bajarish mumkin."</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"Qurilmani yirik menyu orqali boshqarish"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Qulayliklar menyusi sozlamalari"</string> + <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Yirik tugmalar"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Qulayliklar menyusi tugmalarini kattalashtirish"</string> <string name="pref_help_title" msgid="6871558837025010641">"Yordam"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Yorqinlik: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Musiqa tovushi balandligi: <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-vi/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-vi/strings.xml index ee4dd2507f66..f01122620859 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-vi/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-vi/strings.xml @@ -22,9 +22,9 @@ <string name="next_button_content_description" msgid="6810058269847364406">"Chuyển đến màn hình tiếp theo"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Trình đơn hỗ trợ tiếp cận cung cấp một trình đơn lớn trên màn hình dùng để điều khiển thiết bị. Bạn có thể khóa thiết bị, điều chỉnh âm lượng và độ sáng, chụp ảnh màn hình và thực hiện nhiều chức năng khác."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Điều khiển thiết bị qua trình đơn lớn"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Cài đặt Trình đơn Hỗ trợ tiếp cận"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Cài đặt Trình đơn hỗ trợ tiếp cận"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Nút lớn"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Tăng kích thước của các nút trong Trình đơn Hỗ trợ tiếp cận"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Tăng kích thước của các nút trong Trình đơn hỗ trợ tiếp cận"</string> <string name="pref_help_title" msgid="6871558837025010641">"Trợ giúp"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"Độ sáng <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"Âm lượng nhạc <xliff:g id="PERCENTAGE">%1$s</xliff:g> %%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rCN/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rCN/strings.xml index 425c8e56bf81..c896c770ff83 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rCN/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="accessibility_menu_service_name" msgid="730136711554740131">"无障碍功能菜单"</string> - <string name="accessibility_menu_intro" msgid="3164193281544042394">"无障碍功能菜单可在屏幕上提供一个大号的菜单，供您控制设备，比如锁定设备、控制音量和亮度、截取屏幕快照等。"</string> + <string name="accessibility_menu_intro" msgid="3164193281544042394">"无障碍功能菜单是一个放大的菜单，方便您通过屏幕控制设备，完成锁屏、控制音量和亮度、截图等操作。"</string> <string name="assistant_label" msgid="6796392082252272356">"Google 助理"</string> <string name="assistant_utterance" msgid="65509599221141377">"Google 助理"</string> <string name="a11y_settings_label" msgid="3977714687248445050">"无障碍设置"</string> @@ -20,11 +20,11 @@ <string name="brightness_down_label" msgid="7115662941913272072">"调低亮度"</string> <string name="previous_button_content_description" msgid="840869171117765966">"转到上一个屏幕"</string> <string name="next_button_content_description" msgid="6810058269847364406">"转到下一个屏幕"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"无障碍功能菜单可在屏幕上提供一个大号的菜单，供您控制设备，比如锁定设备、控制音量和亮度、截取屏幕快照等。"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"无障碍功能菜单是一个放大的菜单，方便您通过屏幕控制设备，完成锁屏、控制音量和亮度、截图等操作。"</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"使用大菜单控制设备"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"无障碍功能菜单设置"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"大按钮"</string> - <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"增大无障碍功能菜单按钮的大小"</string> + <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"放大无障碍功能菜单按钮"</string> <string name="pref_help_title" msgid="6871558837025010641">"帮助"</string> <string name="brightness_percentage_label" msgid="7391554573977867369">"亮度：<xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> <string name="music_volume_percentage_label" msgid="398635599662604706">"音乐音量：<xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rHK/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rHK/strings.xml index 08d26b52fa04..9f4033cb0bf1 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rHK/strings.xml @@ -20,7 +20,7 @@ <string name="brightness_down_label" msgid="7115662941913272072">"調暗亮度"</string> <string name="previous_button_content_description" msgid="840869171117765966">"前往上一個畫面"</string> <string name="next_button_content_description" msgid="6810058269847364406">"前往下一個畫面"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"「無障礙功能選單」是螢幕上的大型選單，用來控制裝置，方便您鎖定裝置、控制音量和亮度、擷取螢幕畫面及執行其他功能。"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"「無障礙功能選單」是螢幕上的大型選單，用來控制裝置，方便您鎖定裝置、控制音量和亮度、擷取螢幕截圖及執行其他功能。"</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"透過大型選單控制裝置"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"無障礙功能選單設定"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"大按鈕"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rTW/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rTW/strings.xml index 65e90b220f11..40c961c59b1b 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rTW/strings.xml @@ -20,7 +20,7 @@ <string name="brightness_down_label" msgid="7115662941913272072">"調低亮度"</string> <string name="previous_button_content_description" msgid="840869171117765966">"返回上一個畫面"</string> <string name="next_button_content_description" msgid="6810058269847364406">"前往下一個畫面"</string> - <string name="accessibility_menu_description" msgid="4458354794093858297">"無障礙工具選單是螢幕上的大型選單，可用來操控裝置，方便你鎖定裝置、控制音量和亮度、擷取螢幕畫面，以及執行其他功能。"</string> + <string name="accessibility_menu_description" msgid="4458354794093858297">"無障礙選單是一種顯示在螢幕上的大型選單，可用來操控裝置的各項功能，方便你鎖定裝置、調整音量和亮度、擷取螢幕畫面，以及執行其他功能。"</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"透過大型選單操控裝置"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"無障礙選單設定"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"大型按鈕"</string> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zu/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zu/strings.xml index b6f3ef9bce4a..2b92ab1311f0 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-zu/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-zu/strings.xml @@ -8,7 +8,7 @@ <string name="a11y_settings_label" msgid="3977714687248445050">"Izilungiselelo zokufinyelela"</string> <string name="power_label" msgid="7699720321491287839">"Amandla"</string> <string name="power_utterance" msgid="7444296686402104807">"Izinketho zamandla"</string> - <string name="recent_apps_label" msgid="6583276995616385847">"Izinhlelo zokusebenza zakamuva"</string> + <string name="recent_apps_label" msgid="6583276995616385847">"Ama-app akamuva"</string> <string name="lockscreen_label" msgid="648347953557887087">"Khiya isikrini"</string> <string name="quick_settings_label" msgid="2999117381487601865">"Izilungiselelo ezisheshayo"</string> <string name="notifications_label" msgid="6829741046963013567">"Izaziso"</string> @@ -16,13 +16,13 @@ <string name="screenshot_utterance" msgid="1430760563401895074">"Thatha isithombe-skrini"</string> <string name="volume_up_label" msgid="8592766918780362870">"Ivolumu phezulu"</string> <string name="volume_down_label" msgid="8574981863656447346">"Ivolumu iphansi"</string> - <string name="brightness_up_label" msgid="8010753822854544846">"Ukukhanya kuphezulu"</string> - <string name="brightness_down_label" msgid="7115662941913272072">"Ukukhanya kuphansi"</string> + <string name="brightness_up_label" msgid="8010753822854544846">"Ukukhanya kunyukile"</string> + <string name="brightness_down_label" msgid="7115662941913272072">"Ukukhanya kwehlile"</string> <string name="previous_button_content_description" msgid="840869171117765966">"Hamba kusikrini sangaphambilini"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Iya kusikrini esilandelayo"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"Imenyu yokufinyelela inikezela ngemenyu enkulu esesikrinini ukuze ulawule idivayisi yakho. Ungakhiya idivayisi yakho, ulawule ivolumu nokukhanya, uthathe izithombe-skrini, nokuningi."</string> <string name="accessibility_menu_summary" msgid="340071398148208130">"Lawula idivayisi ngemenyu enkulu"</string> - <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Izilungiselelo zemenyu yokufinyelela"</string> + <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Amasethingi Emenyu Yokufinyeleleka"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Izinkinobho ezinkulu"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Khulisa usayizi wezinkinobho zemenyu yokufinyelela"</string> <string name="pref_help_title" msgid="6871558837025010641">"Usizo"</string> diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt index 4df7a44d3e1d..3ec3b5c3f758 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt @@ -25,8 +25,10 @@ import android.widget.FrameLayout import androidx.annotation.VisibleForTesting import com.android.systemui.customization.R import com.android.systemui.plugins.ClockAnimations +import com.android.systemui.plugins.ClockConfig import com.android.systemui.plugins.ClockController import com.android.systemui.plugins.ClockEvents +import com.android.systemui.plugins.ClockFaceConfig import com.android.systemui.plugins.ClockFaceController import com.android.systemui.plugins.ClockFaceEvents import com.android.systemui.plugins.ClockSettings @@ -63,6 +65,8 @@ class DefaultClockController( override lateinit var animations: DefaultClockAnimations private set + override val config = ClockConfig(hasCustomPositionUpdatedAnimation = true) + init { val parent = FrameLayout(ctx) smallClock = @@ -103,6 +107,8 @@ class DefaultClockController( private var isRegionDark = false protected var targetRegion: Rect? = null + override val config = ClockFaceConfig() + override var logBuffer: LogBuffer? get() = view.logBuffer set(value) { @@ -254,9 +260,6 @@ class DefaultClockController( override fun onPositionUpdated(fromRect: Rect, toRect: Rect, fraction: Float) { largeClock.moveForSplitShade(fromRect, toRect, fraction) } - - override val hasCustomPositionUpdatedAnimation: Boolean - get() = true } class AnimationState( diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt index c279053e6daf..322fc774e805 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt @@ -63,6 +63,9 @@ interface ClockController { /** A large version of the clock, appropriate when a bigger viewport is available */ val largeClock: ClockFaceController + /** Determines the way the hosting app should behave when rendering either clock face */ + val config: ClockConfig + /** Events that clocks may need to respond to */ val events: ClockEvents @@ -91,6 +94,9 @@ interface ClockFaceController { /** View that renders the clock face */ val view: View + /** Determines the way the hosting app should behave when rendering this clock face */ + val config: ClockFaceConfig + /** Events specific to this clock face */ val events: ClockFaceEvents @@ -109,9 +115,6 @@ interface ClockEvents { /** Call whenever the locale changes */ fun onLocaleChanged(locale: Locale) {} - val isReactiveToTone - get() = true - /** Call whenever the color palette should update */ fun onColorPaletteChanged(resources: Resources) {} @@ -144,14 +147,6 @@ interface ClockAnimations { * 0.0 -> clock is scaled down in the shade; previewRatio is previewSize / screenSize */ fun onPickerCarouselSwiping(swipingFraction: Float, previewRatio: Float) {} - - /** - * Whether this clock has a custom position update animation. If true, the keyguard will call - * `onPositionUpdated` to notify the clock of a position update animation. If false, a default - * animation will be used (e.g. a simple translation). - */ - val hasCustomPositionUpdatedAnimation - get() = false } /** Events that have specific data about the related face */ @@ -159,14 +154,6 @@ interface ClockFaceEvents { /** Call every time tick */ fun onTimeTick() {} - /** Expected interval between calls to onTimeTick. Can always reduce to PER_MINUTE in AOD. */ - val tickRate: ClockTickRate - get() = ClockTickRate.PER_MINUTE - - /** Call to check whether the clock consumes weather data */ - val hasCustomWeatherDataDisplay: Boolean - get() = false - /** * Region Darkness specific to the clock face. * - isRegionDark = dark theme -> clock should be light @@ -203,6 +190,28 @@ data class ClockMetadata( val name: String, ) +/** Render configuration for the full clock. Modifies the way systemUI behaves with this clock. */ +data class ClockConfig( + /** + * Whether this clock has a custom position update animation. If true, the keyguard will call + * `onPositionUpdated` to notify the clock of a position update animation. If false, a default + * animation will be used (e.g. a simple translation). + */ + val hasCustomPositionUpdatedAnimation: Boolean = false, + + /** True if the clock will react to tone changes in the seed color. */ + val isReactiveToTone: Boolean = true, +) + +/** Render configuration options for a clock face. Modifies the way SystemUI behaves. */ +data class ClockFaceConfig( + /** Expected interval between calls to onTimeTick. Can always reduce to PER_MINUTE in AOD. */ + val tickRate: ClockTickRate = ClockTickRate.PER_MINUTE, + + /** Call to check whether the clock consumes weather data */ + val hasCustomWeatherDataDisplay: Boolean = false, +) + /** Structure for keeping clock-specific settings */ @Keep data class ClockSettings( diff --git a/packages/SystemUI/res-keyguard/drawable/ic_palette.xml b/packages/SystemUI/res-keyguard/drawable/ic_palette.xml new file mode 100644 index 000000000000..cbea369c0236 --- /dev/null +++ b/packages/SystemUI/res-keyguard/drawable/ic_palette.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:fillColor="@android:color/white" + android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,395 112,322Q144,249 199.5,195Q255,141 329.5,110.5Q404,80 489,80Q568,80 639,106.5Q710,133 763.5,180Q817,227 848.5,291.5Q880,356 880,433Q880,541 817,603.5Q754,666 650,666L575,666Q557,666 544,680Q531,694 531,711Q531,738 545.5,757Q560,776 560,801Q560,839 539,859.5Q518,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM247,506Q267,506 282,491Q297,476 297,456Q297,436 282,421Q267,406 247,406Q227,406 212,421Q197,436 197,456Q197,476 212,491Q227,506 247,506ZM373,336Q393,336 408,321Q423,306 423,286Q423,266 408,251Q393,236 373,236Q353,236 338,251Q323,266 323,286Q323,306 338,321Q353,336 373,336ZM587,336Q607,336 622,321Q637,306 637,286Q637,266 622,251Q607,236 587,236Q567,236 552,251Q537,266 537,286Q537,306 552,321Q567,336 587,336ZM718,506Q738,506 753,491Q768,476 768,456Q768,436 753,421Q738,406 718,406Q698,406 683,421Q668,436 668,456Q668,476 683,491Q698,506 718,506ZM480,820Q491,820 495.5,815.5Q500,811 500,801Q500,787 485.5,775Q471,763 471,722Q471,676 501,641Q531,606 577,606L650,606Q726,606 773,561.5Q820,517 820,433Q820,301 720,220.5Q620,140 489,140Q343,140 241.5,238.5Q140,337 140,480Q140,621 239.5,720.5Q339,820 480,820Z"/> +</vector> diff --git a/packages/SystemUI/res-keyguard/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml index 9c8907ffd2a9..526b654c2522 100644 --- a/packages/SystemUI/res-keyguard/values-af/strings.xml +++ b/packages/SystemUI/res-keyguard/values-af/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Voer jou PIN in"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Voer jou patroon in"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Voer jou wagwoord in"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ongeldige kaart."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Gelaai"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laai tans draadloos"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Die e-SIM kan weens \'n fout nie gedeaktiveer word nie."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Verkeerde patroon"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Verkeerde wagwoord"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Verkeerde PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Probeer weer oor # sekonde.}other{Probeer weer oor # sekondes.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Voer SIM se PIN in."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Voer SIM se PIN vir \"<xliff:g id="CARRIER">%1$s</xliff:g>\" in."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM-PUK-bewerking het misluk!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Wissel invoermetode"</string> <string name="airplane_mode" msgid="2528005343938497866">"Vliegtuigmodus"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Patroon word vereis nadat toestel herbegin het"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN word vereis nadat toestel herbegin het"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Wagwoord word vereis nadat toestel herbegin het"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Gebruik eerder ’n patroon vir bykomende sekuriteit"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Gebruik eerder ’n PIN vir bykomende sekuriteit"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Gebruik eerder ’n wagwoord vir bykomende sekuriteit"</string> diff --git a/packages/SystemUI/res-keyguard/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml index 4129f0759054..ae7e1f98a41b 100644 --- a/packages/SystemUI/res-keyguard/values-am/strings.xml +++ b/packages/SystemUI/res-keyguard/values-am/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"የእርስዎን ፒን ያስገቡ"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ሥርዓተ-ጥለትዎን ያስገቡ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ይለፍ ቃልዎን ያስገቡ"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ልክ ያልሆነ ካርድ።"</string> <string name="keyguard_charged" msgid="5478247181205188995">"ባትሪ ሞልቷል"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • በገመድ አልባ ኃይል በመሙላት ላይ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"በአንድ ስህተት ምክንያት eSIM ሊሰናከል አልቻለም።"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"አስገባ"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"የተሳሳተ ሥርዓተ ጥለት"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"የተሳሳተ የይለፍ ቃል"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"የተሳሳተ ፒን"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{በ# ሰከንድ ውስጥ እንደገና ይሞክሩ።}one{በ# ሰከንድ ውስጥ እንደገና ይሞክሩ።}other{በ# ሰከንዶች ውስጥ እንደገና ይሞክሩ።}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"የሲም ፒን ያስገቡ።"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"የ«<xliff:g id="CARRIER">%1$s</xliff:g>» ሲም ፒን ያስገቡ።"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"የሲም PUK ክወና አልተሳካም!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"የግቤት ስልት ቀይር"</string> <string name="airplane_mode" msgid="2528005343938497866">"የአውሮፕላን ሁነታ"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"መሣሪያ ዳግም ከጀመረ በኋላ ሥርዓተ ጥለት ያስፈልጋል"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"መሣሪያ ዳግም ከተነሳ በኋላ ፒን ያስፈልጋል"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"መሣሪያ ዳግም ከጀመረ በኋላ የይለፍ ቃል ያስፈልጋል"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ለተጨማሪ ደህንነት በምትኩ ስርዓተ ጥለት ይጠቀሙ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ለተጨማሪ ደህንነት በምትኩ ፒን ይጠቀሙ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ለተጨማሪ ደህንነት በምትኩ የይለፍ ቃል ይጠቀሙ"</string> diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml index b340d568ba76..7720357d3b35 100644 --- a/packages/SystemUI/res-keyguard/values-ar/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"أدخل رقم التعريف الشخصي (PIN)"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"أدخل النقش"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"أدخل كلمة المرور"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"بطاقة غير صالحة."</string> <string name="keyguard_charged" msgid="5478247181205188995">"تم الشحن"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • جارٍ الشحن لاسلكيًا"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"يتعذّر إيقاف eSIM بسبب خطأ."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"النقش غير صحيح."</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"كلمة مرور غير صحيحة"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"رقم تعريف شخصي خاطئ"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{أعِد المحاولة خلال ثانية واحدة.}zero{أعِد المحاولة خلال # ثانية.}two{أعِد المحاولة خلال ثانيتين.}few{أعِد المحاولة خلال # ثوانٍ.}many{أعِد المحاولة خلال # ثانية.}other{أعِد المحاولة خلال # ثانية.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"أدخل رقم التعريف الشخصي لشريحة SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"أدخل رقم التعريف الشخصي لشريحة SIM التابعة للمشغّل \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"تعذّر إتمام عملية PUK لشريحة SIM"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"تبديل أسلوب الإدخال"</string> <string name="airplane_mode" msgid="2528005343938497866">"وضع الطيران"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"يجب رسم النقش بعد إعادة تشغيل الجهاز"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"يجب إدخال رقم التعريف الشخصي بعد إعادة تشغيل الجهاز"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"يجب إدخال كلمة المرور بعد إعادة تشغيل الجهاز"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"لمزيد من الأمان، استخدِم النقش بدلاً من ذلك."</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"لمزيد من الأمان، أدخِل رقم التعريف الشخصي بدلاً من ذلك."</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"لمزيد من الأمان، أدخِل كلمة المرور بدلاً من ذلك."</string> diff --git a/packages/SystemUI/res-keyguard/values-as/strings.xml b/packages/SystemUI/res-keyguard/values-as/strings.xml index cb446b9b2777..4991d62975f9 100644 --- a/packages/SystemUI/res-keyguard/values-as/strings.xml +++ b/packages/SystemUI/res-keyguard/values-as/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"আপোনাৰ পিন দিয়ক"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"আপোনাৰ আৰ্হি দিয়ক"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"আপোনাৰ পাছৱর্ড দিয়ক"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ব্যৱহাৰৰ অযোগ্য ছিম কাৰ্ড"</string> <string name="keyguard_charged" msgid="5478247181205188995">"চ্চার্জ কৰা হ’ল"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • বেতাঁৰৰ জৰিয়তে চাৰ্জ কৰি থকা হৈছে"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"এটা আসোঁৱাহৰ কাৰণে ই-ছিম অক্ষম কৰিব পৰা নাযায়।"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"এণ্টাৰ বুটাম"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ভুল আৰ্হি"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ভুল পাছৱৰ্ড"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ভুল পিন"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{১ ছেকেণ্ডত আকৌ চেষ্টা কৰক।}one{# ছেকেণ্ডৰ পাছত আকৌ চেষ্টা কৰক।}other{# ছেকেণ্ডৰ পাছত আকৌ চেষ্টা কৰক।}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"ছিমৰ পিন দিয়ক।"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\"ৰ ছিমৰ পিন দিয়ক।"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"ছিম PUKৰ জৰিয়তে আনলক কৰিব পৰা নগ\'ল!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ইনপুট পদ্ধতি সলনি কৰক"</string> <string name="airplane_mode" msgid="2528005343938497866">"এয়াৰপ্লে’ন ম’ড"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পাছত আৰ্হি দিয়াটো বাধ্যতামূলক"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পাছত পিন দিয়াটো বাধ্যতামূলক"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পাছত পাছৱৰ্ড দিয়াটো বাধ্যতামূলক"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"অতিৰিক্ত সুৰক্ষাৰ বাবে, ইয়াৰ পৰিৱৰ্তে আৰ্হি ব্যৱহাৰ কৰক"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"অতিৰিক্ত সুৰক্ষাৰ বাবে, ইয়াৰ পৰিৱৰ্তে পিন ব্যৱহাৰ কৰক"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"অতিৰিক্ত সুৰক্ষাৰ বাবে, ইয়াৰ পৰিৱৰ্তে পাছৱৰ্ড ব্যৱহাৰ কৰক"</string> diff --git a/packages/SystemUI/res-keyguard/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml index 43391690b278..6861f6a801ef 100644 --- a/packages/SystemUI/res-keyguard/values-az/strings.xml +++ b/packages/SystemUI/res-keyguard/values-az/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN kodu daxil edin"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Modeli daxil edin"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Şifrənizi daxil edin"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Yanlış Kart."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Enerji yığılıb"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Simsiz şəkildə batareya yığır"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM xəta səbəbi ilə deaktiv edilmədi."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Daxil edin"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Yanlış model"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Yanlış parol"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Yanlış PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# saniyə sonra yenidən cəhd edin.}other{# saniyə sonra yenidən cəhd edin.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN\'ni daxil edin."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" üçün SIM PIN\'ni daxil edin."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK əməliyyatı alınmadı!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Daxiletmə metoduna keçin"</string> <string name="airplane_mode" msgid="2528005343938497866">"Təyyarə rejimi"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Cihaz yenidən başladıqdan sonra model tələb olunur"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Cihaz yeniden başladıqdan sonra PIN tələb olunur"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Cihaz yeniden başladıqdan sonra parol tələb olunur"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Əlavə təhlükəsizlik üçün modeldən istifadə edin"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Əlavə təhlükəsizlik üçün PIN istifadə edin"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Əlavə təhlükəsizlik üçün paroldan istifadə edin"</string> 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 90a5a201fd73..1b938032d139 100644 --- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Unesite PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Unesite šablon"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Unesite lozinku"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Nevažeća kartica."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Napunjena je"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bežično punjenje"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM ne može da se onemogući zbog greške."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Pogrešan šablon"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Pogrešna lozinka"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Pogrešan PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Probajte ponovo za # sekundu.}one{Probajte ponovo za # sekundu.}few{Probajte ponovo za # sekunde.}other{Probajte ponovo za # sekundi.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Unesite PIN za SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Unesite PIN za SIM „<xliff:g id="CARRIER">%1$s</xliff:g>“."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Radnja sa PUK kodom za SIM nije uspela!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Promeni metod unosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Režim rada u avionu"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Treba da unesete šablon kada se uređaj ponovo pokrene"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Treba da unesete PIN kada se uređaj ponovo pokrene"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Treba da unesete lozinku kada se uređaj ponovo pokrene"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Za dodatnu bezbednost koristite šablon"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Za dodatnu bezbednost koristite PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Za dodatnu bezbednost koristite lozinku"</string> diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml index 8127353166e1..98d28632da8c 100644 --- a/packages/SystemUI/res-keyguard/values-be/strings.xml +++ b/packages/SystemUI/res-keyguard/values-be/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Увядзіце PIN-код"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Увядзіце ўзор разблакіроўкі"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Увядзіце пароль"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Несапраўдная картка."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Зараджаны"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ідзе бесправадная зарадка"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Немагчыма адключыць eSIM-карту з-за памылкі."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Увесці"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Няправільны ўзор разблакіроўкі"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Няправільны пароль"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Няправільны PIN-код"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Паўтарыце спробу праз # секунду.}one{Паўтарыце спробу праз # секунду.}few{Паўтарыце спробу праз # секунды.}many{Паўтарыце спробу праз # секунд.}other{Паўтарыце спробу праз # секунды.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Увядзіце PIN-код SIM-карты."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Увядзіце PIN-код SIM-карты для \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Разблакіраваць SIM-карту PUK-кодам не атрымалася!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Пераключэнне рэжыму ўводу"</string> <string name="airplane_mode" msgid="2528005343938497866">"Рэжым палёту"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Пасля перазапуску прылады патрабуецца ўзор"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Пасля перазапуску прылады патрабуецца PIN-код"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Пасля перазапуску прылады патрабуецца пароль"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"У мэтах дадатковай бяспекі скарыстайце ўзор разблакіроўкі"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"У мэтах дадатковай бяспекі скарыстайце PIN-код"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"У мэтах дадатковай бяспекі скарыстайце пароль"</string> diff --git a/packages/SystemUI/res-keyguard/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml index 33021892dccc..7a2f5e98c0e0 100644 --- a/packages/SystemUI/res-keyguard/values-bg/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bg/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Въведете ПИН кода си"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Въведете фигурата си"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Въведете паролата си"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Картата е невалидна."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Заредена"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зарежда се безжично"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Електронната SIM карта не може да бъде деактивирана поради грешка."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"„Enter“"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Грешна фигура"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Грешна парола"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Грешен ПИН код"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Опитайте отново след # секунда.}other{Опитайте отново след # секунди.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Въведете ПИН кода за SIM картата."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Въведете ПИН кода на SIM картата за „<xliff:g id="CARRIER">%1$s</xliff:g>“."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Операцията с PUK кода за SIM картата не бе успешна!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Превключване на метода на въвеждане"</string> <string name="airplane_mode" msgid="2528005343938497866">"Самолет. режим"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"След рестартиране на устройството се изисква фигура"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"След рестартиране на устройството се изисква ПИН код"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"След рестартиране на устройството се изисква парола"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"За допълнителна сигурност използвайте фигура вместо това"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"За допълнителна сигурност използвайте ПИН код вместо това"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"За допълнителна сигурност използвайте парола вместо това"</string> diff --git a/packages/SystemUI/res-keyguard/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml index 414eb51cb93a..1d9bc2d8eb0a 100644 --- a/packages/SystemUI/res-keyguard/values-bn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bn/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"পিন লিখুন"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"প্যাটার্ন আঁকুন"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"পাসওয়ার্ড লিখুন"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ভুল কার্ড।"</string> <string name="keyguard_charged" msgid="5478247181205188995">"চার্জ হয়েছে"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ওয়্যারলেস পদ্ধতিতে চার্জ হচ্ছে"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"একটি সমস্যার কারণে ই-সিমটি বন্ধ করা যাচ্ছে না।"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"এন্টার"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ভুল প্যাটার্ন"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ভুল পাসওয়ার্ড"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ভুল পিন"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# সেকেন্ডের মধ্যে আবার চেষ্টা করুন।}one{# সেকেন্ডের মধ্যে আবার চেষ্টা করুন।}other{# সেকেন্ডের মধ্যে আবার চেষ্টা করুন।}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"সিমের পিন লিখুন।"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" এর জন্য সিমের পিন লিখুন।"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"সিম PUK দিয়ে আনলক করা যায়নি!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ইনপুট পদ্ধতি পরিবর্তন করুন"</string> <string name="airplane_mode" msgid="2528005343938497866">"বিমান মোড"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ডিভাইসটি পুনরায় চালু হওয়ার পর প্যাটার্নের প্রয়োজন হবে"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ডিভাইসটি পুনরায় চালু হওয়ার পর পিন প্রয়োজন হবে"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ডিভাইসটি পুনরায় চালু হওয়ার পর পাসওয়ার্ডের প্রয়োজন হবে"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"অতিরিক্ত সুরক্ষার জন্য, এর বদলে প্যাটার্ন ব্যবহার করুন"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"অতিরিক্ত সুরক্ষার জন্য, এর বদলে পিন ব্যবহার করুন"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"অতিরিক্ত সুরক্ষার জন্য, এর বদলে পাসওয়ার্ড ব্যবহার করুন"</string> diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml index 8b9eda2dc415..6ae7b18a675c 100644 --- a/packages/SystemUI/res-keyguard/values-bs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Unesite svoj PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Unesite uzorak"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Unesite lozinku"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Nevažeća kartica."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Napunjeno"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bežično punjenje"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM nije moguće onemogućiti zbog greške."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Pogrešan uzorak"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Pogrešna lozinka"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Pogrešan PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Pokušajte ponovo za # s.}one{Pokušajte ponovo za # s.}few{Pokušajte ponovo za # s.}other{Pokušajte ponovo za # s.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Unesite PIN SIM kartice."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Unesite PIN SIM kartice operatera \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Korištenje PUK-a za SIM nije uspjelo!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Promjena načina unosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Način rada u avionu"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Potreban je uzorak nakon što se uređaj ponovo pokrene"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Potreban je PIN nakon što se uređaj ponovo pokrene"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Potrebna je lozinka nakon što se uređaj ponovo pokrene"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Radi dodatne zaštite, umjesto toga koristite uzorak"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Radi dodatne zaštite, umjesto toga koristite PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Radi dodatne zašitite, umjesto toga koristite lozinku"</string> diff --git a/packages/SystemUI/res-keyguard/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml index 7dac29da5ac4..eefd49148bfe 100644 --- a/packages/SystemUI/res-keyguard/values-ca/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ca/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Introdueix el PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Introdueix el patró"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Introdueix la contrasenya"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"La targeta no és vàlida."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Bateria carregada"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • S\'està carregant sense fil"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"S\'ha produït un error i no es pot desactivar l\'eSIM."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Retorn"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Patró incorrecte"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Contrasenya incorrecta"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"El PIN no és correcte"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Torna-ho a provar d\'aquí a # segon.}many{Torna-ho a provar d\'aquí a # segons.}other{Torna-ho a provar d\'aquí a # segons.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Introdueix el PIN de la SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Introdueix el PIN de la SIM de: <xliff:g id="CARRIER">%1$s</xliff:g>."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"No s\'ha pogut desbloquejar la SIM amb el codi PUK."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Canvia el mètode d\'introducció"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode d\'avió"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Cal introduir el patró quan es reinicia el dispositiu"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Cal introduir el PIN quan es reinicia el dispositiu"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Cal introduir la contrasenya quan es reinicia el dispositiu"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Per a més seguretat, utilitza el patró"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Per a més seguretat, utilitza el PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Per a més seguretat, utilitza la contrasenya"</string> diff --git a/packages/SystemUI/res-keyguard/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml index fcd3231c7451..c3de04d9d968 100644 --- a/packages/SystemUI/res-keyguard/values-cs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-cs/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Zadejte PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Zadejte gesto"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Zadejte heslo"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Neplatná karta."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Nabito"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bezdrátové nabíjení"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM kartu kvůli chybě nelze deaktivovat."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Nesprávné gesto"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Špatné heslo"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Nesprávný kód PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Zkuste to znovu za # sekundu.}few{Zkuste to znovu za # sekundy.}many{Zkuste to znovu za # sekundy.}other{Zkuste to znovu za # sekund.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Zadejte kód PIN SIM karty."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Zadejte kód PIN SIM karty <xliff:g id="CARRIER">%1$s</xliff:g>."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operace pomocí kódu PUK SIM karty se nezdařila."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Přepnout metodu zadávání"</string> <string name="airplane_mode" msgid="2528005343938497866">"Režim Letadlo"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po restartování zařízení je vyžadováno gesto"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po restartování zařízení je vyžadován kód PIN"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po restartování zařízení je vyžadováno heslo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Z bezpečnostních důvodů raději použijte gesto"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Z bezpečnostních důvodů raději použijte PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Z bezpečnostních důvodů raději použijte heslo"</string> diff --git a/packages/SystemUI/res-keyguard/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml index e0cc87dc4730..a453bb515646 100644 --- a/packages/SystemUI/res-keyguard/values-da/strings.xml +++ b/packages/SystemUI/res-keyguard/values-da/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Angiv din pinkode"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Angiv dit mønster"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Angiv din adgangskode"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ugyldigt kort."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Opladet"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Trådløs opladning"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM kan ikke deaktiveres på grund af en fejl."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Forkert mønster"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Forkert adgangskode"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Forkert pinkode"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Prøv igen om # sekund.}one{Prøv igen om # sekund.}other{Prøv igen om # sekunder.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Angiv pinkoden til SIM-kortet."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Angiv pinkoden til SIM-kortet fra \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"PUK-koden til SIM-kortet blev afvist"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Skift indtastningsmetode"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flytilstand"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du skal angive et mønster, når du har genstartet enheden"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Der skal angives en pinkode efter genstart af enheden"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Der skal angives en adgangskode efter genstart af enheden"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Øg sikkerheden ved at bruge dit oplåsningsmønter i stedet"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Øg sikkerheden ved at bruge din pinkode i stedet"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Øg sikkerheden ved at bruge din adgangskode i stedet"</string> diff --git a/packages/SystemUI/res-keyguard/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml index 9c7fab5097db..4e168e4859cb 100644 --- a/packages/SystemUI/res-keyguard/values-de/strings.xml +++ b/packages/SystemUI/res-keyguard/values-de/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Gib deine PIN ein"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Muster eingeben"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Passwort eingeben"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ungültige Karte."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Aufgeladen"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kabelloses Laden"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Die eSim kann aufgrund eines Fehlers nicht deaktiviert werden."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Eingabe"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Falsches Muster"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Falsches Passwort"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Falsche PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{In # Sekunde noch einmal versuchen.}other{In # Sekunden noch einmal versuchen.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Gib die SIM-PIN ein"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Gib die SIM-PIN für \"<xliff:g id="CARRIER">%1$s</xliff:g>\" ein."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Fehler beim Entsperren der SIM-Karte mithilfe des PUK-Codes."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Eingabemethode wechseln"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flugmodus"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Nach dem Neustart des Geräts ist die Eingabe des Musters erforderlich"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Nach dem Neustart des Geräts ist die Eingabe der PIN erforderlich"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Nach dem Neustart des Geräts ist die Eingabe des Passworts erforderlich"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Verwende für mehr Sicherheit stattdessen dein Muster"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Verwende für mehr Sicherheit stattdessen deine PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Verwende für mehr Sicherheit stattdessen dein Passwort"</string> diff --git a/packages/SystemUI/res-keyguard/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml index 05188853b9e1..069cb507b50f 100644 --- a/packages/SystemUI/res-keyguard/values-el/strings.xml +++ b/packages/SystemUI/res-keyguard/values-el/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Εισαγάγετε τον αριθμό PIN σας"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Εισαγάγετε το μοτίβο σας"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Εισαγάγετε κωδικό πρόσβασης"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Μη έγκυρη κάρτα."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Φορτίστηκε"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ασύρματη φόρτιση"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Δεν είναι δυνατή η απενεργοποίηση της eSIM, εξαιτίας κάποιου σφάλματος."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Λανθασμένο μοτίβο"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Λανθασμένος κωδικός πρόσβασης"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Λανθασμένο PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Δοκιμάστε ξανά σε # δευτερόλεπτο.}other{Δοκιμάστε ξανά σε # δευτερόλεπτα.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Εισαγωγή αριθμού PIN κάρτας SIM"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Εισαγάγετε τον αριθμό PIN της κάρτας SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Αποτυχία λειτουργίας κωδικού PUK κάρτας SIM!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Εναλλαγή μεθόδου εισαγωγής"</string> <string name="airplane_mode" msgid="2528005343938497866">"Λειτουργία πτήσης"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Απαιτείται μοτίβο μετά από την επανεκκίνηση της συσκευής"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Απαιτείται PIN μετά από την επανεκκίνηση της συσκευής"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Απαιτείται κωδικός πρόσβασης μετά από την επανεκκίνηση της συσκευής"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Για πρόσθετη ασφάλεια, χρησιμοποιήστε εναλλακτικά μοτίβο"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Για πρόσθετη ασφάλεια, χρησιμοποιήστε εναλλακτικά PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Για πρόσθετη ασφάλεια, χρησιμοποιήστε εναλλακτικά κωδικό πρόσβασης"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml index 9df858686520..389f94fcbc69 100644 --- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Enter your PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Enter your pattern"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Enter your password"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"The eSIM can’t be disabled due to an error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Wrong pattern"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Wrong password"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Wrong PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Try again in # second.}other{Try again in # seconds.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Enter SIM PIN."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Enter SIM PIN for \'<xliff:g id="CARRIER">%1$s</xliff:g>\'."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK operation failed!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Aeroplane mode"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"For additional security, use pattern instead"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"For additional security, use PIN instead"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"For additional security, use password instead"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml index d6d4b48810ea..e134d9eaf25e 100644 --- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml @@ -21,8 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Enter your PIN"</string> + <string name="keyguard_enter_pin" msgid="8114529922480276834">"Enter PIN"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Enter your pattern"</string> + <string name="keyguard_enter_pattern" msgid="7616595160901084119">"Draw pattern"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Enter your password"</string> + <string name="keyguard_enter_password" msgid="6483623792371009758">"Enter password"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid Card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> @@ -52,8 +55,38 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"The eSIM can’t be disabled due to an error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Wrong pattern"</string> + <string name="kg_wrong_pattern_try_again" msgid="3603524940234151881">"Wrong pattern. Try again."</string> <string name="kg_wrong_password" msgid="4143127991071670512">"Wrong password"</string> + <string name="kg_wrong_password_try_again" msgid="6602878676125765920">"Wrong password. Try again."</string> <string name="kg_wrong_pin" msgid="4160978845968732624">"Wrong PIN"</string> + <string name="kg_wrong_pin_try_again" msgid="3129729383303430190">"Wrong PIN. Try again."</string> + <string name="kg_wrong_input_try_fp_suggestion" msgid="3143861542242024833">"Or unlock with fingerprint"</string> + <string name="kg_fp_not_recognized" msgid="5183108260932029241">"Fingerprint not recognized"</string> + <string name="bouncer_face_not_recognized" msgid="1666128054475597485">"Face not recognized"</string> + <string name="kg_bio_try_again_or_pin" msgid="4752168242723808390">"Try again or enter PIN"</string> + <string name="kg_bio_try_again_or_password" msgid="1473132729225398039">"Try again or enter password"</string> + <string name="kg_bio_try_again_or_pattern" msgid="4867893307468801501">"Try again or draw pattern"</string> + <string name="kg_bio_too_many_attempts_pin" msgid="5850845723433047605">"PIN is required after too many attempts"</string> + <string name="kg_bio_too_many_attempts_password" msgid="5551690347827728042">"Password is required after too many attempts"</string> + <string name="kg_bio_too_many_attempts_pattern" msgid="736884689355181602">"Pattern is required after too many attempts"</string> + <string name="kg_unlock_with_pin_or_fp" msgid="5635161174698729890">"Unlock with PIN or fingerprint"</string> + <string name="kg_unlock_with_password_or_fp" msgid="2251295907826814237">"Unlock with password or fingerprint"</string> + <string name="kg_unlock_with_pattern_or_fp" msgid="2391870539909135046">"Unlock with pattern or fingerprint"</string> + <string name="kg_prompt_after_dpm_lock" msgid="6002804765868345917">"For added security, device was locked by work policy"</string> + <string name="kg_prompt_after_user_lockdown_pin" msgid="5374732179740050373">"PIN is required after lockdown"</string> + <string name="kg_prompt_after_user_lockdown_password" msgid="9097968458291129795">"Password is required after lockdown"</string> + <string name="kg_prompt_after_user_lockdown_pattern" msgid="215072203613597906">"Pattern is required after lockdown"</string> + <string name="kg_prompt_unattended_update" msgid="8223448855578632202">"Update will install during inactive hours"</string> + <string name="kg_prompt_pin_auth_timeout" msgid="5868644725126275245">"Added security required. PIN not used for a while."</string> + <string name="kg_prompt_password_auth_timeout" msgid="5809110458491920871">"Added security required. Password not used for a while."</string> + <string name="kg_prompt_pattern_auth_timeout" msgid="1860605401869262178">"Added security required. Pattern not used for a while."</string> + <string name="kg_prompt_auth_timeout" msgid="6620679830980315048">"Added security required. Device wasn’t unlocked for a while."</string> + <string name="kg_face_locked_out" msgid="2751559491287575">"Can’t unlock with face. Too many attempts."</string> + <string name="kg_fp_locked_out" msgid="6228277682396768830">"Can’t unlock with fingerprint. Too many attempts."</string> + <string name="kg_trust_agent_disabled" msgid="5400691179958727891">"Trust agent is unavailable"</string> + <string name="kg_primary_auth_locked_out_pin" msgid="5492230176361601475">"Too many attempts with incorrect PIN"</string> + <string name="kg_primary_auth_locked_out_pattern" msgid="8266214607346180952">"Too many attempts with incorrect pattern"</string> + <string name="kg_primary_auth_locked_out_password" msgid="6170245108400198659">"Too many attempts with incorrect password"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Try again in # second.}other{Try again in # seconds.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Enter SIM PIN."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Enter SIM PIN for \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +109,9 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK operation failed!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Airplane mode"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="3321211830602827742">"Pattern is required after device restarts"</string> + <string name="kg_prompt_reason_restart_pin" msgid="2672166323886110512">"PIN is required after device restarts"</string> + <string name="kg_prompt_reason_restart_password" msgid="3967993994418885887">"Password is required after device restarts"</string> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"For additional security, use pattern instead"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"For additional security, use PIN instead"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"For additional security, use password instead"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml index 9df858686520..389f94fcbc69 100644 --- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Enter your PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Enter your pattern"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Enter your password"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"The eSIM can’t be disabled due to an error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Wrong pattern"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Wrong password"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Wrong PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Try again in # second.}other{Try again in # seconds.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Enter SIM PIN."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Enter SIM PIN for \'<xliff:g id="CARRIER">%1$s</xliff:g>\'."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK operation failed!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Aeroplane mode"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"For additional security, use pattern instead"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"For additional security, use PIN instead"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"For additional security, use password instead"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml index 9df858686520..389f94fcbc69 100644 --- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Enter your PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Enter your pattern"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Enter your password"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"The eSIM can’t be disabled due to an error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Wrong pattern"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Wrong password"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Wrong PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Try again in # second.}other{Try again in # seconds.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Enter SIM PIN."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Enter SIM PIN for \'<xliff:g id="CARRIER">%1$s</xliff:g>\'."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK operation failed!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Aeroplane mode"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"For additional security, use pattern instead"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"For additional security, use PIN instead"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"For additional security, use password instead"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml index 566c8b0160c3..ff9d4f35f130 100644 --- a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml @@ -21,8 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Enter your PIN"</string> + <string name="keyguard_enter_pin" msgid="8114529922480276834">"Enter PIN"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Enter your pattern"</string> + <string name="keyguard_enter_pattern" msgid="7616595160901084119">"Draw pattern"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Enter your password"</string> + <string name="keyguard_enter_password" msgid="6483623792371009758">"Enter password"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid Card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> @@ -52,8 +55,38 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"The eSIM can’t be disabled due to an error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Wrong pattern"</string> + <string name="kg_wrong_pattern_try_again" msgid="3603524940234151881">"Wrong pattern. Try again."</string> <string name="kg_wrong_password" msgid="4143127991071670512">"Wrong password"</string> + <string name="kg_wrong_password_try_again" msgid="6602878676125765920">"Wrong password. Try again."</string> <string name="kg_wrong_pin" msgid="4160978845968732624">"Wrong PIN"</string> + <string name="kg_wrong_pin_try_again" msgid="3129729383303430190">"Wrong PIN. Try again."</string> + <string name="kg_wrong_input_try_fp_suggestion" msgid="3143861542242024833">"Or unlock with fingerprint"</string> + <string name="kg_fp_not_recognized" msgid="5183108260932029241">"Fingerprint not recognized"</string> + <string name="bouncer_face_not_recognized" msgid="1666128054475597485">"Face not recognized"</string> + <string name="kg_bio_try_again_or_pin" msgid="4752168242723808390">"Try again or enter PIN"</string> + <string name="kg_bio_try_again_or_password" msgid="1473132729225398039">"Try again or enter password"</string> + <string name="kg_bio_try_again_or_pattern" msgid="4867893307468801501">"Try again or draw pattern"</string> + <string name="kg_bio_too_many_attempts_pin" msgid="5850845723433047605">"PIN is required after too many attempts"</string> + <string name="kg_bio_too_many_attempts_password" msgid="5551690347827728042">"Password is required after too many attempts"</string> + <string name="kg_bio_too_many_attempts_pattern" msgid="736884689355181602">"Pattern is required after too many attempts"</string> + <string name="kg_unlock_with_pin_or_fp" msgid="5635161174698729890">"Unlock with PIN or fingerprint"</string> + <string name="kg_unlock_with_password_or_fp" msgid="2251295907826814237">"Unlock with password or fingerprint"</string> + <string name="kg_unlock_with_pattern_or_fp" msgid="2391870539909135046">"Unlock with pattern or fingerprint"</string> + <string name="kg_prompt_after_dpm_lock" msgid="6002804765868345917">"For added security, device was locked by work policy"</string> + <string name="kg_prompt_after_user_lockdown_pin" msgid="5374732179740050373">"PIN is required after lockdown"</string> + <string name="kg_prompt_after_user_lockdown_password" msgid="9097968458291129795">"Password is required after lockdown"</string> + <string name="kg_prompt_after_user_lockdown_pattern" msgid="215072203613597906">"Pattern is required after lockdown"</string> + <string name="kg_prompt_unattended_update" msgid="8223448855578632202">"Update will install during inactive hours"</string> + <string name="kg_prompt_pin_auth_timeout" msgid="5868644725126275245">"Added security required. PIN not used for a while."</string> + <string name="kg_prompt_password_auth_timeout" msgid="5809110458491920871">"Added security required. Password not used for a while."</string> + <string name="kg_prompt_pattern_auth_timeout" msgid="1860605401869262178">"Added security required. Pattern not used for a while."</string> + <string name="kg_prompt_auth_timeout" msgid="6620679830980315048">"Added security required. Device wasn’t unlocked for a while."</string> + <string name="kg_face_locked_out" msgid="2751559491287575">"Can’t unlock with face. Too many attempts."</string> + <string name="kg_fp_locked_out" msgid="6228277682396768830">"Can’t unlock with fingerprint. Too many attempts."</string> + <string name="kg_trust_agent_disabled" msgid="5400691179958727891">"Trust agent is unavailable"</string> + <string name="kg_primary_auth_locked_out_pin" msgid="5492230176361601475">"Too many attempts with incorrect PIN"</string> + <string name="kg_primary_auth_locked_out_pattern" msgid="8266214607346180952">"Too many attempts with incorrect pattern"</string> + <string name="kg_primary_auth_locked_out_password" msgid="6170245108400198659">"Too many attempts with incorrect password"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Try again in # second.}other{Try again in # seconds.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Enter SIM PIN."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Enter SIM PIN for \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +109,9 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK operation failed!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Airplane mode"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="3321211830602827742">"Pattern is required after device restarts"</string> + <string name="kg_prompt_reason_restart_pin" msgid="2672166323886110512">"PIN is required after device restarts"</string> + <string name="kg_prompt_reason_restart_password" msgid="3967993994418885887">"Password is required after device restarts"</string> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"For additional security, use pattern instead"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"For additional security, use PIN instead"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"For additional security, use password instead"</string> diff --git a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml index 03608ce8ca62..df37e61264f0 100644 --- a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Ingresa tu PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Ingresa tu patrón"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Ingresa tu contraseña"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Tarjeta no válida"</string> <string name="keyguard_charged" msgid="5478247181205188995">"Cargada"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando de manera inalámbrica"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"No se puede inhabilitar la eSIM debido a un error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Intro"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Patrón incorrecto"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Contraseña incorrecta"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN incorrecto"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Vuelve a intentarlo en # segundo.}many{Vuelve a intentarlo en # segundos.}other{Vuelve a intentarlo en # segundos.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Ingresa el PIN de la tarjeta SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Ingresa el PIN de la tarjeta SIM de \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Se produjo un error al desbloquear la tarjeta SIM con el PUK."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambiar método de entrada"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo de avión"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Se requiere el patrón después de reiniciar el dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Se requiere el PIN después de reiniciar el dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Se requiere la contraseña después de reiniciar el dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Para seguridad adicional, usa un patrón"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Para seguridad adicional, usa un PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Para seguridad adicional, usa una contraseña"</string> diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml index 6ff17cacc3a0..49a2b1f1af81 100644 --- a/packages/SystemUI/res-keyguard/values-es/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Introduce tu PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Introduce tu patrón"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Introduce tu contraseña"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Tarjeta no válida."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Cargado"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando sin cables"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"No se puede mostrar la tarjeta eSIM debido a un error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Intro"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Patrón incorrecto"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Contraseña incorrecta"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN incorrecto"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Vuelve a intentarlo en # segundo.}many{Vuelve a intentarlo en # segundos.}other{Vuelve a intentarlo en # segundos.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Introduce el PIN de la tarjeta SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Introduce el PIN de la tarjeta SIM de <xliff:g id="CARRIER">%1$s</xliff:g>."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"No se ha podido desbloquear la tarjeta SIM con el código PUK."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambiar método de introducción"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo Avión"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Debes introducir el patrón después de reiniciar el dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Debes introducir el PIN después de reiniciar el dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Debes introducir la contraseña después de reiniciar el dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Para mayor seguridad, usa el patrón"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Para mayor seguridad, usa el PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Para mayor seguridad, usa la contraseña"</string> diff --git a/packages/SystemUI/res-keyguard/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml index 2b387a4b77e6..d260c1368ba3 100644 --- a/packages/SystemUI/res-keyguard/values-et/strings.xml +++ b/packages/SystemUI/res-keyguard/values-et/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Sisestage PIN-kood"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Sisestage muster"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Sisestage parool"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Kehtetu kaart."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Laetud"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Juhtmeta laadimine"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Vea tõttu ei saa eSIM-kaarte keelata."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Sisesta"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Vale muster"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Vale parool"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Vale PIN-kood"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Proovige uuesti # sekundi pärast.}other{Proovige uuesti # sekundi pärast.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Sisestage SIM-kaardi PIN-kood."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Sisestage operaatori „<xliff:g id="CARRIER">%1$s</xliff:g>” SIM-kaardi PIN-kood."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM-kaardi PUK-koodi toiming ebaõnnestus."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Vaheta sisestusmeetodit"</string> <string name="airplane_mode" msgid="2528005343938497866">"Lennukirežiim"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pärast seadme taaskäivitamist tuleb sisestada muster"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Pärast seadme taaskäivitamist tuleb sisestada PIN-kood"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Pärast seadme taaskäivitamist tuleb sisestada parool"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Kasutage tugevama turvalisuse huvides hoopis mustrit"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Kasutage tugevama turvalisuse huvides hoopis PIN-koodi"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Kasutage tugevama turvalisuse huvides hoopis parooli"</string> diff --git a/packages/SystemUI/res-keyguard/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml index bfe9778f1f39..7786ae6003c8 100644 --- a/packages/SystemUI/res-keyguard/values-eu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-eu/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Idatzi PINa"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Marraztu eredua"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Idatzi pasahitza"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Txartelak ez du balio."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Kargatuta"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Hari gabe kargatzen"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Errore bat gertatu da eta ezin da desgaitu eSIM txartela."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Sartu"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Eredua ez da zuzena"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Pasahitza ez da zuzena"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN hori ez da zuzena"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Saiatu berriro # segundo barru.}other{Saiatu berriro # segundo barru.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Idatzi SIMaren PINa."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Idatzi \"<xliff:g id="CARRIER">%1$s</xliff:g>\" operadorearen SIM txartelaren PINa."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Huts egin du SIM txartelaren PUK kodearen eragiketak!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Aldatu idazketa-metodoa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Hegaldi modua"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Eredua marraztu beharko duzu gailua berrabiarazten denean"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PINa idatzi beharko duzu gailua berrabiarazten denean"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Pasahitza idatzi beharko duzu gailua berrabiarazten denean"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Babestuago egoteko, erabili eredua"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Babestuago egoteko, erabili PINa"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Babestuago egoteko, erabili pasahitza"</string> diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml index e88b4b32f287..1383bafe2f05 100644 --- a/packages/SystemUI/res-keyguard/values-fa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"پین را وارد کنید"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"الگویتان را وارد کنید"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"گذرواژهتان را وارد کنید"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"کارت نامعتبر"</string> <string name="keyguard_charged" msgid="5478247181205188995">"شارژ کامل شد"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ بیسیم"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"به دلیل بروز خطا، سیمکارت داخلی غیرفعال نشد."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"الگو اشتباه است"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"گذرواژه اشتباه است"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"پین اشتباه"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# ثانیه دیگر دوباره امتحان کنید.}one{# ثانیه دیگر دوباره امتحان کنید.}other{# ثانیه دیگر دوباره امتحان کنید.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"پین سیمکارت را وارد کنید."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"پین سیمکارت «<xliff:g id="CARRIER">%1$s</xliff:g>» را وارد کنید."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"عملیات PUK سیمکارت ناموفق بود!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"تغییر روش ورودی"</string> <string name="airplane_mode" msgid="2528005343938497866">"حالت هواپیما"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"بعد از بازنشانی دستگاه باید الگو وارد شود"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"بعد از بازنشانی دستگاه باید پین وارد شود"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"بعد از بازنشانی دستگاه باید گذرواژه وارد شود"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"برای امنیت بیشتر، بهجای آن از الگو استفاده کنید"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"برای امنیت بیشتر، بهجای آن از پین استفاده کنید"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"برای امنیت بیشتر، بهجای آن از گذرواژه استفاده کنید"</string> diff --git a/packages/SystemUI/res-keyguard/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml index 17928c75f655..4b4843c2a6a7 100644 --- a/packages/SystemUI/res-keyguard/values-fi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fi/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Syötä PIN-koodi"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Piirrä kuvio"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Kirjoita salasana"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Virheellinen kortti"</string> <string name="keyguard_charged" msgid="5478247181205188995">"Ladattu"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ladataan langattomasti"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Tapahtui virhe, eikä eSIMiä voitu poistaa käytöstä."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Väärä kuvio"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Väärä salasana"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Väärä PIN-koodi"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Yritä uudelleen # sekunnin kuluttua.}other{Yritä uudelleen # sekunnin kuluttua.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Anna SIM-kortin PIN-koodi."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Anna operaattorin <xliff:g id="CARRIER">%1$s</xliff:g> SIM-kortin PIN-koodi."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM-kortin PUK-toiminto epäonnistui."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Vaihda syöttötapaa."</string> <string name="airplane_mode" msgid="2528005343938497866">"Lentokonetila"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Kuvio vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN-koodi vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Salasana vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Lisäsuojaa saat, kun käytät sen sijaan kuviota"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Lisäsuojaa saat, kun käytät sen sijaan PIN-koodia"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Lisäsuojaa saat, kun käytät sen sijaan salasanaa"</string> diff --git a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml index 7978fda1a355..127588cc0f73 100644 --- a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Entrez votre NIP"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Entrez votre schéma"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Entrez votre mot de passe"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Cette carte n\'est pas valide."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Chargé"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • En recharge sans fil"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"La carte eSIM ne peut pas être réinitialisée à cause d\'une erreur."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Entrée"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Schéma incorrect"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Mot de passe incorrect"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"NIP incorrect"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Réessayez dans # seconde.}one{Réessayez dans # seconde.}many{Réessayez dans # secondes.}other{Réessayez dans # secondes.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Entrez le NIP de la carte SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Entrez le NIP de la carte SIM pour « <xliff:g id="CARRIER">%1$s</xliff:g> »."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Le déverrouillage de la carte SIM par code PUK a échoué."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Changer de méthode d\'entrée"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode Avion"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Le schéma est exigé après le redémarrage de l\'appareil"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Le NIP est exigé après le redémarrage de l\'appareil"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Le mot de passe est exigé après le redémarrage de l\'appareil"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Pour plus de sécurité, utilisez plutôt un schéma"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Pour plus de sécurité, utilisez plutôt un NIP"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Pour plus de sécurité, utilisez plutôt un mot de passe"</string> diff --git a/packages/SystemUI/res-keyguard/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml index 67ce8b19b6f2..41037515e2fb 100644 --- a/packages/SystemUI/res-keyguard/values-fr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Saisissez le code d\'accès"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Tracez le schéma"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Saisissez votre mot de passe"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Carte non valide."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Chargé"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • En charge sans fil"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Impossible de désactiver la carte eSIM en raison d\'une erreur."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Entrée"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Schéma incorrect"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Mot de passe incorrect"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Code incorrect"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Réessayez dans # seconde.}one{Réessayez dans # seconde.}many{Réessayez dans # secondes.}other{Réessayez dans # secondes.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Saisissez le code PIN de la carte SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Saisissez le code PIN de la carte SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Échec du déverrouillage à l\'aide de la clé PUK de la carte SIM."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Changer le mode de saisie"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode Avion"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Veuillez dessiner le schéma après le redémarrage de l\'appareil"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Veuillez saisir le code après le redémarrage de l\'appareil"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Veuillez saisir le mot de passe après le redémarrage de l\'appareil"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Pour plus de sécurité, utilisez plutôt un schéma"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Pour plus de sécurité, utilisez plutôt un code"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Pour plus de sécurité, utilisez plutôt un mot de passe"</string> diff --git a/packages/SystemUI/res-keyguard/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml index c1159e8f6f08..9496eab9f8dd 100644 --- a/packages/SystemUI/res-keyguard/values-gl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gl/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Introduce o teu PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Introduce o padrón"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Introduce o contrasinal"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"A tarxeta non é válida."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Cargado"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando sen fíos"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"A eSIM non se puido desactivar debido a un erro."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Intro"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"O padrón é incorrecto"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"O contrasinal é incorrecto"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN incorrecto"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Téntao de novo dentro de # segundo.}other{Téntao de novo dentro de # segundos.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Introduce o PIN da SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Introduce o PIN da SIM para \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Produciuse un erro ao tentar desbloquear a tarxeta SIM co código PUK."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambia o método de introdución"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avión"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"É necesario o padrón despois do reinicio do dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"É necesario o PIN despois do reinicio do dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"É necesario o contrasinal despois do reinicio do dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Utiliza un padrón para obter maior seguranza"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Utiliza un PIN para obter maior seguranza"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Utiliza un contrasinal para obter maior seguranza"</string> diff --git a/packages/SystemUI/res-keyguard/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml index 8ef5dc202b3e..c66ba19100a5 100644 --- a/packages/SystemUI/res-keyguard/values-gu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gu/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"તમારો પિન દાખલ કરો"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"તમારી પૅટર્ન દાખલ કરો"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"તમારો પાસવર્ડ દાખલ કરો"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"અમાન્ય કાર્ડ."</string> <string name="keyguard_charged" msgid="5478247181205188995">"ચાર્જ થઈ ગયું"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • વાયરલેસથી ચાર્જિંગ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"એક ભૂલને લીધે ઇ-સિમ બંધ કરી શકાતું નથી."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"દાખલ કરો"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ખોટી પૅટર્ન"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ખોટો પાસવર્ડ"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ખોટો પિન"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# સેકન્ડમાં ફરી પ્રયાસ કરો.}one{# સેકન્ડમાં ફરી પ્રયાસ કરો.}other{# સેકન્ડમાં ફરી પ્રયાસ કરો.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"સિમ પિન દાખલ કરો"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" માટે સિમ પિન દાખલ કરો."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"સિમ PUK ઓપરેશન નિષ્ફળ થયું!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ઇનપુટ પદ્ધતિ સ્વિચ કરો"</string> <string name="airplane_mode" msgid="2528005343938497866">"એરપ્લેન મોડ"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પૅટર્ન જરૂરી છે"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પિન જરૂરી છે"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પાસવર્ડ જરૂરી છે"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"વધારાની સુરક્ષા માટે, તેના બદલે પૅટર્નનો ઉપયોગ કરો"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"વધારાની સુરક્ષા માટે, તેના બદલે પિનનો ઉપયોગ કરો"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"વધારાની સુરક્ષા માટે, તેના બદલે પાસવર્ડનો ઉપયોગ કરો"</string> diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml index 8ae56cb0344b..acd49ddcf6cd 100644 --- a/packages/SystemUI/res-keyguard/values-hi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"अपना पिन डालें"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"अपना पैटर्न डालें"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"अपना पासवर्ड डालें"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"गलत कार्ड."</string> <string name="keyguard_charged" msgid="5478247181205188995">"चार्ज हो गई है"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • वायरलेस तरीके से चार्ज हो रहा है"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"किसी गड़बड़ी की वजह से ई-सिम बंद नहीं किया जा सकता."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"डाला गया पैटर्न गलत है"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"डाला गया पासवर्ड गलत है"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"गलत पिन"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# सेकंड बाद फिर से कोशिश करें.}one{# सेकंड बाद फिर से कोशिश करें.}other{# सेकंड बाद फिर से कोशिश करें.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"सिम पिन डालें."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" के लिए सिम पिन डालें"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK की कार्यवाही विफल रही!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"इनपुट का तरीका बदलें"</string> <string name="airplane_mode" msgid="2528005343938497866">"हवाई जहाज़ मोड"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"डिवाइस फिर से चालू होने के बाद पैटर्न ज़रूरी है"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"डिवाइस फिर से चालू होने के बाद पिन ज़रूरी है"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"डिवाइस फिर से चालू होने के बाद पासवर्ड ज़रूरी है"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ज़्यादा सुरक्षा के लिए, इसके बजाय पैटर्न का इस्तेमाल करें"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ज़्यादा सुरक्षा के लिए, इसके बजाय पिन का इस्तेमाल करें"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ज़्यादा सुरक्षा के लिए, इसके बजाय पासवर्ड का इस्तेमाल करें"</string> diff --git a/packages/SystemUI/res-keyguard/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml index 5b121dd8deaa..8c712271ae80 100644 --- a/packages/SystemUI/res-keyguard/values-hr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hr/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Unesite PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Unesite uzorak"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Unesite zaporku"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Nevažeća kartica."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Napunjeno"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • bežično punjenje"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Onemogućivanje eSIM-a nije uspjelo zbog pogreške."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Unos"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Pogrešan uzorak"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Pogrešna zaporka"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Pogrešan PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Pokušajte ponovo za # s.}one{Pokušajte ponovo za # s.}few{Pokušajte ponovo za # s.}other{Pokušajte ponovo za # s.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Unesite PIN za SIM"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Unesite PIN za SIM mobilnog operatera \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operacija PUK-a SIM kartice nije uspjela!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Promjena načina unosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Način rada u zrakoplovu"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Nakon ponovnog pokretanja uređaja morate unijeti uzorak"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Nakon ponovnog pokretanja uređaja morate unijeti PIN"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Nakon ponovnog pokretanja uređaja morate unijeti zaporku"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Za dodatnu sigurnost upotrijebite uzorak"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Za dodatnu sigurnost upotrijebite PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Za dodatnu sigurnost upotrijebite zaporku"</string> diff --git a/packages/SystemUI/res-keyguard/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml index 649952ad7e41..c1ca1871ad1f 100644 --- a/packages/SystemUI/res-keyguard/values-hu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hu/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Adja meg PIN-kódját"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Adja meg a mintáját"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Adja meg jelszavát"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Érvénytelen kártya."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Feltöltve"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Vezeték nélküli töltés"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Hiba történt, így az eSIM-et nem lehet letiltani."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Helytelen minta"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Helytelen jelszó"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Helytelen PIN-kód"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Próbálja újra # másodperc múlva.}other{Próbálja újra # másodperc múlva.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Adja meg a SIM-kártya PIN-kódját."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Adja meg a(z) „<xliff:g id="CARRIER">%1$s</xliff:g>” SIM-kártya PIN-kódját."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"A SIM-kártya PUK-művelete sikertelen!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Beviteli módszer váltása"</string> <string name="airplane_mode" msgid="2528005343938497866">"Repülős üzemmód"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Az eszköz újraindítását követően meg kell adni a mintát"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Az eszköz újraindítását követően meg kell adni a PIN-kódot"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Az eszköz újraindítását követően meg kell adni a jelszót"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"A nagyobb biztonság érdekében használjon inkább mintát"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"A nagyobb biztonság érdekében használjon inkább PIN-kódot"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"A nagyobb biztonság érdekében használjon inkább jelszót"</string> diff --git a/packages/SystemUI/res-keyguard/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml index e85f61cd79df..c4936c5f0078 100644 --- a/packages/SystemUI/res-keyguard/values-hy/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hy/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Մուտքագրեք PIN կոդը"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Մուտքագրեք նախշը"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Մուտքագրեք գաղտնաբառը"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Սխալ քարտ"</string> <string name="keyguard_charged" msgid="5478247181205188995">"Լիցքավորված է"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Անլար լիցքավորում"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Սխալի պատճառով չհաջողվեց անջատել eSIM-ը։"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Մուտքի ստեղն"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Նախշը սխալ է"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Գաղտնաբառը սխալ է"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN կոդը սխալ է"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Նորից փորձեք # վայրկյանից։}one{Նորից փորձեք # վայրկյանից։}other{Նորից փորձեք # վայրկյանից։}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Մուտքագրեք SIM քարտի PIN կոդը։"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Մուտքագրեք SIM քարտի PIN կոդը «<xliff:g id="CARRIER">%1$s</xliff:g>»-ի համար:"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK կոդի գործողությունը ձախողվեց:"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Փոխել ներածման եղանակը"</string> <string name="airplane_mode" msgid="2528005343938497866">"Ավիառեժիմ"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել նախշը"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել PIN կոդը"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել գաղտնաբառը"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Լրացուցիչ անվտանգության համար օգտագործեք նախշ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Լրացուցիչ անվտանգության համար օգտագործեք PIN կոդ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Լրացուցիչ անվտանգության համար օգտագործեք գաղտնաբառ"</string> diff --git a/packages/SystemUI/res-keyguard/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml index bc00d744ecbb..5b2b98caf88d 100644 --- a/packages/SystemUI/res-keyguard/values-in/strings.xml +++ b/packages/SystemUI/res-keyguard/values-in/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Masukkan PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Masukkan pola"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Masukkan sandi"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Kartu Tidak Valid"</string> <string name="keyguard_charged" msgid="5478247181205188995">"Terisi penuh"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengisi daya secara nirkabel"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM tidak dapat dinonaktifkan karena terjadi error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Masukkan"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Pola salah"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Sandi salah"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN Salah"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Coba lagi dalam # detik.}other{Coba lagi dalam # detik.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Masukkan PIN SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Masukkan PIN SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operasi PUK SIM gagal!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Beralih metode input"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode pesawat"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pola diperlukan setelah perangkat dimulai ulang"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN diperlukan setelah perangkat dimulai ulang"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Sandi diperlukan setelah perangkat dimulai ulang"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Untuk keamanan tambahan, gunakan pola"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Untuk keamanan tambahan, gunakan PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Untuk keamanan tambahan, gunakan sandi"</string> diff --git a/packages/SystemUI/res-keyguard/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml index 1d93e0832fb9..0428316b7a73 100644 --- a/packages/SystemUI/res-keyguard/values-is/strings.xml +++ b/packages/SystemUI/res-keyguard/values-is/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Sláðu inn PIN-númer"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Færðu inn mynstrið þitt"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Sláðu inn aðgangsorðið þitt"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ógilt kort."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Fullhlaðin"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Í þráðlausri hleðslu"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Villa kom í veg fyrir að hægt væri að gera eSIM-kortið óvirkt."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Færa inn"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Rangt mynstur"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Rangt aðgangsorð"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Rangt PIN-númer"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Reyndu aftur eftir # sekúndu.}one{Reyndu aftur eftir # sekúndu.}other{Reyndu aftur eftir # sekúndur.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Sláðu inn PIN-númer SIM-kortsins."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Sláðu inn PIN-númer SIM-korts fyrir „<xliff:g id="CARRIER">%1$s</xliff:g>“."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"PUK-aðgerð SIM-korts mistókst!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Skipta um innsláttaraðferð"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flugstilling"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Mynsturs er krafist þegar tækið er endurræst"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN-númers er krafist þegar tækið er endurræst"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Aðgangsorðs er krafist þegar tækið er endurræst"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Fyrir aukið öryggi skaltu nota mynstur í staðinn"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Fyrir aukið öryggi skaltu nota PIN-númer í staðinn"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Fyrir aukið öryggi skaltu nota aðgangsorð í staðinn"</string> diff --git a/packages/SystemUI/res-keyguard/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml index 51a86df8bfe7..848d095783b1 100644 --- a/packages/SystemUI/res-keyguard/values-it/strings.xml +++ b/packages/SystemUI/res-keyguard/values-it/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Inserisci il PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Inserisci la sequenza"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Inserisci la password"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Scheda non valida."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Carico"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • In carica wireless"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Impossibile disattivare la eSIM a causa di un errore."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Invio"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Sequenza errata"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Password errata"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN errato"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Riprova fra # secondo.}many{Riprova fra # secondi.}other{Riprova fra # secondi.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Inserisci il PIN della SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Inserisci il PIN della SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operazione con PUK della SIM non riuscita."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambia metodo di immissione"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modalità aereo"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Sequenza obbligatoria dopo il riavvio del dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN obbligatorio dopo il riavvio del dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password obbligatoria dopo il riavvio del dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Per maggior sicurezza, usa invece la sequenza"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Per maggior sicurezza, usa invece il PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Per maggior sicurezza, usa invece la password"</string> diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml index d1f8760be647..1307ff5e365c 100644 --- a/packages/SystemUI/res-keyguard/values-iw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"צריך להזין קוד אימות"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"יש להזין קו ביטול נעילה"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"יש להזין סיסמה"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"כרטיס לא חוקי."</string> <string name="keyguard_charged" msgid="5478247181205188995">"הסוללה טעונה"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • בטעינה אלחוטית"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"לא ניתן להשבית את כרטיס ה-eSIM עקב שגיאה."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"קו ביטול נעילה שגוי"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"סיסמה שגויה"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"קוד האימות שגוי"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{אפשר לנסות שוב בעוד שנייה אחת.}one{אפשר לנסות שוב בעוד # שניות.}two{אפשר לנסות שוב בעוד # שניות.}other{אפשר לנסות שוב בעוד # שניות.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"יש להזין את קוד האימות של כרטיס ה-SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"יש להזין את קוד האימות של כרטיס ה-SIM של <xliff:g id="CARRIER">%1$s</xliff:g>."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"הניסיון לביטול הנעילה של כרטיס ה-SIM באמצעות קוד PUK נכשל!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"החלפת שיטת קלט"</string> <string name="airplane_mode" msgid="2528005343938497866">"מצב טיסה"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"יש להזין את קו ביטול הנעילה לאחר הפעלה מחדש של המכשיר"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"צריך להזין קוד אימות לאחר הפעלה מחדש של המכשיר"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"יש להזין סיסמה לאחר הפעלה מחדש של המכשיר"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"כדי להגביר את רמת האבטחה, כדאי להשתמש בקו ביטול נעילה במקום זאת"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"כדי להגביר את רמת האבטחה, כדאי להשתמש בקוד אימות במקום זאת"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"כדי להגביר את רמת האבטחה, כדאי להשתמש בסיסמה במקום זאת"</string> diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml index 8057dfd9087c..6bc5055378a9 100644 --- a/packages/SystemUI/res-keyguard/values-ja/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN を入力してください"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"パターンを入力してください"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"パスワードを入力してください"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"無効なカードです。"</string> <string name="keyguard_charged" msgid="5478247181205188995">"充電が完了しました"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ワイヤレス充電中"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"エラーのため、eSIM を無効にできません。"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"入力"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"パターンが正しくありません"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"パスワードが正しくありません"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN が正しくありません"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# 秒後にもう一度お試しください。}other{# 秒後にもう一度お試しください。}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN を入力してください。"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"「<xliff:g id="CARRIER">%1$s</xliff:g>」の SIM PIN を入力してください。"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK 操作に失敗しました。"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"入力方法の切り替え"</string> <string name="airplane_mode" msgid="2528005343938497866">"機内モード"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"デバイスの再起動後はパターンの入力が必要となります"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"デバイスの再起動後は PIN の入力が必要となります"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"デバイスの再起動後はパスワードの入力が必要となります"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"セキュリティを強化するには代わりにパターンを使用してください"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"セキュリティを強化するには代わりに PIN を使用してください"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"セキュリティを強化するには代わりにパスワードを使用してください"</string> diff --git a/packages/SystemUI/res-keyguard/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml index 6b570619d762..4687606376cb 100644 --- a/packages/SystemUI/res-keyguard/values-ka/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ka/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"შეიყვანეთ PIN-კოდი"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"შეიყვანეთ განმბლოკავი ნიმუში"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"შეიყვანეთ პაროლი"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ბარათი არასწორია."</string> <string name="keyguard_charged" msgid="5478247181205188995">"დატენილია"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • იტენება უსადენოდ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM-ის გათიშვა ვერ ხერხდება წარმოქმნილი შეცდომის გამო."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"შეყვანა"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ნიმუში არასწორია"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"პაროლი არასწორია"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN-კოდი არასწორია"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# წამში ისევ ცადეთ.}other{# წამში ისევ ცადეთ.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"შეიყვანეთ SIM ბარათის PIN-კოდი."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"შეიყვანეთ SIM ბარათის PIN-კოდი „<xliff:g id="CARRIER">%1$s</xliff:g>“-ისთვის."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM ბარათის PUK-კოდით განბლოკვა ვერ მოხერხდა!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"შეყვანის მეთოდის გადართვა"</string> <string name="airplane_mode" msgid="2528005343938497866">"თვითმფრინავის რეჟიმი"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა ნიმუშის დახატვა"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა PIN-კოდის შეყვანა"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა პაროლის შეყვანა"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"დამატებითი უსაფრთხოებისთვის გამოიყენეთ ნიმუში"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"დამატებითი უსაფრთხოებისთვის გამოიყენეთ PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"დამატებითი უსაფრთხოებისთვის გამოიყენეთ პაროლი"</string> diff --git a/packages/SystemUI/res-keyguard/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml index db031d6b73f4..79e28ef4bcbd 100644 --- a/packages/SystemUI/res-keyguard/values-kk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kk/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN кодын енгізіңіз"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Өрнекті енгізіңіз"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Құпия сөзді енгізіңіз"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Жарамсыз карта."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Зарядталды"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Сымсыз зарядталуда"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Қатеге байланысты eSIM картасы өшірілмеді."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Енгізу"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Өрнек дұрыс емес"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Құпия сөз дұрыс емес"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN коды қате"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# секундтан соң қайталап көріңіз.}other{# секундтан соң қайталап көріңіз.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN кодын енгізіңіз."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" үшін SIM PIN кодын енгізіңіз."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK кодымен құлпы ашылмады!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Енгізу әдісін ауыстыру"</string> <string name="airplane_mode" msgid="2528005343938497866">"Ұшақ режимі"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Құрылғы қайта іске қосылғаннан кейін, өрнекті енгізу қажет"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Құрылғы қайта іске қосылғаннан кейін, PIN кодын енгізу қажет"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Құрылғы қайта іске қосылғаннан кейін, құпия сөзді енгізу қажет"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Қосымша қауіпсіздік үшін өрнекті пайдаланыңыз."</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Қосымша қауіпсіздік үшін PIN кодын пайдаланыңыз."</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Қосымша қауіпсіздік үшін құпия сөзді пайдаланыңыз."</string> diff --git a/packages/SystemUI/res-keyguard/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml index 5a3b30bd3ad3..8936c2a954a8 100644 --- a/packages/SystemUI/res-keyguard/values-km/strings.xml +++ b/packages/SystemUI/res-keyguard/values-km/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"បញ្ចូលកូដ PIN របស់អ្នក"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"បញ្ចូលលំនាំរបស់អ្នក"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"បញ្ចូលពាក្យសម្ងាត់របស់អ្នក"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"បណ្ណមិនត្រឹមត្រូវទេ។"</string> <string name="keyguard_charged" msgid="5478247181205188995">"បានសាកថ្មពេញ"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • កំពុងសាកថ្មឥតខ្សែ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"មិនអាចបិទ eSIM បានទេ ដោយសារមានបញ្ហា។"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"លំនាំមិនត្រឹមត្រូវ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវ"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"កូដ PIN មិនត្រឹមត្រូវទេ"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{ព្យាយាមម្តងទៀតក្នុងរយៈពេល # វិនាទីទៀត។}other{ព្យាយាមម្តងទៀតក្នុងរយៈពេល # វិនាទីទៀត។}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"បញ្ចូលកូដ PIN របស់ស៊ីម។"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"បញ្ចូលកូដ PIN របស់ស៊ីមសម្រាប់ \"<xliff:g id="CARRIER">%1$s</xliff:g>\"។"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"មិនអាចដោះសោដោយប្រើកូដ PUK របស់ស៊ីមបានទេ!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ប្ដូរវិធីបញ្ចូល"</string> <string name="airplane_mode" msgid="2528005343938497866">"ពេលជិះយន្តហោះ"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"តម្រូវឲ្យប្រើលំនាំ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"តម្រូវឲ្យបញ្ចូលកូដ PIN បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"តម្រូវឲ្យបញ្ចូលពាក្យសម្ងាត់ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ដើម្បីសុវត្ថិភាពបន្ថែម សូមប្រើលំនាំជំនួសវិញ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ដើម្បីសុវត្ថិភាពបន្ថែម សូមប្រើកូដ PIN ជំនួសវិញ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ដើម្បីសុវត្ថិភាពបន្ថែម សូមប្រើពាក្យសម្ងាត់ជំនួសវិញ"</string> diff --git a/packages/SystemUI/res-keyguard/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml index e74dd1a1805b..cb6cdcce0fc8 100644 --- a/packages/SystemUI/res-keyguard/values-kn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kn/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸಿ"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ನಮೂದಿಸಿ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ನಿಮ್ಮ ಪಾಸ್ವರ್ಡ್ ನಮೂದಿಸಿ"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ಅಮಾನ್ಯ ಕಾರ್ಡ್."</string> <string name="keyguard_charged" msgid="5478247181205188995">"ಚಾರ್ಜ್ ಆಗಿದೆ"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ವೈರ್ಲೆಸ್ ಆಗಿ ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ eSIM ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ನಮೂದಿಸಿ"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ಪ್ಯಾಟರ್ನ್ ತಪ್ಪಾಗಿದೆ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ತಪ್ಪು ಪಾಸ್ವರ್ಡ್"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ಪಿನ್ ತಪ್ಪಾಗಿದೆ"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# ಸೆಕೆಂಡಿನಲ್ಲಿ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.}one{# ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.}other{# ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"ಸಿಮ್ ಪಿನ್ ನಮೂದಿಸಿ."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" ಗಾಗಿ ಸಿಮ್ ಪಿನ್ ನಮೂದಿಸಿ."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"ಸಿಮ್ PUK ಕಾರ್ಯಾಚರಣೆ ವಿಫಲಗೊಂಡಿದೆ!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ಇನ್ಪುಟ್ ವಿಧಾನ ಬದಲಿಸಿ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ಹೆಚ್ಚುವರಿ ಭದ್ರತೆಗಾಗಿ, ಬದಲಿಗೆ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ಬಳಸಿ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ಹೆಚ್ಚುವರಿ ಭದ್ರತೆಗಾಗಿ, ಬದಲಿಗೆ ಪಿನ್ ಬಳಸಿ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ಹೆಚ್ಚುವರಿ ಭದ್ರತೆಗಾಗಿ, ಬದಲಿಗೆ ಪಾಸ್ವರ್ಡ್ ಅನ್ನು ಬಳಸಿ"</string> diff --git a/packages/SystemUI/res-keyguard/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml index 8d54aefc7ea5..953773de7bec 100644 --- a/packages/SystemUI/res-keyguard/values-ko/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ko/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN을 입력해 주세요."</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"패턴 입력"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"비밀번호 입력"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"유효하지 않은 카드"</string> <string name="keyguard_charged" msgid="5478247181205188995">"충전됨"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 무선 충전 중"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"오류로 인해 eSIM을 사용 중지할 수 없습니다."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter 키"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"잘못된 패턴"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"잘못된 비밀번호"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN 오류"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{#초 후에 다시 시도하세요.}other{#초 후에 다시 시도하세요.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN을 입력하세요."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\'<xliff:g id="CARRIER">%1$s</xliff:g>\'의 SIM PIN을 입력하세요."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK 작업이 실패했습니다."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"입력 방법 전환"</string> <string name="airplane_mode" msgid="2528005343938497866">"비행기 모드"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"기기가 다시 시작되면 패턴이 필요합니다."</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"기기가 다시 시작되면 PIN이 필요합니다."</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"기기가 다시 시작되면 비밀번호가 필요합니다."</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"보안 강화를 위해 대신 패턴 사용"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"보안 강화를 위해 대신 PIN 사용"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"보안 강화를 위해 대신 비밀번호 사용"</string> diff --git a/packages/SystemUI/res-keyguard/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml index 23afa381bb69..7e095deab94b 100644 --- a/packages/SystemUI/res-keyguard/values-ky/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ky/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN кодуңузду киргизиңиз"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Графикалык ачкычты киргизиңиз"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Сырсөзүңүздү киргизиңиз"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"SIM-карта жараксыз."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Кубатталды"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зымсыз кубатталууда"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Катадан улам eSIM-картаны өчүрүүгө болбойт."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Киргизүү"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Графикалык ачкыч туура эмес"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Сырсөз туура эмес"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN-код туура эмес"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# секунддан кийин кайталаңыз.}other{# секунддан кийин кайталаңыз.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM-картанын PIN-кодун киргизиңиз."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" SIM-картасынын PIN-кодун киргизиңиз."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM-картанын PUK-кодун ачуу кыйрады!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Киргизүү ыкмасын өзгөртүү"</string> <string name="airplane_mode" msgid="2528005343938497866">"Учак режими"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Түзмөк кайра күйгүзүлгөндөн кийин графикалык ачкычты тартуу талап кылынат"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Түзмөк кайра күйгүзүлгөндөн кийин PIN-кодду киргизүү талап кылынат"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Түзмөк кайра күйгүзүлгөндөн кийин сырсөздү киргизүү талап кылынат"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Кошумча коопсуздук үчүн анын ордуна графикалык ачкычты колдонуңуз"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Кошумча коопсуздук үчүн анын ордуна PIN кодду колдонуңуз"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Кошумча коопсуздук үчүн анын ордуна сырсөздү колдонуңуз"</string> diff --git a/packages/SystemUI/res-keyguard/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml index 408e916adbd2..f5e438b7781f 100644 --- a/packages/SystemUI/res-keyguard/values-lo/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lo/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ໃສ່ລະຫັດ PIN ຂອງທ່ານ"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ໃສ່ຮູບແບບປົດລັອກຂອງທ່ານ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ປ້ອນລະຫັດຜ່ານຂອງທ່ານ"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ບັດບໍ່ຖືກຕ້ອງ."</string> <string name="keyguard_charged" msgid="5478247181205188995">"ສາກເຕັມແລ້ວ."</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ກຳລັງສາກໄຟໄຮ້ສາຍ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ບໍ່ສາມາດປິດການນຳໃຊ້ eSIM ໄດ້ເນື່ອງຈາກມີຂໍ້ຜິດພາດ."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ປ້ອນເຂົ້າ"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ຮູບແບບບໍ່ຖືກຕ້ອງ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ລະຫັດ PIN ບໍ່ຖືກຕ້ອງ"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{ກະລຸນາລອງໃໝ່ໃນ # ວິນາທີ.}other{ກະລຸນາລອງໃໝ່ໃນ # ວິນາທີ.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"ໃສ່ລະຫັດ PIN ຂອງຊິມ."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"ໃສ່ລະຫັດ PIN ຂອງຊິມສຳລັບ \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"PUK ຂອງ SIM ເຮັດວຽກລົ້ມເຫຼວ!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ສະລັບຮູບແບບການປ້ອນຂໍ້ມູນ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ໂໝດໃນຍົນ"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ຈຳເປັນຕ້ອງມີແບບຮູບປົດລັອກຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ຈຳເປັນຕ້ອງມີ PIN ຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ຈຳເປັນຕ້ອງມີລະຫັດຜ່ານຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ເພື່ອຄວາມປອດໄພເພີ່ມເຕີມ, ໃຫ້ໃຊ້ຮູບແບບແທນ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ເພື່ອຄວາມປອດໄພເພີ່ມເຕີມ, ໃຫ້ໃຊ້ PIN ແທນ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ເພື່ອຄວາມປອດໄພເພີ່ມເຕີມ, ໃຫ້ໃຊ້ລະຫັດຜ່ານແທນ"</string> diff --git a/packages/SystemUI/res-keyguard/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml index b60f2b7adce6..c173905ce2e0 100644 --- a/packages/SystemUI/res-keyguard/values-lt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lt/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Įveskite PIN kodą"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Nubrėžkite atrakinimo piešinį"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Įveskite slaptažodį"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Netinkama kortelė."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Įkrauta"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kraunama be laidų"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Dėl klaidos nepavyko išjungti „eSIM“ kortelės."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Netinkamas atrakinimo piešinys"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Netinkamas slaptažodis"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Netinkamas PIN kodas"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Bandykite dar kartą po # sekundės.}one{Bandykite dar kartą po # sekundės.}few{Bandykite dar kartą po # sekundžių.}many{Bandykite dar kartą po # sekundės.}other{Bandykite dar kartą po # sekundžių.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Įveskite SIM kortelės PIN kodą."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Įveskite „<xliff:g id="CARRIER">%1$s</xliff:g>“ SIM kortelės PIN kodą"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Nepavyko atlikti SIM kortelės PUK kodo operacijos."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Perjungti įvesties metodą"</string> <string name="airplane_mode" msgid="2528005343938497866">"Lėktuvo režimas"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Iš naujo paleidus įrenginį būtinas atrakinimo piešinys"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Iš naujo paleidus įrenginį būtinas PIN kodas"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Iš naujo paleidus įrenginį būtinas slaptažodis"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Papildomai saugai užtikrinti geriau naudokite atrakinimo piešinį"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Papildomai saugai užtikrinti geriau naudokite PIN kodą"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Papildomai saugai užtikrinti geriau naudokite slaptažodį"</string> diff --git a/packages/SystemUI/res-keyguard/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml index e8cd99b26cbb..40b6b3f73cb1 100644 --- a/packages/SystemUI/res-keyguard/values-lv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lv/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Ievadiet savu PIN kodu"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Ievadiet savu kombināciju"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Ievadiet paroli"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Nederīga karte."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Akumulators uzlādēts"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Notiek bezvadu uzlāde"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Kļūdas dēļ nevar atspējot eSIM karti."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Ievadīšanas taustiņš"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Nepareiza kombinācija"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Nepareiza parole"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Nepareizs PIN kods."</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Mēģiniet vēlreiz pēc # sekundes.}zero{Mēģiniet vēlreiz pēc # sekundēm.}one{Mēģiniet vēlreiz pēc # sekundes.}other{Mēģiniet vēlreiz pēc # sekundēm.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Ievadiet SIM kartes PIN kodu."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Ievadiet SIM kartes “<xliff:g id="CARRIER">%1$s</xliff:g>” PIN kodu."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM kartes PUK koda ievadīšana neizdevās!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Pārslēgt ievades metodi"</string> <string name="airplane_mode" msgid="2528005343938497866">"Lidojuma režīms"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pēc ierīces restartēšanas ir jāievada atbloķēšanas kombinācija."</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Pēc ierīces restartēšanas ir jāievada PIN kods."</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Pēc ierīces restartēšanas ir jāievada parole."</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Papildu drošībai izmantojiet kombināciju"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Papildu drošībai izmantojiet PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Papildu drošībai izmantojiet paroli"</string> diff --git a/packages/SystemUI/res-keyguard/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml index b35be97c4f39..1a2513c78a4c 100644 --- a/packages/SystemUI/res-keyguard/values-mk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mk/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Внесете го PIN-кодот"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Внесете ја шемата"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Внесете ја лозинката"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Неважечка картичка."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Полна"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Се полни безжично"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM-картичката не може да се оневозможи поради грешка."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Внеси"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Погрешна шема"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Погрешна лозинка"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Погрешен PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Обидете се повторно по # секунда.}one{Обидете се повторно по # секунда.}other{Обидете се повторно по # секунди.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Внесете PIN на SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Внесете PIN на SIM за „<xliff:g id="CARRIER">%1$s</xliff:g>“."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM-картичката не се отклучи со PUK-кодот!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Префрли метод за внесување"</string> <string name="airplane_mode" msgid="2528005343938497866">"Авионски режим"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Потребна е шема по рестартирање на уредот"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Потребен е PIN-код по рестартирање на уредот"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Потребна е лозинка по рестартирање на уредот"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"За дополнителна безбедност, користете шема"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"За дополнителна безбедност, користете PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"За дополнителна безбедност, користете лозинка"</string> diff --git a/packages/SystemUI/res-keyguard/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml index 385aadf0cf4d..a223fd10e684 100644 --- a/packages/SystemUI/res-keyguard/values-ml/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ml/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"പിൻ നൽകുക"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"നിങ്ങളുടെ പാറ്റേൺ നൽകുക"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"നിങ്ങളുടെ പാസ്വേഡ് നല്കുക"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"അസാധുവായ കാർഡ്."</string> <string name="keyguard_charged" msgid="5478247181205188995">"ചാർജായി"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • വയർലെസ്സ് ആയി ചാർജ് ചെയ്യുന്നു"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"പിശക് കാരണം ഇ-സിം പ്രവർത്തനരഹിതമാക്കാനാകുന്നില്ല"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"എന്റർ"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"പാറ്റേൺ തെറ്റാണ്"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"പാസ്വേഡ് തെറ്റാണ്"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"പിൻ തെറ്റാണ്"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# സെക്കൻഡിനുള്ളിൽ വീണ്ടും ശ്രമിക്കുക.}other{# സെക്കൻഡിനുള്ളിൽ വീണ്ടും ശ്രമിക്കുക.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"സിം പിൻ നൽകുക."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" എന്ന കാരിയർക്കുള്ള സിം പിൻ നൽകുക."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"PUK ഉപയോഗിച്ച് സിം അൺലോക്കുചെയ്യാനുള്ള ശ്രമം പരാജയപ്പെട്ടു!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ഇൻപുട്ട് രീതി മാറുക"</string> <string name="airplane_mode" msgid="2528005343938497866">"ഫ്ലൈറ്റ് മോഡ്"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ഉപകരണം റീസ്റ്റാർട്ടായശേഷം പാറ്റേൺ വരയ്ക്കേണ്ടതുണ്ട്"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ഉപകരണം റീസ്റ്റാർട്ടായശേഷം പിൻ നൽകേണ്ടതുണ്ട്"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ഉപകരണം റീസ്റ്റാർട്ടായശേഷം പാസ്വേഡ് നൽകേണ്ടതുണ്ട്"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"അധിക സുരക്ഷയ്ക്കായി, പകരം പാറ്റേൺ ഉപയോഗിക്കുക"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"അധിക സുരക്ഷയ്ക്കായി, പകരം പിൻ ഉപയോഗിക്കുക"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"അധിക സുരക്ഷയ്ക്കായി, പകരം പാസ്വേഡ് ഉപയോഗിക്കുക"</string> diff --git a/packages/SystemUI/res-keyguard/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml index 2e941ba62371..d4d84b0acd2e 100644 --- a/packages/SystemUI/res-keyguard/values-mn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mn/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ПИН-ээ оруулна уу"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Хээгээ оруулна уу"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Нууц үгээ оруулна уу"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Карт хүчингүй байна."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Цэнэглэсэн"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Утасгүй цэнэглэж байна"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Алдаа гарсан тул eSIM-г идэвхгүй болгох боломжгүй байна."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Оруулах"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Хээ буруу байна"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Нууц үг буруу байна"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ПИН код буруу байна"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# секундийн дараа дахин оролдоно уу.}other{# секундийн дараа дахин оролдоно уу.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM-н ПИН-г оруулна уу."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\"-н SIM-н ПИН-г оруулна уу."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM-н PUK-г буруу орууллаа!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Оруулах аргыг сэлгэх"</string> <string name="airplane_mode" msgid="2528005343938497866">"Нислэгийн горим"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Төхөөрөмжийг дахин эхлүүлсний дараа загвар оруулах шаардлагатай"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Төхөөрөмжийг дахин эхлүүлсний дараа ПИН оруулах шаардлагатай"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Төхөөрөмжийг дахин эхлүүлсний дараа нууц үг оруулах шаардлагатай"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Нэмэлт аюулгүй байдлын үүднээс оронд нь хээ ашиглана уу"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Нэмэлт аюулгүй байдлын үүднээс оронд нь ПИН ашиглана уу"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Нэмэлт аюулгүй байдлын үүднээс оронд нь нууц үг ашиглана уу"</string> diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml index 2fd9cc025844..8f9d4a04add3 100644 --- a/packages/SystemUI/res-keyguard/values-mr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"तुमचा पिन एंटर करा"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"तुमचा पॅटर्न एंटर करा"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"तुमचा पासवर्ड एंटर करा"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"अवैध कार्ड."</string> <string name="keyguard_charged" msgid="5478247181205188995">"चार्ज झाली"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • वायरलेस पद्धतीने चार्ज करत आहे"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"एका एररमुळे eSIM बंद होऊ शकत नाही."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"एंटर करा"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"चुकीचा पॅटर्न"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"चुकीचा पासवर्ड"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"चुकीचा पिन"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# सेकंदामध्ये पुन्हा प्रयत्न करा.}other{# सेकंदांमध्ये पुन्हा प्रयत्न करा.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"सिम पिन एंटर करा"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" साठी सिम पिन एंटर करा"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"सिम PUK कार्य अयशस्वी झाले!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"इनपुट पद्धत स्विच करा"</string> <string name="airplane_mode" msgid="2528005343938497866">"विमान मोड"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"डिव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"डिव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"डिव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"अतिरिक्त सुरक्षेसाठी, त्याऐवजी पॅटर्न वापरा"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"अतिरिक्त सुरक्षेसाठी, त्याऐवजी पिन वापरा"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"अतिरिक्त सुरक्षेसाठी, त्याऐवजी पासवर्ड वापरा"</string> diff --git a/packages/SystemUI/res-keyguard/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml index de9cb80b9f6c..c0ebce28b4e8 100644 --- a/packages/SystemUI/res-keyguard/values-ms/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ms/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Masukkan PIN anda"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Masukkan corak anda"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Masukkan kata laluan anda"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Kad Tidak Sah."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Sudah dicas"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengecas secara wayarles"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM tidak dapat dilumpuhkan kerana ralat."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Kekunci Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Corak salah"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Kata laluan salah"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN salah"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Cuba lagi dalam # saat.}other{Cuba lagi dalam # saat.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Masukkan PIN SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Masukkan PIN SIM untuk \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Pengendalian PUK SIM gagal!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Tukar kaedah masukan"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mod Pesawat"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Corak diperlukan setelah peranti dimulakan semula"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN diperlukan setelah peranti dimulakan semula"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Kata laluan diperlukan setelah peranti dimulakan semula"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Untuk keselamatan tambahan, gunakan corak"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Untuk keselamatan tambahan, gunakan PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Untuk keselamatan tambahan, gunakan kata laluan"</string> diff --git a/packages/SystemUI/res-keyguard/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml index 3be98903b0c7..53035a4a4939 100644 --- a/packages/SystemUI/res-keyguard/values-my/strings.xml +++ b/packages/SystemUI/res-keyguard/values-my/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"သင့်ပင်နံပါတ် ထည့်ပါ"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"သင့်လော့ခ်ဖွင့်ပုံစံ ထည့်ပါ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"သင့်စကားဝှက် ထည့်ပါ"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ကတ် မမှန်ကန်ပါ။"</string> <string name="keyguard_charged" msgid="5478247181205188995">"အားသွင်းပြီးပါပြီ"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ကြိုးမဲ့ အားသွင်းနေသည်"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"အမှားအယွင်းရှိနေသောကြောင့် eSIM ကို ပိတ်၍မရပါ။"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter ခလုတ်"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"လော့ခ်ဖွင့်ပုံစံ မှားနေသည်"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"စကားဝှက် မှားနေသည်"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ပင်နံပါတ် မမှန်ကန်ပါ"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# စက္ကန့်အကြာတွင် ထပ်စမ်းကြည့်နိုင်သည်။}other{# စက္ကန့်အကြာတွင် ထပ်စမ်းကြည့်နိုင်သည်။}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"ဆင်းမ်ကတ် ပင်နံပါတ်ကို ထည့်ပါ။"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" အတွက် ဆင်းမ်ကဒ်ပင်နံပါတ်ကို ထည့်ပါ။"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"ဆင်းမ်ကတ် ပင်နံပါတ် ပြန်ဖွင့်သည့်ကုဒ် လုပ်ဆောင်ချက် မအောင်မြင်ပါ။"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"စာရိုက်စနစ်ပြောင်းရန်"</string> <string name="airplane_mode" msgid="2528005343938497866">"လေယာဉ်ပျံမုဒ်"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် ပုံစံ လိုအပ်ပါသည်"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် ပင်နံပါတ် လိုအပ်ပါသည်"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် စကားဝှက် လိုအပ်ပါသည်"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ထပ်ဆောင်းလုံခြုံရေးအတွက် ၎င်းအစား ပုံစံသုံးပါ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ထပ်ဆောင်းလုံခြုံရေးအတွက် ၎င်းအစား ပင်နံပါတ်သုံးပါ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ထပ်ဆောင်းလုံခြုံရေးအတွက် ၎င်းအစား စကားဝှက်သုံးပါ"</string> diff --git a/packages/SystemUI/res-keyguard/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml index f0c20fd0803a..13e5ffaf5d74 100644 --- a/packages/SystemUI/res-keyguard/values-nb/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Skriv inn PIN-koden din"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Legg inn mønsteret ditt"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Skriv inn passordet ditt"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ugyldig kort."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Oppladet"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Lader trådløst"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"E-SIM-kortet kan ikke deaktiveres på grunn av en feil."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Feil mønster"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Feil passord"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Feil PIN-kode"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Prøv på nytt om # sekund.}other{Prøv på nytt om # sekunder.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Skriv inn PIN-koden for SIM-kortet."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Skriv inn PIN-koden for SIM-kortet «<xliff:g id="CARRIER">%1$s</xliff:g>»."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"PUK-koden for SIM-kortet ble avvist."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Bytt inndatametode"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flymodus"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du må tegne mønsteret etter at enheten har startet på nytt"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Du må skrive inn PIN-koden etter at enheten har startet på nytt"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Du må skrive inn passordet etter at enheten har startet på nytt"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Bruk mønster i stedet, for å øke sikkerheten"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Bruk PIN-kode i stedet, for å øke sikkerheten"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Bruk passord i stedet, for å øke sikkerheten"</string> diff --git a/packages/SystemUI/res-keyguard/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml index d835f42b22a4..8dc8ff0422a4 100644 --- a/packages/SystemUI/res-keyguard/values-ne/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ne/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"आफ्नो PIN प्रविष्टि गर्नुहोस्"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"आफ्नो ढाँचा प्रविष्टि गर्नुहोस्"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"आफ्नो पासवर्ड प्रविष्ट गर्नु…"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"अमान्य कार्ड।"</string> <string name="keyguard_charged" msgid="5478247181205188995">"चार्ज भयो"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • तारविनै चार्ज गर्दै"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"कुनै त्रुटिका कारण यो eSIM लाई असक्षम पार्न सकिएन।"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"प्रविष्टि गर्नुहोस्"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"प्याटर्न मिलेन"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"गलत पासवर्ड"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"गलत PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# सेकेन्डपछि फेरि प्रयास गर्नुहोस्।}other{# सेकेन्डपछि फेरि प्रयास गर्नुहोस्।}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM को PIN प्रविष्टि गर्नुहोस्।"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" को SIM को PIN प्रविष्टि गर्नुहोस्।"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM को PUK कोड राखेर अनलक गर्ने कार्य असफल भयो!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"इनपुट विधिलाई स्विच गर्नुहोस्"</string> <string name="airplane_mode" msgid="2528005343938497866">"हवाइजहाज मोड"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"यन्त्र पुनः सुरु भएपछि ढाँचा आवश्यक पर्दछ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"यन्त्र पुनः सुरु भएपछि PIN आवश्यक पर्दछ"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"यन्त्र पुनः सुरु भएपछि पासवर्ड आवश्यक पर्दछ"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"अतिरिक्त सुरक्षाका लागि यो प्रमाणीकरण विधिको साटो प्याटर्न प्रयोग गर्नुहोस्"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"अतिरिक्त सुरक्षाका लागि यो प्रमाणीकरण विधिको साटो पिन प्रयोग गर्नुहोस्"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"अतिरिक्त सुरक्षाका लागि यो प्रमाणीकरण विधिको साटो पासवर्ड प्रयोग गर्नुहोस्"</string> diff --git a/packages/SystemUI/res-keyguard/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml index 8278d11cf1a4..af6d4773854d 100644 --- a/packages/SystemUI/res-keyguard/values-nl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nl/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Geef je pincode op"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Geef je patroon op"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Geef je wachtwoord op"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ongeldige kaart."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Opgeladen"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Draadloos opladen"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"De e-simkaart kan niet worden uitgezet vanwege een fout."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Onjuist patroon"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Onjuist wachtwoord"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Onjuiste pincode"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Probeer het over # seconde opnieuw.}other{Probeer het over # seconden opnieuw.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Geef de pincode van de simkaart op."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Geef de pincode voor de simkaart van \'<xliff:g id="CARRIER">%1$s</xliff:g>\' op."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Bewerking met pukcode voor simkaart is mislukt."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Invoermethode wijzigen"</string> <string name="airplane_mode" msgid="2528005343938497866">"Vliegtuigmodus"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Patroon vereist nadat het apparaat opnieuw is opgestart"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Pincode vereist nadat het apparaat opnieuw is opgestart"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Wachtwoord vereist nadat het apparaat opnieuw is opgestart"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Gebruik in plaats daarvan het patroon voor extra beveiliging"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Gebruik in plaats daarvan de pincode voor extra beveiliging"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Gebruik in plaats daarvan het wachtwoord voor extra beveiliging"</string> diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml index c698727d2ca5..a1a6ab2d6981 100644 --- a/packages/SystemUI/res-keyguard/values-or/strings.xml +++ b/packages/SystemUI/res-keyguard/values-or/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ନିଜର PIN ଲେଖନ୍ତୁ"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ନିଜର ପାଟର୍ନ ଆଙ୍କନ୍ତୁ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ନିଜ ପାସ୍ୱର୍ଡ ଲେଖନ୍ତୁ"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ଅମାନ୍ୟ କାର୍ଡ।"</string> <string name="keyguard_charged" msgid="5478247181205188995">"ଚାର୍ଜ ହୋଇଗଲା"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"ୱାୟାର୍ଲେସ୍ଭାବରେ <xliff:g id="PERCENTAGE">%s</xliff:g> • ଚାର୍ଜ ହୋଇଛି"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ଗୋଟିଏ ତ୍ରୁଟି କାରଣରୁ eSIMକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ।"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ଏଣ୍ଟର୍"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ଭୁଲ ପାଟର୍ନ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ଭୁଲ ପାସ୍ୱର୍ଡ"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ଭୁଲ PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# ସେକେଣ୍ଡ ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।}other{# ସେକେଣ୍ଡ ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIMର PIN ଲେଖନ୍ତୁ।"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" ପାଇଁ SIMର PIN ଲେଖନ୍ତୁ।"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUKର କାମ ବିଫଳ ହେଲା!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ଇନପୁଟ୍ ପଦ୍ଧତି ବଦଳାନ୍ତୁ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ଏରୋପ୍ଲେନ୍ ମୋଡ୍"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେବା ପରେ ପାଟର୍ନ ଆବଶ୍ୟକ ଅଟେ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେବାପରେ ପାସ୍ୱର୍ଡ ଆବଶ୍ୟକ"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେବା ପରେ ପାସୱର୍ଡ ଆବଶ୍ୟକ ଅଟେ"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ଅତିରିକ୍ତ ସୁରକ୍ଷା ପାଇଁ, ଏହା ପରିବର୍ତ୍ତେ ପାଟର୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ଅତିରିକ୍ତ ସୁରକ୍ଷା ପାଇଁ, ଏହା ପରିବର୍ତ୍ତେ PIN ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ଅତିରିକ୍ତ ସୁରକ୍ଷା ପାଇଁ, ଏହା ପରିବର୍ତ୍ତେ ପାସୱାର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ"</string> diff --git a/packages/SystemUI/res-keyguard/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml index 383eee58d54b..61eeb49602d5 100644 --- a/packages/SystemUI/res-keyguard/values-pa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pa/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰੋ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"ਅਵੈਧ ਕਾਰਡ।"</string> <string name="keyguard_charged" msgid="5478247181205188995">"ਚਾਰਜ ਹੋ ਗਿਆ"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ਬਿਨਾਂ ਤਾਰ ਤੋਂ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ਕੋਈ ਗੜਬੜ ਹੋਣ ਕਰਕੇ ਈ-ਸਿਮ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ਦਾਖਲ ਕਰੋ"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ਗਲਤ ਪੈਟਰਨ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"ਗਲਤ ਪਾਸਵਰਡ"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"ਗਲਤ ਪਿੰਨ"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# ਸਕਿੰਟ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।}one{# ਸਕਿੰਟ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।}other{# ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"ਸਿਮ ਪਿੰਨ ਦਾਖਲ ਕਰੋ।"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" ਲਈ ਸਿਮ ਪਿੰਨ ਦਾਖਲ ਕਰੋ।"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK ਕਾਰਵਾਈ ਅਸਫਲ ਰਹੀ!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਦੀ ਲੋੜ ਹੈ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ਵਧੀਕ ਸੁਰੱਖਿਆ ਲਈ, ਇਸਦੀ ਬਜਾਏ ਪੈਟਰਨ ਵਰਤੋ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ਵਧੀਕ ਸੁਰੱਖਿਆ ਲਈ, ਇਸਦੀ ਬਜਾਏ ਪਿੰਨ ਵਰਤੋ"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ਵਧੀਕ ਸੁਰੱਖਿਆ ਲਈ, ਇਸਦੀ ਬਜਾਏ ਪਾਸਵਰਡ ਵਰਤੋ"</string> diff --git a/packages/SystemUI/res-keyguard/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml index 9d45b5aebbf2..6ebc80985a02 100644 --- a/packages/SystemUI/res-keyguard/values-pl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pl/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Wpisz kod PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Narysuj wzór"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Wpisz hasło"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Nieprawidłowa karta."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Naładowana"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ładowanie bezprzewodowe"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Nie można wyłączyć karty eSIM z powodu błędu."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Nieprawidłowy wzór"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Nieprawidłowe hasło"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Nieprawidłowy kod PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Spróbuj ponownie za # sekundę.}few{Spróbuj ponownie za # sekundy.}many{Spróbuj ponownie za # sekund.}other{Spróbuj ponownie za # sekundy.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Wpisz kod PIN karty SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Wpisz kod PIN karty SIM „<xliff:g id="CARRIER">%1$s</xliff:g>”."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operacja z kodem PUK karty SIM nie udała się."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Przełączanie metody wprowadzania"</string> <string name="airplane_mode" msgid="2528005343938497866">"Tryb samolotowy"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po ponownym uruchomieniu urządzenia wymagany jest wzór"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po ponownym uruchomieniu urządzenia wymagany jest kod PIN"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po ponownym uruchomieniu urządzenia wymagane jest hasło"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Ze względów bezpieczeństwa użyj wzoru"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Ze względów bezpieczeństwa użyj kodu PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Ze względów bezpieczeństwa użyj hasła"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml index 8534575c56c0..a958741499ce 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Digite seu PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Digite seu padrão"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Digite sua senha"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Cartão inválido."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Carregado"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando sem fio"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Não é possível desativar o eSIM devido a um erro."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Inserir"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Padrão incorreto"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Senha incorreta"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN incorreto"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Tente novamente em # segundo.}one{Tente novamente em # segundo.}many{Tente novamente em # segundos.}other{Tente novamente em # segundos.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Informe o PIN do chip."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Informe o PIN do chip para \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Falha na operação de PUK do chip."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Alterar o método de entrada"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avião"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"O padrão é exigido após a reinicialização do dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"O PIN é exigido após a reinicialização do dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"A senha é exigida após a reinicialização do dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Para ter mais segurança, use o padrão"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Para ter mais segurança, use o PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Para ter mais segurança, use a senha"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml index e0d3eb015fa5..77db3f72b7b9 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Introduza o PIN."</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Introduza o padrão."</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Introduza a palavra-passe."</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Cartão inválido."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Carregada"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • A carregar sem fios"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Não é possível desativar o eSIM devido a um erro."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Tecla Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Padrão incorreto."</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Palavra-passe incorreta."</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN incorreto"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Tente novamente dentro de # segundo.}many{Tente novamente dentro de # segundos.}other{Tente novamente dentro de # segundos.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Introduza o PIN do cartão SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Introduza o PIN do cartão SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Falha ao introduzir o PUK do cartão SIM!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Alternar o método de introdução"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo de avião"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"É necessário um padrão após reiniciar o dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"É necessário um PIN após reiniciar o dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"É necessária uma palavra-passe após reiniciar o dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Para uma segurança adicional, use antes o padrão"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Para uma segurança adicional, use antes o PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Para uma segurança adicional, use antes a palavra-passe"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml index 8534575c56c0..a958741499ce 100644 --- a/packages/SystemUI/res-keyguard/values-pt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Digite seu PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Digite seu padrão"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Digite sua senha"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Cartão inválido."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Carregado"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando sem fio"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Não é possível desativar o eSIM devido a um erro."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Inserir"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Padrão incorreto"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Senha incorreta"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN incorreto"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Tente novamente em # segundo.}one{Tente novamente em # segundo.}many{Tente novamente em # segundos.}other{Tente novamente em # segundos.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Informe o PIN do chip."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Informe o PIN do chip para \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Falha na operação de PUK do chip."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Alterar o método de entrada"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avião"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"O padrão é exigido após a reinicialização do dispositivo"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"O PIN é exigido após a reinicialização do dispositivo"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"A senha é exigida após a reinicialização do dispositivo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Para ter mais segurança, use o padrão"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Para ter mais segurança, use o PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Para ter mais segurança, use a senha"</string> diff --git a/packages/SystemUI/res-keyguard/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml index 0a5538fe2904..683901f794bb 100644 --- a/packages/SystemUI/res-keyguard/values-ro/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ro/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Introdu codul PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Introdu modelul"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Introdu parola"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Card nevalid"</string> <string name="keyguard_charged" msgid="5478247181205188995">"Încărcată"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Se încarcă wireless"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Cardul eSIM nu poate fi dezactivat din cauza unei erori."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Introdu"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Model greșit"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Parolă greșită"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Cod PIN greșit"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Reîncearcă peste o secundă.}few{Reîncearcă peste # secunde.}other{Reîncearcă peste # de secunde.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Introdu codul PIN al cardului SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Introdu codul PIN al cardului SIM pentru „<xliff:g id="CARRIER">%1$s</xliff:g>”."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Deblocarea cu ajutorul codului PUK pentru cardul SIM nu a reușit!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Schimbă metoda de introducere"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mod Avion"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Modelul este necesar după repornirea dispozitivului"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Codul PIN este necesar după repornirea dispozitivului"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Parola este necesară după repornirea dispozitivului"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Pentru mai multă securitate, folosește modelul"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Pentru mai multă securitate, folosește codul PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Pentru mai multă securitate, folosește parola"</string> diff --git a/packages/SystemUI/res-keyguard/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml index 39bf861c4b80..01499c82cefb 100644 --- a/packages/SystemUI/res-keyguard/values-ru/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ru/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Введите PIN-код"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Введите графический ключ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Введите пароль"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ошибка SIM-карты."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Батарея заряжена"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Беспроводная зарядка"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Не удалось отключить eSIM."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Клавиша ввода"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Неверный графический ключ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Неверный пароль"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Неверный PIN-код"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Повторите попытку через # секунду.}one{Повторите попытку через # секунду.}few{Повторите попытку через # секунды.}many{Повторите попытку через # секунд.}other{Повторите попытку через # секунды.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Введите PIN-код SIM-карты."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Введите PIN-код SIM-карты \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Не удалось разблокировать SIM-карту"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Сменить способ ввода"</string> <string name="airplane_mode" msgid="2528005343938497866">"Режим полета"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"После перезагрузки устройства необходимо ввести графический ключ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"После перезагрузки устройства необходимо ввести PIN-код"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"После перезагрузки устройства необходимо ввести пароль"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"В целях дополнительной безопасности используйте графический ключ"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"В целях дополнительной безопасности используйте PIN-код"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"В целях дополнительной безопасности используйте пароль"</string> diff --git a/packages/SystemUI/res-keyguard/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml index 1bb6f0440e09..6cacbf226a4a 100644 --- a/packages/SystemUI/res-keyguard/values-si/strings.xml +++ b/packages/SystemUI/res-keyguard/values-si/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ඔබේ PIN ඇතුළු කරන්න"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ඔබගේ රටාව ඇතුළු කරන්න"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ඔබේ මුරපදය ඇතුළු කරන්න"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"වලංගු නොවන කාඩ්පත."</string> <string name="keyguard_charged" msgid="5478247181205188995">"අරෝපිතයි"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • නොරැහැන්ව ආරෝපණ කෙරේ"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"දෝෂයක් හේතුවෙන් eSIM අබල කළ නොහැකිය."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ඇතුල් කරන්න"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"වැරදි රටාවකි"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"වැරදි මුරපදයකි"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN එක වැරදියි"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{තත්පර #කින් නැවත උත්සාහ කරන්න.}one{තත්පර #කින් නැවත උත්සාහ කරන්න.}other{තත්පර #කින් නැවත උත්සාහ කරන්න.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN ඇතුළු කරන්න"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" සඳහා SIM PIN ඇතුළු කරන්න"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK මෙහෙයුම අසාර්ථක විය!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ආදාන ක්රමය මාරු කිරීම"</string> <string name="airplane_mode" msgid="2528005343938497866">"ගුවන් යානා ප්රකාරය"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"උපාංගය නැවත ආරම්භ වූ පසු රටාව අවශ්යයි"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"උපාංගය නැවත ආරම්භ වූ පසු PIN අංකය අවශ්යයි"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"උපාංගය නැවත ආරම්භ වූ පසු මුරපදය අවශ්යයි"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"අතිරේක ආරක්ෂාව සඳහා, ඒ වෙනුවට රටාව භාවිතා කරන්න"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"අතිරේක ආරක්ෂාව සඳහා, ඒ වෙනුවට PIN භාවිතා කරන්න"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"අතිරේක ආරක්ෂාව සඳහා, ඒ වෙනුවට මුරපදය භාවිතා කරන්න"</string> diff --git a/packages/SystemUI/res-keyguard/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml index 12028a6b2d25..f2f92cb7c8e0 100644 --- a/packages/SystemUI/res-keyguard/values-sk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sk/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Zadajte PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Zadajte vzor"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Zadajte heslo"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Neplatná karta."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Nabité"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Nabíja sa bezdrôtovo"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM karta sa nedá deaktivovať, pretože sa vyskytla chyba."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Nesprávny vzor"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Nesprávne heslo"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Nesprávny kód PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Skúste to znova o # sekundu.}few{Skúste to znova o # sekundy.}many{Skúste to znova o # sekundy.}other{Skúste to znova o # sekúnd.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Zadajte PIN pre SIM kartu"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Zadajte kód PIN pre SIM kartu operátora <xliff:g id="CARRIER">%1$s</xliff:g>."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operácia kódu PUK SIM karty zlyhala!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Prepnúť metódu vstupu"</string> <string name="airplane_mode" msgid="2528005343938497866">"Režim v lietadle"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po reštartovaní zariadenia musíte zadať bezpečnostný vzor"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po reštartovaní zariadenia musíte zadať kód PIN"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po reštartovaní zariadenia musíte zadať heslo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"V rámci zvýšenia zabezpečenia použite radšej vzor"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"V rámci zvýšenia zabezpečenia použite radšej PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"V rámci zvýšenia zabezpečenia použite radšej heslo"</string> diff --git a/packages/SystemUI/res-keyguard/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml index 114fc52bea7c..8b14411b80f1 100644 --- a/packages/SystemUI/res-keyguard/values-sl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sl/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Vnesite kodo PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Vnesite vzorec"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Vnesite geslo"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Neveljavna kartica"</string> <string name="keyguard_charged" msgid="5478247181205188995">"Baterija napolnjena"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • brezžično polnjenje"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Digitalne kartice e-SIM zaradi napake ni mogoče onemogočiti."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Tipka Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Napačen vzorec"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Napačno geslo"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Napačna koda PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Poskusite znova čez # sekundo.}one{Poskusite znova čez # sekundo.}two{Poskusite znova čez # sekundi.}few{Poskusite znova čez # sekunde.}other{Poskusite znova čez # sekund.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Vnesite kodo PIN kartice SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Vnesite kodo PIN kartice SIM operaterja »<xliff:g id="CARRIER">%1$s</xliff:g>«."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Postopek za odklepanje s kodo PUK kartice SIM ni uspel."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Preklop načina vnosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Način za letalo"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po vnovičnem zagonu naprave je treba vnesti vzorec"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po vnovičnem zagonu naprave je treba vnesti kodo PIN"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po vnovičnem zagonu naprave je treba vnesti geslo"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Za dodatno varnost raje uporabite vzorec."</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Za dodatno varnost raje uporabite kodo PIN."</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Za dodatno varnost raje uporabite geslo."</string> diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml index 5d8173b4eabf..646d6609e9dc 100644 --- a/packages/SystemUI/res-keyguard/values-sq/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Fut kodin PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Fut motivin"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Fut fjalëkalimin"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Karta e pavlefshme."</string> <string name="keyguard_charged" msgid="5478247181205188995">"I karikuar"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet me valë"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Karta eSIM nuk mund të çaktivizohet për shkak të një gabimi."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Dërgo"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Motiv i gabuar"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Fjalëkalim i gabuar"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Kod PIN i gabuar"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Provo sërish pas # sekonde.}other{Provo sërish pas # sekondash.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Fut kodin PIN të kartës SIM"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Fut kodin PIN të kartës SIM për \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Operacioni i kodit PUK të kartës SIM dështoi!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Ndërro metodën e hyrjes"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modaliteti i aeroplanit"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Kërkohet motivi pas rinisjes së pajisjes"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Kërkohet kodi PIN pas rinisjes së pajisjes"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Kërkohet fjalëkalimi pas rinisjes së pajisjes"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Për më shumë siguri, përdor motivin më mirë"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Për më shumë siguri, përdor kodin PIN më mirë"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Për më shumë siguri, përdor fjalëkalimin më mirë"</string> diff --git a/packages/SystemUI/res-keyguard/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml index a26d7e815c59..1fcd4c3f84d4 100644 --- a/packages/SystemUI/res-keyguard/values-sr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sr/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Унесите PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Унесите шаблон"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Унесите лозинку"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Неважећа картица."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Напуњена је"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Бежично пуњење"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"eSIM не може да се онемогући због грешке."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Погрешан шаблон"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Погрешна лозинка"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Погрешан PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Пробајте поново за # секунду.}one{Пробајте поново за # секунду.}few{Пробајте поново за # секунде.}other{Пробајте поново за # секунди.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Унесите PIN за SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Унесите PIN за SIM „<xliff:g id="CARRIER">%1$s</xliff:g>“."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Радња са PUK кодом за SIM није успела!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Промени метод уноса"</string> <string name="airplane_mode" msgid="2528005343938497866">"Режим рада у авиону"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Треба да унесете шаблон када се уређај поново покрене"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Треба да унесете PIN када се уређај поново покрене"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Треба да унесете лозинку када се уређај поново покрене"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"За додатну безбедност користите шаблон"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"За додатну безбедност користите PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"За додатну безбедност користите лозинку"</string> diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml index 623532b3bc2e..69553d9e3257 100644 --- a/packages/SystemUI/res-keyguard/values-sv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Ange pinkoden"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Ange mönstret"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Ange ditt lösenord"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ogiltigt kort."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Laddat"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laddas trådlöst"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Det gick inte att inaktivera eSIM-kortet på grund av ett fel."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Retur"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Fel mönster"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Fel lösenord"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Fel pinkod"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Försök igen om # sekund.}other{Försök igen om # sekunder.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Ange pinkod för SIM-kortet."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Ange pinkod för SIM-kortet för <xliff:g id="CARRIER">%1$s</xliff:g>."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Det gick inte att låsa upp med PUK-koden för SIM-kortet."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Byt inmatningsmetod"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flygplansläge"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du måste rita mönster när du har startat om enheten"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Du måste ange pinkod när du har startat om enheten"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Du måste ange lösenord när du har startat om enheten"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"För ytterligare säkerhet använder du mönstret i stället"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"För ytterligare säkerhet använder du pinkoden i stället"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"För ytterligare säkerhet använder du lösenordet i stället"</string> diff --git a/packages/SystemUI/res-keyguard/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml index 96309e198638..be383eb33966 100644 --- a/packages/SystemUI/res-keyguard/values-sw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sw/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Weka PIN yako"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Weka mchoro wako"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Weka nenosiri lako"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Kadi si Sahihi."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Betri imejaa"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Inachaji bila kutumia waya"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Hitilafu imetokea wakati wa kuzima eSIM."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Weka"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Mchoro si sahihi"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Nenosiri si sahihi"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Nambari ya PIN si sahihi"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Jaribu tena baada ya sekunde #.}other{Jaribu tena baada ya sekunde #.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Weka PIN ya SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Weka PIN ya SIM ya \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Utendakazi wa PUK ya SIM haujafanikiwa!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Kubadili mbinu ya kuingiza data"</string> <string name="airplane_mode" msgid="2528005343938497866">"Hali ya ndegeni"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Unafaa kuchora mchoro baada ya kuwasha kifaa upya"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Unafaa kuweka PIN baada ya kuwasha kifaa upya"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Unafaa kuweka nenosiri baada ya kuwasha kifaa upya"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Kwa usalama wa ziada, tumia mchoro badala yake"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Kwa usalama wa ziada, tumia PIN badala yake"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Kwa usalama wa ziada, tumia nenosiri badala yake"</string> diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml index 9f85a972b956..db8b8f82741f 100644 --- a/packages/SystemUI/res-keyguard/values-ta/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"பின்னை உள்ளிடுக"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"பேட்டர்னை உள்ளிடுக"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"கடவுச்சொல்லை உள்ளிடுக"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"செல்லாத சிம் கார்டு."</string> <string name="keyguard_charged" msgid="5478247181205188995">"சார்ஜ் செய்யப்பட்டது"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • வயர்லெஸ் முறையில் சார்ஜாகிறது"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"பிழை ஏற்பட்டதால் eSIMஐ முடக்க முடியவில்லை."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"என்டர் பட்டன்"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"தவறான பேட்டர்ன்"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"தவறான கடவுச்சொல்"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"தவறான பின்"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# வினாடியில் மீண்டும் முயலவும்.}other{# வினாடிகளில் மீண்டும் முயலவும்.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"சிம் பின்னை உள்ளிடவும்."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\"க்கான சிம் பின்னை உள்ளிடவும்."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"சிம் PUK செயல்பாடு தோல்வியடைந்தது!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"உள்ளீட்டு முறையை மாற்றும்"</string> <string name="airplane_mode" msgid="2528005343938497866">"விமானப் பயன்முறை"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"சாதனத்தை மீண்டும் தொடங்கியதும், பேட்டர்னை வரைய வேண்டும்"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"சாதனத்தை மீண்டும் தொடங்கியதும், பின்னை உள்ளிட வேண்டும்"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"சாதனத்தை மீண்டும் தொடங்கியதும், கடவுச்சொல்லை உள்ளிட வேண்டும்"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"கூடுதல் பாதுகாப்பிற்குப் பேட்டர்னைப் பயன்படுத்தவும்"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"கூடுதல் பாதுகாப்பிற்குப் பின்னை (PIN) பயன்படுத்தவும்"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"கூடுதல் பாதுகாப்பிற்குக் கடவுச்சொல்லைப் பயன்படுத்தவும்"</string> diff --git a/packages/SystemUI/res-keyguard/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml index 1684eb87b581..798a89a8ae01 100644 --- a/packages/SystemUI/res-keyguard/values-te/strings.xml +++ b/packages/SystemUI/res-keyguard/values-te/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"మీ పిన్ని నమోదు చేయండి"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"మీ నమూనాను నమోదు చేయండి"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"మీ పాస్వర్డ్ను ఎంటర్ చేయండి"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"చెల్లని కార్డ్."</string> <string name="keyguard_charged" msgid="5478247181205188995">"ఛార్జ్ చేయబడింది"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • వైర్ లేకుండా ఛార్జ్ అవుతోంది"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ఎర్రర్ కారణంగా eSIMని నిలపడం సాధ్యపడదు."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"నమూనా తప్పు"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"పాస్వర్డ్ తప్పు"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"పిన్ తప్పు"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# సెకనులో మళ్లీ ట్రై చేయండి.}other{# సెకన్లలో మళ్లీ ట్రై చేయండి.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM పిన్ని నమోదు చేయండి."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" కోసం SIM పిన్ని నమోదు చేయండి."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK చర్య విఫలమైంది!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ఇన్పుట్ పద్ధతిని మార్చు"</string> <string name="airplane_mode" msgid="2528005343938497866">"విమానం మోడ్"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"పరికరాన్ని పునఃప్రారంభించిన తర్వాత నమూనాను గీయాలి"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"డివైజ్ను పునఃప్రారంభించిన తర్వాత పిన్ నమోదు చేయాలి"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"పరికరాన్ని పునఃప్రారంభించిన తర్వాత పాస్వర్డ్ను నమోదు చేయాలి"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"అదనపు సెక్యూరిటీ కోసం, బదులుగా ఆకృతిని ఉపయోగించండి"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"అదనపు సెక్యూరిటీ కోసం, బదులుగా PINను ఉపయోగించండి"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"అదనపు సెక్యూరిటీ కోసం, బదులుగా పాస్వర్డ్ను ఉపయోగించండి"</string> diff --git a/packages/SystemUI/res-keyguard/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml index f268e60634d5..dc16bb6468da 100644 --- a/packages/SystemUI/res-keyguard/values-th/strings.xml +++ b/packages/SystemUI/res-keyguard/values-th/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"ป้อน PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"ป้อนรูปแบบ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"ป้อนรหัสผ่าน"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"การ์ดไม่ถูกต้อง"</string> <string name="keyguard_charged" msgid="5478247181205188995">"ชาร์จแล้ว"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • กำลังชาร์จแบบไร้สาย"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ปิดใช้ eSIM ไม่ได้เนื่องจากมีข้อผิดพลาด"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"รูปแบบไม่ถูกต้อง"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"รหัสผ่านไม่ถูกต้อง"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN ไม่ถูกต้อง"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{ลองอีกครั้งใน # วินาที}other{ลองอีกครั้งใน # วินาที}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"ป้อน PIN ของซิม"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"ป้อน PIN ของซิมสำหรับ \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"การปลดล็อกด้วย PUK ของซิมล้มเหลว!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"สลับวิธีการป้อนข้อมูล"</string> <string name="airplane_mode" msgid="2528005343938497866">"โหมดบนเครื่องบิน"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ต้องวาดรูปแบบหลังจากอุปกรณ์รีสตาร์ท"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ต้องระบุ PIN หลังจากอุปกรณ์รีสตาร์ท"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ต้องป้อนรหัสผ่านหลังจากอุปกรณ์รีสตาร์ท"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"ใช้รูปแบบแทนเพื่อเพิ่มความปลอดภัย"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"ใช้ PIN แทนเพื่อเพิ่มความปลอดภัย"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"ใช้รหัสผ่านแทนเพื่อเพิ่มความปลอดภัย"</string> diff --git a/packages/SystemUI/res-keyguard/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml index b96f0ae74990..4df08f5055ec 100644 --- a/packages/SystemUI/res-keyguard/values-tl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tl/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Ilagay ang iyong PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Ilagay ang iyong pattern"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Ilagay ang iyong password"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Di-wasto ang Card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Tapos nang mag-charge"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Wireless na nagcha-charge"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Hindi ma-disable ang eSIM dahil sa isang error."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Mali ang pattern"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Mali ang password"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Mali ang PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Subukan ulit sa # segundo.}one{Subukan ulit sa # segundo.}other{Subukan ulit sa # na segundo.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Ilagay ang PIN ng SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Ilagay ang PIN ng SIM para sa \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Nabigo ang operasyon ng PUK ng SIM!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Magpalit ng pamamaraan ng pag-input"</string> <string name="airplane_mode" msgid="2528005343938497866">"Airplane mode"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Kailangan ng pattern pagkatapos mag-restart ng device"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Kailangan ng PIN pagkatapos mag-restart ng device"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Kailangan ng password pagkatapos mag-restart ng device"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Para sa karagdagang seguridad, gumamit na lang ng pattern"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Para sa karagdagang seguridad, gumamit na lang ng PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Para sa karagdagang seguridad, gumamit na lang ng password"</string> diff --git a/packages/SystemUI/res-keyguard/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml index ae8be96d25c3..2aca8ad38190 100644 --- a/packages/SystemUI/res-keyguard/values-tr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tr/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN kodunuzu girin"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Deseninizi girin"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Şifrenizi girin"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Geçersiz Kart."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Şarj oldu"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kablosuz olarak şarj ediliyor"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Bir hata nedeniyle eSIM devre dışı bırakılamıyor."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Yanlış desen"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Yanlış şifre"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Yanlış PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# saniye içinde tekrar deneyin.}other{# saniye içinde tekrar deneyin.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN kodunu girin."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" için SIM PIN kodunu girin."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK işlemi başarısız oldu!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Giriş yöntemini değiştir"</string> <string name="airplane_mode" msgid="2528005343938497866">"Uçak modu"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Cihaz yeniden başladıktan sonra desen gerekir"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Cihaz yeniden başladıktan sonra PIN gerekir"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Cihaz yeniden başladıktan sonra şifre gerekir"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Ek güvenlik için bunun yerine desen kullanın"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Ek güvenlik için bunun yerine PIN kullanın"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Ek güvenlik için bunun yerine şifre kullanın"</string> diff --git a/packages/SystemUI/res-keyguard/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml index 3b3b20cb70be..7da9b9873343 100644 --- a/packages/SystemUI/res-keyguard/values-uk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uk/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Введіть PIN-код"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Введіть ключ"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Введіть пароль"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Недійсна картка."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Заряджено"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Бездротове заряджання"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Не вдається вимкнути eSIM-карту через помилку."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Ввести"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Неправильний ключ"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Неправильний пароль"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Неправильний PIN-код"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Повторіть спробу через # секунду.}one{Повторіть спробу через # секунду.}few{Повторіть спробу через # секунди.}many{Повторіть спробу через # секунд.}other{Повторіть спробу через # секунди.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Введіть PIN-код SIM-карти."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Введіть PIN-код SIM-карти для оператора \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Помилка введення PUK-коду SIM-карти."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Змінити метод введення"</string> <string name="airplane_mode" msgid="2528005343938497866">"Режим польоту"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Після перезавантаження пристрою потрібно ввести ключ"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Після перезавантаження пристрою потрібно ввести PIN-код"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Після перезавантаження пристрою потрібно ввести пароль"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"З міркувань додаткової безпеки скористайтеся ключем"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"З міркувань додаткової безпеки скористайтеся PIN-кодом"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"З міркувань додаткової безпеки скористайтеся паролем"</string> diff --git a/packages/SystemUI/res-keyguard/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml index dac46fd3bcd8..4a75afc989d5 100644 --- a/packages/SystemUI/res-keyguard/values-ur/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ur/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"اپنا PIN درج کریں"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"اپنا پیٹرن درج کریں"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"اپنا پاس ورڈ درج کریں"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"غلط کارڈ۔"</string> <string name="keyguard_charged" msgid="5478247181205188995">"چارج ہوگئی"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • وائرلیس طریقے سے چارج ہو رہا ہے"</string> @@ -32,7 +38,7 @@ <string name="keyguard_plugged_in_charging_slowly" msgid="217655355424210">"<xliff:g id="PERCENTAGE">%s</xliff:g> • آہستہ چارج ہو رہا ہے"</string> <string name="keyguard_plugged_in_charging_limited" msgid="1053130519456324630">"<xliff:g id="PERCENTAGE">%s</xliff:g> • بیٹری کی حفاظت کے لیے چارجنگ کو بہتر بنایا گیا"</string> <string name="keyguard_plugged_in_incompatible_charger" msgid="3687961801947819076">"<xliff:g id="PERCENTAGE">%s</xliff:g> • چارجنگ ایکسیسری کے ساتھ مسئلہ"</string> - <string name="keyguard_instructions_when_pattern_disabled" msgid="8448804180089936954">"غیر مقفل کرنے کیلئے مینو دبائیں۔"</string> + <string name="keyguard_instructions_when_pattern_disabled" msgid="8448804180089936954">"غیر مقفل کرنے کیلئے مینیو دبائیں۔"</string> <string name="keyguard_network_locked_message" msgid="407096292844868608">"نیٹ ورک مقفل ہو گیا"</string> <string name="keyguard_missing_sim_message_short" msgid="685029586173458728">"کوئی SIM نہیں ہے"</string> <string name="keyguard_missing_sim_instructions" msgid="7735360104844653246">"ایک SIM شامل کریں۔"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"ایک خرابی کی وجہ سے eSIM کو غیر فعال نہیں کیا جا سکتا۔"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"درج کریں"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"غلط پیٹرن"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"غلط پاس ورڈ"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"غلط PIN"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# سیکنڈ میں دوبارہ کوشش کریں۔}other{# سیکنڈ میں دوبارہ کوشش کریں۔}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM PIN درج کریں۔"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" کیلئے SIM PIN درج کریں۔"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK کارروائی ناکام ہو گئی!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"اندراج کا طریقہ سوئچ کریں"</string> <string name="airplane_mode" msgid="2528005343938497866">"ہوائی جہاز وضع"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"آلہ دوبارہ چالو ہونے کے بعد پیٹرن درکار ہوتا ہے"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"آلہ دوبارہ چالو ہونے کے بعد PIN درکار ہوتا ہے"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"آلہ دوبارہ چالو ہونے کے بعد پاس ورڈ درکار ہوتا ہے"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"اضافی سیکیورٹی کے لئے، اس کے بجائے پیٹرن استعمال کریں"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"اضافی سیکیورٹی کے لئے، اس کے بجائے PIN استعمال کریں"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"اضافی سیکیورٹی کے لئے، اس کے بجائے پاس ورڈ استعمال کریں"</string> diff --git a/packages/SystemUI/res-keyguard/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml index 70914056ae4d..4c5f4760e05c 100644 --- a/packages/SystemUI/res-keyguard/values-uz/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uz/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"PIN kodni kiriting"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Grafik kalitni chizing"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Parolni kiriting"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"SIM karta yaroqsiz."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Quvvat oldi"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Simsiz quvvatlanyapti"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Xatolik tufayli eSIM faolsizlantirilmadi."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter tugmasi"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Grafik kalit xato"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Parol xato"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN kod xato"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{# soniyadan keyin qaytadan urining.}other{# soniyadan keyin qayta urining.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"SIM karta PIN kodini kiriting."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"“<xliff:g id="CARRIER">%1$s</xliff:g>” SIM kartasi PIN kodini kiriting."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM kartani qulfdan chiqarib bo‘lmadi!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Matn kiritish usulini almashtirish"</string> <string name="airplane_mode" msgid="2528005343938497866">"Parvoz rejimi"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Qurilma qayta ishga tushganidan keyin grafik kalitni kiritish zarur"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Qurilma qayta ishga tushganidan keyin PIN kodni kiritish zarur"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Qurilma qayta ishga tushganidan keyin parolni kiritish zarur"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Qoʻshimcha xavfsizlik maqsadida oʻrniga grafik kalitdan foydalaning"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Qoʻshimcha xavfsizlik maqsadida oʻrniga PIN koddan foydalaning"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Qoʻshimcha xavfsizlik maqsadida oʻrniga paroldan foydalaning"</string> diff --git a/packages/SystemUI/res-keyguard/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml index 79b9f0646b17..49abeb617ee1 100644 --- a/packages/SystemUI/res-keyguard/values-vi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-vi/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Nhập mã PIN của bạn"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Nhập hình mở khóa của bạn"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Nhập mật khẩu của bạn"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Thẻ không hợp lệ."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Đã sạc đầy"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Đang sạc không dây"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Không thể tắt eSIM do lỗi."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Nhập"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Hình mở khóa không chính xác"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Mật khẩu sai"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Mã PIN sai"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Hãy thử lại sau # giây.}other{Hãy thử lại sau # giây.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Nhập mã PIN của SIM."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Nhập mã PIN của SIM dành cho \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Thao tác mã PUK của SIM không thành công!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Chuyển phương thức nhập"</string> <string name="airplane_mode" msgid="2528005343938497866">"Chế độ trên máy bay"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Yêu cầu hình mở khóa sau khi thiết bị khởi động lại"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Yêu cầu mã PIN sau khi thiết bị khởi động lại"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Yêu cầu mật khẩu sau khi thiết bị khởi động lại"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Để tăng cường bảo mật, hãy sử dụng hình mở khoá"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Để tăng cường bảo mật, hãy sử dụng mã PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Để tăng cường bảo mật, hãy sử dụng mật khẩu"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml index a2387b0a4152..685f835a3b5c 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"输入您的 PIN 码"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"绘制您的图案"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"输入您的密码"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"SIM 卡无效。"</string> <string name="keyguard_charged" msgid="5478247181205188995">"已充满电"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在无线充电"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"出现错误，无法停用 eSIM 卡。"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"输入"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"图案错误"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"密码错误"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN 码错误"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{请在 # 秒后重试。}other{请在 # 秒后重试。}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"请输入 SIM 卡 PIN 码。"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"请输入“<xliff:g id="CARRIER">%1$s</xliff:g>”的 SIM 卡 PIN 码。"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM 卡 PUK 码操作失败！"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"切换输入法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飞行模式"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"重启设备后需要绘制解锁图案"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"重启设备后需要输入 PIN 码"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"重启设备后需要输入密码"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"为增强安全性，请改用图案"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"为增强安全性，请改用 PIN 码"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"为增强安全性，请改用密码"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml index 8eeb8a3f2b90..e36f2941a616 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"請輸入 PIN"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"請畫出圖案"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"請輸入密碼"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"SIM 卡無效。"</string> <string name="keyguard_charged" msgid="5478247181205188995">"已完成充電"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 無線充電中"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"發生錯誤，因此無法停用此 eSIM 卡。"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter 鍵 (輸入)"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"圖案錯誤"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"密碼錯誤"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN 碼錯誤"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{請在 # 秒後再試一次。}other{請在 # 秒後再試一次。}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"輸入 SIM 卡的 PIN 碼。"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"輸入「<xliff:g id="CARRIER">%1$s</xliff:g>」SIM 卡的 PIN 碼。"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"無法使用 SIM 卡 PUK 碼解鎖！"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"轉換輸入方法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飛行模式"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"裝置重新啟動後，必須畫出上鎖圖案才能使用"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"裝置重新啟動後，必須輸入 PIN 碼才能使用"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"裝置重新啟動後，必須輸入密碼才能使用"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"為提升安全性，請改用圖案"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"為提升安全性，請改用 PIN"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"為提升安全性，請改用密碼"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml index 781cf4446d16..cd3e7a4580d9 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"輸入 PIN 碼"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"畫出解鎖圖案"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"輸入密碼"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"卡片無效。"</string> <string name="keyguard_charged" msgid="5478247181205188995">"充電完成"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 無線充電"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"發生錯誤，因此無法停用 eSIM 卡。"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter 鍵"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"圖案錯誤"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"密碼錯誤"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN 碼錯誤"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{請於 # 秒後再試一次。}other{請於 # 秒後再試一次。}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"輸入 SIM 卡的 PIN 碼。"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"輸入「<xliff:g id="CARRIER">%1$s</xliff:g>」SIM 卡的 PIN 碼。"</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM 卡 PUK 碼解鎖失敗！"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"切換輸入法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飛航模式"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"裝置重新啟動後需要畫出解鎖圖案"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"裝置重新啟動後需要輸入 PIN 碼"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"裝置重新啟動後需要輸入密碼"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"為強化安全性，請改用解鎖圖案"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"為強化安全性，請改用 PIN 碼"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"為強化安全性，請改用密碼"</string> diff --git a/packages/SystemUI/res-keyguard/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml index 94bd6a18a6d3..01cf8cff0e82 100644 --- a/packages/SystemUI/res-keyguard/values-zu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zu/strings.xml @@ -21,8 +21,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Faka iPHINIKHODI yakho"</string> + <!-- no translation found for keyguard_enter_pin (8114529922480276834) --> + <skip /> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Faka iphethini yakho"</string> + <!-- no translation found for keyguard_enter_pattern (7616595160901084119) --> + <skip /> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Faka iphasiwedi yakho"</string> + <!-- no translation found for keyguard_enter_password (6483623792371009758) --> + <skip /> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Ikhadi elingavumelekile."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Kushajiwe"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Iyashaja ngaphandle kwentambo"</string> @@ -52,8 +58,68 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"I-eSIM ayikwakhi ukukhutshazwa ngenxa yephutha."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Faka"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"Iphethini engalungile"</string> + <!-- no translation found for kg_wrong_pattern_try_again (3603524940234151881) --> + <skip /> <string name="kg_wrong_password" msgid="4143127991071670512">"Iphasiwedi engalungile"</string> + <!-- no translation found for kg_wrong_password_try_again (6602878676125765920) --> + <skip /> <string name="kg_wrong_pin" msgid="4160978845968732624">"Iphinikhodi engalungile"</string> + <!-- no translation found for kg_wrong_pin_try_again (3129729383303430190) --> + <skip /> + <!-- no translation found for kg_wrong_input_try_fp_suggestion (3143861542242024833) --> + <skip /> + <!-- no translation found for kg_fp_not_recognized (5183108260932029241) --> + <skip /> + <!-- no translation found for bouncer_face_not_recognized (1666128054475597485) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pin (4752168242723808390) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_password (1473132729225398039) --> + <skip /> + <!-- no translation found for kg_bio_try_again_or_pattern (4867893307468801501) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pin (5850845723433047605) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_password (5551690347827728042) --> + <skip /> + <!-- no translation found for kg_bio_too_many_attempts_pattern (736884689355181602) --> + <skip /> + <!-- no translation found for kg_unlock_with_pin_or_fp (5635161174698729890) --> + <skip /> + <!-- no translation found for kg_unlock_with_password_or_fp (2251295907826814237) --> + <skip /> + <!-- no translation found for kg_unlock_with_pattern_or_fp (2391870539909135046) --> + <skip /> + <!-- no translation found for kg_prompt_after_dpm_lock (6002804765868345917) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pin (5374732179740050373) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_password (9097968458291129795) --> + <skip /> + <!-- no translation found for kg_prompt_after_user_lockdown_pattern (215072203613597906) --> + <skip /> + <!-- no translation found for kg_prompt_unattended_update (8223448855578632202) --> + <skip /> + <!-- no translation found for kg_prompt_pin_auth_timeout (5868644725126275245) --> + <skip /> + <!-- no translation found for kg_prompt_password_auth_timeout (5809110458491920871) --> + <skip /> + <!-- no translation found for kg_prompt_pattern_auth_timeout (1860605401869262178) --> + <skip /> + <!-- no translation found for kg_prompt_auth_timeout (6620679830980315048) --> + <skip /> + <!-- no translation found for kg_face_locked_out (2751559491287575) --> + <skip /> + <!-- no translation found for kg_fp_locked_out (6228277682396768830) --> + <skip /> + <!-- no translation found for kg_trust_agent_disabled (5400691179958727891) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pin (5492230176361601475) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_pattern (8266214607346180952) --> + <skip /> + <!-- no translation found for kg_primary_auth_locked_out_password (6170245108400198659) --> + <skip /> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Zama futhi kumzuzwana ongu-#.}one{Zama futhi kumizuzwana engu-#.}other{Zama futhi kumizuzwana engu-#.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Faka i-PIN ye-SIM"</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Faka i-PIN ye-SIM ye-\"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string> @@ -76,9 +142,12 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"Umsebenzi we-PUK ye-SIM wehlulekile!"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Shintsha indlela yokufaka"</string> <string name="airplane_mode" msgid="2528005343938497866">"Imodi yendiza"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Iphethini iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> - <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Iphinikhodi iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> - <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Iphasiwedi iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> + <!-- no translation found for kg_prompt_reason_restart_pattern (3321211830602827742) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_pin (2672166323886110512) --> + <skip /> + <!-- no translation found for kg_prompt_reason_restart_password (3967993994418885887) --> + <skip /> <string name="kg_prompt_reason_timeout_pattern" msgid="5514969660010197363">"Ukuze uthole ukuvikeleka okwengeziwe, sebenzisa iphetheni esikhundleni salokho"</string> <string name="kg_prompt_reason_timeout_pin" msgid="4227962059353859376">"Ukuze uthole ukuvikeleka okwengeziwe, sebenzisa i-PIN esikhundleni salokho"</string> <string name="kg_prompt_reason_timeout_password" msgid="8810879144143933690">"Ukuze uthole ukuvikeleka okwengeziwe, sebenzisa iphasiwedi esikhundleni salokho"</string> diff --git a/packages/SystemUI/res/anim/keyguard_settings_popup_ease_out_interpolator.xml b/packages/SystemUI/res/anim/keyguard_settings_popup_ease_out_interpolator.xml new file mode 100644 index 000000000000..8c2937c8c483 --- /dev/null +++ b/packages/SystemUI/res/anim/keyguard_settings_popup_ease_out_interpolator.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<pathInterpolator + xmlns:android="http://schemas.android.com/apk/res/android" + android:controlX1="0.30" + android:controlY1="0.00" + android:controlX2="0.33" + android:controlY2="1.00" /> diff --git a/packages/SystemUI/res/anim/long_press_lock_screen_popup_enter.xml b/packages/SystemUI/res/anim/long_press_lock_screen_popup_enter.xml new file mode 100644 index 000000000000..5fa88224968b --- /dev/null +++ b/packages/SystemUI/res/anim/long_press_lock_screen_popup_enter.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<set + xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <scale + android:interpolator="@android:anim/accelerate_decelerate_interpolator" + android:duration="200" + android:fromXScale="0.5" + android:fromYScale="0.5" + android:toXScale="1.02" + android:toYScale="1.02" + android:pivotX="50%" + android:pivotY="50%" /> + + <scale + android:interpolator="@anim/keyguard_settings_popup_ease_out_interpolator" + android:startOffset="200" + android:duration="200" + android:fromXScale="1" + android:fromYScale="1" + android:toXScale="0.98" + android:toYScale="0.98" + android:pivotX="50%" + android:pivotY="50%" /> + + <alpha + android:interpolator="@android:anim/linear_interpolator" + android:duration="83" + android:fromAlpha="0" + android:toAlpha="1" /> + +</set> diff --git a/packages/SystemUI/res/anim/long_press_lock_screen_popup_exit.xml b/packages/SystemUI/res/anim/long_press_lock_screen_popup_exit.xml new file mode 100644 index 000000000000..a6938defd4be --- /dev/null +++ b/packages/SystemUI/res/anim/long_press_lock_screen_popup_exit.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<set + xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <scale + android:interpolator="@android:anim/accelerate_interpolator" + android:duration="233" + android:fromXScale="1" + android:fromYScale="1" + android:toXScale="0.5" + android:toYScale="0.5" + android:pivotX="50%" + android:pivotY="50%" /> + + <alpha + android:interpolator="@android:anim/linear_interpolator" + android:delay="150" + android:duration="83" + android:fromAlpha="1" + android:toAlpha="0" /> + +</set> diff --git a/packages/SystemUI/res/drawable/contrast_dialog_button_background.xml b/packages/SystemUI/res/drawable/contrast_dialog_button_background.xml new file mode 100644 index 000000000000..4181220ed68c --- /dev/null +++ b/packages/SystemUI/res/drawable/contrast_dialog_button_background.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright 2023, The Android Open Source Project +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--> +<selector + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> + + <item android:state_selected="true"> + <shape android:shape="rectangle"> + <solid android:color="?androidprv:attr/colorSurfaceHighlight" /> + <stroke + android:color="?androidprv:attr/colorAccentPrimary" + android:width="@dimen/contrast_dialog_button_stroke_width" /> + <corners android:radius="@dimen/contrast_dialog_button_radius"/> + </shape> + </item> + + <item> + <layer-list> + <item android:top="@dimen/contrast_dialog_button_stroke_width" + android:bottom="@dimen/contrast_dialog_button_stroke_width" + android:left="@dimen/contrast_dialog_button_stroke_width" + android:right="@dimen/contrast_dialog_button_stroke_width"> + <shape android:shape="rectangle"> + <solid android:color="?androidprv:attr/colorSurfaceHighlight" /> + <corners android:radius="@dimen/contrast_dialog_button_radius"/> + </shape> + </item> + </layer-list> + </item> +</selector> diff --git a/packages/SystemUI/res/drawable/ic_contrast_high.xml b/packages/SystemUI/res/drawable/ic_contrast_high.xml new file mode 100644 index 000000000000..aa5b5abc33aa --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_contrast_high.xml @@ -0,0 +1,25 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<vector android:autoMirrored="true" android:height="20dp" + android:viewportHeight="20" android:viewportWidth="66" + android:width="66dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#F2F1E8" + android:pathData="M0.5,8C0.5,3.858 3.858,0.5 8,0.5H58C62.142,0.5 65.5,3.858 65.5,8V12C65.5,16.142 62.142,19.5 58,19.5H8C3.858,19.5 0.5,16.142 0.5,12V8Z" + android:strokeColor="#1B1C17" android:strokeWidth="1"/> + <path android:fillColor="#1B1C17" android:pathData="M11,10m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"/> + <path android:fillColor="#1B1C17" android:pathData="M23,5L43,5A2,2 0,0 1,45 7L45,7A2,2 0,0 1,43 9L23,9A2,2 0,0 1,21 7L21,7A2,2 0,0 1,23 5z"/> + <path android:fillColor="#1B1C17" android:pathData="M23,11L55,11A2,2 0,0 1,57 13L57,13A2,2 0,0 1,55 15L23,15A2,2 0,0 1,21 13L21,13A2,2 0,0 1,23 11z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_contrast_medium.xml b/packages/SystemUI/res/drawable/ic_contrast_medium.xml new file mode 100644 index 000000000000..89519b86b974 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_contrast_medium.xml @@ -0,0 +1,23 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<vector android:autoMirrored="true" android:height="20dp" + android:viewportHeight="20" android:viewportWidth="66" + android:width="66dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#F2F1E8" android:pathData="M0,8C0,3.582 3.582,0 8,0H58C62.418,0 66,3.582 66,8V12C66,16.418 62.418,20 58,20H8C3.582,20 0,16.418 0,12V8Z"/> + <path android:fillColor="#919283" android:pathData="M11,10m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"/> + <path android:fillColor="#919283" android:pathData="M23,5L43,5A2,2 0,0 1,45 7L45,7A2,2 0,0 1,43 9L23,9A2,2 0,0 1,21 7L21,7A2,2 0,0 1,23 5z"/> + <path android:fillColor="#919283" android:pathData="M23,11L55,11A2,2 0,0 1,57 13L57,13A2,2 0,0 1,55 15L23,15A2,2 0,0 1,21 13L21,13A2,2 0,0 1,23 11z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_contrast_standard.xml b/packages/SystemUI/res/drawable/ic_contrast_standard.xml new file mode 100644 index 000000000000..f914975823da --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_contrast_standard.xml @@ -0,0 +1,23 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<vector android:autoMirrored="true" android:height="20dp" + android:viewportHeight="20" android:viewportWidth="66" + android:width="66dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#C7C8B7" android:pathData="M0,8C0,3.582 3.582,0 8,0H58C62.418,0 66,3.582 66,8V12C66,16.418 62.418,20 58,20H8C3.582,20 0,16.418 0,12V8Z"/> + <path android:fillColor="#919283" android:pathData="M11,10m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"/> + <path android:fillColor="#919283" android:pathData="M23,5L43,5A2,2 0,0 1,45 7L45,7A2,2 0,0 1,43 9L23,9A2,2 0,0 1,21 7L21,7A2,2 0,0 1,23 5z"/> + <path android:fillColor="#919283" android:pathData="M23,11L55,11A2,2 0,0 1,57 13L57,13A2,2 0,0 1,55 15L23,15A2,2 0,0 1,21 13L21,13A2,2 0,0 1,23 11z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_qs_no_calling_sms.xml b/packages/SystemUI/res/drawable/ic_shade_no_calling_sms.xml index da581061370b..da581061370b 100644 --- a/packages/SystemUI/res/drawable/ic_qs_no_calling_sms.xml +++ b/packages/SystemUI/res/drawable/ic_shade_no_calling_sms.xml diff --git a/packages/SystemUI/res/drawable/ic_qs_sim_card.xml b/packages/SystemUI/res/drawable/ic_shade_sim_card.xml index 6eda929b54d3..6eda929b54d3 100644 --- a/packages/SystemUI/res/drawable/ic_qs_sim_card.xml +++ b/packages/SystemUI/res/drawable/ic_shade_sim_card.xml diff --git a/packages/SystemUI/res/drawable/keyguard_settings_popup_menu_background.xml b/packages/SystemUI/res/drawable/keyguard_settings_popup_menu_background.xml index 3807b92ae39d..a0ceb81d42f4 100644 --- a/packages/SystemUI/res/drawable/keyguard_settings_popup_menu_background.xml +++ b/packages/SystemUI/res/drawable/keyguard_settings_popup_menu_background.xml @@ -17,17 +17,17 @@ <ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:color="?android:attr/colorControlHighlight"> + android:color="#4d000000"> <item android:id="@android:id/mask"> <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> - <corners android:radius="28dp" /> + <corners android:radius="@dimen/keyguard_affordance_fixed_radius" /> </shape> </item> <item> <shape android:shape="rectangle"> - <solid android:color="?androidprv:attr/colorSurface" /> - <corners android:radius="28dp" /> + <solid android:color="?androidprv:attr/materialColorOnBackground" /> + <corners android:radius="@dimen/keyguard_affordance_fixed_radius" /> </shape> </item> </ripple> diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml index dffe40b8454a..441f963a855a 100644 --- a/packages/SystemUI/res/layout/combined_qs_header.xml +++ b/packages/SystemUI/res/layout/combined_qs_header.xml @@ -94,7 +94,7 @@ <include android:id="@+id/carrier_group" - layout="@layout/qs_carrier_group" + layout="@layout/shade_carrier_group" app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height" android:minHeight="@dimen/large_screen_shade_header_min_height" app:layout_constraintWidth_min="48dp" diff --git a/packages/SystemUI/res/layout/contrast_dialog.xml b/packages/SystemUI/res/layout/contrast_dialog.xml new file mode 100644 index 000000000000..8e885cf39e2b --- /dev/null +++ b/packages/SystemUI/res/layout/contrast_dialog.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT 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" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <Space + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"/> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <FrameLayout + android:id="@+id/contrast_button_standard" + android:layout_width="@dimen/contrast_dialog_button_total_size" + android:layout_height="@dimen/contrast_dialog_button_total_size" + android:background="@drawable/contrast_dialog_button_background"> + + <ImageView + android:layout_gravity="center" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_contrast_standard"/> + </FrameLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/contrast_dialog_button_text_spacing" + android:gravity="center_horizontal|top" + android:textSize="@dimen/contrast_dialog_button_text_size" + android:text="@string/quick_settings_contrast_standard" + android:textColor="?androidprv:attr/textColorPrimary"/> + </LinearLayout> + + <Space + android:layout_width="@dimen/contrast_dialog_button_horizontal_spacing" + android:layout_height="match_parent" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <FrameLayout + android:id="@+id/contrast_button_medium" + android:layout_width="@dimen/contrast_dialog_button_total_size" + android:layout_height="@dimen/contrast_dialog_button_total_size" + android:background="@drawable/contrast_dialog_button_background"> + + <ImageView + android:layout_gravity="center" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_contrast_medium"/> + </FrameLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/contrast_dialog_button_text_spacing" + android:gravity="center_horizontal|top" + android:textSize="@dimen/contrast_dialog_button_text_size" + android:text="@string/quick_settings_contrast_medium" + android:textColor="?androidprv:attr/textColorPrimary"/> + </LinearLayout> + + <Space + android:layout_width="@dimen/contrast_dialog_button_horizontal_spacing" + android:layout_height="match_parent" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <FrameLayout + android:id="@+id/contrast_button_high" + android:layout_width="@dimen/contrast_dialog_button_total_size" + android:layout_height="@dimen/contrast_dialog_button_total_size" + android:background="@drawable/contrast_dialog_button_background"> + + <ImageView + android:layout_gravity="center" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_contrast_high"/> + + </FrameLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/contrast_dialog_button_text_spacing" + android:gravity="center_horizontal|top" + android:textSize="@dimen/contrast_dialog_button_text_size" + android:text="@string/quick_settings_contrast_high" + android:textColor="?androidprv:attr/textColorPrimary"/> + </LinearLayout> + + <Space + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"/> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 4048a39344bd..c0f7029449a1 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -20,7 +20,7 @@ android:id="@+id/keyguard_bottom_area" android:layout_height="match_parent" android:layout_width="match_parent" - android:outlineProvider="none" > <!-- Put it above the status bar header --> + android:outlineProvider="none" > <LinearLayout android:id="@+id/keyguard_indication_area" @@ -59,33 +59,58 @@ </LinearLayout> - <com.android.systemui.animation.view.LaunchableImageView - android:id="@+id/start_button" - android:layout_height="@dimen/keyguard_affordance_fixed_height" - android:layout_width="@dimen/keyguard_affordance_fixed_width" - android:layout_gravity="bottom|start" - android:scaleType="fitCenter" - android:padding="@dimen/keyguard_affordance_fixed_padding" - android:tint="?android:attr/textColorPrimary" - android:background="@drawable/keyguard_bottom_affordance_bg" - android:foreground="@drawable/keyguard_bottom_affordance_selected_border" - android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset" - android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" - android:visibility="gone" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="bottom" + > + + <com.android.systemui.animation.view.LaunchableImageView + android:id="@+id/start_button" + android:layout_height="@dimen/keyguard_affordance_fixed_height" + android:layout_width="@dimen/keyguard_affordance_fixed_width" + android:layout_gravity="bottom|start" + android:scaleType="fitCenter" + android:padding="@dimen/keyguard_affordance_fixed_padding" + android:tint="?android:attr/textColorPrimary" + android:background="@drawable/keyguard_bottom_affordance_bg" + android:foreground="@drawable/keyguard_bottom_affordance_selected_border" + android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset" + android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" + android:visibility="invisible" /> - <com.android.systemui.animation.view.LaunchableImageView - android:id="@+id/end_button" - android:layout_height="@dimen/keyguard_affordance_fixed_height" - android:layout_width="@dimen/keyguard_affordance_fixed_width" - android:layout_gravity="bottom|end" - android:scaleType="fitCenter" - android:padding="@dimen/keyguard_affordance_fixed_padding" - android:tint="?android:attr/textColorPrimary" - android:background="@drawable/keyguard_bottom_affordance_bg" - android:foreground="@drawable/keyguard_bottom_affordance_selected_border" - android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset" - android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" - android:visibility="gone" /> + <FrameLayout + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:paddingHorizontal="24dp" + > + <include + android:id="@+id/keyguard_settings_button" + layout="@layout/keyguard_settings_popup_menu" + android:layout_width="wrap_content" + android:layout_height="@dimen/keyguard_affordance_fixed_height" + android:layout_gravity="center" + android:visibility="gone" + /> + </FrameLayout> + + <com.android.systemui.animation.view.LaunchableImageView + android:id="@+id/end_button" + android:layout_height="@dimen/keyguard_affordance_fixed_height" + android:layout_width="@dimen/keyguard_affordance_fixed_width" + android:layout_gravity="bottom|end" + android:scaleType="fitCenter" + android:padding="@dimen/keyguard_affordance_fixed_padding" + android:tint="?android:attr/textColorPrimary" + android:background="@drawable/keyguard_bottom_affordance_bg" + android:foreground="@drawable/keyguard_bottom_affordance_selected_border" + android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset" + android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" + android:visibility="invisible" /> + + </LinearLayout> <FrameLayout android:id="@+id/overlay_container" diff --git a/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml b/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml index 89d88fea1817..9d0d783d0113 100644 --- a/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml +++ b/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml @@ -15,25 +15,23 @@ ~ --> -<LinearLayout +<com.android.systemui.animation.view.LaunchableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minHeight="52dp" + android:layout_height="48dp" android:orientation="horizontal" android:gravity="center_vertical" android:background="@drawable/keyguard_settings_popup_menu_background" - android:paddingStart="16dp" - android:paddingEnd="24dp" - android:paddingVertical="16dp"> + android:padding="12dp"> <ImageView android:id="@+id/icon" - android:layout_width="20dp" - android:layout_height="20dp" - android:layout_marginEnd="16dp" - android:tint="?android:attr/textColorPrimary" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginEnd="8dp" + android:tint="?androidprv:attr/materialColorOnSecondaryFixed" android:importantForAccessibility="no" tools:ignore="UseAppTint" /> @@ -42,9 +40,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorPrimary" + android:textColor="?androidprv:attr/materialColorOnSecondaryFixed" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" /> -</LinearLayout>
\ No newline at end of file +</com.android.systemui.animation.view.LaunchableLinearLayout> diff --git a/packages/SystemUI/res/layout/notification_conversation_info.xml b/packages/SystemUI/res/layout/notification_conversation_info.xml index 79948da978d7..4f6e88c2266f 100644 --- a/packages/SystemUI/res/layout/notification_conversation_info.xml +++ b/packages/SystemUI/res/layout/notification_conversation_info.xml @@ -170,11 +170,11 @@ android:layout_width="@dimen/notification_importance_toggle_size" android:layout_height="@dimen/notification_importance_toggle_size" android:layout_centerVertical="true" - android:background="@drawable/ripple_drawable" android:contentDescription="@string/notification_more_settings" + android:background="@drawable/ripple_drawable_20dp" android:src="@drawable/ic_settings" - android:layout_alignParentEnd="true" - android:tint="@color/notification_guts_link_icon_tint"/> + android:tint="?android:attr/colorAccent" + android:layout_alignParentEnd="true" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml index 4d6c2022c3b8..852db1b8fb91 100644 --- a/packages/SystemUI/res/layout/notification_info.xml +++ b/packages/SystemUI/res/layout/notification_info.xml @@ -108,11 +108,11 @@ asked for it --> android:layout_width="@dimen/notification_importance_toggle_size" android:layout_height="@dimen/notification_importance_toggle_size" android:layout_centerVertical="true" - android:background="@android:color/transparent" android:contentDescription="@string/notification_more_settings" - android:src="@drawable/notif_settings_button" - android:layout_alignParentEnd="true" - android:tint="@color/notification_guts_link_icon_tint"/> + android:background="@drawable/ripple_drawable_20dp" + android:src="@drawable/ic_settings" + android:tint="?android:attr/colorAccent" + android:layout_alignParentEnd="true" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/partial_conversation_info.xml b/packages/SystemUI/res/layout/partial_conversation_info.xml index 9ed3f92a7d74..4850b35833e5 100644 --- a/packages/SystemUI/res/layout/partial_conversation_info.xml +++ b/packages/SystemUI/res/layout/partial_conversation_info.xml @@ -81,11 +81,11 @@ android:layout_width="@dimen/notification_importance_toggle_size" android:layout_height="@dimen/notification_importance_toggle_size" android:layout_centerVertical="true" - android:background="@drawable/ripple_drawable" android:contentDescription="@string/notification_more_settings" + android:background="@drawable/ripple_drawable_20dp" android:src="@drawable/ic_settings" - android:layout_alignParentEnd="true" - android:tint="@color/notification_guts_link_icon_tint"/> + android:tint="?android:attr/colorAccent" + android:layout_alignParentEnd="true"/> </LinearLayout> diff --git a/packages/SystemUI/res/layout/qs_carrier.xml b/packages/SystemUI/res/layout/shade_carrier.xml index a854660f64f8..0fed393a7ed3 100644 --- a/packages/SystemUI/res/layout/qs_carrier.xml +++ b/packages/SystemUI/res/layout/shade_carrier.xml @@ -14,7 +14,7 @@ ~ limitations under the License --> -<com.android.systemui.qs.carrier.QSCarrier +<com.android.systemui.shade.carrier.ShadeCarrier xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear_carrier" android:layout_width="wrap_content" @@ -29,7 +29,7 @@ android:focusable="true" > <com.android.systemui.util.AutoMarqueeTextView - android:id="@+id/qs_carrier_text" + android:id="@+id/shade_carrier_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" @@ -53,4 +53,4 @@ android:layout_marginStart="@dimen/qs_carrier_margin_width" android:visibility="gone" /> -</com.android.systemui.qs.carrier.QSCarrier>
\ No newline at end of file +</com.android.systemui.shade.carrier.ShadeCarrier>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/qs_carrier_group.xml b/packages/SystemUI/res/layout/shade_carrier_group.xml index 6e13ab972226..2e8f98cbd190 100644 --- a/packages/SystemUI/res/layout/qs_carrier_group.xml +++ b/packages/SystemUI/res/layout/shade_carrier_group.xml @@ -15,7 +15,7 @@ --> <!-- Extends LinearLayout --> -<com.android.systemui.qs.carrier.QSCarrierGroup +<com.android.systemui.shade.carrier.ShadeCarrierGroup xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/qs_mobile" android:layout_width="0dp" @@ -39,25 +39,25 @@ android:visibility="gone"/> <include - layout="@layout/qs_carrier" + layout="@layout/shade_carrier" android:id="@+id/carrier1" android:layout_weight="1"/> <View - android:id="@+id/qs_carrier_divider1" + android:id="@+id/shade_carrier_divider1" android:layout_width="@dimen/qs_header_carrier_separator_width" android:layout_height="match_parent" android:visibility="gone" android:importantForAccessibility="no"/> <include - layout="@layout/qs_carrier" + layout="@layout/shade_carrier" android:id="@+id/carrier2" android:layout_weight="1" android:visibility="gone"/> <View - android:id="@+id/qs_carrier_divider2" + android:id="@+id/shade_carrier_divider2" android:layout_width="@dimen/qs_header_carrier_separator_width" android:layout_height="match_parent" android:layout_weight="1" @@ -65,9 +65,9 @@ android:importantForAccessibility="no"/> <include - layout="@layout/qs_carrier" + layout="@layout/shade_carrier" android:id="@+id/carrier3" android:layout_weight="1" android:visibility="gone"/> -</com.android.systemui.qs.carrier.QSCarrierGroup>
\ No newline at end of file +</com.android.systemui.shade.carrier.ShadeCarrierGroup>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index a11ffcda9830..f1fca7603571 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -120,10 +120,6 @@ /> </com.android.systemui.shade.NotificationsQuickSettingsContainer> - <include - layout="@layout/keyguard_bottom_area" - android:visibility="gone" /> - <ViewStub android:id="@+id/keyguard_user_switcher_stub" android:layout="@layout/keyguard_user_switcher" @@ -153,6 +149,10 @@ </com.android.keyguard.LockIconView> + <include + layout="@layout/keyguard_bottom_area" + android:visibility="gone" /> + <FrameLayout android:id="@+id/preview_container" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index bb2f0f669e45..752346acfcb3 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"deaktiveer"</string> <string name="sound_settings" msgid="8874581353127418308">"Klank en vibrasie"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Instellings"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Program is vasgespeld"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Dit hou dit in sig totdat jy dit ontspeld. Raak en hou Terug en Oorsig om dit te ontspeld."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Dit hou dit in sig totdat jy dit ontspeld. Raak en hou Terug en Tuis om dit te ontspeld."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Medium"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Klein"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Groot"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Volskerm"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Klaar"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Wysig"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Vergrootglasvensterinstellings"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle kontroles is verwyder"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Veranderinge is nie gestoor nie"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Sien ander programme"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontroles kon nie gelaai word nie. Gaan die <xliff:g id="APP">%s</xliff:g>-program na om seker te maak dat die programinstellings nie verander het nie."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Versoenbare kontroles is nie beskikbaar nie"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Ander"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index dd863ac0ac10..10c7c44a8f18 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"አሰናክል"</string> <string name="sound_settings" msgid="8874581353127418308">"ድምፅ እና ንዝረት"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ቅንብሮች"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"መተግበሪያ ተሰክቷል"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"ይሄ እስኪነቅሉት ድረስ በእይታ ውስጥ ያስቀምጠዋል። ለመንቀል ተመለስ እና አጠቃላይ ዕይታ የሚለውን ይጫኑ እና ይያዙ።"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"ይሄ እስኪነቅሉት ድረስ በእይታ ውስጥ ያስቀምጠዋል። ለመንቀል ተመለስ እና መነሻ የሚለውን ይንኩ እና ይያዙ።"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"መካከለኛ"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ትንሽ"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ትልቅ"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ሙሉ ገጽ ዕይታ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ተከናውኗል"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"አርትዕ"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"የማጉያ መስኮት ቅንብሮች"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"ሁሉም መቆጣጠሪያዎች ተወግደዋል"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ለውጦች አልተቀመጡም"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ሌሎች መተግበሪያዎች ይመልከቱ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"መቆጣጠሪያዎች ሊጫኑ አልቻሉም። የመተግበሪያው ቅንብሮች እንዳልተቀየሩ ለማረጋገጥ <xliff:g id="APP">%s</xliff:g> መተግበሪያን ይፈትሹ።"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ተኳዃኝ መቆጣጠሪያዎች አይገኙም"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ሌላ"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 1751e7803724..1fa13d5ccd83 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"إيقاف"</string> <string name="sound_settings" msgid="8874581353127418308">"الصوت والاهتزاز"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"الإعدادات"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"تم تثبيت الشاشة على التطبيق"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"يؤدي هذا إلى استمرار عرض الشاشة المُختارة إلى أن تتم إزالة تثبيتها. المس مع الاستمرار الزرين \"رجوع\" و\"نظرة عامة\" لإزالة التثبيت."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"يؤدي هذا إلى استمرار عرض الشاشة المُختارة إلى أن تتم إزالة تثبيتها. المس مع الاستمرار الزرين \"رجوع\" و\"الشاشة الرئيسية\" لإزالة التثبيت."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"متوسط"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"صغير"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"كبير"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ملء الشاشة"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"تم"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"تعديل"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"إعدادات نافذة مكبّر الشاشة"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"تمت إزالة كل عناصر التحكّم."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"لم يتم حفظ التغييرات."</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"عرض التطبيقات الأخرى"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"تعذَّر تحميل عناصر التحكّم. تحقّق من تطبيق <xliff:g id="APP">%s</xliff:g> للتأكّد من أنه لم يتم تغيير إعدادات التطبيق."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"عناصر التحكّم المتوافقة غير متوفّرة"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"غير ذلك"</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 9a6ab18a52e2..b42dbeb748e9 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -71,14 +71,14 @@ <string name="global_action_screenshot" msgid="2760267567509131654">"স্ক্ৰীনশ্বট"</string> <string name="global_action_smart_lock_disabled" msgid="6286551337177954859">"Extend Unlock অক্ষম কৰা আছে"</string> <string name="remote_input_image_insertion_text" msgid="4850791636452521123">"এখন প্ৰতিচ্ছবি পঠিয়াইছে"</string> - <string name="screenshot_saving_title" msgid="2298349784913287333">"স্ক্ৰীণশ্বট ছেভ কৰি থকা হৈছে…"</string> + <string name="screenshot_saving_title" msgid="2298349784913287333">"স্ক্ৰীনশ্বট ছেভ কৰি থকা হৈছে…"</string> <string name="screenshot_saving_work_profile_title" msgid="5332829607308450880">"কৰ্মস্থানৰ প্ৰ’ফাইলত স্ক্ৰীনশ্বট ছেভ কৰি থকা হৈছে…"</string> - <string name="screenshot_saved_title" msgid="8893267638659083153">"স্ক্ৰীণশ্বট ছেভ কৰা হ’ল"</string> - <string name="screenshot_failed_title" msgid="3259148215671936891">"স্ক্ৰীণশ্বট ছেভ কৰিব পৰা নগ\'ল"</string> + <string name="screenshot_saved_title" msgid="8893267638659083153">"স্ক্ৰীনশ্বট ছেভ কৰা হ’ল"</string> + <string name="screenshot_failed_title" msgid="3259148215671936891">"স্ক্ৰীনশ্বট ছেভ কৰিব পৰা নগ\'ল"</string> <string name="screenshot_failed_to_save_user_locked_text" msgid="6156607948256936920">"স্ক্ৰীনশ্বট ছেভ কৰিবলৈ ডিভাইচটো আনলক কৰিবই লাগিব"</string> - <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"স্ক্ৰীণশ্বট আকৌ ল\'বলৈ চেষ্টা কৰক"</string> + <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"স্ক্ৰীনশ্বট আকৌ ল\'বলৈ চেষ্টা কৰক"</string> <string name="screenshot_failed_to_save_text" msgid="7232739948999195960">"স্ক্ৰীনশ্বট ছেভ কৰিব নোৱাৰি"</string> - <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"এপটোৱে বা আপোনাৰ প্ৰতিষ্ঠানে স্ক্ৰীণশ্বট ল\'বলৈ অনুমতি নিদিয়ে"</string> + <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"এপটোৱে বা আপোনাৰ প্ৰতিষ্ঠানে স্ক্ৰীনশ্বট ল\'বলৈ অনুমতি নিদিয়ে"</string> <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"স্ক্ৰীনশ্বট লোৱাটো আপোনাৰ আইটি প্ৰশাসকে অৱৰোধ কৰিছে"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"সম্পাদনা কৰক"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"স্ক্ৰীনশ্বট সম্পাদনা কৰক"</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"অক্ষম কৰক"</string> <string name="sound_settings" msgid="8874581353127418308">"ধ্বনি আৰু কম্পন"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ছেটিং"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"এপ্টো পিন কৰা আছে"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"এই কাৰ্যই আপুনি আনপিন নকৰালৈকে ইয়াক দেখা পোৱা অৱস্থাত ৰাখে। আনপিন কৰিবলৈ \'পিছলৈ যাওক\' আৰু \'অৱলোকন\'-ত স্পৰ্শ কৰি থাকক।"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"এই কাৰ্যই আপুনি আনপিন নকৰালৈকে ইয়াক দেখা পোৱা অৱস্থাত ৰাখে। আনপিন কৰিবলৈ পিছলৈ যাওক আৰু হ\'মত স্পৰ্শ কৰি সেঁচি ধৰক।"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"মধ্যমীয়া"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"সৰু"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ডাঙৰ"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"পূৰ্ণ স্ক্ৰীন"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"কৰা হ’ল"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"সম্পাদনা কৰক"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"বিবৰ্ধকৰ ৱিণ্ড’ৰ ছেটিং"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"আটাইবোৰ নিয়ন্ত্ৰণ আঁতৰোৱা হৈছে"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"সালসলনিসমূহ ছেভ নহ’ল"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"অন্য এপ্সমূহ চাওক"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"নিয়ন্ত্ৰণসমূহ ল’ড কৰিবপৰা নগ’ল। এপ্টোৰ ছেটিং সলনি কৰা হোৱা নাই বুলি নিশ্চিত কৰিবলৈ <xliff:g id="APP">%s</xliff:g> এপ্টো পৰীক্ষা কৰক।"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"সমিল নিয়ন্ত্ৰণসমূহ উপলব্ধ নহয়"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"অন্য"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 8834693c1117..8c9af864e876 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"deaktiv edin"</string> <string name="sound_settings" msgid="8874581353127418308">"Səs və vibrasiya"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Ayarlar"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Tətbiq bərkidilib"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Sancaq götürülənə qədər bu görünəcək. Sancağı götürmək üçün Geri və İcmal düymələrinə basıb saxlayın."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"\"Geri\" və \"Əsas ekran\" düymələrinin davamlı basılması ilə çıxarılana qədər tətbiq göz önündə qalır."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Orta"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Kiçik"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Böyük"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Tam ekran"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Hazırdır"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Redaktə edin"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Böyüdücü pəncərə ayarları"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Kontrol vidcetləri silindi"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Dəyişikliklər yadda saxlanmadı"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Digər tətbiqlərə baxın"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Nizamlayıcıları yükləmək mümkün olmadı. <xliff:g id="APP">%s</xliff:g> tətbiqinə toxunaraq tətbiq ayarlarının dəyişmədiyinə əmin olun."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Uyğun nizamlayıcılar əlçatan deyil"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Digə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 3f204accf6c0..fd56a3eba8f4 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"onemogućite"</string> <string name="sound_settings" msgid="8874581353127418308">"Zvuk i vibriranje"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Podešavanja"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikacija je zakačena"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Na ovaj način se ovo stalno prikazuje dok ga ne otkačite. Dodirnite i zadržite Nazad i Pregled da biste ga otkačili."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Na ovaj način se ovo stalno prikazuje dok ga ne otkačite. Dodirnite i zadržite Nazad i Početna da biste ga otkačili."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Srednje"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Malo"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Veliko"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Preko celog ekrana"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Gotovo"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Izmeni"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Podešavanja prozora za uvećanje"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Sve kontrole su uklonjene"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Promene nisu sačuvane"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Pogledajte druge aplikacije"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Učitavanje kontrola nije uspelo. Pogledajte aplikaciju <xliff:g id="APP">%s</xliff:g> da biste se uverili da se podešavanja aplikacije nisu promenila."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilne kontrole nisu dostupne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 5867d9230102..80a07f42ec28 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"адключыць"</string> <string name="sound_settings" msgid="8874581353127418308">"Гук і вібрацыя"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Налады"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Праграма замацавана"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Будзе паказвацца, пакуль не адмацуеце. Каб адмацаваць, краніце і ўтрымлівайце кнопкі \"Назад\" і \"Агляд\"."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Будзе паказвацца, пакуль не адмацуеце. Каб адмацаваць, націсніце і ўтрымлівайце кнопкі \"Назад\" і \"Галоўны экран\"."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Сярэдні"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Дробны"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Вялікі"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Поўнаэкранны рэжым"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Гатова"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Змяніць"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Налады акна лупы"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Усе элементы кіравання выдалены"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Змяненні не захаваны"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Паказаць іншыя праграмы"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Не ўдалося загрузіць элементы кіравання. Праверце, ці не змяніліся налады праграмы \"<xliff:g id="APP">%s</xliff:g>\"."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Сумяшчальныя элементы кіравання недаступныя"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Іншае"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 046ebfce4bb2..585902f6ab81 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"деактивиране"</string> <string name="sound_settings" msgid="8874581353127418308">"Звук и вибриране"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Настройки"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Приложението е фиксирано"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Екранът ще се показва, докато не го освободите с докосване и задържане на бутона за връщане назад и този за общ преглед."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Екранът ще се показва, докато не го освободите с докосване и задържане на бутона за връщане назад и „Начало“."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Среден"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Малък"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Голям"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Цял екран"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Готово"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Редактиране"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Настройки за инструмента за увеличаване на прозорци"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Всички контроли са премахнати"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промените не са запазени"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Преглед на други приложения"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Контролите не се заредиха. Отворете приложението <xliff:g id="APP">%s</xliff:g> и проверете дали настройките му не са променени."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Не са налице съвместими контроли"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Друго"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index f44029768cba..76e657ddd5c7 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -451,13 +451,17 @@ <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent দিয়ে আনলক করে রাখা হয়েছে"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"সাউন্ড সেটিংস"</string> - <string name="volume_odi_captions_tip" msgid="8825655463280990941">"মিডিয়া অটোমেটিক ক্যাপশন করুন"</string> + <string name="volume_odi_captions_tip" msgid="8825655463280990941">"অটোমেটিক মিডিয়া ক্যাপশন দেখুন"</string> <string name="accessibility_volume_close_odi_captions_tip" msgid="8924753283621160480">"ক্লোজড ক্যাপশন টুল টিপ বন্ধ করুন"</string> <string name="volume_odi_captions_content_description" msgid="4172765742046013630">"ক্যাপশন ওভারলে"</string> <string name="volume_odi_captions_hint_enable" msgid="2073091194012843195">"চালু হবে"</string> <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"বন্ধ হবে"</string> <string name="sound_settings" msgid="8874581353127418308">"সাউন্ড ও ভাইব্রেশন"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"সেটিংস"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"অ্যাপ পিন করা হয়েছে"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"এটি আপনি আনপিন না করা পর্যন্ত এটিকে প্রদর্শিত করবে৷ আনপিন করতে ফিরুন এবং ওভারভিউ স্পর্শ করে ধরে থাকুন।"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"এর ফলে আপনি এটি আনপিন না করা পর্যন্ত এটি দেখানো হতে থাকবে। আনপিন করতে \"ফিরে যান\" এবং \"হোম\" বোতামদুটি ট্যাপ করে ধরে রাখুন।"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"মাঝারি"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ছোট"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"বড়"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ফুল স্ক্রিন"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"হয়ে গেছে"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"এডিট করুন"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"\'ম্যাগনিফায়ার উইন্ডো\' সেটিংস"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"সমস্ত কন্ট্রোল সরানো হয়েছে"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"পরিবর্তন সেভ করা হয়নি"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"অন্যান্য অ্যাপ দেখুন"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"কন্ট্রোল লোড করা যায়নি। অ্যাপ সেটিংসে কোনও পরিবর্তন করা হয়েছে কিনা তা ভাল করে দেখে নিতে <xliff:g id="APP">%s</xliff:g> অ্যাপ চেক করুন।"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"মানানসই কন্ট্রোল উপলভ্য নেই"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"অন্য"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index b0638ca2fb6b..4ce0baf96038 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"onemogući"</string> <string name="sound_settings" msgid="8874581353127418308">"Zvuk i vibracija"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Postavke"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikacija je zakačena"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ekran ostaje prikazan ovako dok ga ne otkačite. Da ga otkačite, dodirnite i držite dugme Nazad."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Na ovaj način ekran ostaje prikazan dok ga ne otkačite. Da otkačite ekran, dodirnite i držite dugme Nazad i Početna."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Srednje"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Malo"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Veliko"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Prikaz preko cijelog ekrana"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Gotovo"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Uredi"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Postavke prozora povećala"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Sve kontrole su uklonjene"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Promjene nisu sačuvane"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Prikaži druge aplikacije"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Učitavanje kontrola nije uspjelo. Provjerite aplikaciju <xliff:g id="APP">%s</xliff:g> da se uvjerite da postavke aplikacije nisu izmijenjene."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilne kontrole nisu dostupne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index f85c7b45d522..c08858affbdb 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desactivar"</string> <string name="sound_settings" msgid="8874581353127418308">"So i vibració"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Configuració"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"L\'aplicació està fixada"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Aquest element es continuarà mostrant fins que deixis de fixar-lo. Per fer-ho, toca i mantén premudes els botons Enrere i Aplicacions recents."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Aquest element es continuarà mostrant fins que deixis de fixar-lo. Per fer-ho, mantén premuts els botons Enrere i Inici."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Normal"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Petit"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Gran"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pantalla completa"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Fet"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edita"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Configuració de la finestra de la lupa"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"S\'han suprimit tots els controls"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Els canvis no s\'han desat"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Mostra altres aplicacions"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"No s\'han pogut carregar els controls. Consulta l\'aplicació <xliff:g id="APP">%s</xliff:g> per assegurar-te que la configuració de l\'aplicació no hagi canviat."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Els controls compatibles no estan disponibles"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Altres"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 2c7bea2b3dc8..a63025fec4ff 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"deaktivovat"</string> <string name="sound_settings" msgid="8874581353127418308">"Zvuk a vibrace"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Nastavení"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikace je připnutá"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Obsah bude připnut v zobrazení, dokud jej neuvolníte. Uvolníte jej stisknutím a podržením tlačítek Zpět a Přehled."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Obsah bude připnut v zobrazení, dokud ho neuvolníte. Uvolníte ho podržením tlačítek Zpět a Plocha."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Střední"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Malý"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Velký"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Celá obrazovka"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Hotovo"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Upravit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Nastavení okna zvětšení"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Všechny ovládací prvky byly odstraněny"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Změny nebyly uloženy"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Zobrazit další aplikace"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Ovládací prvky se nepodařilo načíst. V aplikaci <xliff:g id="APP">%s</xliff:g> zkontrolujte, zda se nezměnilo nastavení."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilní ovládání není k dispozici"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Jiné"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index f066e6150fda..e0e1a24e7681 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"deaktiver"</string> <string name="sound_settings" msgid="8874581353127418308">"Lyd og vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Indstillinger"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Appen er fastgjort"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Dette fastholder skærmen i visningen, indtil du frigør den. Tryk på Tilbage og Overblik, og hold fingeren nede for at frigøre skærmen."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Dette fastholder skærmen i visningen, indtil du frigør den. Hold Tilbage og Startskærm nede for at frigøre skærmen."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mellem"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Lille"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Stor"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Fuld skærm"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Udfør"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Rediger"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Indstillinger for lupvindue"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle styringselementerne blev fjernet"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ændringerne blev ikke gemt"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Se andre apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Betjeningselementerne kunne ikke indlæses. Tjek <xliff:g id="APP">%s</xliff:g>-appen for at sikre, at dine appindstillinger ikke er blevet ændret."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatible betjeningselementer er ikke tilgængelige"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Andre"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 2c6b22f709df..662393c260d1 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"deaktivieren"</string> <string name="sound_settings" msgid="8874581353127418308">"Ton & Vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Einstellungen"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"App ist auf dem Bildschirm fixiert"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Die App bleibt so lange auf dem Bildschirm fixiert, bis du die Fixierung aufhebst. Berühre und halte dazu \"Zurück\" und \"Übersicht\"."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Die App bleibt so lange auf dem Bildschirm fixiert, bis du die Fixierung aufhebst. Berühre und halte dazu \"Zurück\" und \"Startbildschirm\"."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mittel"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Klein"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Groß"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Vollbild"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Fertig"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Bearbeiten"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Einstellungen für das Vergrößerungsfenster"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle Steuerelemente entfernt"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Änderungen nicht gespeichert"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Andere Apps ansehen"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Steuerelemente konnten nicht geladen werden. Prüfe in der <xliff:g id="APP">%s</xliff:g> App, ob die Einstellungen möglicherweise geändert wurden."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatible Steuerelemente nicht verfügbar"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Andere"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 9a8c8ab49e72..50b0b4965b43 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -458,6 +458,8 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"απενεργοποίηση"</string> <string name="sound_settings" msgid="8874581353127418308">"Ήχος και δόνηση"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Ρυθμίσεις"</string> + <string name="csd_lowered_title" product="default" msgid="1786173629015030856">"Μειώθηκε σε πιο ασφαλή ένταση ήχου"</string> + <string name="csd_system_lowered_text" product="default" msgid="2001603282316829500">"Η ένταση ήχου ήταν σε υψηλό επίπεδο για μεγαλύτερο διάστημα από αυτό που συνιστάται"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"Η εφαρμογή είναι καρφιτσωμένη."</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Με αυτόν τον τρόπο παραμένει σε προβολή μέχρι να το ξεκαρφιτσώσετε. Αγγίξτε παρατεταμένα τα στοιχεία \"Επιστροφή\" και \"Επισκόπηση\" για ξεκαρφίτσωμα."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Με αυτόν τον τρόπο, παραμένει σε προβολή μέχρι να το ξεκαρφιτσώσετε. Αγγίξτε παρατεταμένα τα στοιχεία \"Πίσω\" και \"Αρχική οθόνη\" για ξεκαρφίτσωμα."</string> @@ -848,8 +850,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Μέτριο"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Μικρό"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Μεγάλο"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Πλήρης οθόνη"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Τέλος"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Επεξεργασία"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Ρυθμίσεις παραθύρου μεγεθυντικού φακού"</string> @@ -885,6 +886,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Όλα τα στοιχεία ελέγχου καταργήθηκαν"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Οι αλλαγές δεν αποθηκεύτηκαν"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Εμφάνιση άλλων εφαρμογών"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Δεν ήταν δυνατή η φόρτωση των στοιχείων ελέγχου. Ελέγξτε την εφαρμογή <xliff:g id="APP">%s</xliff:g> για να βεβαιωθείτε ότι δεν έχουν αλλάξει οι ρυθμίσεις της εφαρμογής."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Μη διαθέσιμα συμβατά στοιχεία ελέγχου"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Άλλο"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 2c9909b77e25..6913b2df9334 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"disable"</string> <string name="sound_settings" msgid="8874581353127418308">"Sound and vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Settings"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"App is pinned"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Medium"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Small"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Large"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Full screen"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Done"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Magnifier window settings"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"See other apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 4479c91357b0..5e3f6ae7c71d 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -458,6 +458,8 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"disable"</string> <string name="sound_settings" msgid="8874581353127418308">"Sound & vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Settings"</string> + <string name="csd_lowered_title" product="default" msgid="1786173629015030856">"Lowered to safer volume"</string> + <string name="csd_system_lowered_text" product="default" msgid="2001603282316829500">"The volume has been high for longer than recommended"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"App is pinned"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string> @@ -884,6 +886,9 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"See other apps"</string> + <string name="controls_favorite_rearrange_button" msgid="2942788904364641185">"Rearrange"</string> + <string name="controls_favorite_add_controls" msgid="1221420435546694004">"Add controls"</string> + <string name="controls_favorite_back_to_editing" msgid="184125114090062713">"Back to editing"</string> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 2c9909b77e25..6913b2df9334 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"disable"</string> <string name="sound_settings" msgid="8874581353127418308">"Sound and vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Settings"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"App is pinned"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Medium"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Small"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Large"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Full screen"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Done"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Magnifier window settings"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"See other apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 2c9909b77e25..6913b2df9334 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"disable"</string> <string name="sound_settings" msgid="8874581353127418308">"Sound and vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Settings"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"App is pinned"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Medium"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Small"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Large"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Full screen"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Done"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Magnifier window settings"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"See other apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 24f09e2f21f9..fd6a2920c95e 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -458,6 +458,8 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"disable"</string> <string name="sound_settings" msgid="8874581353127418308">"Sound & vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Settings"</string> + <string name="csd_lowered_title" product="default" msgid="1786173629015030856">"Lowered to safer volume"</string> + <string name="csd_system_lowered_text" product="default" msgid="2001603282316829500">"The volume has been high for longer than recommended"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"App is pinned"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string> @@ -884,6 +886,9 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"See other apps"</string> + <string name="controls_favorite_rearrange_button" msgid="2942788904364641185">"Rearrange"</string> + <string name="controls_favorite_add_controls" msgid="1221420435546694004">"Add controls"</string> + <string name="controls_favorite_back_to_editing" msgid="184125114090062713">"Back to editing"</string> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 4ffe070ec453..e067d944da85 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -451,13 +451,17 @@ <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent lo mantiene desbloqueado"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Configuración de sonido"</string> - <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Subtitular automáticamente"</string> + <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Muestra subtítulos automáticos"</string> <string name="accessibility_volume_close_odi_captions_tip" msgid="8924753283621160480">"Sugerencia de subtítulos"</string> <string name="volume_odi_captions_content_description" msgid="4172765742046013630">"Superposición de subtítulos"</string> <string name="volume_odi_captions_hint_enable" msgid="2073091194012843195">"habilitar"</string> <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"inhabilitar"</string> <string name="sound_settings" msgid="8874581353127418308">"Sonido y vibración"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Configuración"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"La app está fijada"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Esta función mantiene la pantalla visible hasta que dejes de fijarla. Para ello, mantén presionados los botones Atrás y Recientes."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Esta función mantiene la pantalla visible hasta que dejes de fijarla. Para ello, mantén presionados los botones de inicio y Atrás."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mediano"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pequeño"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pantalla completa"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Listo"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editar"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Configuración de la ventana de ampliación"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Se quitaron todos los controles"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"No se guardaron los cambios"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ver otras apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"No se pudieron cargar los controles. Revisa la app de <xliff:g id="APP">%s</xliff:g> para asegurarte de que su configuración no haya cambiado."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"No hay ningún control compatible disponible"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Otros"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 5d19759ed46d..5ba337e69e3b 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desactivar"</string> <string name="sound_settings" msgid="8874581353127418308">"Sonido y vibración"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Ajustes"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplicación fijada"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"La aplicación se mantendrá visible hasta que dejes de fijarla. Para dejar de fijarla, mantén pulsados los botones Atrás y Aplicaciones recientes."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"La aplicación se mantendrá visible hasta que dejes de fijarla. Para dejar de fijarla, mantén pulsados los botones Atrás e Inicio."</string> @@ -848,9 +852,8 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mediano"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pequeño"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> - <string name="accessibility_magnification_done" msgid="263349129937348512">"Listo"</string> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pantalla completa"</string> + <string name="accessibility_magnification_done" msgid="263349129937348512">"Hecho"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editar"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Configuración de la ventana de la lupa"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Toca para abrir funciones de accesibilidad. Personaliza o sustituye este botón en Ajustes.\n\n"<annotation id="link">"Ver ajustes"</annotation></string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos los controles quitados"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"No se han guardado los cambios"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ver otras aplicaciones"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"No se han podido cargar los controles. Comprueba que no hayan cambiado los ajustes de la aplicación <xliff:g id="APP">%s</xliff:g>."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Los controles compatibles no están disponibles"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Otros"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 5573a40c73f1..7db471ac7a0f 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"keela"</string> <string name="sound_settings" msgid="8874581353127418308">"Heli ja vibreerimine"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Seaded"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Rakendus on kinnitatud"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"See hoitakse kuval, kuni selle vabastate. Vabastamiseks puudutage pikalt nuppe Tagasi ja Ülevaade."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"See hoitakse kuval, kuni selle vabastate. Vabastamiseks puudutage pikalt nuppe Tagasi ja Avakuva."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Keskmine"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Väike"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Suur"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Täisekraan"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Valmis"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Muuda"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Luubi akna seaded"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Kõik juhtelemendid eemaldati"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Muudatusi ei salvestatud"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Kuva muud rakendused"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Juhtelemente ei õnnestunud laadida. Kontrollige rakendust <xliff:g id="APP">%s</xliff:g> ja veenduge, et rakenduse seaded poleks muutunud."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Ühilduvaid juhtelemente pole saadaval"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Muu"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 15e236cda8d2..492bb6faa402 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desgaitu"</string> <string name="sound_settings" msgid="8874581353127418308">"Audioa eta dardara"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Ezarpenak"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikazioa ainguratuta dago"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Horrela, ikusgai egongo da aingura kendu arte. Aingura kentzeko, eduki sakatuta \"Atzera\" eta \"Ikuspegi orokorra\" botoiak."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Horrela, ikusgai egongo da aingura kendu arte. Aingura kentzeko, eduki sakatuta Atzera eta Hasiera botoiak."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Ertaina"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Txikia"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Handia"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pantaila osoa"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Eginda"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editatu"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Luparen leihoaren ezarpenak"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Kendu dira kontrolatzeko aukera guztiak"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ez dira gorde aldaketak"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ikusi beste aplikazio batzuk"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Ezin izan dira kargatu kontrolatzeko aukerak. Joan <xliff:g id="APP">%s</xliff:g> aplikaziora, eta ziurtatu aplikazioaren ezarpenak ez direla aldatu."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Ez dago erabilgarri kontrolatzeko aukera bateragarririk"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Beste bat"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 47ebc9eadd0f..b8bf0c91cb54 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"غیرفعال کردن"</string> <string name="sound_settings" msgid="8874581353127418308">"صدا و لرزش"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"تنظیمات"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"برنامه سنجاق شده است"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"تا زمانی که سنجاق را برندارید، در نما نگهداشته میشود. برای برداشتن سنجاق، «برگشت» و «نمای کلی» را لمس کنید و نگهدارید."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"تا برداشتن سنجاق، در نما نگهداشته میشود. برای برداشتن سنجاق، «برگشت» و «صفحه اصلی» را لمس کنید و نگهدارید."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"متوسط"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"کوچک"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"بزرگ"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"تمامصفحه"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"تمام"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ویرایش"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"تنظیمات پنجره ذرهبین"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"همه کنترلها برداشته شدهاند"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"تغییرات ذخیره نشد"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"دیدن برنامههای دیگر"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"کنترلها بار نشدند. برنامه <xliff:g id="APP">%s</xliff:g> را بررسی کنید تا مطمئن شوید تنظیمات برنامه تغییر نکرده باشد."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"کنترلهای سازگار دردسترس نیستند"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"موارد دیگر"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 9d61ec37f4d3..d7d211715d01 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"poista käytöstä"</string> <string name="sound_settings" msgid="8874581353127418308">"Ääni ja värinä"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Asetukset"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Sovellus on kiinnitetty"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Pysyy näkyvissä, kunnes irrotat sen. Irrota painamalla pitkään Edellinen ja Viimeisimmät."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Pysyy näkyvissä, kunnes irrotat sen. Irrota painamalla pitkään Edellinen ja Aloitusnäyttö."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Keskitaso"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pieni"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Suuri"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Koko näyttö"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Valmis"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Muokkaa"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Ikkunan suurennuksen asetukset"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Kaikki säätimet poistettu"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Muutoksia ei tallennettu"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Katso muita sovelluksia"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Säätimiä ei voitu ladata. Avaa <xliff:g id="APP">%s</xliff:g> ja tarkista, että sovelluksen asetukset eivät ole muuttuneet."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Yhteensopivat säätimet eivät käytettävissä"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Muu"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 7cede1f3e5c8..4abf838a3fc5 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"désactiver"</string> <string name="sound_settings" msgid="8874581353127418308">"Son et vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Paramètres"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"L\'application est épinglée"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Cet écran est épinglé jusqu\'à ce que vous annuliez l\'opération. Pour annuler l\'épinglage, maintenez le doigt sur « Retour » et « Aperçu »."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Cet écran est épinglé jusqu\'à ce que vous annuliez l\'opération. Pour annuler l\'épinglage, maintenez le doigt sur les touches Retour et Accueil."</string> @@ -885,6 +889,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Toutes les commandes ont été supprimées"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Modifications non enregistrées"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Afficher autres applications"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Impossible de charger les commandes. Vérifiez l\'application <xliff:g id="APP">%s</xliff:g> pour vous assurer que les paramètres de l\'application n\'ont pas changé."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Les commandes compatibles ne sont pas accessibles"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Autre"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index e8e88474818f..fa48b7ab472a 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"désactiver"</string> <string name="sound_settings" msgid="8874581353127418308">"Son et vibreur"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Paramètres"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"L\'application est épinglée"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Elle restera visible jusqu\'à ce que vous la retiriez. Pour la retirer, appuyez de manière prolongée sur les boutons Retour et Récents."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Elle restera visible jusqu\'à ce que vous la retiriez. Pour la retirer, appuyez de manière prolongée sur les boutons Retour et Accueil."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Moyen"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Petit"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grand"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Plein écran"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"OK"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Modifier"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Paramètres de la fenêtre d\'agrandissement"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Toutes les commandes ont été supprimées"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Les modifications n\'ont pas été enregistrées"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Afficher d\'autres applications"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Impossible de charger les commandes. Vérifiez l\'application <xliff:g id="APP">%s</xliff:g> pour vous assurer que les paramètres n\'ont pas changé."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Commandes compatibles indisponibles"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Autre"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 1cdb66cbc6e5..7828b209113a 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desactiva"</string> <string name="sound_settings" msgid="8874581353127418308">"Son e vibración"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Configuración"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"A aplicación está fixada"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"A pantalla manterase visible ata que deixes de fixala. Para facelo, mantén premido Atrás e Visión xeral."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"A pantalla manterase visible ata que deixes de fixala. Para facelo, mantén premido Atrás e Inicio."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mediano"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pequeno"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pantalla completa"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Feito"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editar"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Configuración da ventá da lupa"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Quitáronse todos os controis"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Non se gardaron os cambios"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ver outras aplicacións"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Non se puideron cargar os controis. Comproba a aplicación <xliff:g id="APP">%s</xliff:g> para asegurarte de que non se modificase a súa configuración."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Non hai controis compatibles que estean dispoñibles"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outra"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 8d945cea3ff2..012607ee9115 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"બંધ કરો"</string> <string name="sound_settings" msgid="8874581353127418308">"સાઉન્ડ અને વાઇબ્રેશન"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"સેટિંગ"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ઍપને પિન કરેલી છે"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"તમે જ્યાં સુધી અનપિન કરશો નહીં ત્યાં સુધી આ તેને વ્યૂમાં રાખે છે. અનપિન કરવા માટે પાછળ અને ઓવરવ્યૂને સ્પર્શ કરી રાખો."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"તમે જ્યાં સુધી અનપિન કરશો નહીં ત્યાં સુધી આ તેને વ્યૂમાં રાખે છે. અનપિન કરવા માટે પાછળ અને હોમને સ્પર્શ કરી રાખો."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"મધ્યમ"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"નાનું"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"મોટું"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"પૂર્ણ સ્ક્રીન"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"થઈ ગયું"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ફેરફાર કરો"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"મેગ્નિફાયર વિન્ડોના સેટિંગ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"બધા નિયંત્રણો કાઢી નાખ્યા"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ફેરફારો સાચવ્યા નથી"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"અન્ય બધી ઍપ જુઓ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"નિયંત્રણો લોડ કરી શકાયા નથી. ઍપના સેટિંગ બદલાયા નથી તેની ખાતરી કરવા માટે <xliff:g id="APP">%s</xliff:g> ઍપ ચેક કરો."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"સુસંગત નિયંત્રણો ઉપલબ્ધ નથી"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"અન્ય"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 9fb299687a7b..4728ea1413d9 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -385,7 +385,7 @@ <string name="media_projection_permission_dialog_title" msgid="7130975432309482596">"क्या आपको शेयर या रिकॉर्ड करने की <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> को अनुमति देनी है?"</string> <string name="media_projection_permission_dialog_option_entire_screen" msgid="392086473225692983">"पूरी स्क्रीन"</string> <string name="media_projection_permission_dialog_option_single_app" msgid="1591110238124910521">"सिर्फ़ एक ऐप्लिकेशन"</string> - <string name="media_projection_permission_dialog_warning_entire_screen" msgid="3989078820637452717">"शेयर, रिकॉर्ड या कास्ट करते समय, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> के पास स्क्रीन पर दिख रही हर चीज़ या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, शेयर, रिकॉर्ड या कास्ट करते समय, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज या किसी और संवेदनशील जानकारी को लेकर खास सावधानी बरतें."</string> + <string name="media_projection_permission_dialog_warning_entire_screen" msgid="3989078820637452717">"शेयर, रिकॉर्ड या कास्ट करते समय <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> के पास स्क्रीन पर दिख रही हर चीज़ या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज या किसी और संवेदनशील जानकारी को लेकर खास सावधानी बरतें."</string> <string name="media_projection_permission_dialog_warning_single_app" msgid="1659532781536753059">"शेयर, रिकॉर्ड या कास्ट करते समय, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> के पास उस ऐप्लिकेशन पर दिख रही हर चीज़ या उस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज या किसी और संवेदनशील जानकारी को लेकर खास सावधानी बरतें."</string> <string name="media_projection_permission_dialog_continue" msgid="1827799658916736006">"जारी रखें"</string> <string name="media_projection_permission_app_selector_title" msgid="894251621057480704">"ऐप्लिकेशन शेयर करें या उसकी रिकॉर्डिंग करें"</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"बंद करें"</string> <string name="sound_settings" msgid="8874581353127418308">"आवाज़ और वाइब्रेशन"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"सेटिंग"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ऐप्लिकेशन पिन किया गया है"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"इससे वह तब तक दिखता रहता है, जब तक कि आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए, \'वापस जाएं\' और \'खास जानकारी\' को दबाकर रखें."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"इससे वह तब तक दिखाई देती है जब तक आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए, होम और वापस जाएं वाले बटन को दबाकर रखें."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"मध्यम"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"छोटा"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"बड़ा"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"फ़ुल स्क्रीन"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"हो गया"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"बदलाव करें"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ज़ूम करने की सुविधा वाली विंडो से जुड़ी सेटिंग"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"सभी कंट्रोल हटा दिए गए"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"बदलाव सेव नहीं किए गए"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"दूसरे ऐप्लिकेशन देखें"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"कंट्रोल लोड नहीं किए जा सके. <xliff:g id="APP">%s</xliff:g> ऐप्लिकेशन देखें, ताकि यह पक्का किया जा सके कि ऐप्लिकेशन की सेटिंग में कोई बदलाव नहीं हुआ है."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"इस सेटिंग के साथ काम करने वाले कंट्रोल उपलब्ध नहीं हैं"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"अन्य"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index f9fabaa87f05..a68d09930c0f 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"onemogući"</string> <string name="sound_settings" msgid="8874581353127418308">"Zvuk i vibracija"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Postavke"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikacija je prikvačena"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Zaslon će tako ostati u prvom planu dok ga ne otkvačite. Dodirnite i zadržite Natrag i Pregled da biste ga otkvačili."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Zaslon će tako ostati u prvom planu dok ga ne otkvačite. Dodirnite gumbe Natrag i Početna i zadržite pritisak da biste ga otkvačili."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Srednja"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Mala"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Velika"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Cijeli zaslon"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Gotovo"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Uredi"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Postavke prozora povećala"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Sve su kontrole uklonjene"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Promjene nisu spremljene"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Pogledajte ostale aplikacije"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrole se ne mogu učitati. U aplikaciji <xliff:g id="APP">%s</xliff:g> provjerite da se postavke aplikacije nisu promijenile."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilne kontrole nisu dostupne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 9bdd52b9a91c..e2f0eb0612b0 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"letiltás"</string> <string name="sound_settings" msgid="8874581353127418308">"Hang és rezgés"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Beállítások"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Az alkalmazás ki van tűzve"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Megjelenítve tartja addig, amíg Ön fel nem oldja a rögzítést. A feloldáshoz tartsa lenyomva a Vissza és az Áttekintés lehetőséget."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Megjelenítve tartja addig, amíg Ön fel nem oldja a rögzítést. A feloldáshoz tartsa lenyomva a Vissza és a Kezdőképernyő elemet."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Közepes"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Kicsi"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Nagy"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Teljes képernyő"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Kész"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Szerkesztés"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Nagyítóablak beállításai"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Minden vezérlő eltávolítva"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"A rendszer nem mentette a módosításokat"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Többi alkalmazás megtekintése"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Nem sikerült betölteni a vezérlőket. Ellenőrizze a(z) <xliff:g id="APP">%s</xliff:g> alkalmazást, és győződjön meg arról, hogy nem változtak az alkalmazásbeállítások."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Nem állnak rendelkezésre kompatibilis vezérlők"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Más"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index b8811e29dd16..26a43157805b 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"անջատել"</string> <string name="sound_settings" msgid="8874581353127418308">"Ձայն և թրթռոց"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Կարգավորումներ"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Հավելվածն ամրացված է"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Էկրանը կմնա տեսադաշտում, մինչև այն ապամրացնեք: Ապամրացնելու համար հպեք և պահեք Հետ և Համատեսք կոճակները:"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Էկրանը կցուցադրվի այնքան ժամանակ, մինչև չեղարկեք ամրացումը: Չեղարկելու համար հպեք և պահեք «Հետ» և «Գլխավոր էկրան» կոճակները"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Միջին"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Փոքր"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Մեծ"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Լիաէկրան ռեժիմ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Պատրաստ է"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Փոփոխել"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Խոշորացույցի պատուհանի կարգավորումներ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Կառավարման բոլոր տարրերը հեռացվեցին"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Փոփոխությունները չեն պահվել"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Տեսնել այլ հավելվածներ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Չհաջողվեց բեռնել կառավարման տարրերը։ Ստուգեք <xliff:g id="APP">%s</xliff:g> հավելվածը՝ համոզվելու, որ հավելվածի կարգավորումները չեն փոխվել։"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Համատեղելի կառավարման տարրերը հասանելի չեն"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Այլ"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 254844d2c672..dade59c20dd8 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"nonaktifkan"</string> <string name="sound_settings" msgid="8874581353127418308">"Suara & getaran"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Setelan"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikasi disematkan"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ini akan terus ditampilkan sampai Anda melepas sematan. Sentuh lama tombol Kembali dan Ringkasan untuk melepas sematan."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ini akan terus ditampilkan sampai Anda melepas sematan. Sentuh lama tombol Kembali dan Beranda untuk melepas sematan."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Sedang"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Kecil"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Besar"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Layar penuh"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Selesai"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Setelan jendela kaca pembesar"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Semua kontrol dihapus"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Perubahan tidak disimpan"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Lihat aplikasi lainnya"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrol tidak dapat dimuat. Periksa aplikasi <xliff:g id="APP">%s</xliff:g> untuk memastikan setelan aplikasi tidak berubah."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kontrol yang kompatibel tidak tersedia"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Lainnya"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index a78cac2a0cd1..a588d36d13b4 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"slökkva"</string> <string name="sound_settings" msgid="8874581353127418308">"Hljóð og titringur"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Stillingar"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Forrit er fest"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Þetta heldur þessu opnu þangað til þú losar það. Haltu fingri á „Til baka“ og „Yfirlit“ til að losa."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Þetta heldur þessu opnu þangað til það er losað. Haltu inni bakkhnappinum og heimahnappinum til að losa."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Miðlungs"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Lítið"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Stórt"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Allur skjárinn"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Lokið"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Breyta"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Stillingar stækkunarglugga"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Allar stýringar fjarlægðar"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Breytingar ekki vistaðar"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Sjá önnur forrit"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Ekki tókst að hlaða stýringum. Athugaðu <xliff:g id="APP">%s</xliff:g> til að ganga úr skugga um að stillingar forritsins hafi ekki breyst."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Samhæfar stýringar eru ekki tiltækar"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Annað"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index e880640718af..f46ccb73246a 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"disattiva"</string> <string name="sound_settings" msgid="8874581353127418308">"Suoni e vibrazione"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Impostazioni"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"L\'app è bloccata sullo schermo"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"La schermata rimane visibile finché non viene sganciata. Per sganciarla, tieni premuto Indietro e Panoramica."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"La schermata rimane visibile finché non viene disattivato il blocco su schermo. Per disattivarlo, tocca e tieni premuto Indietro e Home."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Medio"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Piccolo"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Schermo intero"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Fine"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Modifica"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Impostazioni della finestra di ingrandimento"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Tutti i controlli sono stati rimossi"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Modifiche non salvate"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Mostra altre app"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Impossibile caricare i controlli. Verifica nell\'app <xliff:g id="APP">%s</xliff:g> che le relative impostazioni non siano cambiate."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Controlli compatibili non disponibili"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Altro"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 80a8ff90e087..7eb276435a10 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"השבתה"</string> <string name="sound_settings" msgid="8874581353127418308">"צליל ורטט"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"הגדרות"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"האפליקציה מוצמדת"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"נשאר בתצוגה עד לביטול ההצמדה. יש ללחוץ לחיצה ארוכה על הלחצנים \'הקודם\' ו\'סקירה\' כדי לבטל את ההצמדה."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"נשאר בתצוגה עד לביטול ההצמדה. יש ללחוץ לחיצה ארוכה על הלחצנים \'הקודם\' ו\'דף הבית\' כדי לבטל את ההצמדה."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"בינוני"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"קטן"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"גדול"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"מסך מלא"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"סיום"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"עריכה"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ההגדרות של חלון ההגדלה"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"כל הפקדים הוסרו"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"השינויים לא נשמרו"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"הצגת אפליקציות אחרות"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"לא ניתן היה לטעון את הפקדים. יש לבדוק את האפליקציה <xliff:g id="APP">%s</xliff:g> כדי לוודא שהגדרות האפליקציה לא השתנו."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"פקדים תואמים לא זמינים"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"אחר"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 175d4ac4553b..6f43e4bde475 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"無効にする"</string> <string name="sound_settings" msgid="8874581353127418308">"音とバイブレーション"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"設定"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"アプリは固定されています"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"固定を解除するまで画面が常に表示されるようになります。[戻る] と [最近] を同時に押し続けると固定が解除されます。"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"固定を解除するまで画面が常に表示されるようになります。[戻る] と [ホーム] を同時に押し続けると固定が解除されます。"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"中"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"小"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"大"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"全画面表示"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"完了"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"編集"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"拡大鏡ウィンドウの設定"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"すべてのコントロールを削除しました"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"変更が保存されていません"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"その他のアプリを表示"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"コントロールを読み込めませんでした。<xliff:g id="APP">%s</xliff:g> アプリで、アプリの設定が変更されていないことをご確認ください。"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"互換性のあるコントロールがありません"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"その他"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 7538410bd72e..97ccc04c1bae 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"გამორთვა"</string> <string name="sound_settings" msgid="8874581353127418308">"ხმა და ვიბრაცია"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"პარამეტრები"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"აპი ჩამაგრებულია"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"ამით ის დარჩება ხედში ჩამაგრების მოხსნამდე. ჩამაგრების მოსახსნელად, ხანგრძლივად შეეხეთ „უკან და მიმოხილვა“-ს."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"ამით ის დარჩება ხედში ჩამაგრების მოხსნამდე. ჩამაგრების მოსახსნელად, ხანგრძლივად შეეხეთ „უკან მთავარ გვერდზე“-ს."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"საშუალო"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"პატარა"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"დიდი"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"სრული ეკრანი"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"მზადაა"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"რედაქტირება"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"გადიდების ფანჯრის პარამეტრები"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"მართვის ყველა საშუალება ამოიშალა"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ცვლილებები არ შენახულა"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"სხვა აპების ნახვა"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"მართვის საშუალებების ჩატვირთვა ვერ მოხერხდა. შეამოწმეთ <xliff:g id="APP">%s</xliff:g> აპი, რათა დარწმუნდეთ, რომ აპის პარამეტრები არ შეცვლილა."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"მართვის თავსებადი საშუალებები მიუწვდომელია"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"სხვა"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index ac73680b31c1..609dba4af432 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"өшіру"</string> <string name="sound_settings" msgid="8874581353127418308">"Дыбыс және діріл"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Параметрлер"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Қолданба бекітілді"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Өзіңіз босатқаша ашық тұрады. Босату үшін \"Артқа\" және \"Шолу\" түймелерін басып тұрыңыз."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Өзіңіз босатқаша ашық тұрады. Босату үшін \"Артқа\" және \"Негізгі бет\" түймелерін басып тұрыңыз"</string> @@ -885,6 +889,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Барлық басқару элементтері жойылды."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Өзгерістер сақталмады."</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Басқа қолданбаларды көру"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Басқару элементтері жүктелмеді. Қолданба параметрлерінің өзгермегенін тексеру үшін <xliff:g id="APP">%s</xliff:g> қолданбасын қараңыз."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Үйлесімді басқару элементтері қолжетімді емес."</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Басқа"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index c191088a932c..0d4333f81bd7 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"បិទ"</string> <string name="sound_settings" msgid="8874581353127418308">"សំឡេង និងការញ័រ"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ការកំណត់"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"កម្មវិធីត្រូវបានខ្ទាស់"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"វានឹងនៅតែបង្ហាញ រហូតទាល់តែអ្នកដកការដៅ។ សូមសង្កត់ប៊ូតុងថយក្រោយ និងប៊ូតុងទិដ្ឋភាពរួមឲ្យជាប់ ដើម្បីដកការដៅ។"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"វានឹងនៅតែបង្ហាញ រហូតទាល់តែអ្នកដកការដៅ។ សូមចុចប៊ូតុងថយក្រោយ និងប៊ូតុងទំព័រដើមឱ្យជាប់ ដើម្បីដកការដៅ។"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"មធ្យម"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"តូច"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ធំ"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"អេក្រង់ពេញ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"រួចរាល់"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"កែ"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ការកំណត់វិនដូកម្មវិធីពង្រីក"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"បានដកផ្ទាំងគ្រប់គ្រងទាំងអស់ហើយ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"មិនបានរក្សាទុកការផ្លាស់ប្ដូរទេ"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"មើលកម្មវិធីផ្សេងទៀត"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"មិនអាចផ្ទុកការគ្រប់គ្រងបានទេ។ សូមពិនិត្យមើលកម្មវិធី <xliff:g id="APP">%s</xliff:g> ដើម្បីធ្វើឱ្យប្រាកដថាការកំណត់កម្មវិធីមិនបានផ្លាស់ប្ដូរ។"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"មិនអាចប្រើការគ្រប់គ្រងដែលត្រូវគ្នាបានទេ"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ផ្សេងៗ"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index d5d10d9cc011..43fc73516269 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -124,7 +124,7 @@ <string name="accessibility_back" msgid="6530104400086152611">"ಹಿಂದೆ"</string> <string name="accessibility_home" msgid="5430449841237966217">"ಮುಖಪುಟ"</string> <string name="accessibility_menu" msgid="2701163794470513040">"ಮೆನು"</string> - <string name="accessibility_accessibility_button" msgid="4089042473497107709">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string> + <string name="accessibility_accessibility_button" msgid="4089042473497107709">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string> <string name="accessibility_rotate_button" msgid="1238584767612362586">"ಪರದೆಯನ್ನು ತಿರುಗಿಸಿ"</string> <string name="accessibility_recent" msgid="901641734769533575">"ಸಮಗ್ರ ನೋಟ"</string> <string name="accessibility_camera_button" msgid="2938898391716647247">"ಕ್ಯಾಮರಾ"</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> <string name="sound_settings" msgid="8874581353127418308">"ಧ್ವನಿ & ವೈಬ್ರೇಷನ್"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ಆ್ಯಪ್ ಅನ್ನು ಪಿನ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"ನೀವು ಅನ್ಪಿನ್ ಮಾಡುವವರೆಗೆ ಅದನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿಡುತ್ತದೆ. ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ ಹಾಗೂ ಅನ್ಪಿನ್ ಮಾಡಲು ಅವಲೋಕಿಸಿ."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"ನೀವು ಅನ್ಪಿನ್ ಮಾಡುವವರೆಗೆ ಅದನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿಡುತ್ತದೆ. ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ ಹಾಗೂ ಅನ್ಪಿನ್ ಮಾಡಲು ಮುಖಪುಟಕ್ಕೆ ಹಿಂತಿರುಗಿ."</string> @@ -481,13 +485,13 @@ <string name="stream_notification" msgid="7930294049046243939">"ಅಧಿಸೂಚನೆ"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"ಬ್ಲೂಟೂತ್"</string> <string name="stream_dtmf" msgid="7322536356554673067">"ಡ್ಯುಯಲ್ ಬಹು ಟೋನ್ ಆವರ್ತನೆ"</string> - <string name="stream_accessibility" msgid="3873610336741987152">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string> + <string name="stream_accessibility" msgid="3873610336741987152">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string> <string name="volume_ringer_status_normal" msgid="1339039682222461143">"ರಿಂಗ್"</string> <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"ವೈಬ್ರೇಟ್"</string> <string name="volume_ringer_status_silent" msgid="3691324657849880883">"ಮ್ಯೂಟ್"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. ಅನ್ಮ್ಯೂಟ್ ಮಾಡುವುದಕ್ಕಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> - <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. ಕಂಪನಕ್ಕೆ ಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಬಹುದು."</string> - <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. ಮ್ಯೂಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಬಹುದು."</string> + <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. ಕಂಪನಕ್ಕೆ ಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಸೇವೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಬಹುದು."</string> + <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. ಮ್ಯೂಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಸೇವೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಬಹುದು."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. ವೈಬ್ರೇಟ್ ಮಾಡಲು ಹೊಂದಿಸುವುದಕ್ಕಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. ಮ್ಯೂಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ರಿಂಗರ್ ಮೋಡ್ ಬದಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> @@ -848,12 +852,11 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"ಮಧ್ಯಮ"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ಚಿಕ್ಕದು"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ದೊಡ್ಡದು"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ಫುಲ್ ಸ್ಕ್ರೀನ್"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ಮುಗಿದಿದೆ"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ಎಡಿಟ್ ಮಾಡಿ"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ಮ್ಯಾಗ್ನಿಫೈರ್ ವಿಂಡೋ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> - <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ತೆರೆಯಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಈ ಬಟನ್ ಅನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ ಅಥವಾ ಬದಲಾಯಿಸಿ.\n\n"<annotation id="link">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</annotation></string> + <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ತೆರೆಯಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಈ ಬಟನ್ ಅನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ ಅಥವಾ ಬದಲಾಯಿಸಿ.\n\n"<annotation id="link">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ಅದನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಮರೆಮಾಡಲು ಅಂಚಿಗೆ ಬಟನ್ ಸರಿಸಿ"</string> <string name="accessibility_floating_button_undo" msgid="511112888715708241">"ರದ್ದುಗೊಳಿಸಿ"</string> <string name="accessibility_floating_button_undo_message_label_text" msgid="9017658016426242640">"<xliff:g id="FEATURE_NAME">%s</xliff:g> ಶಾರ್ಟ್ಕಟ್ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"ಎಲ್ಲಾ ನಿಯಂತ್ರಣಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲಾಗಿಲ್ಲ"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ಇತರ ಆ್ಯಪ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"ನಿಯಂತ್ರಣಗಳನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಬದಲಾಗಿಲ್ಲ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು <xliff:g id="APP">%s</xliff:g> ಆ್ಯಪ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ಹೊಂದಾಣಿಕೆಯ ನಿಯಂತ್ರಣಗಳು ಲಭ್ಯವಿಲ್ಲ"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ಇತರ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index a62608f82ef7..724233c65846 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"사용 중지"</string> <string name="sound_settings" msgid="8874581353127418308">"소리 및 진동"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"설정"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"앱 고정됨"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"고정 해제할 때까지 계속 표시됩니다. 고정 해제하려면 뒤로 및 최근 사용을 길게 터치하세요."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"고정 해제할 때까지 계속 표시됩니다. 고정 해제하려면 뒤로 및 홈을 길게 터치하세요."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"보통"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"작게"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"크게"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"전체 화면"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"완료"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"수정"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"돋보기 창 설정"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"모든 컨트롤 삭제됨"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"변경사항이 저장되지 않음"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"다른 앱 보기"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"컨트롤을 로드할 수 없습니다. <xliff:g id="APP">%s</xliff:g> 앱에서 설정이 변경되지 않았는지 확인하세요."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"호환 컨트롤을 사용할 수 없습니다."</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"기타"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 7f74f3d7b318..2c43d93c0636 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"өчүрүү"</string> <string name="sound_settings" msgid="8874581353127418308">"Үн жана дирилдөө"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Параметрлер"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Колдонмо кадалды"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ал бошотулмайынча көрүнө берет. Бошотуу үчүн \"Артка\" жана \"Назар\" баскычтарын басып, кармап туруңуз."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ал бошотулмайынча көрүнө берет. Бошотуу үчүн, \"Артка\" жана \"Башкы бет\" баскычтарын басып, кармап туруңуз."</string> @@ -720,7 +724,7 @@ <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"<xliff:g id="POSITION">%1$d</xliff:g>-позиция"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Карта кошулду"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Карта өчүрүлдү"</string> - <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Ыкчам жөндөөлөр түзөткүчү."</string> + <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Ыкчам параметрлер түзөткүчү."</string> <string name="accessibility_desc_notification_icon" msgid="7331265967584178674">"<xliff:g id="ID_1">%1$s</xliff:g> эскертмеси: <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="accessibility_quick_settings_settings" msgid="7098489591715844713">"Жөндөөлөрдү ачуу."</string> <string name="accessibility_quick_settings_expand" msgid="2609275052412521467">"Ыкчам жөндөөлөрдү ачуу."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Орто"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Кичине"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Чоң"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Толук экран"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Бүттү"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Түзөтүү"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Чоңойткуч терезесинин параметрлери"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Бардык башкаруу элементтери өчүрүлдү"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Өзгөртүүлөр сакталган жок"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Башка колдонмолорду көрүү"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Башкаруу элементтери жүктөлгөн жок. <xliff:g id="APP">%s</xliff:g> колдонмосуна өтүп, колдонмонун параметрлери өзгөрбөгөнүн текшериңиз."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Шайкеш башкаруу элементтери жеткиликсиз"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Башка"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 7646d7e7c82d..b57f8368bcdb 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -458,6 +458,8 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"ປິດນຳໃຊ້"</string> <string name="sound_settings" msgid="8874581353127418308">"ສຽງ ແລະ ການສັ່ນເຕືອນ"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ການຕັ້ງຄ່າ"</string> + <string name="csd_lowered_title" product="default" msgid="1786173629015030856">"ໄດ້ຫຼຸດລົງຫາລະດັບສຽງທີ່ປອດໄພຍິ່ງຂຶ້ນ"</string> + <string name="csd_system_lowered_text" product="default" msgid="2001603282316829500">"ລະດັບສຽງສູງເປັນເວລາດົນກວ່າທີ່ແນະນໍາໃຫ້"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"ແອັບຖືກປັກໝຸດແລ້ວ"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"ນີ້ຈະສະແດງມັນໃນໜ້າຈໍຈົນກວ່າທ່ານຈະເຊົາປັກມຸດ. ໃຫ້ແຕະປຸ່ມກັບຄືນ ແລະ ປຸ່ມພາບຮວມຄ້າງໄວ້ເພື່ອຍົກເລີກການປັກມຸດ."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"ນີ້ຈະສະແດງມັນໃນໜ້າຈໍຈົນກວ່າທ່ານຈະເຊົາປັກໝຸດ. ໃຫ້ແຕະປຸ່ມກັບຄືນ ແລະ ປຸ່ມພາບຮວມຄ້າງໄວ້ເພື່ອຍົກເລີກການປັກໝຸດ."</string> @@ -848,8 +850,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"ປານກາງ"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ນ້ອຍ"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ໃຫຍ່"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ເຕັມຈໍ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ແລ້ວໆ"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ແກ້ໄຂ"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ການຕັ້ງຄ່າໜ້າຈໍຂະຫຍາຍ"</string> @@ -885,6 +886,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"ລຶບການຄວບຄຸມທັງໝົດອອກແລ້ວ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ບໍ່ໄດ້ບັນທຶກການປ່ຽນແປງໄວ້"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ເບິ່ງແອັບອື່ນໆ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"ບໍ່ສາມາດໂຫຼດການຄວບຄຸມໄດ້. ກວດສອບແອັບ <xliff:g id="APP">%s</xliff:g> ເພື່ອໃຫ້ແນ່ໃຈວ່າຍັງບໍ່ມີການປ່ຽນແປງການຕັ້ງຄ່າແອັບເທື່ອ."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ບໍ່ມີການຄວບຄຸມທີ່ໃຊ້ຮ່ວມກັນທີ່ສາມາດໃຊ້ໄດ້"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ອື່ນໆ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index c74b2ad139a7..ab2ac5ae3c25 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"išjungti"</string> <string name="sound_settings" msgid="8874581353127418308">"Garsas ir vibravimas"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Nustatymai"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Programa prisegta"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Tai bus rodoma, kol atsegsite. Palieskite ir palaikykite „Atgal“ ir „Apžvalga“, kad atsegtumėte."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Tai bus rodoma, kol atsegsite. Palieskite ir palaikykite „Atgal“ ir „Pagrindinis ekranas“, kad atsegtumėte."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Vidutinis"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Mažas"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Didelis"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Visas ekranas"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Atlikta"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Redaguoti"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Didinimo lango nustatymai"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Visi valdikliai pašalinti"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Pakeitimai neišsaugoti"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Žr. kitas programas"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Nepavyko įkelti valdiklių. Eikite į programą „<xliff:g id="APP">%s</xliff:g>“ ir įsitikinkite, kad programos nustatymai nepakeisti."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Suderinami valdikliai nepasiekiami"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Kita"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index bba95e1559e5..4992eb169c2a 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"atspējot"</string> <string name="sound_settings" msgid="8874581353127418308">"Skaņa un vibrācija"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Iestatījumi"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Lietotne ir piesprausta"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Šādi tas būs redzams līdz brīdim, kad to atspraudīsiet. Lai atspraustu, pieskarieties pogām Atpakaļ un Pārskats un turiet tās."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Šādi tas būs redzams līdz brīdim, kad to atspraudīsiet. Lai atspraustu, pieskarieties pogām “Atpakaļ” un “Sākums” un turiet tās."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Vidējs"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Mazs"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Liels"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pilnekrāna režīms"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Gatavs"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Rediģēt"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Lupas loga iestatījumi"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Visas vadīklas ir noņemtas"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Izmaiņas nav saglabātas."</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Skatīt citas lietotnes"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Nevarēja ielādēt vadīklas. Lietotnē <xliff:g id="APP">%s</xliff:g> pārbaudiet, vai nav mainīti lietotnes iestatījumi."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Nav pieejamas saderīgas vadīklas"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Cita"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 9625dc37e6da..ec30a5baf027 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"оневозможи"</string> <string name="sound_settings" msgid="8874581353127418308">"Звук и вибрации"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Поставки"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Апликацијата е закачена"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ќе се гледа сѐ додека не го откачите. Допрете и држете „Назад“ и „Краток преглед“ за откачување."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ќе се гледа сѐ додека не го откачите. Допрете и задржете „Назад“ и „Почетен екран“ за откачување."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Средно"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Мало"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Големо"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Цел екран"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Готово"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Изменете"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Поставки за прозорец за лупа"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Сите контроли се отстранети"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промените не се зачувани"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Видете други апликации"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Контролите не може да се вчитаат. Проверете ја апликацијата <xliff:g id="APP">%s</xliff:g> за да се уверите дека поставките за апликацијата не се променети."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Нема компатибилни контроли"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Друга"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 389539f163cc..790ebdb26553 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"പ്രവർത്തനരഹിതമാക്കുക"</string> <string name="sound_settings" msgid="8874581353127418308">"ശബ്ദവും വൈബ്രേഷനും"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ക്രമീകരണം"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ആപ്പ് പിൻ ചെയ്തു"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"നിങ്ങൾ അൺപിൻ ചെയ്യുന്നതുവരെ ഇത് കാണുന്ന വിധത്തിൽ നിലനിർത്തും. അൺപിൻ ചെയ്യാൻ \'തിരികെ\', \'ചുരുക്കവിവരണം\' എന്നിവ സ്പർശിച്ച് പിടിക്കുക."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"നിങ്ങൾ അൺപിൻ ചെയ്യുന്നതുവരെ ഇത് കാണുന്ന വിധത്തിൽ നിലനിർത്തും. അൺപിൻ ചെയ്യാൻ \'തിരികെ പോവുക\', \'ഹോം\' ബട്ടണുകൾ സ്പർശിച്ച് പിടിക്കുക."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"ഇടത്തരം"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ചെറുത്"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"വലുത്"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"പൂർണ്ണ സ്ക്രീൻ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"പൂർത്തിയായി"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"എഡിറ്റ് ചെയ്യുക"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"മാഗ്നിഫയർ വിൻഡോ ക്രമീകരണം"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"എല്ലാ നിയന്ത്രണങ്ങളും നീക്കം ചെയ്തു"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"മാറ്റങ്ങൾ സംരക്ഷിച്ചിട്ടില്ല"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"മറ്റ് ആപ്പുകൾ കാണുക"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"നിയന്ത്രണങ്ങൾ ലോഡ് ചെയ്യാനായില്ല. ആപ്പ് ക്രമീകരണം മാറ്റിയിട്ടില്ലെന്ന് ഉറപ്പാക്കാൻ <xliff:g id="APP">%s</xliff:g> ആപ്പ് പരിശോധിക്കുക."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"അനുയോജ്യമായ നിയന്ത്രണങ്ങൾ ലഭ്യമല്ല"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"മറ്റുള്ളവ"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index d85bd33351f9..5d00da28987f 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"идэвхгүй болгох"</string> <string name="sound_settings" msgid="8874581353127418308">"Дуу, чичиргээ"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Тохиргоо"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Аппыг бэхэлсэн"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Таныг тогтоосныг болиулах хүртэл үүнийг харуулна. Тогтоосныг болиулахын тулд Буцах, Тоймыг дараад хүлээнэ үү."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Таныг тогтоосныг болиулах хүртэл үүнийг харуулсан хэвээр байна. Тогтоосныг болиулахын тулд Буцах, Нүүр хуудас товчлуурыг дараад хүлээнэ үү."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Дунд зэрэг"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Жижиг"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Том"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Бүтэн дэлгэц"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Болсон"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Засах"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Томруулагчийн цонхны тохиргоо"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Бүх хяналтыг хассан"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Өөрчлөлтийг хадгалаагүй"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Бусад аппыг харах"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Хяналтыг ачаалж чадсангүй. Аппын тохиргоог өөрчлөөгүй эсэхийг нягтлахын тулд <xliff:g id="APP">%s</xliff:g> аппыг шалгана уу."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Тохирох хяналт байхгүй"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Бусад"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 45088a71682d..20b1267a95f6 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"बंद करा"</string> <string name="sound_settings" msgid="8874581353127418308">"आवाज आणि व्हायब्रेशन"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"सेटिंग्ज"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ॲप पिन केले आहे"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"तुम्ही अनपिन करेर्यंत हे यास दृश्यामध्ये ठेवते. अनपिन करण्यासाठी परत आणि विहंगावलोकनास स्पर्श करा आणि धरून ठेवा."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"तुम्ही अनपिन करेर्यंत हे त्याला दृश्यामध्ये ठेवते. अनपिन करण्यासाठी मागे आणि होम वर स्पर्श करा आणि धरून ठेवा."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"मध्यम"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"लहान"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"मोठा"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"फुल स्क्रीन"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"पूर्ण झाले"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"संपादित करा"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"मॅग्निफायर विंडो सेटिंग्ज"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"सर्व नियंत्रणे काढून टाकली आहेत"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"बदल सेव्ह केले गेले नाहीत"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"इतर अॅप्स पहा"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"नियंत्रणे लोड करता अली नाहीत. ॲपची सेटिंग्ज बदलली नसल्याची खात्री करण्यासाठी <xliff:g id="APP">%s</xliff:g> ॲप तपासा."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"कंपॅटिबल नियंत्रणे उपलब्ध नाहीत"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"इतर"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 769e60650265..5936fc811f98 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"lumpuhkan"</string> <string name="sound_settings" msgid="8874581353127418308">"Bunyi & getaran"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Tetapan"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Apl telah disemat"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Tindakan ini memastikan skrin kelihatan sehingga anda menyahsemat. Sentuh & tahan Kembali dan Ikhtisar untuk menyahsemat."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Tindakan ini memastikan skrin kelihatan sehingga anda menyahsemat. Sentuh & tahan Kembali dan Skrin Utama untuk menyahsemat."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Sederhana"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Kecil"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Besar"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Skrin penuh"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Selesai"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Tetapan tetingkap penggadang"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Semua kawalan dialih keluar"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Perubahan tidak disimpan"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Lihat apl lain"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kawalan tidak dapat dimuatkan. Semak apl <xliff:g id="APP">%s</xliff:g> untuk memastikan bahawa tetapan apl tidak berubah."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kawalan serasi tidak tersedia"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Lain-lain"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 291e33852f9a..ae55ab2f2749 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"ပိတ်ရန်"</string> <string name="sound_settings" msgid="8874581353127418308">"အသံနှင့် တုန်ခါမှု"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ဆက်တင်များ"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"အက်ပ်ကို ပင်ထိုးထားသည်"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"သင်ပင်မဖြုတ်မခြင်း ၎င်းကို ပြသထားပါမည်။ ပင်ဖြုတ်ရန် Back နှင့် Overview ကို ထိ၍ဖိထားပါ။"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"သင်က ပင်မဖြုတ်မခြင်း ၎င်းကို ပြသထားပါမည်။ ပင်ဖြုတ်ရန် \'နောက်သို့\' နှင့် \'ပင်မ\' ခလုတ်တို့ကို တို့၍ဖိထားပါ။"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"အလတ်"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"အသေး"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"အကြီး"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ဖန်သားပြင်အပြည့်"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ပြီးပြီ"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ပြင်ရန်"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"မှန်ဘီလူးဝင်းဒိုး ဆက်တင်များ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"ထိန်းချုပ်မှုအားလုံး ဖယ်ရှားလိုက်သည်"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"အပြောင်းအလဲများကို သိမ်းမထားပါ"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"အခြားအက်ပ်များကိုကြည့်ပါ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"ထိန်းချုပ်မှုများကို ဖွင့်၍မရပါ။ အက်ပ်ဆက်တင်များ ပြောင်းမထားကြောင်း သေချာစေရန် <xliff:g id="APP">%s</xliff:g> အက်ပ်ကို စစ်ဆေးပါ။"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ကိုက်ညီသော ထိန်းချုပ်မှုများကို မရရှိနိုင်ပါ"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"အခြား"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 23a89c6fa32b..ea274600fdf4 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"deaktiver"</string> <string name="sound_settings" msgid="8874581353127418308">"Lyd og vibrering"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Innstillinger"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Appen er festet"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Gjør at den vises til du løsner den. Trykk og hold inne Tilbake og Oversikt for å løsne den."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Gjør at den vises til du løsner den. Trykk og hold inne Tilbake og Startside for å løsne den."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Middels"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Liten"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Stor"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Fullskjerm"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Ferdig"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Endre"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Innstillinger for forstørringsvindu"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle kontroller er fjernet"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Endringene er ikke lagret"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Se andre apper"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kunne ikke laste inn kontrollene. Sjekk <xliff:g id="APP">%s</xliff:g>-appen for å sjekke at appinnstillingene ikke er endret."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatible kontroller er ikke tilgjengelige"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Annet"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 7f5943a110d7..8a2057a98fe3 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"असक्षम पार्नुहोस्"</string> <string name="sound_settings" msgid="8874581353127418308">"साउन्ड तथा भाइब्रेसन"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"सेटिङ"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"एप पिन गरिएको छ"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"तपाईंले अनपिन नगरेसम्म यसले त्यसलाई दृश्यमा कायम राख्छ। अनपिन गर्न पछाडि र परिदृश्य बटनलाई टच एण्ड होल्ड गर्नुहोस्।"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"तपाईंले अनपिन नगरेसम्म यसले त्यसलाई दृश्यमा कायम राख्छ। अनपिन गर्न पछाडि र गृह नामक बटनहरूलाई टच एण्ड होल्ड गर्नुहोस्।"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"मध्यम"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"सानो"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ठुलो"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"फुल स्क्रिन"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"सम्पन्न भयो"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"सम्पादन गर्नुहोस्"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"म्याग्निफायर विन्डोसम्बन्धी सेटिङ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"सबै कन्ट्रोल हटाइए"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"परिवर्तनहरू सुरक्षित गरिएका छैनन्"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"अन्य एपहरू हेर्नुहोस्"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"नियन्त्रण सुविधाहरू लोड गर्न सकिएन। <xliff:g id="APP">%s</xliff:g> एपका सेटिङ परिवर्तन गरिएका छैनन् भन्ने कुरा सुनिश्चित गर्न उक्त एप जाँच्नुहोस्।"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"मिल्दा नियन्त्रण सुविधाहरू उपलब्ध छैनन्"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"अन्य"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 34cde1702f9c..1a0265fa6e60 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"uitzetten"</string> <string name="sound_settings" msgid="8874581353127418308">"Geluid en trillen"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Instellingen"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"App is vastgezet"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Het scherm blijft zichtbaar totdat je het losmaakt. Tik op Terug en Overzicht en houd deze vast om het scherm los te maken."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Het scherm blijft zichtbaar totdat je het losmaakt. Tik op Terug en Home en houd deze vast om het scherm los te maken."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Normaal"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Klein"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Groot"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Volledig scherm"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Klaar"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Bewerken"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Instellingen voor vergrotingsvenster"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle bedieningselementen verwijderd"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Wijzigingen zijn niet opgeslagen"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Andere apps bekijken"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Bedieningselementen kunnen niet worden geladen. Check de <xliff:g id="APP">%s</xliff:g>-app om na te gaan of de app-instellingen niet zijn gewijzigd."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Geen geschikte bedieningselementen beschikbaar"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Overig"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 328bb376ddbc..df284c18807f 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"ଅକ୍ଷମ କରନ୍ତୁ"</string> <string name="sound_settings" msgid="8874581353127418308">"ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେସନ"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ସେଟିଂସ"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ଆପକୁ ପିନ୍ କରାଯାଇଛି"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"ଆପଣ ଅନପିନ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହା ଦେଖାଉଥିବ। ଅନପିନ୍ କରିବାକୁ ସ୍ପର୍ଶ କରି ଧରିରଖନ୍ତୁ ଓ ଦେଖନ୍ତୁ।"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"ଆପଣ ଅନପିନ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହା ଦେଖାଉଥିବ। ଅନପିନ୍ କରିବା ପାଇଁ ହୋମ ଓ ବ୍ୟାକ ବଟନକୁ ଦବାଇ ଧରନ୍ତୁ।"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"ମଧ୍ୟମ"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ଛୋଟ"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ବଡ଼"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ହୋଇଗଲା"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ଏଡିଟ କରନ୍ତୁ"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ମ୍ୟାଗ୍ନିଫାୟର ୱିଣ୍ଡୋର ସେଟିଂସ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"ସମସ୍ତ ନିୟନ୍ତ୍ରଣ କାଢ଼ି ଦିଆଯାଇଛି"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ପରିବର୍ତ୍ତନଗୁଡ଼ିକ ସେଭ୍ କରାଯାଇନାହିଁ"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ଅନ୍ୟ ଆପ୍ ଦେଖନ୍ତୁ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଲୋଡ୍ କରାଯାଇପାରିଲା ନାହିଁ। ଆପ୍ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ ହୋଇନାହିଁ ବୋଲି ନିଶ୍ଚିତ କରିବାକୁ <xliff:g id="APP">%s</xliff:g> ଆପ୍ ଯାଞ୍ଚ କରନ୍ତୁ।"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ସୁସଙ୍ଗତ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ଉପଲବ୍ଧ ନାହିଁ"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ଅନ୍ୟ"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 0828b02adea1..67f13143fc59 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"ਬੰਦ ਕਰੋ"</string> <string name="sound_settings" msgid="8874581353127418308">"ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟ"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ਸੈਟਿੰਗਾਂ"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ਐਪ ਨੂੰ ਪਿੰਨ ਕੀਤਾ ਗਿਆ ਹੈ"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"ਇਹ ਇਸ ਨੂੰ ਤਦ ਤੱਕ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਦਾ ਹੈ ਜਦ ਤੱਕ ਤੁਸੀਂ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ। ਅਨਪਿੰਨ ਕਰਨ ਲਈ \'ਪਿੱਛੇ\' ਅਤੇ \'ਰੂਪ-ਰੇਖਾ\' ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਅਨਪਿੰਨ ਕੀਤੇ ਜਾਣ ਤੱਕ ਇਸਨੂੰ ਦਿਖਾਇਆ ਜਾਂਦਾ ਹੈ। ਅਨਪਿੰਨ ਕਰਨ ਲਈ \'ਪਿੱਛੇ\' ਅਤੇ \'ਹੋਮ\' ਨੂੰ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ।"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"ਦਰਮਿਆਨਾ"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"ਛੋਟਾ"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ਵੱਡਾ"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ਪੂਰੀ ਸਕ੍ਰੀਨ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ਹੋ ਗਿਆ"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ਸੰਪਾਦਨ ਕਰੋ"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"ਵੱਡਦਰਸ਼ੀ ਵਿੰਡੋ ਸੈਟਿੰਗਾਂ"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"ਸਾਰੇ ਕੰਟਰੋਲ ਹਟਾਏ ਗਏ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ਤਬਦੀਲੀਆਂ ਨੂੰ ਰੱਖਿਅਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ਹੋਰ ਐਪਾਂ ਦੇਖੋ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"ਕੰਟਰੋਲਾਂ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਇਹ ਪੱਕਾ ਕਰਨ ਲਈ <xliff:g id="APP">%s</xliff:g> ਐਪ ਦੀ ਜਾਂਚ ਕਰੋ ਕਿ ਐਪ ਸੈਟਿੰਗਾਂ ਨਹੀਂ ਬਦਲੀਆਂ ਹਨ।"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ਕੋਈ ਅਨੁਰੂਪ ਕੰਟਰੋਲ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ਹੋਰ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 6ce99368d1ef..db2ea3788b0e 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"wyłącz"</string> <string name="sound_settings" msgid="8874581353127418308">"Dźwięk i wibracje"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Ustawienia"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikacja jest przypięta"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ekran będzie widoczny, dopóki go nie odepniesz. Aby to zrobić, kliknij i przytrzymaj Wstecz oraz Przegląd."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ekran będzie widoczny, dopóki go nie odepniesz. Aby to zrobić, naciśnij i przytrzymaj Wstecz oraz Ekran główny."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Średni"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Mały"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Duży"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Pełny ekran"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Gotowe"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Edytuj"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Ustawienia okna powiększania"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Usunięto wszystkie elementy sterujące"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Zmiany nie zostały zapisane"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Wyświetl pozostałe aplikacje"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Nie udało się wczytać elementów sterujących. Sprawdź aplikację <xliff:g id="APP">%s</xliff:g>, aby upewnić się, że jej ustawienia się nie zmieniły."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Zgodne elementy sterujące niedostępne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Inne"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 0d21a5d7ec7d..9e434d5d77cd 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desativar"</string> <string name="sound_settings" msgid="8874581353127418308">"Som e vibração"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Configurações"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"O app está fixado"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ela é mantida à vista até que seja liberada. Toque em Voltar e em Visão geral e mantenha essas opções pressionadas para liberar."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ela é mantida à vista até que seja liberada. Toque em Voltar e em Início e mantenha essas opções pressionadas para liberar."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Médio"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pequeno"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Tela cheia"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Concluído"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editar"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Configurações da janela de lupa"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos os controles foram removidos"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"As mudanças não foram salvas"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ver outros apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Não foi possível carregar os controles. Verifique o app <xliff:g id="APP">%s</xliff:g> para garantir que as configurações não tenham sido modificadas."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Controles compatíveis indisponíveis"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outro"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 8958fdababe0..5de3135a6b28 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -458,6 +458,8 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desativar"</string> <string name="sound_settings" msgid="8874581353127418308">"Som e vibração"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Definições"</string> + <string name="csd_lowered_title" product="default" msgid="1786173629015030856">"Volume reduzido para um nível mais seguro"</string> + <string name="csd_system_lowered_text" product="default" msgid="2001603282316829500">"O volume está elevado há mais tempo que o recomendado"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"A app está fixada"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Esta opção mantém o item visível até o soltar. Toque sem soltar em Anterior e em Vista geral para soltar."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Esta opção mantém o item visível até o soltar. Toque sem soltar em Anterior e em Página inicial para soltar."</string> @@ -848,8 +850,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Médio"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pequeno"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Ecrã inteiro"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Concluir"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editar"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Definições da janela da lupa"</string> @@ -885,6 +886,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos os controlos foram removidos."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Alterações não guardadas."</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ver outras apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Não foi possível carregar os controlos. Verifique a app <xliff:g id="APP">%s</xliff:g> para se certificar de que as definições da mesma não foram alteradas."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Controlos compatíveis indisponíveis"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outro"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 0d21a5d7ec7d..9e434d5d77cd 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"desativar"</string> <string name="sound_settings" msgid="8874581353127418308">"Som e vibração"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Configurações"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"O app está fixado"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ela é mantida à vista até que seja liberada. Toque em Voltar e em Visão geral e mantenha essas opções pressionadas para liberar."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ela é mantida à vista até que seja liberada. Toque em Voltar e em Início e mantenha essas opções pressionadas para liberar."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Médio"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Pequeno"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Grande"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Tela cheia"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Concluído"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editar"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Configurações da janela de lupa"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos os controles foram removidos"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"As mudanças não foram salvas"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Ver outros apps"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Não foi possível carregar os controles. Verifique o app <xliff:g id="APP">%s</xliff:g> para garantir que as configurações não tenham sido modificadas."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Controles compatíveis indisponíveis"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outro"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 8c187eb2c37a..6380223f2467 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"dezactivează"</string> <string name="sound_settings" msgid="8874581353127418308">"Sunete și vibrații"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Setări"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplicația este fixată"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Astfel rămâne afișat până anulezi fixarea. Atinge lung opțiunile Înapoi și Recente pentru a anula fixarea."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Astfel rămâne afișat până anulezi fixarea. Atinge lung opțiunile Înapoi și Acasă pentru a anula fixarea."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mediu"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Mic"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Mare"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Ecran complet"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Gata"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Editează"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Setările ferestrei de mărire"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Au fost șterse toate comenzile"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Modificările nu au fost salvate"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Vezi alte aplicații"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Comenzile nu au putut fi încărcate. Accesează aplicația <xliff:g id="APP">%s</xliff:g> pentru a te asigura că setările aplicației nu s-au schimbat."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Nu sunt disponibile comenzi compatibile"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Altul"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index f4e364a6f74f..dd6aff6a3c18 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"отключить"</string> <string name="sound_settings" msgid="8874581353127418308">"Звук и вибрация"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Открыть настройки"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Приложение закреплено"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Приложение останется активным, пока вы не отмените блокировку, нажав и удерживая кнопки \"Назад\" и \"Обзор\"."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Приложение останется активным, пока вы не отмените блокировку, нажав и удерживая кнопки \"Назад\" и \"Главный экран\"."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Средняя"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Маленькая"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Большая"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Полноэкранный режим"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ОК"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Изменить"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Настройка окна лупы"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Все виджеты управления удалены."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Изменения не сохранены."</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Показать другие приложения"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Не удалось загрузить список виджетов для управления устройствами. Проверьте, не изменились ли настройки приложения \"<xliff:g id="APP">%s</xliff:g>\"."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Управление недоступно."</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Другое"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index c6bc48296db4..67ebeabffa1a 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"අබල කරන්න"</string> <string name="sound_settings" msgid="8874581353127418308">"ශබ්ද සහ කම්පනය"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"සැකසීම්"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"යෙදුම අමුණා ඇත"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"මෙය ඔබ ගලවන තෙක් එය දසුන තුළ තබයි. ගැලවීමට දළ විශ්ලේෂණය ස්පර්ශ කර ආපසු අල්ලාගෙන සිටින්න."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"මෙය ඔබ ගලවන තෙක් එය දසුන තුළ තබයි. ගැලවීමට මුල් පිටුව ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"මධ්යම"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"කුඩා"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"විශාල"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"පූර්ණ තිරය"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"නිමයි"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"සංස්කරණය කරන්න"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"විශාලන කවුළු සැකසීම්"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"සියලු පාලන ඉවත් කර ඇත"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"වෙනස් කිරීම් නොසුරැකිණි"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"වෙනත් යෙදුම් බලන්න"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"පාලන පූරණය කළ නොහැකි විය. යෙදුම් සැකසීම් වෙනස් වී නැති බව සහතික කර ගැනීමට <xliff:g id="APP">%s</xliff:g> යෙදුම පරීක්ෂා කරන්න."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ගැළපෙන පාලන ලබා ගත නොහැකිය"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"වෙනත්"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 49baf94c0a17..45faf7fff11d 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"zakázať"</string> <string name="sound_settings" msgid="8874581353127418308">"Zvuk a vibrácie"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Nastavenia"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikácia je pripnutá"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho stlačením a podržaním tlačidiel Späť a Prehľad."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho pridržaním tlačidiel Späť a Domov."</string> @@ -634,7 +638,7 @@ <string name="group_system_hide_reshow_taskbar" msgid="3809304065624351131">"Skrytie a opätovné zobrazenie panela úloh"</string> <string name="group_system_access_system_settings" msgid="7961639365383008053">"Prístup k nastaveniam systému"</string> <string name="group_system_access_google_assistant" msgid="1186152943161483864">"Prístup k Asistentovi Google"</string> - <string name="group_system_lock_screen" msgid="7391191300363416543">"Uzamknutá obrazovka"</string> + <string name="group_system_lock_screen" msgid="7391191300363416543">"Zamknúť obrazovku"</string> <string name="group_system_quick_memo" msgid="2914234890158583919">"Otvorenie aplikácie Poznámky na rýchle zapisovanie"</string> <string name="keyboard_shortcut_group_system_multitasking" msgid="1065232949510862593">"Multitasking systému"</string> <string name="system_multitasking_rhs" msgid="6593269428880305699">"Rozdelenie obrazovky s aktuálnou aplikáciou vpravo"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Stredný"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Malý"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Veľký"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Celá obrazovka"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Hotovo"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Upraviť"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Nastavenia okna lupy"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Všetky ovládače boli odstránené"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Zmeny neboli uložené"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Zobraziť ďalšie aplikácie"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Ovládacie prvky sa nepodarilo načítať. V aplikácii <xliff:g id="APP">%s</xliff:g> skontrolujte, či sa nezmenili nastavenia."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilné ovládacie prvky nie sú k dispozícii"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Iné"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 19ec829b20d9..e90a29de57e6 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -124,7 +124,7 @@ <string name="accessibility_back" msgid="6530104400086152611">"Nazaj"</string> <string name="accessibility_home" msgid="5430449841237966217">"Začetni zaslon"</string> <string name="accessibility_menu" msgid="2701163794470513040">"Meni"</string> - <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Funkcije za ljudi s posebnimi potrebami"</string> + <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Dostopnost"</string> <string name="accessibility_rotate_button" msgid="1238584767612362586">"Sukanje zaslona"</string> <string name="accessibility_recent" msgid="901641734769533575">"Pregled"</string> <string name="accessibility_camera_button" msgid="2938898391716647247">"Fotoaparat"</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"onemogoči"</string> <string name="sound_settings" msgid="8874581353127418308">"Zvok in vibriranje"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Nastavitve"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikacija je pripeta"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"S tem ostane vidna, dokler je ne odpnete. Če jo želite odpeti, hkrati pridržite gumba za nazaj in pregled."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"S tem ostane vidna, dokler je ne odpnete. Če jo želite odpeti, hkrati pridržite gumba za nazaj in za začetni zaslon."</string> @@ -481,13 +485,13 @@ <string name="stream_notification" msgid="7930294049046243939">"Obvestilo"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string> <string name="stream_dtmf" msgid="7322536356554673067">"Dvojna večtonska frekvenca"</string> - <string name="stream_accessibility" msgid="3873610336741987152">"Funkcije za ljudi s posebnimi potrebami"</string> + <string name="stream_accessibility" msgid="3873610336741987152">"Dostopnost"</string> <string name="volume_ringer_status_normal" msgid="1339039682222461143">"Zvonjenje"</string> <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"Vibriranje"</string> <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Utišano"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. Dotaknite se, če želite vklopiti zvok."</string> - <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Dotaknite se, če želite nastaviti vibriranje. V storitvah za ljudi s posebnimi potrebami bo morda izklopljen zvok."</string> - <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Dotaknite se, če želite izklopiti zvok. V storitvah za ljudi s posebnimi potrebami bo morda izklopljen zvok."</string> + <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Dotaknite se, če želite nastaviti vibriranje. V storitvah za dostopnost bo morda izklopljen zvok."</string> + <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Dotaknite se, če želite izklopiti zvok. V storitvah za dostopnost bo morda izklopljen zvok."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. Dotaknite se, če želite nastaviti vibriranje."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. Dotaknite se, če želite izklopiti zvok."</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Dotaknite se, če želite spremeniti način zvonjenja."</string> @@ -848,12 +852,11 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Srednja"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Majhna"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Velika"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Celozaslonski način"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Končano"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Uredi"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Nastavitve okna povečevalnika"</string> - <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Dotaknite se za funkcije za ljudi s posebnimi potrebami. Ta gumb lahko prilagodite ali zamenjate v nastavitvah.\n\n"<annotation id="link">"Ogled nastavitev"</annotation></string> + <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Dotaknite se za funkcije dostopnosti. Ta gumb lahko prilagodite ali zamenjate v nastavitvah.\n\n"<annotation id="link">"Ogled nastavitev"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Če želite gumb začasno skriti, ga premaknite ob rob."</string> <string name="accessibility_floating_button_undo" msgid="511112888715708241">"Razveljavi"</string> <string name="accessibility_floating_button_undo_message_label_text" msgid="9017658016426242640">"Odstranjena bližnjica za fun. <xliff:g id="FEATURE_NAME">%s</xliff:g>"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Vsi kontrolniki so bili odstranjeni."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Spremembe niso shranjene"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Prikaz drugih aplikacij"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrolnikov ni bilo mogoče naložiti. Preverite aplikacijo <xliff:g id="APP">%s</xliff:g> in se prepričajte, da se njene nastavitve niso spremenile."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Združljivi kontrolniki niso na voljo"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 2bbad3b2a9f2..37248fe2874a 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"çaktivizo"</string> <string name="sound_settings" msgid="8874581353127418308">"Tingulli dhe dridhjet"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Cilësimet"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikacioni është i gozhduar"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Kjo e ruan në pamje deri sa ta heqësh nga gozhdimi. Prek dhe mbaj të shtypur \"Prapa\" dhe \"Përmbledhje\" për ta hequr nga gozhdimi."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Kjo e ruan në pamje deri sa ta heqësh nga gozhdimi. Prek dhe mbaj të shtypur \"Prapa\" dhe \"Kreu\" për ta hequr nga gozhdimi."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Mesatar"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"I vogël"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"I madh"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Ekran i plotë"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"U krye"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Modifiko"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Cilësimet e dritares së zmadhimit"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Të gjitha kontrollet u hoqën"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ndryshimet nuk u ruajtën"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Shiko aplikacionet e tjera"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrollet nuk mund të ngarkoheshin. Kontrollo aplikacionin <xliff:g id="APP">%s</xliff:g> për t\'u siguruar që cilësimet e aplikacionit nuk janë ndryshuar."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kontrollet e përputhshme nuk ofrohen"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Tjetër"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 0108b0da0dfc..d26d5a49d5ee 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"онемогућите"</string> <string name="sound_settings" msgid="8874581353127418308">"Звук и вибрирање"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Подешавања"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Апликација је закачена"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"На овај начин се ово стално приказује док га не откачите. Додирните и задржите Назад и Преглед да бисте га откачили."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"На овај начин се ово стално приказује док га не откачите. Додирните и задржите Назад и Почетна да бисте га откачили."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Средње"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Мало"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Велико"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Преко целог екрана"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Готово"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Измени"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Подешавања прозора за увећање"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Све контроле су уклоњене"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промене нису сачуване"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Погледајте друге апликације"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Учитавање контрола није успело. Погледајте апликацију <xliff:g id="APP">%s</xliff:g> да бисте се уверили да се подешавања апликације нису променила."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Компатибилне контроле нису доступне"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Друго"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 83dd3bf4f5ed..58a74269706d 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"inaktivera"</string> <string name="sound_settings" msgid="8874581353127418308">"Ljud och vibration"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Inställningar"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Appen har fästs"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Skärmen visas tills du lossar den. Tryck länge på Tillbaka och Översikt om du vill lossa skärmen."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Skärmen visas tills du lossar den. Tryck länge på Tillbaka och Startsida om du vill lossa skärmen."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Medel"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Liten"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Stor"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Helskärm"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Klar"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Redigera"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Inställningar för förstoringsfönster"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Alla kontroller har tagits bort"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ändringarna har inte sparats"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Visa andra appar"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Det gick inte att läsa in enhetsstyrning. Kontrollera att inställningarna inte har ändrats i <xliff:g id="APP">%s</xliff:g>-appen."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Ingen kompatibel enhetsstyrning tillgänglig"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Övrigt"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 88d0e53620b7..a3cd09818ead 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"zima"</string> <string name="sound_settings" msgid="8874581353127418308">"Sauti na mtetemo"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Mipangilio"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Programu imebandikwa"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Hali hii huifanya ionekane hadi utakapoibandua. Gusa na ushikilie kipengele cha Nyuma na Muhtasari ili ubandue."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Hali hii huifanya ionekane hadi utakapoibandua. Gusa na ushikilie kitufe cha kurudisha Nyuma na cha Mwanzo kwa pamoja ili ubandue."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Wastani"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Ndogo"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Kubwa"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Skrini nzima"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Nimemaliza"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Badilisha"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Mipangilio ya dirisha la kikuzaji"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Umeondoa vidhibiti vyote"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Mabadiliko hayajahifadhiwa"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Angalia programu zingine"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Imeshindwa kupakia vidhibiti. Angalia programu ya <xliff:g id="APP">%s</xliff:g> ili uhakikishe kuwa mipangilio yake haijabadilika."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Vidhibiti vinavyooana havipatikani"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Nyingine"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index fe8d2cf8a320..41a77433e3d7 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"முடக்கும்"</string> <string name="sound_settings" msgid="8874581353127418308">"ஒலி & அதிர்வு"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"அமைப்புகள்"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ஆப்ஸ் பின் செய்யப்பட்டது"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"பொருத்தியதை அகற்றும் வரை இதைக் காட்சியில் வைக்கும். அகற்ற, முந்தையது மற்றும் மேலோட்டப் பார்வையைத் தொட்டுப் பிடிக்கவும்."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"இதற்கான பின்னை அகற்றும் வரை, இந்தப் பயன்முறை செயல்பாட்டிலேயே இருக்கும். அகற்றுவதற்கு, முந்தையது மற்றும் முகப்பு பட்டன்களைத் தொட்டுப் பிடிக்கவும்."</string> @@ -885,6 +889,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"கட்டுப்பாடுகள் அனைத்தும் அகற்றப்பட்டன"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"மாற்றங்கள் சேமிக்கப்படவில்லை"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"பிற ஆப்ஸையும் காட்டு"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"கட்டுப்பாடுகளை ஏற்ற முடியவில்லை. ஆப்ஸ் அமைப்புகள் மாறவில்லை என்பதை உறுதிப்படுத்த <xliff:g id="APP">%s</xliff:g> ஆப்ஸைப் பார்க்கவும்."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"இணக்கமான கட்டுப்பாடுகள் இல்லை"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"பிற"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index a9760fabb4c2..fa549b817884 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"నిలిపివేయండి"</string> <string name="sound_settings" msgid="8874581353127418308">"సౌండ్ & వైబ్రేషన్"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"సెట్టింగ్లు"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"యాప్ పిన్ చేయబడి ఉంది"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"దీని వలన మీరు అన్పిన్ చేసే వరకు ఇది వీక్షణలో ఉంచబడుతుంది. అన్పిన్ చేయడానికి వెనుకకు మరియు స్థూలదృష్టి తాకి & అలాగే పట్టుకోండి."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"దీని వలన మీరు అన్పిన్ చేసే వరకు ఇది వీక్షణలో ఉంచబడుతుంది. అన్పిన్ చేయడానికి వెనుకకు మరియు హోమ్ని తాకి & అలాగే పట్టుకోండి."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"మధ్యస్థం"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"చిన్నది"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"పెద్దది"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"ఫుల్ స్క్రీన్"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"పూర్తయింది"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ఎడిట్ చేయండి"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"మాగ్నిఫయర్ విండో సెట్టింగ్లు"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"అన్ని కంట్రోల్స్ తీసివేయబడ్డాయి"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"మార్పులు సేవ్ చేయబడలేదు"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ఇతర యాప్లను చూడండి"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"కంట్రోల్లను లోడ్ చేయడం సాధ్యపడలేదు. యాప్ సెట్టింగ్లు మారలేదని నిర్ధారించడానికి <xliff:g id="APP">%s</xliff:g> యాప్ను చెక్ చేయండి."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"అనుకూల కంట్రోల్లు అందుబాటులో లేవు"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ఇతరం"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 769f7d82ca7c..110b62aede94 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"ปิดใช้"</string> <string name="sound_settings" msgid="8874581353127418308">"เสียงและการสั่น"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"การตั้งค่า"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ปักหมุดแอปอยู่"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"การดำเนินการนี้จะแสดงหน้าจอนี้ไว้เสมอจนกว่าคุณจะเลิกปักหมุด แตะ \"กลับ\" และ \"ภาพรวม\" ค้างไว้เพื่อเลิกปักหมุด"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"การดำเนินการนี้จะแสดงหน้าจอนี้ไว้เสมอจนกว่าคุณจะเลิกปักหมุด แตะ \"กลับ\" และ \"หน้าแรก\" ค้างไว้เพื่อเลิกปักหมุด"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"ปานกลาง"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"เล็ก"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"ใหญ่"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"เต็มหน้าจอ"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"เสร็จสิ้น"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"แก้ไข"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"การตั้งค่าหน้าต่างแว่นขยาย"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"นำตัวควบคุมทั้งหมดออกแล้ว"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ยังไม่ได้บันทึกการเปลี่ยนแปลง"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"ดูแอปอื่นๆ"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"โหลดตัวควบคุมไม่ได้ ตรวจสอบแอป <xliff:g id="APP">%s</xliff:g> ให้แน่ใจว่าการตั้งค่าของแอปไม่เปลี่ยนแปลง"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"ตัวควบคุมที่เข้ากันได้ไม่พร้อมใช้งาน"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"อื่นๆ"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 7cdd6dcd35b8..285b865e6789 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"i-disable"</string> <string name="sound_settings" msgid="8874581353127418308">"Tunog at pag-vibrate"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Mga Setting"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Naka-pin ang app"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Pinapanatili nitong nakikita ito hanggang sa mag-unpin ka. Pindutin nang matagal ang Bumalik at Overview upang mag-unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Pinapanatili nitong nakikita ito hanggang sa mag-unpin ka. Pindutin nang matagal ang Bumalik at Home upang mag-unpin."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Katamtaman"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Maliit"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Malaki"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Full screen"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Tapos na"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"I-edit"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Mga setting ng window ng magnifier"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Inalis ang lahat ng kontrol"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Hindi na-save ang mga pagbabago"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Tingnan ang iba pang app"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Hindi ma-load ang mga kontrol. Tingnan ang app na <xliff:g id="APP">%s</xliff:g> para matiyak na hindi nabago ang mga setting ng app."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Hindi available ang mga compatible na kontrol"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Iba pa"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index cdfea9005e2a..f82194d72660 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"devre dışı bırak"</string> <string name="sound_settings" msgid="8874581353127418308">"Ses ve titreşim"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Ayarlar"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Uygulama sabitlendi"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Geri\'ye ve Genel Bakış\'a dokunup basılı tutun."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Geri\'ye ve Ana sayfaya dokunup basılı tutun."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Orta"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Küçük"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Büyük"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Tam ekran"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Bitti"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Düzenle"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Büyüteç penceresi ayarları"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Tüm denetimler kaldırıldı"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Değişiklikler kaydedilmedi"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Tüm uygulamaları göster"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontroller yüklenemedi. Uygulama ayarlarının değişmediğinden emin olmak için <xliff:g id="APP">%s</xliff:g> uygulamasını kontrol edin."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Uyumlu kontrol bulunamadı"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Diğer"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 4ad9649ce9a0..62e1ec6493ab 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -124,7 +124,7 @@ <string name="accessibility_back" msgid="6530104400086152611">"Назад"</string> <string name="accessibility_home" msgid="5430449841237966217">"Головна"</string> <string name="accessibility_menu" msgid="2701163794470513040">"Меню"</string> - <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Спеціальні можливості"</string> + <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Доступність"</string> <string name="accessibility_rotate_button" msgid="1238584767612362586">"Обернути екран"</string> <string name="accessibility_recent" msgid="901641734769533575">"Огляд"</string> <string name="accessibility_camera_button" msgid="2938898391716647247">"Камера"</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"вимкнути"</string> <string name="sound_settings" msgid="8874581353127418308">"Звук і вібрація"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Налаштування"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Додаток закріплено"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ви постійно бачитимете екран, доки не відкріпите його. Щоб відкріпити екран, натисніть і втримуйте кнопки \"Назад\" та \"Огляд\"."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ви бачитимете цей екран, доки не відкріпите його. Для цього натисніть і утримуйте кнопки \"Назад\" та \"Головний екран\"."</string> @@ -481,7 +485,7 @@ <string name="stream_notification" msgid="7930294049046243939">"Сповіщення"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string> <string name="stream_dtmf" msgid="7322536356554673067">"Двотональний багаточастотний аналоговий сигнал"</string> - <string name="stream_accessibility" msgid="3873610336741987152">"Спеціальні можливості"</string> + <string name="stream_accessibility" msgid="3873610336741987152">"Доступність"</string> <string name="volume_ringer_status_normal" msgid="1339039682222461143">"Дзвінок"</string> <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"Вібросигнал"</string> <string name="volume_ringer_status_silent" msgid="3691324657849880883">"без звуку"</string> @@ -848,12 +852,11 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Звичайна"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Мала"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Велика"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"На весь екран"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Готово"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Змінити"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Налаштування розміру лупи"</string> - <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Кнопка спеціальних можливостей. Змініть або замініть її в Налаштуваннях.\n\n"<annotation id="link">"Переглянути налаштування"</annotation></string> + <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Торкніться, щоб відкрити функції доступності. Змінити або замінити цю кнопку можна в Налаштуваннях.\n\n"<annotation id="link">"Налаштування"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Щоб тимчасово сховати кнопку, перемістіть її на край екрана"</string> <string name="accessibility_floating_button_undo" msgid="511112888715708241">"Відмінити"</string> <string name="accessibility_floating_button_undo_message_label_text" msgid="9017658016426242640">"Ярлик функції \"<xliff:g id="FEATURE_NAME">%s</xliff:g>\" вилучено"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Усі елементи керування вилучено"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Зміни не збережено"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Переглянути інші додатки"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Не вдалося завантажити елементи керування. Перевірте в додатку <xliff:g id="APP">%s</xliff:g>, чи його налаштування не змінились."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Сумісні елементи керування недоступні"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Інше"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index d601e8fcc462..c2bbe9dfc2ab 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -123,7 +123,7 @@ <string name="screenrecord_start_error" msgid="2200660692479682368">"اسکرین ریکارڈنگ شروع کرنے میں خرابی"</string> <string name="accessibility_back" msgid="6530104400086152611">"واپس جائیں"</string> <string name="accessibility_home" msgid="5430449841237966217">"ہوم"</string> - <string name="accessibility_menu" msgid="2701163794470513040">"مینو"</string> + <string name="accessibility_menu" msgid="2701163794470513040">"مینیو"</string> <string name="accessibility_accessibility_button" msgid="4089042473497107709">"ایکسیسبیلٹی"</string> <string name="accessibility_rotate_button" msgid="1238584767612362586">"اسکرین کو گھمائیں"</string> <string name="accessibility_recent" msgid="901641734769533575">"عمومی جائزہ"</string> @@ -364,7 +364,7 @@ <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • آہستہ چارج ہو رہا ہے • <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> میں مکمل"</string> <string name="keyguard_indication_charging_time_dock" msgid="3149328898931741271">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • چارج ہو رہا ہے • <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> میں مکمل"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"صارف سوئچ کریں"</string> - <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"پل ڈاؤن مینو"</string> + <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"پل ڈاؤن مینیو"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"اس سیشن میں موجود سبھی ایپس اور ڈیٹا کو حذف کر دیا جائے گا۔"</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"مہمان، پھر سے خوش آمدید!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"کیا آپ اپنا سیشن جاری رکھنا چاہتے ہیں؟"</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"غیر فعال کریں"</string> <string name="sound_settings" msgid="8874581353127418308">"آواز اور وائبریشن"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"ترتیبات"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"ایپ کو پن کر دیا گیا ہے"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"اس سے یہ اس وقت تک منظر میں رہتی ہے جب تک آپ اس سے پن ہٹا نہیں دیتے۔ پن ہٹانے کیلئے پیچھے اور مجموعی جائزہ کے بٹنز کو ٹچ کریں اور دبائے رکھیں۔"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"اس سے یہ اس وقت تک منظر میں رہتی ہے جب تک آپ اس سے پن نہیں ہٹا دیتے۔ پن ہٹانے کیلئے \"پیچھے\" اور \"ہوم\" بٹنز کو ٹچ کریں اور دبائے رکھیں۔"</string> @@ -730,7 +734,7 @@ <string name="data_connection_no_internet" msgid="691058178914184544">"انٹرنیٹ نہیں ہے"</string> <string name="accessibility_quick_settings_open_settings" msgid="536838345505030893">"<xliff:g id="ID_1">%s</xliff:g> ترتیبات کھولیں۔"</string> <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ترتیبات کی ترتیب میں ترمیم کریں۔"</string> - <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"پاور مینو"</string> + <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"پاور مینیو"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"صفحہ <xliff:g id="ID_1">%1$d</xliff:g> از <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"مقفل اسکرین"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"حرارت کی وجہ سے فون آف ہو گیا"</string> @@ -756,7 +760,7 @@ <string name="tuner_minus" msgid="5258518368944598545">"علامت تفریق"</string> <string name="tuner_left" msgid="5758862558405684490">"بائیں"</string> <string name="tuner_right" msgid="8247571132790812149">"دائیں"</string> - <string name="tuner_menu" msgid="363690665924769420">"مینو"</string> + <string name="tuner_menu" msgid="363690665924769420">"مینیو"</string> <string name="tuner_app" msgid="6949280415826686972">"<xliff:g id="APP">%1$s</xliff:g> ایپ"</string> <string name="notification_channel_alerts" msgid="3385787053375150046">"الرٹس"</string> <string name="notification_channel_battery" msgid="9219995638046695106">"بیٹری"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"متوسط"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"چھوٹا"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"بڑا"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"فُل اسکرین"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"ہو گیا"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"ترمیم کریں"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"میگنیفائر ونڈو کی ترتیبات"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"سبھی کنٹرولز ہٹا دیے گئے"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"تبدیلیاں محفوظ نہیں ہوئیں"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"دیگر ایپس دیکھیں"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"کنٹرولز کو لوڈ نہیں کیا جا سکا۔ یہ یقینی بنانے کے لیے <xliff:g id="APP">%s</xliff:g> ایپ کو چیک کریں کہ ایپ کی ترتیبات تبدیل نہیں ہوئی ہیں۔"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"موافق کنٹرولز دستیاب نہیں ہیں"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"دیگر"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index b005ebcdbe2d..fb20f8b7ceeb 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -124,7 +124,7 @@ <string name="accessibility_back" msgid="6530104400086152611">"Orqaga"</string> <string name="accessibility_home" msgid="5430449841237966217">"Uyga"</string> <string name="accessibility_menu" msgid="2701163794470513040">"Menyu"</string> - <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Maxsus imkoniyatlar"</string> + <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Qulayliklar"</string> <string name="accessibility_rotate_button" msgid="1238584767612362586">"Ekranni burish"</string> <string name="accessibility_recent" msgid="901641734769533575">"Umumiy nazar"</string> <string name="accessibility_camera_button" msgid="2938898391716647247">"Kamera"</string> @@ -181,7 +181,7 @@ <string name="accessibility_cast_name" msgid="7344437925388773685">"Bunga ulangan: <xliff:g id="CAST">%s</xliff:g>."</string> <string name="accessibility_not_connected" msgid="4061305616351042142">"Ulanmagan."</string> <string name="data_connection_roaming" msgid="375650836665414797">"Rouming"</string> - <string name="cell_data_off" msgid="4886198950247099526">"Yoqilmagan"</string> + <string name="cell_data_off" msgid="4886198950247099526">"Oʻchiq"</string> <string name="accessibility_airplane_mode" msgid="1899529214045998505">"Parvoz rejimi"</string> <string name="accessibility_vpn_on" msgid="8037549696057288731">"VPN yoniq."</string> <string name="accessibility_battery_level" msgid="5143715405241138822">"Batareya <xliff:g id="NUMBER">%d</xliff:g> foiz."</string> @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"faolsizlantirish"</string> <string name="sound_settings" msgid="8874581353127418308">"Tovush va tebranish"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Sozlamalar"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Ilova mahkamlandi"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ekran yechilmaguncha u o‘zgarmas holatda qoladi. Uni yechish uchun “Orqaga” va “Umumiy ma’lumot” tugmalarini bosib turing."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ekran yechib olinmagunicha u mahkamlangan holatda qoladi. Uni yechish uchun Orqaga va Asosiy tugmalarni birga bosib turing."</string> @@ -481,13 +485,13 @@ <string name="stream_notification" msgid="7930294049046243939">"Bildirishnoma"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string> <string name="stream_dtmf" msgid="7322536356554673067">"Ikkitali ko‘pchastotali ovoz"</string> - <string name="stream_accessibility" msgid="3873610336741987152">"Maxsus imkoniyatlar"</string> + <string name="stream_accessibility" msgid="3873610336741987152">"Qulayliklar"</string> <string name="volume_ringer_status_normal" msgid="1339039682222461143">"Jiringlatish"</string> <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"Tebranish"</string> <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Ovozsiz"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. Ovozini yoqish uchun ustiga bosing."</string> - <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Tebranishni yoqish uchun ustiga bosing. Maxsus imkoniyatlar ishlamasligi mumkin."</string> - <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Ovozini o‘chirish uchun ustiga bosing. Maxsus imkoniyatlar ishlamasligi mumkin."</string> + <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Tebranishni yoqish uchun ustiga bosing. Qulayliklar ishlamasligi mumkin."</string> + <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Ovozini o‘chirish uchun ustiga bosing. Qulayliklar ishlamasligi mumkin."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. Tebranishni yoqish uchun ustiga bosing."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. Ovozsiz qilish uchun ustiga bosing."</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Jiringlagich rejimini oʻzgartirish uchun bosing"</string> @@ -666,7 +670,7 @@ <string name="data_saver" msgid="3484013368530820763">"Trafik tejash"</string> <string name="accessibility_data_saver_on" msgid="5394743820189757731">"Trafik tejash yoniq"</string> <string name="switch_bar_on" msgid="1770868129120096114">"Yoniq"</string> - <string name="switch_bar_off" msgid="5669805115416379556">"Yoqilmagan"</string> + <string name="switch_bar_off" msgid="5669805115416379556">"Oʻchiq"</string> <string name="tile_unavailable" msgid="3095879009136616920">"Mavjud emas"</string> <string name="accessibility_tile_disabled_by_policy_action_description" msgid="6958422730461646926">"batafsil"</string> <string name="nav_bar" msgid="4642708685386136807">"Navigatsiya paneli"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Oʻrtacha"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Kichik"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Yirik"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Butun ekran"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Tayyor"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Tahrirlash"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Lupa oynasi sozlamalari"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Barcha boshqaruv elementlari olib tashlandi"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Oʻzgarishlar saqlanmadi"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Boshqa ilovalar"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Boshqaruvlar yuklanmadi. <xliff:g id="APP">%s</xliff:g> ilovasining sozlamalari oʻzgarmaganini tekshiring."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Mos boshqaruv elementlari mavjud emas"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Boshqa"</string> diff --git a/packages/SystemUI/res/values-uz/tiles_states_strings.xml b/packages/SystemUI/res/values-uz/tiles_states_strings.xml index 4a45f03f4cbe..bd5ee8951c5b 100644 --- a/packages/SystemUI/res/values-uz/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-uz/tiles_states_strings.xml @@ -88,7 +88,7 @@ </string-array> <string-array name="tile_states_color_correction"> <item msgid="2840507878437297682">"Ishlamaydi"</item> - <item msgid="1909756493418256167">"Yoqilmagan"</item> + <item msgid="1909756493418256167">"Oʻchiq"</item> <item msgid="4531508423703413340">"Yoniq"</item> </string-array> <string-array name="tile_states_inversion"> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 5ebf5cd9cdbe..0f2ebf65a51d 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"tắt"</string> <string name="sound_settings" msgid="8874581353127418308">"Âm thanh và chế độ rung"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Cài đặt"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"Đã ghim ứng dụng"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Ứng dụng này sẽ ở cố định trên màn hình cho đến khi bạn bỏ ghim. Hãy chạm và giữ Quay lại và Tổng quan để bỏ ghim."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Ứng dụng này sẽ ở cố định trên màn hình cho đến khi bạn bỏ ghim. Hãy chạm và giữ nút Quay lại và nút Màn hình chính để bỏ ghim."</string> @@ -885,6 +889,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Đã xóa tất cả tùy chọn điều khiển"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Chưa lưu các thay đổi"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Xem ứng dụng khác"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Không tải được các chức năng điều khiển. Hãy kiểm tra ứng dụng <xliff:g id="APP">%s</xliff:g> để đảm bảo rằng thông tin cài đặt của ứng dụng chưa thay đổi."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Không có các chức năng điều khiển tương thích"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Khác"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 58217aed2407..571ee95bbd13 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"停用"</string> <string name="sound_settings" msgid="8874581353127418308">"提示音和振动"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"设置"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"应用已固定"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"这将会固定显示此屏幕，直到您取消固定为止。触摸并按住“返回”和“概览”即可取消固定屏幕。"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"这将会固定显示此屏幕，直到您取消固定为止。触摸并按住“返回”和“主屏幕”即可取消固定屏幕。"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"中"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"小"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"大"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"全屏"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"完成"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"修改"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"放大镜窗口设置"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"已移除所有控制器"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"未保存更改"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"查看其他应用"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"无法加载控件。请查看<xliff:g id="APP">%s</xliff:g>应用，确保应用设置没有更改。"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"找不到兼容的控件"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"其他"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 77e8e5df1701..8df1c3df94cc 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"停用"</string> <string name="sound_settings" msgid="8874581353127418308">"音效和震動"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"設定"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"已固定應用程式"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。按住「返回」和「概覽」按鈕即可取消固定。"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。按住「返回」按鈕和主按鈕即可取消固定。"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"中"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"小"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"大"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"全螢幕"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"完成"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"編輯"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"放大鏡視窗設定"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"已移除所有控制項"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"未儲存變更"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"查看其他應用程式"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"無法載入控制項。請檢查 <xliff:g id="APP">%s</xliff:g> 應用程式，確保設定沒有變動。"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"沒有兼容的控制項"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"其他"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index ef64b8d8eec1..a25fc44ed60b 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"停用"</string> <string name="sound_settings" msgid="8874581353127418308">"音效與震動"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"設定"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"應用程式已固定"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"這會讓目前的螢幕畫面保持顯示狀態，直到取消固定為止。按住 [返回] 按鈕和 [總覽] 按鈕即可取消固定。"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"這會讓應用程式顯示在螢幕上，直到取消固定為止。按住 [返回] 按鈕和主畫面按鈕即可取消固定。"</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"中"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"小"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"大"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"全螢幕"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"完成"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"編輯"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"放大鏡視窗設定"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"所有控制項都已移除"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"未儲存變更"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"查看其他應用程式"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"無法載入控制項。請查看「<xliff:g id="APP">%s</xliff:g>」應用程式，確認應用程式設定沒有任何異動。"</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"找不到相容的控制項"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"其他"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index f658544f6440..59884dbce7e5 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -458,6 +458,10 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"khubaza"</string> <string name="sound_settings" msgid="8874581353127418308">"Umsindo nokudlidliza"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"Amasethingi"</string> + <!-- no translation found for csd_lowered_title (1786173629015030856) --> + <skip /> + <!-- no translation found for csd_system_lowered_text (2001603282316829500) --> + <skip /> <string name="screen_pinning_title" msgid="9058007390337841305">"I-app iphiniwe"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Lokhu kuyigcina ibukeka uze ususe ukuphina. Thinta uphinde ubambe okuthi Emuva Nokubuka konke ukuze ususe ukuphina."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Lokhu kuyigcina ibonakala uze uyisuse. Thinta uphinde ubambe okuthi Emuva nokuthi Ekhaya ukuze ususe ukuphina."</string> @@ -848,8 +852,7 @@ <string name="accessibility_magnification_medium" msgid="6994632616884562625">"Kumaphakathi"</string> <string name="accessibility_magnification_small" msgid="8144502090651099970">"Esincane"</string> <string name="accessibility_magnification_large" msgid="6602944330021308774">"Obukhulu"</string> - <!-- no translation found for accessibility_magnification_fullscreen (5043514702759201964) --> - <skip /> + <string name="accessibility_magnification_fullscreen" msgid="5043514702759201964">"Iskrini esigcwele"</string> <string name="accessibility_magnification_done" msgid="263349129937348512">"Kwenziwe"</string> <string name="accessibility_magnifier_edit" msgid="1522877239671820636">"Hlela"</string> <string name="accessibility_magnification_magnifier_window_settings" msgid="2834685072221468434">"Amasethingi ewindi lesikhulisi"</string> @@ -885,6 +888,12 @@ <string name="controls_favorite_removed" msgid="5276978408529217272">"Zonke izilawuli zisusiwe"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Izinguquko azilondolozwanga"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Bona ezinye izinhlelo zokusebenza"</string> + <!-- no translation found for controls_favorite_rearrange_button (2942788904364641185) --> + <skip /> + <!-- no translation found for controls_favorite_add_controls (1221420435546694004) --> + <skip /> + <!-- no translation found for controls_favorite_back_to_editing (184125114090062713) --> + <skip /> <string name="controls_favorite_load_error" msgid="5126216176144877419">"Izilawuli azikwazanga ukulayishwa. Hlola uhlelo lokusebenza le-<xliff:g id="APP">%s</xliff:g> ukuqinisekisa ukuthi amasethingi wohlelo lokusebenza awashintshile."</string> <string name="controls_favorite_load_none" msgid="7687593026725357775">"Izilawuli ezihambelanayo azitholakali"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Okunye"</string> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 2663ffb1fed9..4db42aacbdcd 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1735,6 +1735,15 @@ <dimen name="broadcast_dialog_btn_minHeight">44dp</dimen> <dimen name="broadcast_dialog_margin">16dp</dimen> + <!-- Contrast dialog --> + <dimen name="contrast_dialog_button_total_size">90dp</dimen> + <dimen name="contrast_dialog_button_inner_size">82dp</dimen> + <dimen name="contrast_dialog_button_radius">20dp</dimen> + <dimen name="contrast_dialog_button_stroke_width">4dp</dimen> + <dimen name="contrast_dialog_button_text_size">14sp</dimen> + <dimen name="contrast_dialog_button_text_spacing">4dp</dimen> + <dimen name="contrast_dialog_button_horizontal_spacing">16dp</dimen> + <!-- Shadow for dream overlay clock complication --> <dimen name="dream_overlay_clock_key_text_shadow_dx">0dp</dimen> <dimen name="dream_overlay_clock_key_text_shadow_dy">0dp</dimen> @@ -1765,13 +1774,6 @@ <dimen name="rear_display_title_top_padding">24dp</dimen> <dimen name="rear_display_title_bottom_padding">16dp</dimen> - <!-- - Vertical distance between the pointer and the popup menu that shows up on the lock screen when - it is long-pressed. - --> - <dimen name="keyguard_long_press_settings_popup_vertical_offset">96dp</dimen> - - <!-- Bouncer user switcher margins --> <dimen name="bouncer_user_switcher_view_mode_user_switcher_bottom_margin">0dp</dimen> <dimen name="bouncer_user_switcher_view_mode_view_flipper_bottom_margin">0dp</dimen> diff --git a/packages/SystemUI/res/values/integers.xml b/packages/SystemUI/res/values/integers.xml index befbfab7dbc3..675ae326b5a2 100644 --- a/packages/SystemUI/res/values/integers.xml +++ b/packages/SystemUI/res/values/integers.xml @@ -36,7 +36,7 @@ fade_out_complete_frame --> <dimen name="percent_displacement_at_fade_out" format="float">0.1066</dimen> - <integer name="qs_carrier_max_em">7</integer> + <integer name="shade_carrier_max_em">7</integer> <!-- Maximum number of notification icons shown on the Always on Display (excluding overflow dot) --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 1dd12eef4639..74ae954a539c 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -757,6 +757,15 @@ <!-- QuickSettings: Label for the toggle that controls whether One-handed mode is enabled. [CHAR LIMIT=NONE] --> <string name="quick_settings_onehanded_label">One-handed mode</string> + <!-- QuickSettings: Contrast tile [CHAR LIMIT=NONE] --> + <string name="quick_settings_contrast_label">Contrast</string> + <!-- QuickSettings: Contrast tile description: standard [CHAR LIMIT=NONE] --> + <string name="quick_settings_contrast_standard">Standard</string> + <!-- QuickSettings: Contrast tile description: medium [CHAR LIMIT=NONE] --> + <string name="quick_settings_contrast_medium">Medium</string> + <!-- QuickSettings: Contrast tile description: high [CHAR LIMIT=NONE] --> + <string name="quick_settings_contrast_high">High</string> + <!--- Title of dialog triggered if the microphone is disabled but an app tried to access it. [CHAR LIMIT=150] --> <string name="sensor_privacy_start_use_mic_dialog_title">Unblock device microphone?</string> <!--- Title of dialog triggered if the camera is disabled but an app tried to access it. [CHAR LIMIT=150] --> @@ -3048,13 +3057,17 @@ <string name="call_from_work_profile_close">Close</string> <!-- - Label for a menu item in a menu that is shown when the user wishes to configure the lock screen. + Label for a menu item in a menu that is shown when the user wishes to customize the lock screen. Clicking on this menu item takes the user to a screen where they can modify the settings of the lock screen. + It is critical that this text is as short as possible. If needed, translators should feel free + to drop "lock screen" from their translation and keep just "Customize" or "Customization", in + cases when that verb is not available in their target language. + [CHAR LIMIT=32] --> - <string name="lock_screen_settings">Lock screen settings</string> + <string name="lock_screen_settings">Customize lock screen</string> <!-- Content description for Wi-Fi not available icon on dream [CHAR LIMIT=NONE]--> <string name="wifi_unavailable_dream_overlay_content_description">Wi-Fi not available</string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 8a86fd560655..2098aea87ab2 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -377,6 +377,10 @@ <item name="android:windowBackground">@android:color/transparent</item> </style> + <style name="Theme.SystemUI.ContrastDialog" parent="@android:style/Theme.DeviceDefault.Dialog"> + <item name="android:windowBackground">@android:color/transparent</item> + </style> + <style name="Theme.SystemUI.QuickSettings.Dialog" parent="@android:style/Theme.DeviceDefault.Dialog"> <item name="android:dialogCornerRadius">@dimen/notification_corner_radius</item> </style> @@ -1395,4 +1399,9 @@ <style name="ShortcutItemBackground"> <item name="android:background">@color/ksh_key_item_new_background</item> </style> + + <style name="LongPressLockScreenAnimation"> + <item name="android:windowEnterAnimation">@anim/long_press_lock_screen_popup_enter</item> + <item name="android:windowExitAnimation">@anim/long_press_lock_screen_popup_exit</item> + </style> </resources> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java index 6c59a941d4ce..3c447a8eb6d8 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java @@ -116,28 +116,27 @@ public class QuickStepContract { public static final int SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE = 1 << 26; // Device dreaming state public static final int SYSUI_STATE_DEVICE_DREAMING = 1 << 27; - // Whether the screen is currently on. Note that the screen is considered on while turning on, - // but not while turning off. - public static final int SYSUI_STATE_SCREEN_ON = 1 << 28; - // Whether the screen is currently transitioning into the state indicated by - // SYSUI_STATE_SCREEN_ON. - public static final int SYSUI_STATE_SCREEN_TRANSITION = 1 << 29; + // Whether the device is currently awake (as opposed to asleep, see WakefulnessLifecycle). + // Note that the device is awake on while waking up on, but not while going to sleep. + public static final int SYSUI_STATE_AWAKE = 1 << 28; + // Whether the device is currently transitioning between awake/asleep indicated by + // SYSUI_STATE_AWAKE. + public static final int SYSUI_STATE_WAKEFULNESS_TRANSITION = 1 << 29; // The notification panel expansion fraction is > 0 public static final int SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE = 1 << 30; + // When keyguard will be dismissed but didn't start animation yet + public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY = 1 << 31; - // Mask for SystemUiStateFlags to isolate SYSUI_STATE_SCREEN_ON and - // SYSUI_STATE_SCREEN_TRANSITION, to match SCREEN_STATE_* - public static final int SYSUI_STATE_SCREEN_STATE_MASK = - SYSUI_STATE_SCREEN_ON | SYSUI_STATE_SCREEN_TRANSITION; - // Screen is off. - public static final int SCREEN_STATE_OFF = 0; - // Screen is on. - public static final int SCREEN_STATE_ON = SYSUI_STATE_SCREEN_ON; - // Screen is still on, but transitioning to turn off. - public static final int SCREEN_STATE_TURNING_OFF = SYSUI_STATE_SCREEN_TRANSITION; - // Screen was off and is now turning on. - public static final int SCREEN_STATE_TURNING_ON = - SYSUI_STATE_SCREEN_TRANSITION | SYSUI_STATE_SCREEN_ON; + // Mask for SystemUiStateFlags to isolate SYSUI_STATE_AWAKE and + // SYSUI_STATE_WAKEFULNESS_TRANSITION, to match WAKEFULNESS_* constants + public static final int SYSUI_STATE_WAKEFULNESS_MASK = + SYSUI_STATE_AWAKE | SYSUI_STATE_WAKEFULNESS_TRANSITION; + // Mirroring the WakefulnessLifecycle#Wakefulness states + public static final int WAKEFULNESS_ASLEEP = 0; + public static final int WAKEFULNESS_AWAKE = SYSUI_STATE_AWAKE; + public static final int WAKEFULNESS_GOING_TO_SLEEP = SYSUI_STATE_WAKEFULNESS_TRANSITION; + public static final int WAKEFULNESS_WAKING = + SYSUI_STATE_WAKEFULNESS_TRANSITION | SYSUI_STATE_AWAKE; // Whether the back gesture is allowed (or ignored) by the Shade public static final boolean ALLOW_BACK_GESTURE_IN_SHADE = SystemProperties.getBoolean( @@ -172,8 +171,10 @@ public class QuickStepContract { SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING, SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE, SYSUI_STATE_DEVICE_DREAMING, - SYSUI_STATE_SCREEN_ON, - SYSUI_STATE_SCREEN_TRANSITION, + SYSUI_STATE_AWAKE, + SYSUI_STATE_WAKEFULNESS_TRANSITION, + SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, + SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY, }) public @interface SystemUiStateFlags {} @@ -195,7 +196,7 @@ public class QuickStepContract { str.add("navbar_hidden"); } if ((flags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0) { - str.add("notif_visible"); + str.add("notif_expanded"); } if ((flags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) != 0) { str.add("qs_visible"); @@ -263,11 +264,17 @@ public class QuickStepContract { if ((flags & SYSUI_STATE_DEVICE_DREAMING) != 0) { str.add("device_dreaming"); } - if ((flags & SYSUI_STATE_SCREEN_TRANSITION) != 0) { - str.add("screen_transition"); + if ((flags & SYSUI_STATE_WAKEFULNESS_TRANSITION) != 0) { + str.add("wakefulness_transition"); + } + if ((flags & SYSUI_STATE_AWAKE) != 0) { + str.add("awake"); + } + if ((flags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0) { + str.add("notif_visible"); } - if ((flags & SYSUI_STATE_SCREEN_ON) != 0) { - str.add("screen_on"); + if ((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY) != 0) { + str.add("keygrd_going_away"); } return str.toString(); diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt index 3b9060ad0ac3..0779653430b2 100644 --- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt +++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt @@ -46,10 +46,10 @@ import com.android.systemui.log.dagger.KeyguardSmallClockLog import com.android.systemui.plugins.ClockController import com.android.systemui.plugins.ClockFaceController import com.android.systemui.plugins.ClockTickRate +import com.android.systemui.plugins.WeatherData import com.android.systemui.plugins.log.LogBuffer import com.android.systemui.plugins.log.LogLevel.DEBUG import com.android.systemui.shared.regionsampling.RegionSampler -import com.android.systemui.plugins.WeatherData import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback import com.android.systemui.statusbar.policy.ConfigurationController @@ -144,8 +144,10 @@ constructor( val currentViewRect = Rect(left, top, right, bottom) val oldViewRect = Rect(oldLeft, oldTop, oldRight, oldBottom) - if (currentViewRect.width() != oldViewRect.width() || - currentViewRect.height() != oldViewRect.height()) { + if ( + currentViewRect.width() != oldViewRect.width() || + currentViewRect.height() != oldViewRect.height() + ) { updateRegionSampler(view) } } @@ -425,7 +427,7 @@ constructor( } isRunning = true - when (clockFace.events.tickRate) { + when (clockFace.config.tickRate) { ClockTickRate.PER_MINUTE -> { /* Handled by KeyguardClockSwitchController */ } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 07333f79cc94..9290220b8698 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -40,7 +40,6 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.log.dagger.KeyguardClockLog; -import com.android.systemui.plugins.ClockAnimations; import com.android.systemui.plugins.ClockController; import com.android.systemui.plugins.log.LogBuffer; import com.android.systemui.plugins.log.LogLevel; @@ -469,7 +468,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } @Nullable - private ClockController getClock() { + public ClockController getClock() { return mClockEventController.getClock(); } @@ -535,13 +534,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } return ((mCurrentClockSize == LARGE) ? clock.getLargeClock() : clock.getSmallClock()) - .getEvents().getHasCustomWeatherDataDisplay(); - } - - /** Gets the animations for the current clock. */ - @Nullable - public ClockAnimations getClockAnimations() { - ClockController clock = getClock(); - return clock == null ? null : clock.getAnimations(); + .getConfig().getHasCustomWeatherDataDisplay(); } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java index fd55d69badd1..c4df836e401f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java @@ -16,12 +16,13 @@ package com.android.keyguard; +import android.annotation.Nullable; import android.graphics.Rect; import android.util.Slog; import com.android.keyguard.KeyguardClockSwitch.ClockSize; import com.android.keyguard.logging.KeyguardLogger; -import com.android.systemui.plugins.ClockAnimations; +import com.android.systemui.plugins.ClockController; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; import com.android.systemui.statusbar.notification.stack.AnimationProperties; @@ -241,8 +242,9 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV } } - /** Gets the animations for the current clock. */ - public ClockAnimations getClockAnimations() { - return mKeyguardClockSwitchController.getClockAnimations(); + /** Gets the current clock controller. */ + @Nullable + public ClockController getClockController() { + return mKeyguardClockSwitchController.getClock(); } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java index ac0a3fd8dbc4..a678edc0eb06 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java @@ -28,7 +28,6 @@ import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; import com.android.systemui.statusbar.notification.stack.AnimationProperties; -import com.android.systemui.statusbar.phone.AnimatorHandle; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -48,7 +47,6 @@ public class KeyguardVisibilityHelper { private final ScreenOffAnimationController mScreenOffAnimationController; private boolean mAnimateYPos; private boolean mKeyguardViewVisibilityAnimating; - private AnimatorHandle mKeyguardAnimatorHandle; private boolean mLastOccludedState = false; private final AnimationProperties mAnimationProperties = new AnimationProperties(); private final LogBuffer mLogBuffer; @@ -85,10 +83,6 @@ public class KeyguardVisibilityHelper { boolean keyguardFadingAway, boolean goingToFullShade, int oldStatusBarState) { - if (mKeyguardAnimatorHandle != null) { - mKeyguardAnimatorHandle.cancel(); - mKeyguardAnimatorHandle = null; - } mView.animate().cancel(); boolean isOccluded = mKeyguardStateController.isOccluded(); mKeyguardViewVisibilityAnimating = false; @@ -122,7 +116,7 @@ public class KeyguardVisibilityHelper { .setDuration(320) .setInterpolator(Interpolators.ALPHA_IN) .withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable); - log("keyguardFadingAway transition w/ Y Animation"); + log("keyguardFadingAway transition w/ Y Aniamtion"); } else if (statusBarState == KEYGUARD) { if (keyguardFadingAway) { mKeyguardViewVisibilityAnimating = true; @@ -154,7 +148,7 @@ public class KeyguardVisibilityHelper { // Ask the screen off animation controller to animate the keyguard visibility for us // since it may need to be cancelled due to keyguard lifecycle events. - mKeyguardAnimatorHandle = mScreenOffAnimationController.animateInKeyguard( + mScreenOffAnimationController.animateInKeyguard( mView, mAnimateKeyguardStatusViewVisibleEndRunnable); } else { log("Direct set Visibility to VISIBLE"); diff --git a/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java b/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java index 6a6e81e9cb46..14810d9baf02 100644 --- a/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java +++ b/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java @@ -30,7 +30,6 @@ import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.view.ViewGroup; -import android.view.animation.Animation; import android.widget.ImageView; import android.widget.LinearLayout; @@ -50,7 +49,7 @@ public class PinShapeNonHintingView extends LinearLayout implements PinShapeInpu android.R.attr.textColorPrimary).getDefaultColor(); private int mPosition = 0; private final PinShapeAdapter mPinShapeAdapter; - private Animation mCurrentPlayingAnimation; + private ValueAnimator mValueAnimator = ValueAnimator.ofFloat(1f, 0f); public PinShapeNonHintingView(Context context, AttributeSet attrs) { super(context, attrs); mPinShapeAdapter = new PinShapeAdapter(context); @@ -80,15 +79,17 @@ public class PinShapeNonHintingView extends LinearLayout implements PinShapeInpu Log.e(getClass().getName(), "Trying to delete a non-existent char"); return; } + if (mValueAnimator.isRunning()) { + mValueAnimator.end(); + } mPosition--; ImageView pinDot = (ImageView) getChildAt(mPosition); - ValueAnimator animator = ValueAnimator.ofFloat(1f, 0f); - animator.addUpdateListener(valueAnimator -> { + mValueAnimator.addUpdateListener(valueAnimator -> { float value = (float) valueAnimator.getAnimatedValue(); pinDot.setScaleX(value); pinDot.setScaleY(value); }); - animator.addListener(new AnimatorListenerAdapter() { + mValueAnimator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); @@ -96,11 +97,10 @@ public class PinShapeNonHintingView extends LinearLayout implements PinShapeInpu PinShapeNonHintingView.this, new PinShapeViewTransition()); removeView(pinDot); - mCurrentPlayingAnimation = null; } }); - animator.setDuration(PasswordTextView.DISAPPEAR_DURATION); - animator.start(); + mValueAnimator.setDuration(PasswordTextView.DISAPPEAR_DURATION); + mValueAnimator.start(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java index 12b5705190d9..f3c71da63594 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java @@ -210,8 +210,8 @@ public class SystemActions implements CoreStartable { // Saving in instance variable since to prevent GC since // NotificationShadeWindowController.registerCallback() only keeps weak references. mNotificationShadeCallback = - (keyguardShowing, keyguardOccluded, bouncerShowing, mDozing, panelExpanded, - isDreaming) -> + (keyguardShowing, keyguardOccluded, keyguardGoingAway, bouncerShowing, mDozing, + panelExpanded, isDreaming) -> registerOrUnregisterDismissNotificationShadeAction(); mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy; } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt index 868ffcf54fe1..e0b9f01bf662 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt @@ -34,6 +34,7 @@ import com.android.systemui.animation.Interpolators import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.WakefulnessLifecycle +import com.android.systemui.plugins.log.LogLevel import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.CircleReveal import com.android.systemui.statusbar.LiftReveal @@ -43,7 +44,6 @@ import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.CentralSurfaces -import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent.CentralSurfacesScope import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController @@ -52,7 +52,7 @@ import java.io.PrintWriter import javax.inject.Inject import javax.inject.Provider -/*** +/** * Controls two ripple effects: * 1. Unlocked ripple: shows when authentication is successful * 2. UDFPS dwell ripple: shows when the user has their finger down on the UDFPS area and reacts @@ -71,14 +71,15 @@ class AuthRippleController @Inject constructor( private val wakefulnessLifecycle: WakefulnessLifecycle, private val commandRegistry: CommandRegistry, private val notificationShadeWindowController: NotificationShadeWindowController, - private val bypassController: KeyguardBypassController, - private val biometricUnlockController: BiometricUnlockController, private val udfpsControllerProvider: Provider<UdfpsController>, private val statusBarStateController: StatusBarStateController, private val featureFlags: FeatureFlags, private val logger: KeyguardLogger, - rippleView: AuthRippleView? -) : ViewController<AuthRippleView>(rippleView), KeyguardStateController.Callback, + private val biometricUnlockController: BiometricUnlockController, + rippleView: AuthRippleView? +) : + ViewController<AuthRippleView>(rippleView), + KeyguardStateController.Callback, WakefulnessLifecycle.Observer { @VisibleForTesting @@ -102,8 +103,24 @@ class AuthRippleController @Inject constructor( keyguardStateController.addCallback(this) wakefulnessLifecycle.addObserver(this) commandRegistry.registerCommand("auth-ripple") { AuthRippleCommand() } + biometricUnlockController.addListener(biometricModeListener) } + private val biometricModeListener = + object : BiometricUnlockController.BiometricUnlockEventsListener { + override fun onBiometricUnlockedWithKeyguardDismissal( + biometricSourceType: BiometricSourceType? + ) { + if (biometricSourceType != null) { + showUnlockRipple(biometricSourceType) + } else { + logger.log(TAG, + LogLevel.ERROR, + "Unexpected scenario where biometricSourceType is null") + } + } + } + @VisibleForTesting public override fun onViewDetached() { udfpsController?.removeCallback(udfpsControllerCallback) @@ -113,6 +130,7 @@ class AuthRippleController @Inject constructor( keyguardStateController.removeCallback(this) wakefulnessLifecycle.removeObserver(this) commandRegistry.unregisterCommand("auth-ripple") + biometricUnlockController.removeListener(biometricModeListener) notificationShadeWindowController.setForcePluginOpen(false, this) } @@ -143,9 +161,6 @@ class AuthRippleController @Inject constructor( showUnlockedRipple() } } else if (biometricSourceType == BiometricSourceType.FACE) { - if (!bypassController.canBypass() && !authController.isUdfpsFingerDown) { - return - } faceSensorLocation?.let { mView.setSensorLocation(it) circleReveal = CircleReveal( @@ -267,7 +282,6 @@ class AuthRippleController @Inject constructor( if (biometricSourceType == BiometricSourceType.FINGERPRINT) { mView.fadeDwellRipple() } - showUnlockRipple(biometricSourceType) } override fun onBiometricAuthFailed(biometricSourceType: BiometricSourceType) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index 8e5c76c598d8..aabdafb88558 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -563,6 +563,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { (TouchProcessorResult.ProcessedTouch) result; final NormalizedTouchData data = processedTouch.getTouchData(); + boolean shouldPilfer = false; mActivePointerId = processedTouch.getPointerOnSensorId(); switch (processedTouch.getEvent()) { case DOWN: @@ -581,8 +582,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { mStatusBarStateController.isDozing()); // Pilfer if valid overlap, don't allow following events to reach keyguard - mInputManager.pilferPointers( - mOverlay.getOverlayView().getViewRootImpl().getInputToken()); + shouldPilfer = true; break; case UP: @@ -618,9 +618,15 @@ public class UdfpsController implements DozeReceiver, Dumpable { } logBiometricTouch(processedTouch.getEvent(), data); - // Always pilfer pointers that are within sensor area - if (isWithinSensorArea(mOverlay.getOverlayView(), event.getRawX(), event.getRawY(), true)) { - Log.d("Austin", "pilferTouch invalid overlap"); + // Always pilfer pointers that are within sensor area or when alternate bouncer is showing + if (isWithinSensorArea(mOverlay.getOverlayView(), event.getRawX(), event.getRawY(), true) + || mAlternateBouncerInteractor.isVisibleState()) { + shouldPilfer = true; + } + + // Execute the pilfer, never pilfer if a vertical swipe is in progress + if (shouldPilfer && mLockscreenShadeTransitionController.getQSDragProgress() == 0f + && !mPrimaryBouncerInteractor.isInTransit()) { mInputManager.pilferPointers( mOverlay.getOverlayView().getViewRootImpl().getInputToken()); } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt index 414c2ecb70bc..f876affb2a9c 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt @@ -353,10 +353,19 @@ class UdfpsControllerOverlay @JvmOverloads constructor( flags = flags or WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH } - // Original sensorBounds assume portrait mode. + val isEnrollment = when (requestReason) { + REASON_ENROLL_FIND_SENSOR, REASON_ENROLL_ENROLLING -> true + else -> false + } + + // Use expanded overlay unless touchExploration enabled var rotatedBounds = if (featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) { - Rect(overlayParams.overlayBounds) + if (accessibilityManager.isTouchExplorationEnabled && isEnrollment) { + Rect(overlayParams.sensorBounds) + } else { + Rect(overlayParams.overlayBounds) + } } else { Rect(overlayParams.sensorBounds) } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java index 178cda46cdda..ba8e60a08a1d 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java @@ -306,7 +306,7 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { lp.width = mSensorBounds.width(); lp.height = mSensorBounds.height(); RectF relativeToView = getBoundsRelativeToView(new RectF(mSensorBounds)); - lp.setMargins( + lp.setMarginsRelative( (int) relativeToView.left, (int) relativeToView.top, (int) relativeToView.right, diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractor.kt index 000213fabe0d..86940ca8581b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractor.kt @@ -38,7 +38,6 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.catch -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map @@ -147,11 +146,6 @@ constructor( override fun addBiometricContextListener(listener: IBiometricContextListener): Job { return applicationScope.launch { - combine(isAod, isAwake) { doze, awake -> doze to awake } - .onEach { (aod, awake) -> listener.onDozeChanged(aod, awake) } - .catch { t -> Log.w(TAG, "failed to notify new doze state", t) } - .launchIn(this) - foldState .onEach { state -> listener.onFoldChanged(state) } .catch { t -> Log.w(TAG, "failed to notify new fold state", t) } diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java index edda87527b1d..63b4288ce055 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java @@ -21,7 +21,6 @@ import static android.content.ClipDescription.CLASSIFICATION_COMPLETE; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ENTERED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_UPDATED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN; -import static com.android.systemui.flags.Flags.CLIPBOARD_MINIMIZED_LAYOUT; import static com.google.android.setupcompat.util.WizardManagerHelper.SETTINGS_SECURE_USER_SETUP_COMPLETE; @@ -36,7 +35,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.UiEventLogger; import com.android.systemui.CoreStartable; import com.android.systemui.dagger.SysUISingleton; -import com.android.systemui.flags.FeatureFlags; import javax.inject.Inject; import javax.inject.Provider; @@ -59,7 +57,6 @@ public class ClipboardListener implements private final Provider<ClipboardOverlayController> mOverlayProvider; private final ClipboardToast mClipboardToast; private final ClipboardManager mClipboardManager; - private final FeatureFlags mFeatureFlags; private final UiEventLogger mUiEventLogger; private ClipboardOverlay mClipboardOverlay; @@ -68,13 +65,11 @@ public class ClipboardListener implements Provider<ClipboardOverlayController> clipboardOverlayControllerProvider, ClipboardToast clipboardToast, ClipboardManager clipboardManager, - FeatureFlags featureFlags, UiEventLogger uiEventLogger) { mContext = context; mOverlayProvider = clipboardOverlayControllerProvider; mClipboardToast = clipboardToast; mClipboardManager = clipboardManager; - mFeatureFlags = featureFlags; mUiEventLogger = uiEventLogger; } @@ -113,11 +108,7 @@ public class ClipboardListener implements } else { mUiEventLogger.log(CLIPBOARD_OVERLAY_UPDATED, 0, clipSource); } - if (mFeatureFlags.isEnabled(CLIPBOARD_MINIMIZED_LAYOUT)) { - mClipboardOverlay.setClipData(clipData, clipSource); - } else { - mClipboardOverlay.setClipDataLegacy(clipData, clipSource); - } + mClipboardOverlay.setClipData(clipData, clipSource); mClipboardOverlay.setOnSessionCompleteListener(() -> { // Session is complete, free memory until it's needed again. mClipboardOverlay = null; @@ -160,8 +151,6 @@ public class ClipboardListener implements } interface ClipboardOverlay { - void setClipDataLegacy(ClipData clipData, String clipSource); - void setClipData(ClipData clipData, String clipSource); void setOnSessionCompleteListener(Runnable runnable); diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java index c312f6969b07..5230159aaef4 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java @@ -24,12 +24,14 @@ import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBO import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISSED_OTHER; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EDIT_TAPPED; +import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_REMOTE_COPY_TAPPED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHARE_TAPPED; +import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_EXPANDED; +import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_MINIMIZED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TAP_OUTSIDE; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TIMED_OUT; -import static com.android.systemui.flags.Flags.CLIPBOARD_MINIMIZED_LAYOUT; import static com.android.systemui.flags.Flags.CLIPBOARD_REMOTE_BEHAVIOR; import android.animation.Animator; @@ -37,20 +39,14 @@ import android.animation.AnimatorListenerAdapter; import android.app.RemoteAction; import android.content.BroadcastReceiver; import android.content.ClipData; -import android.content.ClipDescription; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; -import android.graphics.Bitmap; import android.hardware.input.InputManager; import android.net.Uri; import android.os.Looper; import android.provider.DeviceConfig; -import android.text.TextUtils; -import android.util.Log; -import android.util.Size; import android.view.InputEvent; import android.view.InputEventReceiver; import android.view.InputMonitor; @@ -69,7 +65,6 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.screenshot.TimeoutHandler; -import java.io.IOException; import java.util.Optional; import java.util.concurrent.Executor; @@ -167,9 +162,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv @Override public void onMinimizedViewTapped() { - if (mFeatureFlags.isEnabled(CLIPBOARD_MINIMIZED_LAYOUT)) { - animateFromMinimized(); - } + animateFromMinimized(); } }; @@ -252,11 +245,9 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv @VisibleForTesting void onInsetsChanged(WindowInsets insets, int orientation) { mView.setInsets(insets, orientation); - if (mFeatureFlags.isEnabled(CLIPBOARD_MINIMIZED_LAYOUT)) { - if (shouldShowMinimized(insets) && !mIsMinimized) { - mIsMinimized = true; - mView.setMinimized(true); - } + if (shouldShowMinimized(insets) && !mIsMinimized) { + mIsMinimized = true; + mView.setMinimized(true); } } @@ -274,9 +265,11 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv reset(); mClipboardLogger.setClipSource(mClipboardModel.getSource()); if (shouldShowMinimized(mWindow.getWindowInsets())) { + mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED); mIsMinimized = true; mView.setMinimized(true); } else { + mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_EXPANDED); setExpandedView(); } animateIn(); @@ -359,7 +352,10 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); - mIsMinimized = false; + if (mIsMinimized) { + mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED); + mIsMinimized = false; + } setExpandedView(); animateIn(); } @@ -393,61 +389,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv }); } - @Override // ClipboardListener.ClipboardOverlay - public void setClipDataLegacy(ClipData clipData, String clipSource) { - if (mExitAnimator != null && mExitAnimator.isRunning()) { - mExitAnimator.cancel(); - } - reset(); - mClipboardLogger.setClipSource(clipSource); - String accessibilityAnnouncement = mContext.getString(R.string.clipboard_content_copied); - - boolean isSensitive = clipData != null && clipData.getDescription().getExtras() != null - && clipData.getDescription().getExtras() - .getBoolean(ClipDescription.EXTRA_IS_SENSITIVE); - boolean isRemote = mFeatureFlags.isEnabled(CLIPBOARD_REMOTE_BEHAVIOR) - && mClipboardUtils.isRemoteCopy(mContext, clipData, clipSource); - if (clipData == null || clipData.getItemCount() == 0) { - mView.showDefaultTextPreview(); - } else if (!TextUtils.isEmpty(clipData.getItemAt(0).getText())) { - ClipData.Item item = clipData.getItemAt(0); - if (isRemote || DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, - CLIPBOARD_OVERLAY_SHOW_ACTIONS, false)) { - if (item.getTextLinks() != null) { - classifyText(clipData.getItemAt(0), clipSource); - } - } - if (isSensitive) { - showEditableText(mContext.getString(R.string.clipboard_asterisks), true); - } else { - showEditableText(item.getText(), false); - } - mOnShareTapped = () -> shareContent(clipData); - mView.showShareChip(); - accessibilityAnnouncement = mContext.getString(R.string.clipboard_text_copied); - } else if (clipData.getItemAt(0).getUri() != null) { - if (tryShowEditableImage(clipData.getItemAt(0).getUri(), isSensitive)) { - accessibilityAnnouncement = mContext.getString(R.string.clipboard_image_copied); - } - mOnShareTapped = () -> shareContent(clipData); - mView.showShareChip(); - } else { - mView.showDefaultTextPreview(); - } - if (!isRemote) { - maybeShowRemoteCopy(clipData); - } - animateIn(); - mView.announceForAccessibility(accessibilityAnnouncement); - if (isRemote) { - mTimeoutHandler.cancelTimeout(); - mOnUiUpdate = null; - } else { - mOnUiUpdate = mTimeoutHandler::resetTimeout; - mOnUiUpdate.run(); - } - } - private void maybeShowRemoteCopy(ClipData clipData) { Intent remoteCopyIntent = IntentCreator.getRemoteCopyIntent(clipData, mContext); // Only show remote copy if it's available. @@ -470,22 +411,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv mOnSessionCompleteListener = runnable; } - private void classifyText(ClipData.Item item, String source) { - mBgExecutor.execute(() -> { - Optional<RemoteAction> action = mClipboardUtils.getAction(item, source); - mView.post(() -> { - mView.resetActionChips(); - action.ifPresent(remoteAction -> { - mView.setActionChip(remoteAction, () -> { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_ACTION_TAPPED); - animateOut(); - }); - mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_ACTION_SHOWN); - }); - }); - }); - } - private void monitorOutsideTouches() { InputManager inputManager = mContext.getSystemService(InputManager.class); mInputMonitor = inputManager.monitorGestureInput("clipboard overlay", 0); @@ -526,43 +451,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv animateOut(); } - private void showEditableText(CharSequence text, boolean hidden) { - mView.showTextPreview(text.toString(), hidden); - mView.setEditAccessibilityAction(true); - mOnPreviewTapped = this::editText; - } - - private boolean tryShowEditableImage(Uri uri, boolean isSensitive) { - Runnable listener = () -> editImage(uri); - ContentResolver resolver = mContext.getContentResolver(); - String mimeType = resolver.getType(uri); - boolean isEditableImage = mimeType != null && mimeType.startsWith("image"); - if (isSensitive) { - mView.showImagePreview(null); - if (isEditableImage) { - mOnPreviewTapped = listener; - mView.setEditAccessibilityAction(true); - } - } else if (isEditableImage) { // if the MIMEtype is image, try to load - try { - int size = mContext.getResources().getDimensionPixelSize(R.dimen.overlay_x_scale); - // The width of the view is capped, height maintains aspect ratio, so allow it to be - // taller if needed. - Bitmap thumbnail = resolver.loadThumbnail(uri, new Size(size, size * 4), null); - mView.showImagePreview(thumbnail); - mView.setEditAccessibilityAction(true); - mOnPreviewTapped = listener; - } catch (IOException e) { - Log.e(TAG, "Thumbnail loading failed", e); - mView.showDefaultTextPreview(); - isEditableImage = false; - } - } else { - mView.showDefaultTextPreview(); - } - return isEditableImage; - } - private void animateIn() { if (mEnterAnimator != null && mEnterAnimator.isRunning()) { return; diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayEvent.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayEvent.java index 4b5f8765c4d0..e26acd526dc0 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayEvent.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayEvent.java @@ -44,6 +44,12 @@ public enum ClipboardOverlayEvent implements UiEventLogger.UiEventEnum { CLIPBOARD_OVERLAY_TAP_OUTSIDE(1077), @UiEvent(doc = "clipboard overlay dismissed, miscellaneous reason") CLIPBOARD_OVERLAY_DISMISSED_OTHER(1078), + @UiEvent(doc = "clipboard overlay shown in expanded form") + CLIPBOARD_OVERLAY_SHOWN_EXPANDED(1356), + @UiEvent(doc = "clipboard overlay shown in minimized form") + CLIPBOARD_OVERLAY_SHOWN_MINIMIZED(1357), + @UiEvent(doc = "clipboard overlay expanded") + CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED(1358), @UiEvent(doc = "clipboard toast shown") CLIPBOARD_TOAST_SHOWN(1270); diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java index 25caaeac2c38..758a6563323e 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java @@ -88,25 +88,4 @@ class ClipboardOverlayUtils { } return actions; } - - public Optional<RemoteAction> getAction(ClipData.Item item, String source) { - return getActions(item).stream().filter(remoteAction -> { - ComponentName component = remoteAction.getActionIntent().getIntent().getComponent(); - return component != null && !TextUtils.equals(source, component.getPackageName()); - }).findFirst(); - } - - private ArrayList<RemoteAction> getActions(ClipData.Item item) { - ArrayList<RemoteAction> actions = new ArrayList<>(); - for (TextLinks.TextLink link : item.getTextLinks().getLinks()) { - // skip classification for incidental entities - if (link.getEnd() - link.getStart() - >= item.getText().length() * MINIMUM_ENTITY_PROPORTION) { - TextClassification classification = mTextClassifier.classifyText( - item.getText(), link.getStart(), link.getEnd(), null); - actions.addAll(classification.getActions()); - } - } - return actions; - } } diff --git a/packages/SystemUI/src/com/android/systemui/common/ui/view/MotionEventExt.kt b/packages/SystemUI/src/com/android/systemui/common/ui/view/MotionEventExt.kt new file mode 100644 index 000000000000..26fc36dd3c9e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/ui/view/MotionEventExt.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.common.ui.view + +import android.util.MathUtils +import android.view.MotionEvent + +/** Returns the distance from the position of this [MotionEvent] and the given coordinates. */ +fun MotionEvent.distanceFrom( + x: Float, + y: Float, +): Float { + return MathUtils.dist(this.x, this.y, x, y) +} diff --git a/packages/SystemUI/src/com/android/systemui/contrast/ContrastDialog.kt b/packages/SystemUI/src/com/android/systemui/contrast/ContrastDialog.kt new file mode 100644 index 000000000000..9e15c7e31127 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/contrast/ContrastDialog.kt @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.contrast + +import android.app.UiModeManager +import android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_HIGH +import android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_MEDIUM +import android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_STANDARD +import android.app.UiModeManager.ContrastUtils.fromContrastLevel +import android.app.UiModeManager.ContrastUtils.toContrastLevel +import android.content.Context +import android.os.Bundle +import android.provider.Settings +import android.view.LayoutInflater +import android.view.View +import android.widget.FrameLayout +import com.android.internal.annotations.VisibleForTesting +import com.android.systemui.R +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.settings.UserTracker +import com.android.systemui.statusbar.phone.SystemUIDialog +import com.android.systemui.util.settings.SecureSettings +import java.util.concurrent.Executor + +/** Dialog to select contrast options */ +class ContrastDialog( + context: Context?, + @Main private val mainExecutor: Executor, + private val uiModeManager: UiModeManager, + private val userTracker: UserTracker, + private val secureSettings: SecureSettings, +) : SystemUIDialog(context), UiModeManager.ContrastChangeListener { + + @VisibleForTesting lateinit var contrastButtons: Map<Int, FrameLayout> + lateinit var dialogView: View + @VisibleForTesting var initialContrast: Float = fromContrastLevel(CONTRAST_LEVEL_STANDARD) + + public override fun onCreate(savedInstanceState: Bundle?) { + dialogView = LayoutInflater.from(context).inflate(R.layout.contrast_dialog, null) + setView(dialogView) + + setTitle(R.string.quick_settings_contrast_label) + setNeutralButton(R.string.cancel) { _, _ -> + secureSettings.putFloatForUser( + Settings.Secure.CONTRAST_LEVEL, + initialContrast, + userTracker.userId + ) + dismiss() + } + setPositiveButton(R.string.done) { _, _ -> dismiss() } + super.onCreate(savedInstanceState) + + contrastButtons = + mapOf( + CONTRAST_LEVEL_STANDARD to findViewById(R.id.contrast_button_standard), + CONTRAST_LEVEL_MEDIUM to findViewById(R.id.contrast_button_medium), + CONTRAST_LEVEL_HIGH to findViewById(R.id.contrast_button_high) + ) + + contrastButtons.forEach { (contrastLevel, contrastButton) -> + contrastButton.setOnClickListener { + val contrastValue = fromContrastLevel(contrastLevel) + secureSettings.putFloatForUser( + Settings.Secure.CONTRAST_LEVEL, + contrastValue, + userTracker.userId + ) + } + } + + initialContrast = uiModeManager.contrast + highlightContrast(toContrastLevel(initialContrast)) + } + + override fun onStart() { + super.onStart() + uiModeManager.addContrastChangeListener(mainExecutor, this) + } + + override fun onStop() { + super.onStop() + uiModeManager.removeContrastChangeListener(this) + } + + override fun onContrastChanged(contrast: Float) { + highlightContrast(toContrastLevel(contrast)) + } + + private fun highlightContrast(contrast: Int) { + contrastButtons.forEach { (level, button) -> button.isSelected = level == contrast } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/contrast/ContrastDialogActivity.kt b/packages/SystemUI/src/com/android/systemui/contrast/ContrastDialogActivity.kt new file mode 100644 index 000000000000..70d713845f00 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/contrast/ContrastDialogActivity.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.contrast + +import android.app.Activity +import android.app.UiModeManager +import android.content.Context +import android.os.Bundle +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.settings.UserTracker +import com.android.systemui.util.settings.SecureSettings +import java.util.concurrent.Executor +import javax.inject.Inject + +/** Trampoline activity responsible for creating a [ContrastDialog] */ +class ContrastDialogActivity +@Inject +constructor( + private val context: Context, + @Main private val mainExecutor: Executor, + private val uiModeManager: UiModeManager, + private val userTracker: UserTracker, + private val secureSettings: SecureSettings +) : Activity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val contrastDialog = + ContrastDialog(context, mainExecutor, uiModeManager, userTracker, secureSettings) + contrastDialog.show() + finish() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java index 3cf26b381d7d..dba353b0d70e 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java @@ -19,6 +19,7 @@ package com.android.systemui.dagger; import android.app.Activity; import com.android.systemui.ForegroundServicesDialog; +import com.android.systemui.contrast.ContrastDialogActivity; import com.android.systemui.hdmi.HdmiCecSetMenuLanguageActivity; import com.android.systemui.keyguard.WorkLockActivity; import com.android.systemui.people.PeopleSpaceActivity; @@ -73,6 +74,12 @@ public abstract class DefaultActivityBinder { @ClassKey(BrightnessDialog.class) public abstract Activity bindBrightnessDialog(BrightnessDialog activity); + /** Inject into ContrastDialogActivity. */ + @Binds + @IntoMap + @ClassKey(ContrastDialogActivity.class) + public abstract Activity bindContrastDialogActivity(ContrastDialogActivity activity); + /** Inject into UsbDebuggingActivity. */ @Binds @IntoMap diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 63a4fd2189d8..7945470b424a 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -85,6 +85,8 @@ import com.android.systemui.statusbar.notification.collection.inflation.Notifica import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider; +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper; +import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider; import com.android.systemui.statusbar.notification.people.PeopleHubModule; import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent; import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent; @@ -116,16 +118,16 @@ import com.android.systemui.wallet.dagger.WalletModule; import com.android.systemui.wmshell.BubblesManager; import com.android.wm.shell.bubbles.Bubbles; -import java.util.Optional; -import java.util.concurrent.Executor; - -import javax.inject.Named; - import dagger.Binds; import dagger.BindsOptionalOf; import dagger.Module; import dagger.Provides; +import java.util.Optional; +import java.util.concurrent.Executor; + +import javax.inject.Named; + /** * A dagger module for injecting components of System UI that are required by System UI. * @@ -315,4 +317,11 @@ public abstract class SystemUIModule { @Binds abstract LargeScreenShadeInterpolator largeScreensShadeInterpolator( LargeScreenShadeInterpolatorImpl impl); + + @SysUISingleton + @Provides + static VisualInterruptionDecisionProvider provideVisualInterruptionDecisionProvider( + NotificationInterruptStateProvider innerProvider) { + return new NotificationInterruptStateProviderWrapper(innerProvider); + } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeBrightnessHostForwarder.java b/packages/SystemUI/src/com/android/systemui/doze/DozeBrightnessHostForwarder.java index 0aeb12875ea1..cf0dcad5bf0d 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeBrightnessHostForwarder.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeBrightnessHostForwarder.java @@ -16,6 +16,8 @@ package com.android.systemui.doze; +import java.util.concurrent.Executor; + /** * Forwards the currently used brightness to {@link DozeHost}. */ @@ -23,8 +25,9 @@ public class DozeBrightnessHostForwarder extends DozeMachine.Service.Delegate { private final DozeHost mHost; - public DozeBrightnessHostForwarder(DozeMachine.Service wrappedService, DozeHost host) { - super(wrappedService); + public DozeBrightnessHostForwarder(DozeMachine.Service wrappedService, DozeHost host, + Executor bgExecutor) { + super(wrappedService, bgExecutor); mHost = host; } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java index f0aefb5bc0df..7f0b16bca8b4 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java @@ -39,6 +39,7 @@ import com.android.systemui.util.wakelock.WakeLock; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.concurrent.Executor; import javax.inject.Inject; @@ -150,7 +151,6 @@ public class DozeMachine { private final DockManager mDockManager; private final Part[] mParts; private final UserTracker mUserTracker; - private final ArrayList<State> mQueuedRequests = new ArrayList<>(); private State mState = State.UNINITIALIZED; private int mPulseReason; @@ -512,9 +512,11 @@ public class DozeMachine { class Delegate implements Service { private final Service mDelegate; + private final Executor mBgExecutor; - public Delegate(Service delegate) { + public Delegate(Service delegate, Executor bgExecutor) { mDelegate = delegate; + mBgExecutor = bgExecutor; } @Override @@ -534,7 +536,9 @@ public class DozeMachine { @Override public void setDozeScreenBrightness(int brightness) { - mDelegate.setDozeScreenBrightness(brightness); + mBgExecutor.execute(() -> { + mDelegate.setDozeScreenBrightness(brightness); + }); } } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java index 25c2c39f3e25..8d4447285af2 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java @@ -22,14 +22,16 @@ import androidx.annotation.VisibleForTesting; import com.android.systemui.statusbar.phone.DozeParameters; +import java.util.concurrent.Executor; + /** * Prevents usage of doze screen states on devices that don't support them. */ public class DozeScreenStatePreventingAdapter extends DozeMachine.Service.Delegate { @VisibleForTesting - DozeScreenStatePreventingAdapter(DozeMachine.Service inner) { - super(inner); + DozeScreenStatePreventingAdapter(DozeMachine.Service inner, Executor bgExecutor) { + super(inner, bgExecutor); } @Override @@ -47,8 +49,8 @@ public class DozeScreenStatePreventingAdapter extends DozeMachine.Service.Delega * return a new instance of {@link DozeScreenStatePreventingAdapter} wrapping {@code inner}. */ public static DozeMachine.Service wrapIfNeeded(DozeMachine.Service inner, - DozeParameters params) { - return isNeeded(params) ? new DozeScreenStatePreventingAdapter(inner) : inner; + DozeParameters params, Executor bgExecutor) { + return isNeeded(params) ? new DozeScreenStatePreventingAdapter(inner, bgExecutor) : inner; } private static boolean isNeeded(DozeParameters params) { diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java index a0c490951199..f7773f1888b3 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java @@ -22,14 +22,16 @@ import androidx.annotation.VisibleForTesting; import com.android.systemui.statusbar.phone.DozeParameters; +import java.util.concurrent.Executor; + /** * Prevents usage of doze screen states on devices that don't support them. */ public class DozeSuspendScreenStatePreventingAdapter extends DozeMachine.Service.Delegate { @VisibleForTesting - DozeSuspendScreenStatePreventingAdapter(DozeMachine.Service inner) { - super(inner); + DozeSuspendScreenStatePreventingAdapter(DozeMachine.Service inner, Executor bgExecutor) { + super(inner, bgExecutor); } @Override @@ -45,8 +47,9 @@ public class DozeSuspendScreenStatePreventingAdapter extends DozeMachine.Service * return a new instance of {@link DozeSuspendScreenStatePreventingAdapter} wrapping {@code inner}. */ public static DozeMachine.Service wrapIfNeeded(DozeMachine.Service inner, - DozeParameters params) { - return isNeeded(params) ? new DozeSuspendScreenStatePreventingAdapter(inner) : inner; + DozeParameters params, Executor bgExecutor) { + return isNeeded(params) ? new DozeSuspendScreenStatePreventingAdapter(inner, bgExecutor) + : inner; } private static boolean isNeeded(DozeParameters params) { diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java index 069344ff0e2d..d408472efca5 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java +++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java @@ -22,6 +22,7 @@ import android.os.Handler; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.doze.DozeAuthRemover; import com.android.systemui.doze.DozeBrightnessHostForwarder; import com.android.systemui.doze.DozeDockHandler; @@ -45,13 +46,14 @@ import com.android.systemui.util.sensors.AsyncSensorManager; import com.android.systemui.util.wakelock.DelayedWakeLock; import com.android.systemui.util.wakelock.WakeLock; +import dagger.Module; +import dagger.Provides; + import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Optional; - -import dagger.Module; -import dagger.Provides; +import java.util.concurrent.Executor; /** Dagger module for use with {@link com.android.systemui.doze.dagger.DozeComponent}. */ @Module @@ -60,13 +62,13 @@ public abstract class DozeModule { @DozeScope @WrappedService static DozeMachine.Service providesWrappedService(DozeMachine.Service dozeMachineService, - DozeHost dozeHost, DozeParameters dozeParameters) { + DozeHost dozeHost, DozeParameters dozeParameters, @UiBackground Executor bgExecutor) { DozeMachine.Service wrappedService = dozeMachineService; - wrappedService = new DozeBrightnessHostForwarder(wrappedService, dozeHost); + wrappedService = new DozeBrightnessHostForwarder(wrappedService, dozeHost, bgExecutor); wrappedService = DozeScreenStatePreventingAdapter.wrapIfNeeded( - wrappedService, dozeParameters); + wrappedService, dozeParameters, bgExecutor); wrappedService = DozeSuspendScreenStatePreventingAdapter.wrapIfNeeded( - wrappedService, dozeParameters); + wrappedService, dozeParameters, bgExecutor); return wrappedService; } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java index 2ea7bce66452..570132e111eb 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java @@ -303,10 +303,6 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { } flingToExpansion(verticalVelocity, expansion); - - if (expansion == KeyguardBouncerConstants.EXPANSION_HIDDEN) { - mCurrentScrimController.reset(); - } break; default: mVelocityTracker.addMovement(motionEvent); diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 4d6aef5050f2..6bb0f2ee48d6 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -132,6 +132,11 @@ object Flags { // TODO(b/254512676): Tracking Bug @JvmField val LOCKSCREEN_CUSTOM_CLOCKS = releasedFlag(207, "lockscreen_custom_clocks") + // TODO(b/275694445): Tracking Bug + @JvmField + val LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING = unreleasedFlag(208, + "lockscreen_without_secure_lock_when_dreaming") + /** * Whether the clock on a wide lock screen should use the new "stepping" animation for moving * the digits when the clock moves. @@ -219,7 +224,7 @@ object Flags { /** Whether to inflate the bouncer view on a background thread. */ // TODO(b/272091103): Tracking Bug @JvmField - val ASYNC_INFLATE_BOUNCER = unreleasedFlag(229, "async_inflate_bouncer", teamfood = true) + val ASYNC_INFLATE_BOUNCER = releasedFlag(229, "async_inflate_bouncer") /** Whether to inflate the bouncer view on a background thread. */ // TODO(b/273341787): Tracking Bug @@ -230,6 +235,12 @@ object Flags { @JvmField val REFACTOR_KEYGUARD_DISMISS_INTENT = unreleasedFlag(231, "refactor_keyguard_dismiss_intent") + /** Whether to allow long-press on the lock screen to directly open wallpaper picker. */ + // TODO(b/277220285): Tracking bug. + @JvmField + val LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP = + unreleasedFlag(232, "lock_screen_long_press_directly_opens_wallpaper_picker") + // 300 - power menu // TODO(b/254512600): Tracking Bug @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite") @@ -285,7 +296,7 @@ object Flags { /** Enables Font Scaling Quick Settings tile */ // TODO(b/269341316): Tracking Bug @JvmField - val ENABLE_FONT_SCALING_TILE = unreleasedFlag(509, "enable_font_scaling_tile", teamfood = true) + val ENABLE_FONT_SCALING_TILE = releasedFlag(509, "enable_font_scaling_tile") /** Enables new QS Edit Mode visual refresh */ // TODO(b/269787742): Tracking Bug @@ -417,7 +428,7 @@ object Flags { // TODO(b/273509374): Tracking Bug @JvmField - val ALWAYS_SHOW_HOME_CONTROLS_ON_DREAMS = unreleasedFlag(1006, + val ALWAYS_SHOW_HOME_CONTROLS_ON_DREAMS = releasedFlag(1006, "always_show_home_controls_on_dreams") // 1100 - windowing @@ -513,6 +524,11 @@ object Flags { sysPropBooleanFlag( 1116, "persist.wm.debug.enable_move_floating_window_in_tabletop", default = true) + // TODO(b/273443374): Tracking Bug + @Keep + @JvmField val LOCKSCREEN_LIVE_WALLPAPER = + sysPropBooleanFlag(1117, "persist.wm.debug.lockscreen_live_wallpaper", default = false) + // 1200 - predictive back @Keep @JvmField @@ -575,9 +591,6 @@ object Flags { // TODO(b/251205791): Tracking Bug @JvmField val SCREENSHOT_APP_CLIPS = releasedFlag(1304, "screenshot_app_clips") - // TODO(b/268484562): Tracking bug - @JvmField val SCREENSHOT_METADATA_REFACTOR = releasedFlag(1305, "screenshot_metadata_refactor") - // 1400 - columbus // TODO(b/254512756): Tracking Bug val QUICK_TAP_IN_PCC = releasedFlag(1400, "quick_tap_in_pcc") @@ -608,8 +621,6 @@ object Flags { // 1700 - clipboard @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag(1701, "clipboard_remote_behavior") - // TODO(b/267162944): Tracking bug - @JvmField val CLIPBOARD_MINIMIZED_LAYOUT = releasedFlag(1702, "clipboard_data_model") // 1800 - shade container @JvmField diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt b/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt index a173f8b914db..2ef5e19bf382 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt @@ -90,9 +90,9 @@ class KeyboardBacklightDialog( private fun updateResources() { context.resources.apply { - filledRectangleColor = getColor(R.color.backlight_indicator_step_filled) - emptyRectangleColor = getColor(R.color.backlight_indicator_step_empty) - backgroundColor = getColor(R.color.backlight_indicator_background) + filledRectangleColor = getColor(R.color.backlight_indicator_step_filled, context.theme) + emptyRectangleColor = getColor(R.color.backlight_indicator_step_empty, context.theme) + backgroundColor = getColor(R.color.backlight_indicator_background, context.theme) rootProperties = RootProperties( cornerRadius = @@ -224,7 +224,6 @@ class KeyboardBacklightDialog( private fun setWindowTitle() { val attrs = window.attributes - // TODO(b/271796169): check if title needs to be a translatable resource. attrs.title = "KeyboardBacklightDialog" attrs?.y = dialogBottomMargin window.attributes = attrs diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index b1efdd733faa..416b2379eef8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -128,6 +128,8 @@ import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.dump.DumpManager; +import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.dagger.KeyguardModule; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -1184,6 +1186,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private Lazy<ActivityLaunchAnimator> mActivityLaunchAnimator; private Lazy<ScrimController> mScrimControllerLazy; + private FeatureFlags mFeatureFlags; + /** * Injected constructor. See {@link KeyguardModule}. */ @@ -1214,7 +1218,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, Lazy<ShadeController> shadeControllerLazy, Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy, Lazy<ActivityLaunchAnimator> activityLaunchAnimator, - Lazy<ScrimController> scrimControllerLazy) { + Lazy<ScrimController> scrimControllerLazy, + FeatureFlags featureFlags) { mContext = context; mUserTracker = userTracker; mFalsingCollector = falsingCollector; @@ -1269,6 +1274,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mDreamOpenAnimationDuration = (int) DREAMING_ANIMATION_DURATION_MS; mDreamCloseAnimationDuration = (int) LOCKSCREEN_ANIMATION_DURATION_MS; + + mFeatureFlags = featureFlags; } public void userActivity() { @@ -1682,14 +1689,17 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, } /** - * A dream started. We should lock after the usual screen-off lock timeout but only - * if there is a secure lock pattern. + * A dream started. We should lock after the usual screen-off lock timeout regardless if + * there is a secure lock pattern or not */ public void onDreamingStarted() { mUpdateMonitor.dispatchDreamingStarted(); synchronized (this) { + final boolean alwaysShowKeyguard = + mFeatureFlags.isEnabled(Flags.LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING); if (mDeviceInteractive - && mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser())) { + && (alwaysShowKeyguard || + mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser()))) { doKeyguardLaterLocked(); } } @@ -2856,14 +2866,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, + " wasShowing=" + wasShowing); } + mKeyguardUnlockAnimationControllerLazy.get() + .notifyFinishedKeyguardExitAnimation(cancelled); finishSurfaceBehindRemoteAnimation(cancelled); // Dispatch the callback on animation finishes. mUpdateMonitor.dispatchKeyguardDismissAnimationFinished(); }); - mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation( - cancelled); } /** diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java index 6ac51cd52b49..5e71458c8bb4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java @@ -39,6 +39,7 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.dump.DumpManager; +import com.android.systemui.flags.FeatureFlags; import com.android.systemui.keyguard.DismissCallbackRegistry; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.KeyguardViewMediator; @@ -119,7 +120,8 @@ public class KeyguardModule { Lazy<ShadeController> shadeController, Lazy<NotificationShadeWindowController> notificationShadeWindowController, Lazy<ActivityLaunchAnimator> activityLaunchAnimator, - Lazy<ScrimController> scrimControllerLazy) { + Lazy<ScrimController> scrimControllerLazy, + FeatureFlags featureFlags) { return new KeyguardViewMediator( context, userTracker, @@ -149,7 +151,8 @@ public class KeyguardModule { shadeController, notificationShadeWindowController, activityLaunchAnimator, - scrimControllerLazy); + scrimControllerLazy, + featureFlags); } /** */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt index 8ece3183fd56..ab4abbf3d575 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.data.repository import android.content.Context import android.os.UserHandle +import android.util.LayoutDirection import com.android.systemui.Dumpable import com.android.systemui.R import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging @@ -113,30 +114,6 @@ constructor( initialValue = emptyMap(), ) - private val _slotPickerRepresentations: List<KeyguardSlotPickerRepresentation> by lazy { - fun parseSlot(unparsedSlot: String): Pair<String, Int> { - val split = unparsedSlot.split(SLOT_CONFIG_DELIMITER) - check(split.size == 2) - val slotId = split[0] - val slotCapacity = split[1].toInt() - return slotId to slotCapacity - } - - val unparsedSlots = - appContext.resources.getStringArray(R.array.config_keyguardQuickAffordanceSlots) - - val seenSlotIds = mutableSetOf<String>() - unparsedSlots.mapNotNull { unparsedSlot -> - val (slotId, slotCapacity) = parseSlot(unparsedSlot) - check(!seenSlotIds.contains(slotId)) { "Duplicate slot \"$slotId\"!" } - seenSlotIds.add(slotId) - KeyguardSlotPickerRepresentation( - id = slotId, - maxSelectedAffordances = slotCapacity, - ) - } - } - init { legacySettingSyncer.startSyncing() dumpManager.registerDumpable("KeyguardQuickAffordances", Dumpster()) @@ -211,7 +188,30 @@ constructor( * each slot and select which affordance(s) is/are installed in each slot on the keyguard. */ fun getSlotPickerRepresentations(): List<KeyguardSlotPickerRepresentation> { - return _slotPickerRepresentations + fun parseSlot(unparsedSlot: String): Pair<String, Int> { + val split = unparsedSlot.split(SLOT_CONFIG_DELIMITER) + check(split.size == 2) + val slotId = split[0] + val slotCapacity = split[1].toInt() + return slotId to slotCapacity + } + + val unparsedSlots = + appContext.resources.getStringArray(R.array.config_keyguardQuickAffordanceSlots) + if (appContext.resources.configuration.layoutDirection == LayoutDirection.RTL) { + unparsedSlots.reverse() + } + + val seenSlotIds = mutableSetOf<String>() + return unparsedSlots.mapNotNull { unparsedSlot -> + val (slotId, slotCapacity) = parseSlot(unparsedSlot) + check(!seenSlotIds.contains(slotId)) { "Duplicate slot \"$slotId\"!" } + seenSlotIds.add(slotId) + KeyguardSlotPickerRepresentation( + id = slotId, + maxSelectedAffordances = slotCapacity, + ) + } } private inner class Dumpster : Dumpable { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt index 76f20d25b0ec..3567d814f63e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt @@ -25,6 +25,7 @@ import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLoggin import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.common.shared.model.Position import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.doze.DozeHost import com.android.systemui.doze.DozeMachine import com.android.systemui.doze.DozeTransitionCallback @@ -43,12 +44,14 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController.WakeAndUnl import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.policy.KeyguardStateController import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOn /** Defines interface for classes that encapsulate application state for the keyguard. */ interface KeyguardRepository { @@ -195,6 +198,7 @@ constructor( private val dozeParameters: DozeParameters, private val authController: AuthController, private val dreamOverlayCallbackController: DreamOverlayCallbackController, + @Main private val mainDispatcher: CoroutineDispatcher ) : KeyguardRepository { private val _animateBottomAreaDozingTransitions = MutableStateFlow(false) override val animateBottomAreaDozingTransitions = @@ -387,6 +391,7 @@ constructor( awaitClose { keyguardUpdateMonitor.removeCallback(callback) } } + .flowOn(mainDispatcher) .distinctUntilChanged() override val linearDozeAmount: Flow<Float> = conflatedCallbackFlow { @@ -466,7 +471,7 @@ constructor( } val callback = - object : BiometricUnlockController.BiometricModeListener { + object : BiometricUnlockController.BiometricUnlockEventsListener { override fun onModeChanged(@WakeAndUnlockMode mode: Int) { dispatchUpdate() } @@ -476,10 +481,10 @@ constructor( } } - biometricUnlockController.addBiometricModeListener(callback) + biometricUnlockController.addListener(callback) dispatchUpdate() - awaitClose { biometricUnlockController.removeBiometricModeListener(callback) } + awaitClose { biometricUnlockController.removeListener(callback) } } override val wakefulness: Flow<WakefulnessModel> = conflatedCallbackFlow { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractor.kt index 6525a13fc44f..ea6700e92731 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractor.kt @@ -17,29 +17,29 @@ package com.android.systemui.keyguard.domain.interactor -import android.content.Context import android.content.Intent import android.content.IntentFilter +import android.view.accessibility.AccessibilityManager +import androidx.annotation.VisibleForTesting import com.android.internal.logging.UiEvent import com.android.internal.logging.UiEventLogger -import com.android.systemui.R import com.android.systemui.broadcast.BroadcastDispatcher -import com.android.systemui.common.shared.model.Position import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.data.repository.KeyguardRepository -import com.android.systemui.keyguard.domain.model.KeyguardSettingsPopupMenuModel import com.android.systemui.keyguard.shared.model.KeyguardState -import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf @@ -47,6 +47,7 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch /** Business logic for use-cases related to the keyguard long-press feature. */ @OptIn(ExperimentalCoroutinesApi::class) @@ -54,18 +55,16 @@ import kotlinx.coroutines.flow.stateIn class KeyguardLongPressInteractor @Inject constructor( - @Application unsafeContext: Context, - @Application scope: CoroutineScope, + @Application private val scope: CoroutineScope, transitionInteractor: KeyguardTransitionInteractor, repository: KeyguardRepository, - private val activityStarter: ActivityStarter, private val logger: UiEventLogger, private val featureFlags: FeatureFlags, broadcastDispatcher: BroadcastDispatcher, + private val accessibilityManager: AccessibilityManagerWrapper, ) { - private val appContext = unsafeContext.applicationContext - - private val _isLongPressHandlingEnabled: StateFlow<Boolean> = + /** Whether the long-press handling feature should be enabled. */ + val isLongPressHandlingEnabled: StateFlow<Boolean> = if (isFeatureEnabled()) { combine( transitionInteractor.finishedKeyguardState.map { @@ -84,19 +83,35 @@ constructor( initialValue = false, ) - /** Whether the long-press handling feature should be enabled. */ - val isLongPressHandlingEnabled: Flow<Boolean> = _isLongPressHandlingEnabled - - private val _menu = MutableStateFlow<KeyguardSettingsPopupMenuModel?>(null) - /** Model for a menu that should be shown; `null` when no menu should be shown. */ - val menu: Flow<KeyguardSettingsPopupMenuModel?> = - isLongPressHandlingEnabled.flatMapLatest { isEnabled -> - if (isEnabled) { - _menu - } else { - flowOf(null) + private val _isMenuVisible = MutableStateFlow(false) + /** Model for whether the menu should be shown. */ + val isMenuVisible: StateFlow<Boolean> = + isLongPressHandlingEnabled + .flatMapLatest { isEnabled -> + if (isEnabled) { + _isMenuVisible.asStateFlow() + } else { + // Reset the state so we don't see a menu when long-press handling is enabled + // again in the future. + _isMenuVisible.value = false + flowOf(false) + } } - } + .stateIn( + scope = scope, + started = SharingStarted.WhileSubscribed(), + initialValue = false, + ) + + private val _shouldOpenSettings = MutableStateFlow(false) + /** + * Whether the long-press accessible "settings" flow should be opened. + * + * Note that [onSettingsShown] must be invoked to consume this, once the settings are opened. + */ + val shouldOpenSettings = _shouldOpenSettings.asStateFlow() + + private var delayedHideMenuJob: Job? = null init { if (isFeatureEnabled()) { @@ -110,15 +125,46 @@ constructor( } /** Notifies that the user has long-pressed on the lock screen. */ - fun onLongPress(x: Int, y: Int) { - if (!_isLongPressHandlingEnabled.value) { + fun onLongPress() { + if (!isLongPressHandlingEnabled.value) { return } - showMenu( - x = x, - y = y, - ) + if (featureFlags.isEnabled(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP)) { + showSettings() + } else { + showMenu() + } + } + + /** Notifies that the user has touched outside of the pop-up. */ + fun onTouchedOutside() { + hideMenu() + } + + /** Notifies that the user has started a touch gesture on the menu. */ + fun onMenuTouchGestureStarted() { + cancelAutomaticMenuHiding() + } + + /** Notifies that the user has started a touch gesture on the menu. */ + fun onMenuTouchGestureEnded(isClick: Boolean) { + if (isClick) { + hideMenu() + logger.log(LogEvents.LOCK_SCREEN_LONG_PRESS_POPUP_CLICKED) + showSettings() + } else { + scheduleAutomaticMenuHiding() + } + } + + /** Notifies that the settings UI has been shown, consuming the event to show it. */ + fun onSettingsShown() { + _shouldOpenSettings.value = false + } + + private fun showSettings() { + _shouldOpenSettings.value = true } private fun isFeatureEnabled(): Boolean { @@ -126,51 +172,40 @@ constructor( featureFlags.isEnabled(Flags.REVAMPED_WALLPAPER_UI) } - /** Updates application state to ask to show the menu at the given coordinates. */ - private fun showMenu( - x: Int, - y: Int, - ) { - _menu.value = - KeyguardSettingsPopupMenuModel( - position = - Position( - x = x, - y = y, - ), - onClicked = { - hideMenu() - navigateToLockScreenSettings() - }, - onDismissed = { hideMenu() }, - ) + /** Updates application state to ask to show the menu. */ + private fun showMenu() { + _isMenuVisible.value = true + scheduleAutomaticMenuHiding() logger.log(LogEvents.LOCK_SCREEN_LONG_PRESS_POPUP_SHOWN) } + private fun scheduleAutomaticMenuHiding() { + cancelAutomaticMenuHiding() + delayedHideMenuJob = + scope.launch { + delay(timeOutMs()) + hideMenu() + } + } + /** Updates application state to ask to hide the menu. */ private fun hideMenu() { - _menu.value = null + cancelAutomaticMenuHiding() + _isMenuVisible.value = false } - /** Opens the wallpaper picker screen after the device is unlocked by the user. */ - private fun navigateToLockScreenSettings() { - logger.log(LogEvents.LOCK_SCREEN_LONG_PRESS_POPUP_CLICKED) - activityStarter.dismissKeyguardThenExecute( - /* action= */ { - appContext.startActivity( - Intent(Intent.ACTION_SET_WALLPAPER).apply { - flags = Intent.FLAG_ACTIVITY_NEW_TASK - appContext - .getString(R.string.config_wallpaperPickerPackage) - .takeIf { it.isNotEmpty() } - ?.let { packageName -> setPackage(packageName) } - } - ) - true - }, - /* cancel= */ {}, - /* afterKeyguardGone= */ true, - ) + private fun cancelAutomaticMenuHiding() { + delayedHideMenuJob?.cancel() + delayedHideMenuJob = null + } + + private fun timeOutMs(): Long { + return accessibilityManager + .getRecommendedTimeoutMillis( + DEFAULT_POPUP_AUTO_HIDE_TIMEOUT_MS.toInt(), + AccessibilityManager.FLAG_CONTENT_ICONS or AccessibilityManager.FLAG_CONTENT_TEXT, + ) + .toLong() } enum class LogEvents( @@ -184,4 +219,8 @@ constructor( override fun getId() = _id } + + companion object { + @VisibleForTesting const val DEFAULT_POPUP_AUTO_HIDE_TIMEOUT_MS = 5000L + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt index 9212aa1c8ef5..970d00403f28 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt @@ -142,22 +142,18 @@ constructor( (isBouncerShowing() || repository.primaryBouncerShowingSoon.value) && needsFullscreenBouncer() - if (!resumeBouncer && isBouncerShowing()) { - // If bouncer is visible, the bouncer is already showing. - return - } - Trace.beginSection("KeyguardBouncer#show") repository.setPrimaryScrimmed(isScrimmed) if (isScrimmed) { setPanelExpansion(KeyguardBouncerConstants.EXPANSION_VISIBLE) } + // In this special case, we want to hide the bouncer and show it again. We want to emit + // show(true) again so that we can reinflate the new view. if (resumeBouncer) { - primaryBouncerView.delegate?.resume() - // Bouncer is showing the next security screen and we just need to prompt a resume. - return + repository.setPrimaryShow(false) } + if (primaryBouncerView.delegate?.showNextSecurityScreenOrFinish() == true) { // Keyguard is done. return diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaVibrations.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaVibrations.kt new file mode 100644 index 000000000000..568db2f543b6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaVibrations.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.keyguard.ui.binder + +import android.os.VibrationEffect +import kotlin.time.Duration.Companion.milliseconds + +object KeyguardBottomAreaVibrations { + + val ShakeAnimationDuration = 300.milliseconds + const val ShakeAnimationCycles = 5f + + private const val SmallVibrationScale = 0.3f + private const val BigVibrationScale = 0.6f + + val Shake = + VibrationEffect.startComposition() + .apply { + val vibrationDelayMs = + (ShakeAnimationDuration.inWholeMilliseconds / ShakeAnimationCycles * 2).toInt() + val vibrationCount = ShakeAnimationCycles.toInt() * 2 + repeat(vibrationCount) { + addPrimitive( + VibrationEffect.Composition.PRIMITIVE_TICK, + SmallVibrationScale, + vibrationDelayMs, + ) + } + } + .compose() + + val Activated = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_TICK, + BigVibrationScale, + 0, + ) + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_QUICK_RISE, + 0.1f, + 0, + ) + .compose() + + val Deactivated = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_TICK, + BigVibrationScale, + 0, + ) + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_QUICK_FALL, + 0.1f, + 0, + ) + .compose() +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt index d63636c6fccc..68ac7e1c71e5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt @@ -17,41 +17,42 @@ package com.android.systemui.keyguard.ui.binder import android.annotation.SuppressLint +import android.content.Intent +import android.graphics.Rect import android.graphics.drawable.Animatable2 -import android.os.VibrationEffect import android.util.Size import android.util.TypedValue -import android.view.MotionEvent import android.view.View -import android.view.ViewConfiguration import android.view.ViewGroup import android.view.ViewPropertyAnimator import android.widget.ImageView import android.widget.TextView -import androidx.core.animation.CycleInterpolator -import androidx.core.animation.ObjectAnimator +import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import com.android.settingslib.Utils import com.android.systemui.R +import com.android.systemui.animation.ActivityLaunchAnimator import com.android.systemui.animation.Expandable import com.android.systemui.animation.Interpolators +import com.android.systemui.animation.view.LaunchableLinearLayout import com.android.systemui.common.shared.model.Icon import com.android.systemui.common.ui.binder.IconViewBinder +import com.android.systemui.common.ui.binder.TextViewBinder import com.android.systemui.keyguard.ui.viewmodel.KeyguardBottomAreaViewModel import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordanceViewModel import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager import com.android.systemui.statusbar.VibratorHelper -import kotlin.math.pow -import kotlin.math.sqrt -import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch @@ -91,15 +92,20 @@ object KeyguardBottomAreaViewBinder { * icon */ fun shouldConstrainToTopOfLockIcon(): Boolean + + /** Destroys this binding, releases resources, and cancels any coroutines. */ + fun destroy() } /** Binds the view to the view-model, continuing to update the former based on the latter. */ + @SuppressLint("ClickableViewAccessibility") @JvmStatic fun bind( view: ViewGroup, viewModel: KeyguardBottomAreaViewModel, falsingManager: FalsingManager?, vibratorHelper: VibratorHelper?, + activityStarter: ActivityStarter?, messageDisplayer: (Int) -> Unit, ): Binding { val indicationArea: View = view.requireViewById(R.id.keyguard_indication_area) @@ -110,137 +116,192 @@ object KeyguardBottomAreaViewBinder { val indicationText: TextView = view.requireViewById(R.id.keyguard_indication_text) val indicationTextBottom: TextView = view.requireViewById(R.id.keyguard_indication_text_bottom) + val settingsMenu: LaunchableLinearLayout = + view.requireViewById(R.id.keyguard_settings_button) view.clipChildren = false view.clipToPadding = false + view.setOnTouchListener { _, event -> + if (settingsMenu.isVisible) { + val hitRect = Rect() + settingsMenu.getHitRect(hitRect) + if (!hitRect.contains(event.x.toInt(), event.y.toInt())) { + viewModel.onTouchedOutsideLockScreenSettingsMenu() + } + } + + false + } val configurationBasedDimensions = MutableStateFlow(loadFromResources(view)) - view.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.STARTED) { - launch { - viewModel.startButton.collect { buttonModel -> - updateButton( + val disposableHandle = + view.repeatWhenAttached { + repeatOnLifecycle(Lifecycle.State.STARTED) { + launch { + viewModel.startButton.collect { buttonModel -> + updateButton( + view = startButton, + viewModel = buttonModel, + falsingManager = falsingManager, + messageDisplayer = messageDisplayer, + vibratorHelper = vibratorHelper, + ) + } + } + + launch { + viewModel.endButton.collect { buttonModel -> + updateButton( + view = endButton, + viewModel = buttonModel, + falsingManager = falsingManager, + messageDisplayer = messageDisplayer, + vibratorHelper = vibratorHelper, + ) + } + } + + launch { + viewModel.isOverlayContainerVisible.collect { isVisible -> + overlayContainer.visibility = + if (isVisible) { + View.VISIBLE + } else { + View.INVISIBLE + } + } + } + + launch { + viewModel.alpha.collect { alpha -> + view.importantForAccessibility = + if (alpha == 0f) { + View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS + } else { + View.IMPORTANT_FOR_ACCESSIBILITY_AUTO + } + + ambientIndicationArea?.alpha = alpha + indicationArea.alpha = alpha + } + } + + launch { + updateButtonAlpha( view = startButton, - viewModel = buttonModel, - falsingManager = falsingManager, - messageDisplayer = messageDisplayer, - vibratorHelper = vibratorHelper, + viewModel = viewModel.startButton, + alphaFlow = viewModel.alpha, ) } - } - launch { - viewModel.endButton.collect { buttonModel -> - updateButton( + launch { + updateButtonAlpha( view = endButton, - viewModel = buttonModel, - falsingManager = falsingManager, - messageDisplayer = messageDisplayer, - vibratorHelper = vibratorHelper, + viewModel = viewModel.endButton, + alphaFlow = viewModel.alpha, ) } - } - launch { - viewModel.isOverlayContainerVisible.collect { isVisible -> - overlayContainer.visibility = - if (isVisible) { - View.VISIBLE - } else { - View.INVISIBLE - } + launch { + viewModel.indicationAreaTranslationX.collect { translationX -> + indicationArea.translationX = translationX + ambientIndicationArea?.translationX = translationX + } } - } - launch { - viewModel.alpha.collect { alpha -> - view.importantForAccessibility = - if (alpha == 0f) { - View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS - } else { - View.IMPORTANT_FOR_ACCESSIBILITY_AUTO + launch { + combine( + viewModel.isIndicationAreaPadded, + configurationBasedDimensions.map { it.indicationAreaPaddingPx }, + ) { isPadded, paddingIfPaddedPx -> + if (isPadded) { + paddingIfPaddedPx + } else { + 0 + } + } + .collect { paddingPx -> + indicationArea.setPadding(paddingPx, 0, paddingPx, 0) } - - ambientIndicationArea?.alpha = alpha - indicationArea.alpha = alpha } - } - - launch { - updateButtonAlpha( - view = startButton, - viewModel = viewModel.startButton, - alphaFlow = viewModel.alpha, - ) - } - - launch { - updateButtonAlpha( - view = endButton, - viewModel = viewModel.endButton, - alphaFlow = viewModel.alpha, - ) - } - launch { - viewModel.indicationAreaTranslationX.collect { translationX -> - indicationArea.translationX = translationX - ambientIndicationArea?.translationX = translationX + launch { + configurationBasedDimensions + .map { it.defaultBurnInPreventionYOffsetPx } + .flatMapLatest { defaultBurnInOffsetY -> + viewModel.indicationAreaTranslationY(defaultBurnInOffsetY) + } + .collect { translationY -> + indicationArea.translationY = translationY + ambientIndicationArea?.translationY = translationY + } } - } - launch { - combine( - viewModel.isIndicationAreaPadded, - configurationBasedDimensions.map { it.indicationAreaPaddingPx }, - ) { isPadded, paddingIfPaddedPx -> - if (isPadded) { - paddingIfPaddedPx - } else { - 0 + launch { + configurationBasedDimensions.collect { dimensions -> + indicationText.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + dimensions.indicationTextSizePx.toFloat(), + ) + indicationTextBottom.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + dimensions.indicationTextSizePx.toFloat(), + ) + + startButton.updateLayoutParams<ViewGroup.LayoutParams> { + width = dimensions.buttonSizePx.width + height = dimensions.buttonSizePx.height + } + endButton.updateLayoutParams<ViewGroup.LayoutParams> { + width = dimensions.buttonSizePx.width + height = dimensions.buttonSizePx.height } } - .collect { paddingPx -> - indicationArea.setPadding(paddingPx, 0, paddingPx, 0) - } - } + } - launch { - configurationBasedDimensions - .map { it.defaultBurnInPreventionYOffsetPx } - .flatMapLatest { defaultBurnInOffsetY -> - viewModel.indicationAreaTranslationY(defaultBurnInOffsetY) - } - .collect { translationY -> - indicationArea.translationY = translationY - ambientIndicationArea?.translationY = translationY + launch { + viewModel.settingsMenuViewModel.isVisible.distinctUntilChanged().collect { + isVisible -> + settingsMenu.animateVisibility(visible = isVisible) + if (isVisible) { + vibratorHelper?.vibrate(KeyguardBottomAreaVibrations.Activated) + settingsMenu.setOnTouchListener( + KeyguardSettingsButtonOnTouchListener( + view = settingsMenu, + viewModel = viewModel.settingsMenuViewModel, + ) + ) + IconViewBinder.bind( + icon = viewModel.settingsMenuViewModel.icon, + view = settingsMenu.requireViewById(R.id.icon), + ) + TextViewBinder.bind( + view = settingsMenu.requireViewById(R.id.text), + viewModel = viewModel.settingsMenuViewModel.text, + ) + } } - } - - launch { - configurationBasedDimensions.collect { dimensions -> - indicationText.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - dimensions.indicationTextSizePx.toFloat(), - ) - indicationTextBottom.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - dimensions.indicationTextSizePx.toFloat(), - ) + } - startButton.updateLayoutParams<ViewGroup.LayoutParams> { - width = dimensions.buttonSizePx.width - height = dimensions.buttonSizePx.height - } - endButton.updateLayoutParams<ViewGroup.LayoutParams> { - width = dimensions.buttonSizePx.width - height = dimensions.buttonSizePx.height + // activityStarter will only be null when rendering the preview that + // shows up in the Wallpaper Picker app. If we do that, then the + // settings menu should never be visible. + if (activityStarter != null) { + launch { + viewModel.settingsMenuViewModel.shouldOpenSettings + .filter { it } + .collect { + navigateToLockScreenSettings( + activityStarter = activityStarter, + view = settingsMenu, + ) + viewModel.settingsMenuViewModel.onSettingsShown() + } } } } } - } return object : Binding { override fun getIndicationAreaAnimators(): List<ViewPropertyAnimator> { @@ -253,6 +314,10 @@ object KeyguardBottomAreaViewBinder { override fun shouldConstrainToTopOfLockIcon(): Boolean = viewModel.shouldConstrainToTopOfLockIcon() + + override fun destroy() { + disposableHandle.dispose() + } } } @@ -265,7 +330,7 @@ object KeyguardBottomAreaViewBinder { vibratorHelper: VibratorHelper?, ) { if (!viewModel.isVisible) { - view.isVisible = false + view.isInvisible = true return } @@ -342,7 +407,7 @@ object KeyguardBottomAreaViewBinder { if (viewModel.isClickable) { if (viewModel.useLongPress) { view.setOnTouchListener( - OnTouchListener( + KeyguardQuickAffordanceOnTouchListener( view, viewModel, messageDisplayer, @@ -372,187 +437,21 @@ object KeyguardBottomAreaViewBinder { .collect { view.alpha = it } } - private class OnTouchListener( - private val view: View, - private val viewModel: KeyguardQuickAffordanceViewModel, - private val messageDisplayer: (Int) -> Unit, - private val vibratorHelper: VibratorHelper?, - private val falsingManager: FalsingManager?, - ) : View.OnTouchListener { - - private val longPressDurationMs = ViewConfiguration.getLongPressTimeout().toLong() - private var longPressAnimator: ViewPropertyAnimator? = null - - @SuppressLint("ClickableViewAccessibility") - override fun onTouch(v: View?, event: MotionEvent?): Boolean { - return when (event?.actionMasked) { - MotionEvent.ACTION_DOWN -> - if (viewModel.configKey != null) { - if (isUsingAccurateTool(event)) { - // For accurate tool types (stylus, mouse, etc.), we don't require a - // long-press. - } else { - // When not using a stylus, we require a long-press to activate the - // quick affordance, mostly to do "falsing" (e.g. protect from false - // clicks in the pocket/bag). - longPressAnimator = - view - .animate() - .scaleX(PRESSED_SCALE) - .scaleY(PRESSED_SCALE) - .setDuration(longPressDurationMs) - .withEndAction { - if ( - falsingManager - ?.isFalseLongTap( - FalsingManager.MODERATE_PENALTY - ) == false - ) { - dispatchClick(viewModel.configKey) - } - cancel() - } - } - true - } else { - false - } - MotionEvent.ACTION_MOVE -> { - if (!isUsingAccurateTool(event)) { - // Moving too far while performing a long-press gesture cancels that - // gesture. - val distanceMoved = distanceMoved(event) - if (distanceMoved > ViewConfiguration.getTouchSlop()) { - cancel() - } - } - true - } - MotionEvent.ACTION_UP -> { - if (isUsingAccurateTool(event)) { - // When using an accurate tool type (stylus, mouse, etc.), we don't require - // a long-press gesture to activate the quick affordance. Therefore, lifting - // the pointer performs a click. - if ( - viewModel.configKey != null && - distanceMoved(event) <= ViewConfiguration.getTouchSlop() && - falsingManager?.isFalseTap(FalsingManager.NO_PENALTY) == false - ) { - dispatchClick(viewModel.configKey) - } - } else { - // When not using a stylus, lifting the finger/pointer will actually cancel - // the long-press gesture. Calling cancel after the quick affordance was - // already long-press activated is a no-op, so it's safe to call from here. - cancel( - onAnimationEnd = - if (event.eventTime - event.downTime < longPressDurationMs) { - Runnable { - messageDisplayer.invoke( - R.string.keyguard_affordance_press_too_short - ) - val amplitude = - view.context.resources - .getDimensionPixelSize( - R.dimen.keyguard_affordance_shake_amplitude - ) - .toFloat() - val shakeAnimator = - ObjectAnimator.ofFloat( - view, - "translationX", - -amplitude / 2, - amplitude / 2, - ) - shakeAnimator.duration = - ShakeAnimationDuration.inWholeMilliseconds - shakeAnimator.interpolator = - CycleInterpolator(ShakeAnimationCycles) - shakeAnimator.start() - - vibratorHelper?.vibrate(Vibrations.Shake) - } - } else { - null - } - ) - } - true - } - MotionEvent.ACTION_CANCEL -> { - cancel() - true - } - else -> false - } - } - - private fun dispatchClick( - configKey: String, - ) { - view.setOnClickListener { - vibratorHelper?.vibrate( - if (viewModel.isActivated) { - Vibrations.Activated - } else { - Vibrations.Deactivated - } - ) - viewModel.onClicked( - KeyguardQuickAffordanceViewModel.OnClickedParameters( - configKey = configKey, - expandable = Expandable.fromView(view), - slotId = viewModel.slotId, - ) - ) - } - view.performClick() - view.setOnClickListener(null) - } - - private fun cancel(onAnimationEnd: Runnable? = null) { - longPressAnimator?.cancel() - longPressAnimator = null - view.animate().scaleX(1f).scaleY(1f).withEndAction(onAnimationEnd) - } - - companion object { - private const val PRESSED_SCALE = 1.5f - - /** - * Returns `true` if the tool type at the given pointer index is an accurate tool (like - * stylus or mouse), which means we can trust it to not be a false click; `false` - * otherwise. - */ - private fun isUsingAccurateTool( - event: MotionEvent, - pointerIndex: Int = 0, - ): Boolean { - return when (event.getToolType(pointerIndex)) { - MotionEvent.TOOL_TYPE_STYLUS -> true - MotionEvent.TOOL_TYPE_MOUSE -> true - else -> false + private fun View.animateVisibility(visible: Boolean) { + animate() + .withStartAction { + if (visible) { + alpha = 0f + isVisible = true } } - - /** - * Returns the amount of distance the pointer moved since the historical record at the - * [since] index. - */ - private fun distanceMoved( - event: MotionEvent, - since: Int = 0, - ): Float { - return if (event.historySize > 0) { - sqrt( - (event.y - event.getHistoricalY(since)).pow(2) + - (event.x - event.getHistoricalX(since)).pow(2) - ) - } else { - 0f + .alpha(if (visible) 1f else 0f) + .withEndAction { + if (!visible) { + isVisible = false } } - } + .start() } private class OnClickListener( @@ -594,64 +493,28 @@ object KeyguardBottomAreaViewBinder { ) } + /** Opens the wallpaper picker screen after the device is unlocked by the user. */ + private fun navigateToLockScreenSettings( + activityStarter: ActivityStarter, + view: View, + ) { + activityStarter.startActivity( + Intent(Intent.ACTION_SET_WALLPAPER).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK + view.context + .getString(R.string.config_wallpaperPickerPackage) + .takeIf { it.isNotEmpty() } + ?.let { packageName -> setPackage(packageName) } + }, + /* dismissShade= */ true, + ActivityLaunchAnimator.Controller.fromView(view), + ) + } + private data class ConfigurationBasedDimensions( val defaultBurnInPreventionYOffsetPx: Int, val indicationAreaPaddingPx: Int, val indicationTextSizePx: Int, val buttonSizePx: Size, ) - - private val ShakeAnimationDuration = 300.milliseconds - private val ShakeAnimationCycles = 5f - - object Vibrations { - - private const val SmallVibrationScale = 0.3f - private const val BigVibrationScale = 0.6f - - val Shake = - VibrationEffect.startComposition() - .apply { - val vibrationDelayMs = - (ShakeAnimationDuration.inWholeMilliseconds / (ShakeAnimationCycles * 2)) - .toInt() - val vibrationCount = ShakeAnimationCycles.toInt() * 2 - repeat(vibrationCount) { - addPrimitive( - VibrationEffect.Composition.PRIMITIVE_TICK, - SmallVibrationScale, - vibrationDelayMs, - ) - } - } - .compose() - - val Activated = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_TICK, - BigVibrationScale, - 0, - ) - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_QUICK_RISE, - 0.1f, - 0, - ) - .compose() - - val Deactivated = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_TICK, - BigVibrationScale, - 0, - ) - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_QUICK_FALL, - 0.1f, - 0, - ) - .compose() - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt index 927df551aa45..72dc7a4f7753 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt @@ -110,11 +110,12 @@ object KeyguardBouncerViewBinder { viewModel.setBouncerViewDelegate(delegate) launch { viewModel.isShowing.collect { isShowing -> + view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE if (isShowing) { // Reset Security Container entirely. + view.visibility = View.VISIBLE securityContainerController.reinflateViewFlipper { // Reset Security Container entirely. - view.visibility = View.VISIBLE securityContainerController.onBouncerVisibilityChanged( /* isVisible= */ true ) @@ -128,7 +129,6 @@ object KeyguardBouncerViewBinder { ) } } else { - view.visibility = View.INVISIBLE securityContainerController.onBouncerVisibilityChanged( /* isVisible= */ false ) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressPopupViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressPopupViewBinder.kt deleted file mode 100644 index d85682b3bab8..000000000000 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressPopupViewBinder.kt +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT 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.keyguard.ui.binder - -import android.annotation.SuppressLint -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.WindowManager -import android.widget.PopupWindow -import com.android.systemui.R -import com.android.systemui.common.ui.binder.IconViewBinder -import com.android.systemui.common.ui.binder.TextViewBinder -import com.android.systemui.keyguard.ui.viewmodel.KeyguardSettingsPopupMenuViewModel - -object KeyguardLongPressPopupViewBinder { - @SuppressLint("InflateParams") // We don't care that the parent is null. - fun createAndShow( - container: View, - viewModel: KeyguardSettingsPopupMenuViewModel, - onDismissed: () -> Unit, - ): () -> Unit { - val contentView: View = - LayoutInflater.from(container.context) - .inflate( - R.layout.keyguard_settings_popup_menu, - null, - ) - - contentView.setOnClickListener { viewModel.onClicked() } - IconViewBinder.bind( - icon = viewModel.icon, - view = contentView.requireViewById(R.id.icon), - ) - TextViewBinder.bind( - view = contentView.requireViewById(R.id.text), - viewModel = viewModel.text, - ) - - val popupWindow = - PopupWindow(container.context).apply { - windowLayoutType = WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG - setBackgroundDrawable(null) - animationStyle = com.android.internal.R.style.Animation_Dialog - isOutsideTouchable = true - isFocusable = true - setContentView(contentView) - setOnDismissListener { onDismissed() } - contentView.measure( - View.MeasureSpec.makeMeasureSpec( - 0, - View.MeasureSpec.UNSPECIFIED, - ), - View.MeasureSpec.makeMeasureSpec( - 0, - View.MeasureSpec.UNSPECIFIED, - ), - ) - showAtLocation( - container, - Gravity.NO_GRAVITY, - viewModel.position.x - contentView.measuredWidth / 2, - viewModel.position.y - - contentView.measuredHeight - - container.context.resources.getDimensionPixelSize( - R.dimen.keyguard_long_press_settings_popup_vertical_offset - ), - ) - } - - return { popupWindow.dismiss() } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressViewBinder.kt index 86717537efd3..9cc503c07955 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardLongPressViewBinder.kt @@ -50,10 +50,7 @@ object KeyguardLongPressViewBinder { return } - viewModel.onLongPress( - x = x, - y = y, - ) + viewModel.onLongPress() } override fun onSingleTapDetected(view: View) { @@ -72,23 +69,6 @@ object KeyguardLongPressViewBinder { view.setLongPressHandlingEnabled(isEnabled) } } - - launch { - var dismissMenu: (() -> Unit)? = null - - viewModel.menu.collect { menuOrNull -> - if (menuOrNull != null) { - dismissMenu = - KeyguardLongPressPopupViewBinder.createAndShow( - container = view, - viewModel = menuOrNull, - onDismissed = menuOrNull.onDismissed, - ) - } else { - dismissMenu?.invoke() - } - } - } } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt new file mode 100644 index 000000000000..779095cd1d1e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt @@ -0,0 +1,200 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.keyguard.ui.binder + +import android.annotation.SuppressLint +import android.graphics.PointF +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.view.ViewPropertyAnimator +import androidx.core.animation.CycleInterpolator +import androidx.core.animation.ObjectAnimator +import com.android.systemui.R +import com.android.systemui.animation.Expandable +import com.android.systemui.common.ui.view.distanceFrom +import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordanceViewModel +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.statusbar.VibratorHelper + +class KeyguardQuickAffordanceOnTouchListener( + private val view: View, + private val viewModel: KeyguardQuickAffordanceViewModel, + private val messageDisplayer: (Int) -> Unit, + private val vibratorHelper: VibratorHelper?, + private val falsingManager: FalsingManager?, +) : View.OnTouchListener { + + private val longPressDurationMs = ViewConfiguration.getLongPressTimeout().toLong() + private var longPressAnimator: ViewPropertyAnimator? = null + private val down: PointF by lazy { PointF() } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouch(v: View, event: MotionEvent): Boolean { + return when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> + if (viewModel.configKey != null) { + down.set(event.x, event.y) + if (isUsingAccurateTool(event)) { + // For accurate tool types (stylus, mouse, etc.), we don't require a + // long-press. + } else { + // When not using a stylus, we require a long-press to activate the + // quick affordance, mostly to do "falsing" (e.g. protect from false + // clicks in the pocket/bag). + longPressAnimator = + view + .animate() + .scaleX(PRESSED_SCALE) + .scaleY(PRESSED_SCALE) + .setDuration(longPressDurationMs) + .withEndAction { + if ( + falsingManager?.isFalseLongTap( + FalsingManager.MODERATE_PENALTY + ) == false + ) { + dispatchClick(viewModel.configKey) + } + cancel() + } + } + true + } else { + false + } + MotionEvent.ACTION_MOVE -> { + if (!isUsingAccurateTool(event)) { + // Moving too far while performing a long-press gesture cancels that + // gesture. + if (event.distanceFrom(down.x, down.y) > ViewConfiguration.getTouchSlop()) { + cancel() + } + } + true + } + MotionEvent.ACTION_UP -> { + if (isUsingAccurateTool(event)) { + // When using an accurate tool type (stylus, mouse, etc.), we don't require + // a long-press gesture to activate the quick affordance. Therefore, lifting + // the pointer performs a click. + if ( + viewModel.configKey != null && + event.distanceFrom(down.x, down.y) <= + ViewConfiguration.getTouchSlop() && + falsingManager?.isFalseTap(FalsingManager.NO_PENALTY) == false + ) { + dispatchClick(viewModel.configKey) + } + } else { + // When not using a stylus, lifting the finger/pointer will actually cancel + // the long-press gesture. Calling cancel after the quick affordance was + // already long-press activated is a no-op, so it's safe to call from here. + cancel( + onAnimationEnd = + if (event.eventTime - event.downTime < longPressDurationMs) { + Runnable { + messageDisplayer.invoke( + R.string.keyguard_affordance_press_too_short + ) + val amplitude = + view.context.resources + .getDimensionPixelSize( + R.dimen.keyguard_affordance_shake_amplitude + ) + .toFloat() + val shakeAnimator = + ObjectAnimator.ofFloat( + view, + "translationX", + -amplitude / 2, + amplitude / 2, + ) + shakeAnimator.duration = + KeyguardBottomAreaVibrations.ShakeAnimationDuration + .inWholeMilliseconds + shakeAnimator.interpolator = + CycleInterpolator( + KeyguardBottomAreaVibrations.ShakeAnimationCycles + ) + shakeAnimator.start() + + vibratorHelper?.vibrate(KeyguardBottomAreaVibrations.Shake) + } + } else { + null + } + ) + } + true + } + MotionEvent.ACTION_CANCEL -> { + cancel() + true + } + else -> false + } + } + + private fun dispatchClick( + configKey: String, + ) { + view.setOnClickListener { + vibratorHelper?.vibrate( + if (viewModel.isActivated) { + KeyguardBottomAreaVibrations.Activated + } else { + KeyguardBottomAreaVibrations.Deactivated + } + ) + viewModel.onClicked( + KeyguardQuickAffordanceViewModel.OnClickedParameters( + configKey = configKey, + expandable = Expandable.fromView(view), + slotId = viewModel.slotId, + ) + ) + } + view.performClick() + view.setOnClickListener(null) + } + + private fun cancel(onAnimationEnd: Runnable? = null) { + longPressAnimator?.cancel() + longPressAnimator = null + view.animate().scaleX(1f).scaleY(1f).withEndAction(onAnimationEnd) + } + + companion object { + private const val PRESSED_SCALE = 1.5f + + /** + * Returns `true` if the tool type at the given pointer index is an accurate tool (like + * stylus or mouse), which means we can trust it to not be a false click; `false` otherwise. + */ + private fun isUsingAccurateTool( + event: MotionEvent, + pointerIndex: Int = 0, + ): Boolean { + return when (event.getToolType(pointerIndex)) { + MotionEvent.TOOL_TYPE_STYLUS -> true + MotionEvent.TOOL_TYPE_MOUSE -> true + else -> false + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsButtonOnTouchListener.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsButtonOnTouchListener.kt new file mode 100644 index 000000000000..ad3fb637961b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsButtonOnTouchListener.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.keyguard.ui.binder + +import android.graphics.PointF +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import com.android.systemui.animation.view.LaunchableLinearLayout +import com.android.systemui.common.ui.view.distanceFrom +import com.android.systemui.keyguard.ui.viewmodel.KeyguardSettingsMenuViewModel + +class KeyguardSettingsButtonOnTouchListener( + private val view: LaunchableLinearLayout, + private val viewModel: KeyguardSettingsMenuViewModel, +) : View.OnTouchListener { + + private val downPosition = PointF() + + override fun onTouch(view: View, motionEvent: MotionEvent): Boolean { + when (motionEvent.actionMasked) { + MotionEvent.ACTION_DOWN -> { + view.isPressed = true + downPosition.set(motionEvent.x, motionEvent.y) + viewModel.onTouchGestureStarted() + } + MotionEvent.ACTION_UP -> { + view.isPressed = false + val distanceMoved = motionEvent.distanceFrom(downPosition.x, downPosition.y) + val isClick = distanceMoved < ViewConfiguration.getTouchSlop() + viewModel.onTouchGestureEnded(isClick) + if (isClick) { + view.performClick() + } + } + MotionEvent.ACTION_CANCEL -> { + view.isPressed = false + viewModel.onTouchGestureEnded(/* isClick= */ false) + } + } + + return true + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt index a8e346477690..2d83be95183e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt @@ -44,6 +44,8 @@ constructor( private val quickAffordanceInteractor: KeyguardQuickAffordanceInteractor, private val bottomAreaInteractor: KeyguardBottomAreaInteractor, private val burnInHelperWrapper: BurnInHelperWrapper, + private val longPressViewModel: KeyguardLongPressViewModel, + val settingsMenuViewModel: KeyguardSettingsMenuViewModel, ) { data class PreviewMode( val isInPreviewMode: Boolean = false, @@ -161,6 +163,14 @@ constructor( selectedPreviewSlotId.value = slotId } + /** + * Notifies that some input gesture has started somewhere in the bottom area that's outside of + * the lock screen settings menu item pop-up. + */ + fun onTouchedOutsideLockScreenSettingsMenu() { + longPressViewModel.onTouchedOutside() + } + private fun button( position: KeyguardQuickAffordancePosition ): Flow<KeyguardQuickAffordanceViewModel> { @@ -225,9 +235,10 @@ constructor( isDimmed = isDimmed, slotId = slotId, ) - is KeyguardQuickAffordanceModel.Hidden -> KeyguardQuickAffordanceViewModel( - slotId = slotId, - ) + is KeyguardQuickAffordanceModel.Hidden -> + KeyguardQuickAffordanceViewModel( + slotId = slotId, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardLongPressViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardLongPressViewModel.kt index d896390fd471..c73931a12455 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardLongPressViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardLongPressViewModel.kt @@ -17,15 +17,13 @@ package com.android.systemui.keyguard.ui.viewmodel -import com.android.systemui.R -import com.android.systemui.common.shared.model.Icon -import com.android.systemui.common.shared.model.Text +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.KeyguardLongPressInteractor import javax.inject.Inject import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.map /** Models UI state to support the lock screen long-press feature. */ +@SysUISingleton class KeyguardLongPressViewModel @Inject constructor( @@ -35,35 +33,16 @@ constructor( /** Whether the long-press handling feature should be enabled. */ val isLongPressHandlingEnabled: Flow<Boolean> = interactor.isLongPressHandlingEnabled - /** View-model for a menu that should be shown; `null` when no menu should be shown. */ - val menu: Flow<KeyguardSettingsPopupMenuViewModel?> = - interactor.menu.map { model -> - model?.let { - KeyguardSettingsPopupMenuViewModel( - icon = - Icon.Resource( - res = R.drawable.ic_settings, - contentDescription = null, - ), - text = - Text.Resource( - res = R.string.lock_screen_settings, - ), - position = model.position, - onClicked = model.onClicked, - onDismissed = model.onDismissed, - ) - } - } - /** Notifies that the user has long-pressed on the lock screen. */ - fun onLongPress( - x: Int, - y: Int, - ) { - interactor.onLongPress( - x = x, - y = y, - ) + fun onLongPress() { + interactor.onLongPress() + } + + /** + * Notifies that some input gesture has started somewhere outside of the lock screen settings + * menu item pop-up. + */ + fun onTouchedOutside() { + interactor.onTouchedOutside() } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt new file mode 100644 index 000000000000..c36da9da58a5 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.keyguard.ui.viewmodel + +import com.android.systemui.R +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.common.shared.model.Text +import com.android.systemui.keyguard.domain.interactor.KeyguardLongPressInteractor +import javax.inject.Inject +import kotlinx.coroutines.flow.Flow + +/** Models the UI state of a keyguard settings popup menu. */ +class KeyguardSettingsMenuViewModel +@Inject +constructor( + private val interactor: KeyguardLongPressInteractor, +) { + val isVisible: Flow<Boolean> = interactor.isMenuVisible + val shouldOpenSettings: Flow<Boolean> = interactor.shouldOpenSettings + + val icon: Icon = + Icon.Resource( + res = R.drawable.ic_palette, + contentDescription = null, + ) + + val text: Text = + Text.Resource( + res = R.string.lock_screen_settings, + ) + + fun onTouchGestureStarted() { + interactor.onMenuTouchGestureStarted() + } + + fun onTouchGestureEnded(isClick: Boolean) { + interactor.onMenuTouchGestureEnded( + isClick = isClick, + ) + } + + fun onSettingsShown() { + interactor.onSettingsShown() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsPopupMenuViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsPopupMenuViewModel.kt deleted file mode 100644 index 0571b05b4751..000000000000 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsPopupMenuViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT 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.keyguard.ui.viewmodel - -import com.android.systemui.common.shared.model.Icon -import com.android.systemui.common.shared.model.Position -import com.android.systemui.common.shared.model.Text - -/** Models the UI state of a keyguard settings popup menu. */ -data class KeyguardSettingsPopupMenuViewModel( - val icon: Icon, - val text: Text, - /** Where the menu should be anchored, roughly in screen space. */ - val position: Position, - /** Callback to invoke when the menu gets clicked by the user. */ - val onClicked: () -> Unit, - /** Callback to invoke when the menu gets dismissed by the user. */ - val onDismissed: () -> Unit, -) diff --git a/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java b/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java index 4f5bbb797516..81de607f24f8 100644 --- a/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java +++ b/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java @@ -239,7 +239,7 @@ public class LogAccessDialogActivity extends Activity implements if (view.getId() == R.id.log_access_dialog_allow_button) { mCallback.approveAccessForClient(mUid, mPackageName); finish(); - } else if (view.getId() == R.id.log_access_dialog_allow_button) { + } else if (view.getId() == R.id.log_access_dialog_deny_button) { declineLogAccess(); finish(); } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java index c4e76b203f19..ccddd1d359b7 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java @@ -60,7 +60,7 @@ import javax.inject.Inject; import dagger.Lazy; public class MediaProjectionPermissionActivity extends Activity - implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener { + implements DialogInterface.OnClickListener { private static final String TAG = "MediaProjectionPermissionActivity"; private static final float MAX_APP_NAME_SIZE_PX = 500f; private static final String ELLIPSIS = "\u2026"; @@ -215,7 +215,8 @@ public class MediaProjectionPermissionActivity extends Activity SystemUIDialog.applyFlags(dialog); SystemUIDialog.setDialogSize(dialog); - dialog.setOnCancelListener(this); + dialog.setOnCancelListener(this::onDialogDismissedOrCancelled); + dialog.setOnDismissListener(this::onDialogDismissedOrCancelled); dialog.create(); dialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true); @@ -283,9 +284,10 @@ public class MediaProjectionPermissionActivity extends Activity return intent; } - @Override - public void onCancel(DialogInterface dialog) { - finish(); + private void onDialogDismissedOrCancelled(DialogInterface dialogInterface) { + if (!isFinishing()) { + finish(); + } } private boolean isPartialScreenSharingEnabled() { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt index 8f1c9048026f..30ee147e302a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt @@ -63,6 +63,10 @@ constructor( override fun onStateChanged(newState: Int) { refreshMediaPosition() } + + override fun onDozingChanged(isDozing: Boolean) { + refreshMediaPosition() + } } ) configurationController.addCallback( @@ -198,7 +202,8 @@ constructor( mediaHost.visible && !bypassController.bypassEnabled && keyguardOrUserSwitcher && - allowMediaPlayerOnLockScreen + allowMediaPlayerOnLockScreen && + shouldBeVisibleForSplitShade() if (visible) { showMediaPlayer() } else { @@ -206,6 +211,19 @@ constructor( } } + private fun shouldBeVisibleForSplitShade(): Boolean { + if (!useSplitShade) { + return true + } + // We have to explicitly hide media for split shade when on AOD, as it is a child view of + // keyguard status view, and nothing hides keyguard status view on AOD. + // When using the double-line clock, it is not an issue, as media gets implicitly hidden + // by the clock. This is not the case for single-line clock though. + // For single shade, we don't need to do it, because media is a child of NSSL, which already + // gets hidden on AOD. + return !statusBarStateController.isDozing + } + private fun showMediaPlayer() { if (useSplitShade) { setVisibility(splitShadeContainer, View.VISIBLE) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index 9928c4f79a96..f50a7a854169 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -205,7 +205,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { && mController.isSubStatusSupported() && mController.isAdvancedLayoutSupported() && device.hasSubtext()) { boolean isActiveWithOngoingSession = - (device.hasOngoingSession() && currentlyConnected); + (device.hasOngoingSession() && (currentlyConnected || isDeviceIncluded( + mController.getSelectedMediaDevice(), device))); boolean isHost = device.isHostForOngoingSession() && isActiveWithOngoingSession; if (isHost) { @@ -224,10 +225,17 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { if (isActiveWithOngoingSession) { //Selected device which has ongoing session, disable seekbar since we //only allow volume control on Host - initSeekbar(device, isCurrentSeekbarInvisible); mCurrentActivePosition = position; } - setUpDeviceIcon(device); + boolean showSeekbar = + (!device.hasOngoingSession() && currentlyConnected); + if (showSeekbar) { + updateTitleIcon(R.drawable.media_output_icon_volume, + mController.getColorItemContent()); + initSeekbar(device, isCurrentSeekbarInvisible); + } else { + setUpDeviceIcon(device); + } mSubTitleText.setText(device.getSubtextString()); Drawable deviceStatusIcon = device.hasOngoingSession() ? mContext.getDrawable( @@ -241,8 +249,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { updateTwoLineLayoutContentAlpha( updateClickActionBasedOnSelectionBehavior(device) ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA); - setTwoLineLayout(device, isActiveWithOngoingSession /* bFocused */, - isActiveWithOngoingSession /* showSeekBar */, + setTwoLineLayout(device, currentlyConnected /* bFocused */, + showSeekbar /* showSeekBar */, false /* showProgressBar */, true /* showSubtitle */, deviceStatusIcon != null /* showStatus */, isActiveWithOngoingSession /* isFakeActive */); diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java index 731bb2f4db7c..73ab52722a79 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java @@ -270,10 +270,10 @@ public abstract class MediaOutputBaseAdapter extends final Drawable backgroundDrawable; if (mController.isAdvancedLayoutSupported() && mController.isSubStatusSupported()) { backgroundDrawable = mContext.getDrawable( - showSeekBar ? R.drawable.media_output_item_background_active + showSeekBar || isFakeActive ? R.drawable.media_output_item_background_active : R.drawable.media_output_item_background).mutate(); backgroundDrawable.setTint( - showSeekBar ? mController.getColorConnectedItemBackground() + showSeekBar || isFakeActive ? mController.getColorConnectedItemBackground() : mController.getColorItemBackground()); mIconAreaLayout.setBackgroundTintList( ColorStateList.valueOf(showProgressBar || isFakeActive diff --git a/packages/SystemUI/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractor.kt b/packages/SystemUI/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractor.kt index e352c613ad86..1894bc4cfeab 100644 --- a/packages/SystemUI/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractor.kt @@ -20,12 +20,16 @@ import android.content.Context import android.view.MotionEvent import android.view.ViewConfiguration import com.android.systemui.classifier.Classifier +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.multishade.shared.math.isZero import com.android.systemui.multishade.shared.model.ProxiedInputModel import com.android.systemui.plugins.FalsingManager +import com.android.systemui.shade.ShadeController import javax.inject.Inject import kotlin.math.abs import kotlinx.coroutines.CoroutineScope @@ -33,6 +37,7 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch /** * Encapsulates business logic to handle [MotionEvent]-based user input. @@ -40,15 +45,31 @@ import kotlinx.coroutines.flow.stateIn * This class is meant purely for the legacy `View`-based system to be able to pass `MotionEvent`s * into the newer multi-shade framework for processing. */ +@SysUISingleton class MultiShadeMotionEventInteractor @Inject constructor( @Application private val applicationContext: Context, @Application private val applicationScope: CoroutineScope, private val multiShadeInteractor: MultiShadeInteractor, + featureFlags: FeatureFlags, keyguardTransitionInteractor: KeyguardTransitionInteractor, private val falsingManager: FalsingManager, + private val shadeController: ShadeController, ) { + init { + if (featureFlags.isEnabled(Flags.DUAL_SHADE)) { + applicationScope.launch { + multiShadeInteractor.isAnyShadeExpanded.collect { + if (!it && !shadeController.isKeyguard) { + shadeController.makeExpandedInvisible() + } else { + shadeController.makeExpandedVisible(false) + } + } + } + } + } private val isAnyShadeExpanded: StateFlow<Boolean> = multiShadeInteractor.isAnyShadeExpanded.stateIn( @@ -56,6 +77,7 @@ constructor( started = SharingStarted.Eagerly, initialValue = false, ) + private val isBouncerShowing: StateFlow<Boolean> = keyguardTransitionInteractor .transitionValue(state = KeyguardState.PRIMARY_BOUNCER) @@ -102,23 +124,7 @@ constructor( false } MotionEvent.ACTION_MOVE -> { - interactionState?.let { - val pointerIndex = event.findPointerIndex(it.pointerId) - val currentX = event.getX(pointerIndex) - val currentY = event.getY(pointerIndex) - if (!it.isDraggingHorizontally && !it.isDraggingShade) { - val xDistanceTravelled = currentX - it.initialX - val yDistanceTravelled = currentY - it.initialY - val touchSlop = ViewConfiguration.get(applicationContext).scaledTouchSlop - interactionState = - when { - yDistanceTravelled > touchSlop -> it.copy(isDraggingShade = true) - abs(xDistanceTravelled) > touchSlop -> - it.copy(isDraggingHorizontally = true) - else -> interactionState - } - } - } + onMove(event) // We want to intercept the rest of the gesture if we're dragging the shade. isDraggingShade() @@ -162,7 +168,8 @@ constructor( } true } else { - false + onMove(event) + isDraggingShade() } } ?: false @@ -225,6 +232,32 @@ constructor( } } + /** + * Handles [MotionEvent.ACTION_MOVE] and sets whether or not we are dragging shade in our + * current interaction + * + * @param event The [MotionEvent] to handle. + */ + private fun onMove(event: MotionEvent) { + interactionState?.let { + val pointerIndex = event.findPointerIndex(it.pointerId) + val currentX = event.getX(pointerIndex) + val currentY = event.getY(pointerIndex) + if (!it.isDraggingHorizontally && !it.isDraggingShade) { + val xDistanceTravelled = currentX - it.initialX + val yDistanceTravelled = currentY - it.initialY + val touchSlop = ViewConfiguration.get(applicationContext).scaledTouchSlop + interactionState = + when { + yDistanceTravelled > touchSlop -> it.copy(isDraggingShade = true) + abs(xDistanceTravelled) > touchSlop -> + it.copy(isDraggingHorizontally = true) + else -> interactionState + } + } + } + } + private data class InteractionState( val initialX: Float, val initialY: Float, diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt index 70040c75d123..c804df8fa555 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt @@ -363,12 +363,8 @@ class BackPanel( } fun popOffEdge(startingVelocity: Float) { - val heightStretchAmount = startingVelocity * 50 - val widthStretchAmount = startingVelocity * 150 - val scaleStretchAmount = startingVelocity * 0.8f - backgroundHeight.stretchTo(stretchAmount = 0f, startingVelocity = -heightStretchAmount) - backgroundWidth.stretchTo(stretchAmount = 0f, startingVelocity = widthStretchAmount) - scale.stretchTo(stretchAmount = 0f, startingVelocity = -scaleStretchAmount) + scale.stretchTo(stretchAmount = 0f, startingVelocity = startingVelocity * -.8f) + horizontalTranslation.stretchTo(stretchAmount = 0f, startingVelocity * 200f) } fun popScale(startingVelocity: Float) { @@ -410,7 +406,7 @@ class BackPanel( arrowAlpha.updateRestingPosition(restingParams.arrowDimens.alpha, animate) arrowLength.updateRestingPosition(restingParams.arrowDimens.length, animate) arrowHeight.updateRestingPosition(restingParams.arrowDimens.height, animate) - scalePivotX.updateRestingPosition(restingParams.backgroundDimens.width, animate) + scalePivotX.updateRestingPosition(restingParams.scalePivotX, animate) backgroundWidth.updateRestingPosition(restingParams.backgroundDimens.width, animate) backgroundHeight.updateRestingPosition(restingParams.backgroundDimens.height, animate) backgroundEdgeCornerRadius.updateRestingPosition( diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt index a29eb3bda748..3770b2885b18 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt @@ -49,6 +49,7 @@ import kotlin.math.sign private const val TAG = "BackPanelController" private const val ENABLE_FAILSAFE = true +private const val FAILSAFE_DELAY_MS = 350L private const val PX_PER_SEC = 1000 private const val PX_PER_MS = 1 @@ -64,9 +65,9 @@ private const val MIN_DURATION_FLING_ANIMATION = 160L private const val MIN_DURATION_ENTRY_TO_ACTIVE_CONSIDERED_AS_FLING = 100L private const val MIN_DURATION_INACTIVE_TO_ACTIVE_CONSIDERED_AS_FLING = 400L -private const val FAILSAFE_DELAY_MS = 350L -private const val POP_ON_FLING_DELAY = 50L -private const val POP_ON_FLING_SCALE = 3f +private const val POP_ON_FLING_DELAY = 60L +private const val POP_ON_FLING_SCALE = 2f +private const val POP_ON_COMMITTED_SCALE = 3f internal val VIBRATE_ACTIVATED_EFFECT = VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK) @@ -774,7 +775,9 @@ class BackPanelController internal constructor( GestureState.ENTRY, GestureState.INACTIVE, GestureState.CANCELLED -> params.preThresholdIndicator.scalePivotX - else -> params.committedIndicator.scalePivotX + GestureState.ACTIVE -> params.activeIndicator.scalePivotX + GestureState.FLUNG, + GestureState.COMMITTED -> params.committedIndicator.scalePivotX }, horizontalTranslation = when (currentState) { GestureState.GONE -> { @@ -921,7 +924,7 @@ class BackPanelController internal constructor( mainHandler.postDelayed(onEndSetGoneStateListener.runnable, MIN_DURATION_COMMITTED_AFTER_FLING_ANIMATION) } else { - mView.popScale(POP_ON_FLING_SCALE) + mView.popScale(POP_ON_COMMITTED_SCALE) mainHandler.postDelayed(onAlphaEndSetGoneStateListener.runnable, MIN_DURATION_COMMITTED_ANIMATION) } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt index 6ce6f0d5f722..c9d8c8495dcc 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt @@ -35,7 +35,7 @@ data class EdgePanelParams(private var resources: Resources) { data class BackIndicatorDimens( val horizontalTranslation: Float? = 0f, val scale: Float = 0f, - val scalePivotX: Float = 0f, + val scalePivotX: Float? = null, val arrowDimens: ArrowDimens, val backgroundDimens: BackgroundDimens, val verticalTranslationSpring: SpringForce? = null, @@ -203,7 +203,8 @@ data class EdgePanelParams(private var resources: Resources) { horizontalTranslation = getDimen(R.dimen.navigation_edge_active_margin), scale = getDimenFloat(R.dimen.navigation_edge_active_scale), horizontalTranslationSpring = entryActiveHorizontalTranslationSpring, - scaleSpring = createSpring(450f, 0.415f), + scaleSpring = createSpring(450f, 0.39f), + scalePivotX = getDimen(R.dimen.navigation_edge_active_background_width), arrowDimens = ArrowDimens( length = getDimen(R.dimen.navigation_edge_active_arrow_length), height = getDimen(R.dimen.navigation_edge_active_arrow_height), @@ -258,6 +259,7 @@ data class EdgePanelParams(private var resources: Resources) { committedIndicator = activeIndicator.copy( horizontalTranslation = null, + scalePivotX = null, arrowDimens = activeIndicator.arrowDimens.copy( lengthSpring = activeCommittedArrowLengthSpring, heightSpring = activeCommittedArrowHeightSpring, diff --git a/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt b/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt index 44855fb7c8cc..0f38d32e0b64 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt @@ -18,9 +18,11 @@ package com.android.systemui.notetask.shortcut import android.content.Context import android.content.Intent -import android.content.pm.UserInfo +import android.os.Build import android.os.Bundle +import android.os.UserHandle import android.os.UserManager +import android.util.Log import androidx.activity.ComponentActivity import com.android.systemui.notetask.NoteTaskController import com.android.systemui.notetask.NoteTaskEntryPoint @@ -63,9 +65,13 @@ constructor( // | Bubble#showOrHideAppBubble | <-------------- // | (with WP user ID) | // ---------------------------- - val mainUser: UserInfo? = userTracker.userProfiles.firstOrNull { it.isMain } - if (userManager.isManagedProfile && mainUser != null) { - controller.startNoteTaskProxyActivityForUser(mainUser.userHandle) + val mainUser: UserHandle? = userManager.mainUser + if (userManager.isManagedProfile) { + if (mainUser == null) { + logDebug { "Can't find the main user. Skipping the notes app launch." } + } else { + controller.startNoteTaskProxyActivityForUser(mainUser) + } } else { controller.showNoteTask(entryPoint = NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT) } @@ -83,3 +89,8 @@ constructor( } } } + +/** [Log.println] a [Log.DEBUG] message, only when [Build.IS_DEBUGGABLE]. */ +private inline fun Any.logDebug(message: () -> String) { + if (Build.IS_DEBUGGABLE) Log.d(this::class.java.simpleName.orEmpty(), message()) +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 90e31afef84b..cffe45fadaa3 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -16,6 +16,7 @@ package com.android.systemui.recents; +import static android.content.Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST; import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY; import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_DOWN; @@ -28,15 +29,16 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYS import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER; import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER; import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_WINDOW_CORNER_RADIUS; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_ON; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_TRANSITION; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_TRANSITION; import android.annotation.FloatRange; import android.app.ActivityTaskManager; @@ -85,6 +87,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.ScreenLifecycle; +import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.NavigationBar; import com.android.systemui.navigationbar.NavigationBarController; @@ -112,6 +115,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.function.Supplier; @@ -389,6 +393,16 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private final BroadcastReceiver mLauncherStateChangedReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { + StringBuilder extraComponentList = new StringBuilder(" components: "); + if (intent.hasExtra(EXTRA_CHANGED_COMPONENT_NAME_LIST)) { + String[] comps = intent.getStringArrayExtra(EXTRA_CHANGED_COMPONENT_NAME_LIST); + if (comps != null) { + for (String c : comps) { + extraComponentList.append(c).append(", "); + } + } + } + Log.d(TAG_OPS, "launcherStateChanged intent: " + intent + extraComponentList); updateEnabledState(); // Reconnect immediately, instead of waiting for resume to arrive. @@ -399,9 +413,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private final ServiceConnection mOverviewServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { - if (SysUiState.DEBUG) { - Log.d(TAG_OPS, "Overview proxy service connected"); - } + Log.d(TAG_OPS, "Overview proxy service connected"); mConnectionBackoffAttempts = 0; mHandler.removeCallbacks(mDeferredConnectionCallback); try { @@ -446,6 +458,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis notifySystemUiStateFlags(mSysUiState.getFlags()); notifyConnectionChanged(); + if (mLatchForOnUserChanging != null) { + mLatchForOnUserChanging.countDown(); + mLatchForOnUserChanging = null; + } } @Override @@ -500,11 +516,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } }; + private CountDownLatch mLatchForOnUserChanging; private final UserTracker.Callback mUserChangedCallback = new UserTracker.Callback() { @Override - public void onUserChanged(int newUser, @NonNull Context userContext) { + public void onUserChanging(int newUser, @NonNull Context userContext, + CountDownLatch latch) { mConnectionBackoffAttempts = 0; + mLatchForOnUserChanging = latch; internalConnectToCurrentUser("User changed"); } }; @@ -521,6 +540,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis NotificationShadeWindowController statusBarWinController, SysUiState sysUiState, UserTracker userTracker, ScreenLifecycle screenLifecycle, + WakefulnessLifecycle wakefulnessLifecycle, UiEventLogger uiEventLogger, DisplayTracker displayTracker, KeyguardUnlockAnimationController sysuiUnlockAnimationController, @@ -598,8 +618,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis // Listen for user setup mUserTracker.addCallback(mUserChangedCallback, mMainExecutor); - screenLifecycle.addObserver(mLifecycleObserver); - + screenLifecycle.addObserver(mScreenLifecycleObserver); + wakefulnessLifecycle.addObserver(mWakefulnessLifecycleObserver); // Connect to the service updateEnabledState(); startConnectionToCurrentUser(); @@ -674,11 +694,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } private void onStatusBarStateChanged(boolean keyguardShowing, boolean keyguardOccluded, - boolean bouncerShowing, boolean isDozing, boolean panelExpanded, boolean isDreaming) { + boolean keyguardGoingAway, boolean bouncerShowing, boolean isDozing, + boolean panelExpanded, boolean isDreaming) { mSysUiState.setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING, keyguardShowing && !keyguardOccluded) .setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED, keyguardShowing && keyguardOccluded) + .setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY, + keyguardGoingAway) .setFlag(SYSUI_STATE_BOUNCER_SHOWING, bouncerShowing) .setFlag(SYSUI_STATE_DEVICE_DOZING, isDozing) .setFlag(SYSUI_STATE_DEVICE_DREAMING, isDreaming) @@ -864,81 +887,94 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } } - private final ScreenLifecycle.Observer mLifecycleObserver = new ScreenLifecycle.Observer() { - /** - * Notifies the Launcher that screen turned on and ready to use - */ - @Override - public void onScreenTurnedOn() { - mSysUiState - .setFlag(SYSUI_STATE_SCREEN_ON, true) - .setFlag(SYSUI_STATE_SCREEN_TRANSITION, false) - .commitUpdate(mContext.getDisplayId()); + private final ScreenLifecycle.Observer mScreenLifecycleObserver = + new ScreenLifecycle.Observer() { + /** + * Notifies the Launcher that screen turned on and ready to use + */ + @Override + public void onScreenTurnedOn() { + try { + if (mOverviewProxy != null) { + mOverviewProxy.onScreenTurnedOn(); + } else { + Log.e(TAG_OPS, + "Failed to get overview proxy for screen turned on event."); + } + } catch (RemoteException e) { + Log.e(TAG_OPS, "Failed to call onScreenTurnedOn()", e); + } + } - try { - if (mOverviewProxy != null) { - mOverviewProxy.onScreenTurnedOn(); - } else { - Log.e(TAG_OPS, "Failed to get overview proxy for screen turned on event."); + /** + * Notifies the Launcher that screen is starting to turn on. + */ + @Override + public void onScreenTurningOff() { + try { + if (mOverviewProxy != null) { + mOverviewProxy.onScreenTurningOff(); + } else { + Log.e(TAG_OPS, + "Failed to get overview proxy for screen turning off event."); + } + } catch (RemoteException e) { + Log.e(TAG_OPS, "Failed to call onScreenTurningOff()", e); + } } - } catch (RemoteException e) { - Log.e(TAG_OPS, "Failed to call onScreenTurnedOn()", e); - } - } - /** - * Notifies the Launcher that screen turned off. - */ - @Override - public void onScreenTurnedOff() { - mSysUiState - .setFlag(SYSUI_STATE_SCREEN_ON, false) - .setFlag(SYSUI_STATE_SCREEN_TRANSITION, false) - .commitUpdate(mContext.getDisplayId()); - } + /** + * Notifies the Launcher that screen is starting to turn on. + */ + @Override + public void onScreenTurningOn() { + try { + if (mOverviewProxy != null) { + mOverviewProxy.onScreenTurningOn(); + } else { + Log.e(TAG_OPS, + "Failed to get overview proxy for screen turning on event."); + } + } catch (RemoteException e) { + Log.e(TAG_OPS, "Failed to call onScreenTurningOn()", e); + } + } + }; - /** - * Notifies the Launcher that screen is starting to turn on. - */ - @Override - public void onScreenTurningOff() { - mSysUiState - .setFlag(SYSUI_STATE_SCREEN_ON, false) - .setFlag(SYSUI_STATE_SCREEN_TRANSITION, true) - .commitUpdate(mContext.getDisplayId()); + private final WakefulnessLifecycle.Observer mWakefulnessLifecycleObserver = + new WakefulnessLifecycle.Observer() { + @Override + public void onStartedWakingUp() { + mSysUiState + .setFlag(SYSUI_STATE_AWAKE, true) + .setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, true) + .commitUpdate(mContext.getDisplayId()); + } - try { - if (mOverviewProxy != null) { - mOverviewProxy.onScreenTurningOff(); - } else { - Log.e(TAG_OPS, "Failed to get overview proxy for screen turning off event."); + @Override + public void onFinishedWakingUp() { + mSysUiState + .setFlag(SYSUI_STATE_AWAKE, true) + .setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, false) + .commitUpdate(mContext.getDisplayId()); } - } catch (RemoteException e) { - Log.e(TAG_OPS, "Failed to call onScreenTurningOff()", e); - } - } - /** - * Notifies the Launcher that screen is starting to turn on. - */ - @Override - public void onScreenTurningOn() { - mSysUiState - .setFlag(SYSUI_STATE_SCREEN_ON, true) - .setFlag(SYSUI_STATE_SCREEN_TRANSITION, true) - .commitUpdate(mContext.getDisplayId()); + @Override + public void onStartedGoingToSleep() { + mSysUiState + .setFlag(SYSUI_STATE_AWAKE, false) + .setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, true) + .commitUpdate(mContext.getDisplayId()); + } - try { - if (mOverviewProxy != null) { - mOverviewProxy.onScreenTurningOn(); - } else { - Log.e(TAG_OPS, "Failed to get overview proxy for screen turning on event."); + @Override + public void onFinishedGoingToSleep() { + mSysUiState + .setFlag(SYSUI_STATE_AWAKE, false) + .setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, false) + .commitUpdate(mContext.getDisplayId()); } - } catch (RemoteException e) { - Log.e(TAG_OPS, "Failed to call onScreenTurningOn()", e); - } - } - }; + }; void notifyToggleRecentApps() { for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 6f85c45a6614..c9d1da38b196 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -289,7 +289,7 @@ public class ScreenshotController { if (DEBUG_INPUT) { Log.d(TAG, "Predictive Back callback dispatched"); } - respondToBack(); + respondToKeyDismissal(); }; private ScreenshotView mScreenshotView; @@ -581,7 +581,7 @@ public class ScreenshotController { } } - private void respondToBack() { + private void respondToKeyDismissal() { dismissScreenshot(SCREENSHOT_DISMISSED_OTHER); } @@ -641,11 +641,11 @@ public class ScreenshotController { mScreenshotView.setDefaultTimeoutMillis(mScreenshotHandler.getDefaultTimeoutMillis()); mScreenshotView.setOnKeyListener((v, keyCode, event) -> { - if (keyCode == KeyEvent.KEYCODE_BACK) { + if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) { if (DEBUG_INPUT) { - Log.d(TAG, "onKeyEvent: KeyEvent.KEYCODE_BACK"); + Log.d(TAG, "onKeyEvent: " + keyCode); } - respondToBack(); + respondToKeyDismissal(); return true; } return false; diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java index d0b7ad3e9dd5..394949297d6d 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java @@ -27,9 +27,15 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.os.IBinder; +import android.os.UserHandle; +import android.os.UserManager; +import android.util.Log; import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import com.android.internal.infra.AndroidFuture; +import com.android.internal.infra.ServiceConnector; import com.android.internal.statusbar.IAppClipsService; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Application; @@ -37,6 +43,7 @@ import com.android.systemui.flags.FeatureFlags; import com.android.wm.shell.bubbles.Bubbles; import java.util.Optional; +import java.util.concurrent.ExecutionException; import javax.inject.Inject; @@ -46,21 +53,63 @@ import javax.inject.Inject; */ public class AppClipsService extends Service { + private static final String TAG = AppClipsService.class.getSimpleName(); + @Application private final Context mContext; private final FeatureFlags mFeatureFlags; private final Optional<Bubbles> mOptionalBubbles; private final DevicePolicyManager mDevicePolicyManager; + private final UserManager mUserManager; + private final boolean mAreTaskAndTimeIndependentPrerequisitesMet; + @VisibleForTesting() + @Nullable ServiceConnector<IAppClipsService> mProxyConnectorToMainProfile; + @Inject public AppClipsService(@Application Context context, FeatureFlags featureFlags, - Optional<Bubbles> optionalBubbles, DevicePolicyManager devicePolicyManager) { + Optional<Bubbles> optionalBubbles, DevicePolicyManager devicePolicyManager, + UserManager userManager) { mContext = context; mFeatureFlags = featureFlags; mOptionalBubbles = optionalBubbles; mDevicePolicyManager = devicePolicyManager; + mUserManager = userManager; + + // The consumer of this service are apps that call through StatusBarManager API to query if + // it can use app clips API. Since these apps can be launched as work profile users, this + // service will start as work profile user. SysUI doesn't share injected instances for + // different users. This is why the bubbles instance injected will be incorrect. As the apps + // don't generally have permission to connect to a service running as different user, we + // start a proxy connection to communicate with the main user's version of this service. + if (mUserManager.isManagedProfile()) { + // No need to check for prerequisites in this case as those are incorrect for work + // profile user instance of the service and the main user version of the service will + // take care of this check. + mAreTaskAndTimeIndependentPrerequisitesMet = false; + + // Get the main user so that we can connect to the main user's version of the service. + UserHandle mainUser = mUserManager.getMainUser(); + if (mainUser == null) { + // If main user is not available there isn't much we can do, no apps can use app + // clips. + return; + } + + // Set up the connection to be used later during onBind callback. + mProxyConnectorToMainProfile = + new ServiceConnector.Impl<>( + context, + new Intent(context, AppClipsService.class), + Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY + | Context.BIND_NOT_VISIBLE, + mainUser.getIdentifier(), + IAppClipsService.Stub::asInterface); + return; + } mAreTaskAndTimeIndependentPrerequisitesMet = checkIndependentVariables(); + mProxyConnectorToMainProfile = null; } private boolean checkIndependentVariables() { @@ -95,6 +144,13 @@ public class AppClipsService extends Service { return new IAppClipsService.Stub() { @Override public boolean canLaunchCaptureContentActivityForNote(int taskId) { + // In case of managed profile, use the main user's instance of the service. Callers + // cannot directly connect to the main user's instance as they may not have the + // permission to interact across users. + if (mUserManager.isManagedProfile()) { + return canLaunchCaptureContentActivityForNoteFromMainUser(taskId); + } + if (!mAreTaskAndTimeIndependentPrerequisitesMet) { return false; } @@ -107,4 +163,21 @@ public class AppClipsService extends Service { } }; } + + /** Returns whether the app clips API can be used by querying the service as the main user. */ + private boolean canLaunchCaptureContentActivityForNoteFromMainUser(int taskId) { + if (mProxyConnectorToMainProfile == null) { + return false; + } + + try { + AndroidFuture<Boolean> future = mProxyConnectorToMainProfile.postForResult( + service -> service.canLaunchCaptureContentActivityForNote(taskId)); + return future.get(); + } catch (ExecutionException | InterruptedException e) { + Log.d(TAG, "Exception from service\n" + e); + } + + return false; + } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java index 3cb1a34a921c..0487cbc995dd 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java @@ -40,6 +40,8 @@ import android.os.Bundle; import android.os.Handler; import android.os.Parcel; import android.os.ResultReceiver; +import android.os.UserHandle; +import android.os.UserManager; import android.util.Log; import androidx.annotation.Nullable; @@ -79,13 +81,10 @@ public class AppClipsTrampolineActivity extends Activity { private static final String TAG = AppClipsTrampolineActivity.class.getSimpleName(); static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; - @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) - public static final String EXTRA_SCREENSHOT_URI = TAG + "SCREENSHOT_URI"; + static final String EXTRA_SCREENSHOT_URI = TAG + "SCREENSHOT_URI"; static final String ACTION_FINISH_FROM_TRAMPOLINE = TAG + "FINISH_FROM_TRAMPOLINE"; - @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) - public static final String EXTRA_RESULT_RECEIVER = TAG + "RESULT_RECEIVER"; - @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) - public static final String EXTRA_CALLING_PACKAGE_NAME = TAG + "CALLING_PACKAGE_NAME"; + static final String EXTRA_RESULT_RECEIVER = TAG + "RESULT_RECEIVER"; + static final String EXTRA_CALLING_PACKAGE_NAME = TAG + "CALLING_PACKAGE_NAME"; private static final ApplicationInfoFlags APPLICATION_INFO_FLAGS = ApplicationInfoFlags.of(0); private final DevicePolicyManager mDevicePolicyManager; @@ -95,6 +94,7 @@ public class AppClipsTrampolineActivity extends Activity { private final PackageManager mPackageManager; private final UserTracker mUserTracker; private final UiEventLogger mUiEventLogger; + private final UserManager mUserManager; private final ResultReceiver mResultReceiver; private Intent mKillAppClipsBroadcastIntent; @@ -103,7 +103,7 @@ public class AppClipsTrampolineActivity extends Activity { public AppClipsTrampolineActivity(DevicePolicyManager devicePolicyManager, FeatureFlags flags, Optional<Bubbles> optionalBubbles, NoteTaskController noteTaskController, PackageManager packageManager, UserTracker userTracker, UiEventLogger uiEventLogger, - @Main Handler mainHandler) { + UserManager userManager, @Main Handler mainHandler) { mDevicePolicyManager = devicePolicyManager; mFeatureFlags = flags; mOptionalBubbles = optionalBubbles; @@ -111,6 +111,7 @@ public class AppClipsTrampolineActivity extends Activity { mPackageManager = packageManager; mUserTracker = userTracker; mUiEventLogger = uiEventLogger; + mUserManager = userManager; mResultReceiver = createResultReceiver(mainHandler); } @@ -123,6 +124,12 @@ public class AppClipsTrampolineActivity extends Activity { return; } + if (mUserManager.isManagedProfile()) { + maybeStartActivityForWPUser(); + finish(); + return; + } + if (!mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)) { finish(); return; @@ -191,6 +198,19 @@ public class AppClipsTrampolineActivity extends Activity { } } + private void maybeStartActivityForWPUser() { + UserHandle mainUser = mUserManager.getMainUser(); + if (mainUser == null) { + setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_FAILED); + return; + } + + // Start the activity as the main user with activity result forwarding. + startActivityAsUser( + new Intent(this, AppClipsTrampolineActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT), mainUser); + } + private void setErrorResultAndFinish(int errorCode) { setResult(RESULT_OK, new Intent().putExtra(EXTRA_CAPTURE_CONTENT_FOR_NOTE_STATUS_CODE, errorCode)); diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index d2cb762682c5..3316ca0c3fcd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -158,10 +158,13 @@ import com.android.systemui.media.controls.pipeline.MediaDataManager; import com.android.systemui.media.controls.ui.KeyguardMediaController; import com.android.systemui.media.controls.ui.MediaHierarchyManager; import com.android.systemui.model.SysUiState; +import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationBarView; import com.android.systemui.navigationbar.NavigationModeController; +import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ClockAnimations; +import com.android.systemui.plugins.ClockController; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.FalsingManager.FalsingTapListener; import com.android.systemui.plugins.qs.QS; @@ -392,6 +395,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private KeyguardBottomAreaView mKeyguardBottomArea; private boolean mExpanding; private boolean mSplitShadeEnabled; + private boolean mDualShadeEnabled; /** The bottom padding reserved for elements of the keyguard measuring notifications. */ private float mKeyguardNotificationBottomPadding; /** @@ -623,7 +627,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private final KeyguardTransitionInteractor mKeyguardTransitionInteractor; private final KeyguardInteractor mKeyguardInteractor; + private final @Nullable MultiShadeInteractor mMultiShadeInteractor; private final CoroutineDispatcher mMainDispatcher; + private boolean mIsAnyMultiShadeExpanded; private boolean mIsOcclusionTransitionRunning = false; private int mDreamingToLockscreenTransitionTranslationY; private int mOccludedToLockscreenTransitionTranslationY; @@ -645,6 +651,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } }; + private final Consumer<Boolean> mMultiShadeExpansionConsumer = + (Boolean expanded) -> mIsAnyMultiShadeExpanded = expanded; + private final Consumer<TransitionStep> mDreamingToLockscreenTransition = (TransitionStep step) -> { mIsOcclusionTransitionRunning = @@ -687,23 +696,29 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mInteractionJankMonitor.end(CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION); } }; + private final ActivityStarter mActivityStarter; @Inject public NotificationPanelViewController(NotificationPanelView view, @Main Handler handler, LayoutInflater layoutInflater, FeatureFlags featureFlags, - NotificationWakeUpCoordinator coordinator, PulseExpansionHandler pulseExpansionHandler, + NotificationWakeUpCoordinator coordinator, + PulseExpansionHandler pulseExpansionHandler, DynamicPrivacyController dynamicPrivacyController, - KeyguardBypassController bypassController, FalsingManager falsingManager, + KeyguardBypassController bypassController, + FalsingManager falsingManager, FalsingCollector falsingCollector, KeyguardStateController keyguardStateController, StatusBarStateController statusBarStateController, StatusBarWindowStateController statusBarWindowStateController, NotificationShadeWindowController notificationShadeWindowController, DozeLog dozeLog, - DozeParameters dozeParameters, CommandQueue commandQueue, VibratorHelper vibratorHelper, - LatencyTracker latencyTracker, PowerManager powerManager, + DozeParameters dozeParameters, + CommandQueue commandQueue, + VibratorHelper vibratorHelper, + LatencyTracker latencyTracker, + PowerManager powerManager, AccessibilityManager accessibilityManager, @DisplayId int displayId, KeyguardUpdateMonitor keyguardUpdateMonitor, MetricsLogger metricsLogger, @@ -761,9 +776,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump LockscreenToOccludedTransitionViewModel lockscreenToOccludedTransitionViewModel, @Main CoroutineDispatcher mainDispatcher, KeyguardTransitionInteractor keyguardTransitionInteractor, + Provider<MultiShadeInteractor> multiShadeInteractorProvider, DumpManager dumpManager, KeyguardLongPressViewModel keyguardLongPressViewModel, - KeyguardInteractor keyguardInteractor) { + KeyguardInteractor keyguardInteractor, + ActivityStarter activityStarter) { mInteractionJankMonitor = interactionJankMonitor; keyguardStateController.addCallback(new KeyguardStateController.Callback() { @Override @@ -861,6 +878,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mFeatureFlags = featureFlags; mAnimateBack = mFeatureFlags.isEnabled(Flags.WM_SHADE_ANIMATE_BACK_GESTURE); mTrackpadGestureFeaturesEnabled = mFeatureFlags.isEnabled(Flags.TRACKPAD_GESTURE_FEATURES); + mDualShadeEnabled = mFeatureFlags.isEnabled(Flags.DUAL_SHADE); + mMultiShadeInteractor = mDualShadeEnabled ? multiShadeInteractorProvider.get() : null; mFalsingCollector = falsingCollector; mPowerManager = powerManager; mWakeUpCoordinator = coordinator; @@ -942,6 +961,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump return Unit.INSTANCE; }, mFalsingManager); + mActivityStarter = activityStarter; onFinishInflate(); keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener( new KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener() { @@ -1097,6 +1117,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mNotificationPanelUnfoldAnimationController.ifPresent(controller -> controller.setup(mNotificationContainerParent)); + if (mDualShadeEnabled) { + collectFlow(mView, mMultiShadeInteractor.isAnyShadeExpanded(), + mMultiShadeExpansionConsumer, mMainDispatcher); + } + // Dreaming->Lockscreen collectFlow(mView, mKeyguardTransitionInteractor.getDreamingToLockscreenTransition(), mDreamingToLockscreenTransition, mMainDispatcher); @@ -1379,7 +1404,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mLockIconViewController, stringResourceId -> mKeyguardIndicationController.showTransientIndication(stringResourceId), - mVibratorHelper); + mVibratorHelper, + mActivityStarter); } @VisibleForTesting @@ -1612,9 +1638,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump transition.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); transition.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD); - ClockAnimations clockAnims = mKeyguardStatusViewController.getClockAnimations(); - boolean customClockAnimation = clockAnims != null - && clockAnims.getHasCustomPositionUpdatedAnimation(); + ClockController clock = mKeyguardStatusViewController.getClockController(); + boolean customClockAnimation = clock != null + && clock.getConfig().getHasCustomPositionUpdatedAnimation(); if (mFeatureFlags.isEnabled(Flags.STEP_CLOCK_ANIMATION) && customClockAnimation) { // Find the clock, so we can exclude it from this transition. @@ -4617,7 +4643,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mQsController.setExpandImmediate(false); // Close the status bar in the next frame so we can show the end of the // animation. - mView.post(mMaybeHideExpandedRunnable); + if (!mIsAnyMultiShadeExpanded) { + mView.post(mMaybeHideExpandedRunnable); + } } mCurrentPanelState = state; } @@ -5142,12 +5170,12 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump Rect to = (Rect) endValues.values.get(PROP_BOUNDS); anim.addUpdateListener(animation -> { - ClockAnimations clockAnims = mController.getClockAnimations(); - if (clockAnims == null) { + ClockController clock = mController.getClockController(); + if (clock == null) { return; } - clockAnims.onPositionUpdated(from, to, animation.getAnimatedFraction()); + clock.getAnimations().onPositionUpdated(from, to, animation.getAnimatedFraction()); }); return anim; diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index 156e4fd1889f..af74c2793cc9 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -561,6 +561,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW for (StatusBarWindowCallback cb : activeCallbacks) { cb.onStateChanged(mCurrentState.keyguardShowing, mCurrentState.keyguardOccluded, + mCurrentState.keyguardGoingAway, mCurrentState.bouncerShowing, mCurrentState.dozing, mCurrentState.panelExpanded, diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java index ad5a68e4dc3f..e08bc33c1ccd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java @@ -64,6 +64,11 @@ public interface ShadeController { boolean closeShadeIfOpen(); /** + * Returns whether the shade state is the keyguard or not. + */ + boolean isKeyguard(); + + /** * Returns whether the shade is currently open. * Even though in the current implementation shade is in expanded state on keyguard, this * method makes distinction between shade being truly open and plain keyguard state: diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java index 826b3ee7a92d..c71467b99961 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java @@ -154,6 +154,11 @@ public final class ShadeControllerImpl implements ShadeController { } @Override + public boolean isKeyguard() { + return mStatusBarStateController.getState() == StatusBarState.KEYGUARD; + } + + @Override public boolean isShadeFullyOpen() { return mNotificationPanelViewController.isShadeFullyExpanded(); } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt index b79f32a6eae1..b4653bef766d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt @@ -43,13 +43,13 @@ import com.android.systemui.demomode.DemoModeController import com.android.systemui.dump.DumpManager import com.android.systemui.qs.ChipVisibilityListener import com.android.systemui.qs.HeaderPrivacyIconsController -import com.android.systemui.qs.carrier.QSCarrierGroup -import com.android.systemui.qs.carrier.QSCarrierGroupController import com.android.systemui.shade.ShadeHeaderController.Companion.HEADER_TRANSITION_ID import com.android.systemui.shade.ShadeHeaderController.Companion.LARGE_SCREEN_HEADER_CONSTRAINT import com.android.systemui.shade.ShadeHeaderController.Companion.LARGE_SCREEN_HEADER_TRANSITION_ID import com.android.systemui.shade.ShadeHeaderController.Companion.QQS_HEADER_CONSTRAINT import com.android.systemui.shade.ShadeHeaderController.Companion.QS_HEADER_CONSTRAINT +import com.android.systemui.shade.carrier.ShadeCarrierGroup +import com.android.systemui.shade.carrier.ShadeCarrierGroupController import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider import com.android.systemui.statusbar.phone.StatusBarIconController import com.android.systemui.statusbar.phone.StatusBarLocation @@ -87,7 +87,7 @@ constructor( private val variableDateViewControllerFactory: VariableDateViewController.Factory, @Named(SHADE_HEADER) private val batteryMeterViewController: BatteryMeterViewController, private val dumpManager: DumpManager, - private val qsCarrierGroupControllerBuilder: QSCarrierGroupController.Builder, + private val shadeCarrierGroupControllerBuilder: ShadeCarrierGroupController.Builder, private val combinedShadeHeadersConstraintManager: CombinedShadeHeadersConstraintManager, private val demoModeController: DemoModeController, private val qsBatteryModeController: QsBatteryModeController, @@ -114,13 +114,13 @@ constructor( private lateinit var iconManager: StatusBarIconController.TintedIconManager private lateinit var carrierIconSlots: List<String> - private lateinit var qsCarrierGroupController: QSCarrierGroupController + private lateinit var mShadeCarrierGroupController: ShadeCarrierGroupController private val batteryIcon: BatteryMeterView = header.findViewById(R.id.batteryRemainingIcon) private val clock: Clock = header.findViewById(R.id.clock) private val date: TextView = header.findViewById(R.id.date) private val iconContainer: StatusIconContainer = header.findViewById(R.id.statusIcons) - private val qsCarrierGroup: QSCarrierGroup = header.findViewById(R.id.carrier_group) + private val mShadeCarrierGroup: ShadeCarrierGroup = header.findViewById(R.id.carrier_group) private var roundedCorners = 0 private var cutout: DisplayCutout? = null @@ -243,7 +243,7 @@ constructor( override fun onDensityOrFontScaleChanged() { clock.setTextAppearance(R.style.TextAppearance_QS_Status) date.setTextAppearance(R.style.TextAppearance_QS_Status) - qsCarrierGroup.updateTextAppearance(R.style.TextAppearance_QS_Status_Carriers) + mShadeCarrierGroup.updateTextAppearance(R.style.TextAppearance_QS_Status_Carriers) loadConstraints() header.minHeight = resources.getDimensionPixelSize(R.dimen.large_screen_shade_header_min_height) @@ -266,8 +266,8 @@ constructor( carrierIconSlots = listOf(header.context.getString(com.android.internal.R.string.status_bar_mobile)) - qsCarrierGroupController = - qsCarrierGroupControllerBuilder.setQSCarrierGroup(qsCarrierGroup).build() + mShadeCarrierGroupController = + shadeCarrierGroupControllerBuilder.setShadeCarrierGroup(mShadeCarrierGroup).build() privacyIconsController.onParentVisible() } @@ -284,7 +284,7 @@ constructor( v.pivotX = newPivot v.pivotY = v.height.toFloat() / 2 - qsCarrierGroup.setPaddingRelative((v.width * v.scaleX).toInt(), 0, 0, 0) + mShadeCarrierGroup.setPaddingRelative((v.width * v.scaleX).toInt(), 0, 0, 0) } dumpManager.registerDumpable(this) @@ -439,12 +439,14 @@ constructor( } private fun updateListeners() { - qsCarrierGroupController.setListening(visible) + mShadeCarrierGroupController.setListening(visible) if (visible) { - updateSingleCarrier(qsCarrierGroupController.isSingleCarrier) - qsCarrierGroupController.setOnSingleCarrierChangedListener { updateSingleCarrier(it) } + updateSingleCarrier(mShadeCarrierGroupController.isSingleCarrier) + mShadeCarrierGroupController.setOnSingleCarrierChangedListener { + updateSingleCarrier(it) + } } else { - qsCarrierGroupController.setOnSingleCarrierChangedListener(null) + mShadeCarrierGroupController.setOnSingleCarrierChangedListener(null) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt b/packages/SystemUI/src/com/android/systemui/shade/carrier/CellSignalState.kt index e925b5472c27..958230bbef99 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/CellSignalState.kt @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier +package com.android.systemui.shade.carrier /** * Represents the state of cell signal for a particular slot. * - * To be used between [QSCarrierGroupController] and [QSCarrier]. + * To be used between [ShadeCarrierGroupController] and [ShadeCarrier]. */ data class CellSignalState( @JvmField val visible: Boolean = false, @@ -37,7 +37,6 @@ data class CellSignalState( * @return `this` if `this.visible == visible`. Else, a new copy with the visibility changed. */ fun changeVisibility(visible: Boolean): CellSignalState { - if (this.visible == visible) return this - else return copy(visible = visible) + if (this.visible == visible) return this else return copy(visible = visible) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java index b5ceeaed4904..8586828af0cd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier; +package com.android.systemui.shade.carrier; import android.annotation.StyleRes; import android.content.Context; @@ -38,7 +38,7 @@ import com.android.systemui.util.LargeScreenUtils; import java.util.Objects; -public class QSCarrier extends LinearLayout { +public class ShadeCarrier extends LinearLayout { private View mMobileGroup; private TextView mCarrierText; @@ -50,19 +50,19 @@ public class QSCarrier extends LinearLayout { private boolean mMobileSignalInitialized = false; private boolean mIsSingleCarrier; - public QSCarrier(Context context) { + public ShadeCarrier(Context context) { super(context); } - public QSCarrier(Context context, AttributeSet attrs) { + public ShadeCarrier(Context context, AttributeSet attrs) { super(context, attrs); } - public QSCarrier(Context context, AttributeSet attrs, int defStyleAttr) { + public ShadeCarrier(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - public QSCarrier(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + public ShadeCarrier(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } @@ -72,7 +72,7 @@ public class QSCarrier extends LinearLayout { mMobileGroup = findViewById(R.id.mobile_combo); mMobileRoaming = findViewById(R.id.mobile_roaming); mMobileSignal = findViewById(R.id.mobile_signal); - mCarrierText = findViewById(R.id.qs_carrier_text); + mCarrierText = findViewById(R.id.shade_carrier_text); mSpacer = findViewById(R.id.spacer); updateResources(); } @@ -158,7 +158,7 @@ public class QSCarrier extends LinearLayout { mCarrierText.setMaxEms( useLargeScreenHeader ? Integer.MAX_VALUE - : getResources().getInteger(R.integer.qs_carrier_max_em) + : getResources().getInteger(R.integer.shade_carrier_max_em) ); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroup.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java index a36035b99b4f..68561d1cfd0f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroup.java +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier; +package com.android.systemui.shade.carrier; import android.annotation.StyleRes; import android.content.Context; @@ -27,10 +27,10 @@ import com.android.systemui.FontSizeUtils; import com.android.systemui.R; /** - * Displays Carrier name and network status in QS + * Displays Carrier name and network status in the shade header */ -public class QSCarrierGroup extends LinearLayout { - public QSCarrierGroup(Context context, AttributeSet attrs) { +public class ShadeCarrierGroup extends LinearLayout { + public ShadeCarrierGroup(Context context, AttributeSet attrs) { super(context, attrs); } @@ -38,24 +38,24 @@ public class QSCarrierGroup extends LinearLayout { return findViewById(R.id.no_carrier_text); } - QSCarrier getCarrier1View() { + ShadeCarrier getCarrier1View() { return findViewById(R.id.carrier1); } - QSCarrier getCarrier2View() { + ShadeCarrier getCarrier2View() { return findViewById(R.id.carrier2); } - QSCarrier getCarrier3View() { + ShadeCarrier getCarrier3View() { return findViewById(R.id.carrier3); } View getCarrierDivider1() { - return findViewById(R.id.qs_carrier_divider1); + return findViewById(R.id.shade_carrier_divider1); } View getCarrierDivider2() { - return findViewById(R.id.qs_carrier_divider2); + return findViewById(R.id.shade_carrier_divider2); } public void updateTextAppearance(@StyleRes int resId) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroupController.java index 6a8bf759a849..0ebcfa2a1876 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroupController.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier; +package com.android.systemui.shade.carrier; import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES; @@ -52,8 +52,8 @@ import java.util.function.Consumer; import javax.inject.Inject; -public class QSCarrierGroupController { - private static final String TAG = "QSCarrierGroup"; +public class ShadeCarrierGroupController { + private static final String TAG = "ShadeCarrierGroup"; /** * Support up to 3 slots which is what's supported by {@link TelephonyManager#getPhoneCount} @@ -72,7 +72,7 @@ public class QSCarrierGroupController { private final CellSignalState[] mInfos = new CellSignalState[SIM_SLOTS]; private View[] mCarrierDividers = new View[SIM_SLOTS - 1]; - private QSCarrier[] mCarrierGroups = new QSCarrier[SIM_SLOTS]; + private ShadeCarrier[] mCarrierGroups = new ShadeCarrier[SIM_SLOTS]; private int[] mLastSignalLevel = new int[SIM_SLOTS]; private String[] mLastSignalLevelDescription = new String[SIM_SLOTS]; private final CarrierConfigTracker mCarrierConfigTracker; @@ -129,7 +129,7 @@ public class QSCarrierGroupController { } } - private QSCarrierGroupController(QSCarrierGroup view, ActivityStarter activityStarter, + private ShadeCarrierGroupController(ShadeCarrierGroup view, ActivityStarter activityStarter, @Background Handler bgHandler, @Main Looper mainLooper, NetworkController networkController, CarrierTextManager.Builder carrierTextManagerBuilder, Context context, @@ -167,7 +167,7 @@ public class QSCarrierGroupController { for (int i = 0; i < SIM_SLOTS; i++) { mInfos[i] = new CellSignalState( true, - R.drawable.ic_qs_no_calling_sms, + R.drawable.ic_shade_no_calling_sms, context.getText(AccessibilityContentDescriptions.NO_CALLING).toString(), "", false); @@ -257,7 +257,7 @@ public class QSCarrierGroupController { if (singleCarrier) { for (int i = 0; i < SIM_SLOTS; i++) { if (mInfos[i].visible - && mInfos[i].mobileSignalIconId == R.drawable.ic_qs_sim_card) { + && mInfos[i].mobileSignalIconId == R.drawable.ic_shade_sim_card) { mInfos[i] = new CellSignalState(true, R.drawable.ic_blank, "", "", false); } } @@ -322,8 +322,8 @@ public class QSCarrierGroupController { Log.e(TAG, "Carrier information arrays not of same length"); } } else { - // No sims or airplane mode (but not WFC). Do not show QSCarrierGroup, instead just show - // info.carrierText in a different view. + // No sims or airplane mode (but not WFC). Do not show ShadeCarrierGroup, + // instead just show info.carrierText in a different view. for (int i = 0; i < SIM_SLOTS; i++) { mInfos[i] = mInfos[i].changeVisibility(false); mCarrierGroups[i].setCarrierText(""); @@ -368,7 +368,7 @@ public class QSCarrierGroupController { } public static class Builder { - private QSCarrierGroup mView; + private ShadeCarrierGroup mView; private final ActivityStarter mActivityStarter; private final Handler mHandler; private final Looper mLooper; @@ -393,13 +393,13 @@ public class QSCarrierGroupController { mSlotIndexResolver = slotIndexResolver; } - public Builder setQSCarrierGroup(QSCarrierGroup view) { + public Builder setShadeCarrierGroup(ShadeCarrierGroup view) { mView = view; return this; } - public QSCarrierGroupController build() { - return new QSCarrierGroupController(mView, mActivityStarter, mHandler, mLooper, + public ShadeCarrierGroupController build() { + return new ShadeCarrierGroupController(mView, mActivityStarter, mHandler, mLooper, mNetworkController, mCarrierTextControllerBuilder, mContext, mCarrierConfigTracker, mSlotIndexResolver); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index fda227795915..765c93ed209b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -869,12 +869,9 @@ public class KeyguardIndicationController { // Walk down a precedence-ordered list of what indication // should be shown based on device state if (mDozing) { + boolean useMisalignmentColor = false; mLockScreenIndicationView.setVisibility(View.GONE); mTopIndicationView.setVisibility(VISIBLE); - // When dozing we ignore any text color and use white instead, because - // colors can be hard to read in low brightness. - mTopIndicationView.setTextColor(Color.WHITE); - CharSequence newIndication; if (!TextUtils.isEmpty(mBiometricMessage)) { newIndication = mBiometricMessage; // note: doesn't show mBiometricMessageFollowUp @@ -885,8 +882,8 @@ public class KeyguardIndicationController { mIndicationArea.setVisibility(GONE); return; } else if (!TextUtils.isEmpty(mAlignmentIndication)) { + useMisalignmentColor = true; newIndication = mAlignmentIndication; - mTopIndicationView.setTextColor(mContext.getColor(R.color.misalignment_text_color)); } else if (mPowerPluggedIn || mEnableBatteryDefender) { newIndication = computePowerIndication(); } else { @@ -896,7 +893,14 @@ public class KeyguardIndicationController { if (!TextUtils.equals(mTopIndicationView.getText(), newIndication)) { mWakeLock.setAcquired(true); - mTopIndicationView.switchIndication(newIndication, null, + mTopIndicationView.switchIndication(newIndication, + new KeyguardIndication.Builder() + .setMessage(newIndication) + .setTextColor(ColorStateList.valueOf( + useMisalignmentColor + ? mContext.getColor(R.color.misalignment_text_color) + : Color.WHITE)) + .build(), true, () -> mWakeLock.setAcquired(false)); } return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java index 565c0a9426ab..34300c731343 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java @@ -38,8 +38,8 @@ import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteracto import com.android.systemui.media.controls.pipeline.MediaDataManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.qs.carrier.QSCarrierGroupController; import com.android.systemui.settings.DisplayTracker; +import com.android.systemui.shade.carrier.ShadeCarrierGroupController; import com.android.systemui.statusbar.ActionClickLogger; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.MediaArtworkProcessor; @@ -78,14 +78,14 @@ import com.android.systemui.tracing.ProtoTracer; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.time.SystemClock; +import java.util.Optional; +import java.util.concurrent.Executor; + import dagger.Binds; import dagger.Lazy; import dagger.Module; import dagger.Provides; -import java.util.Optional; -import java.util.concurrent.Executor; - /** * This module provides instances needed to construct {@link CentralSurfacesImpl}. These are moved to * this separate from {@link CentralSurfacesModule} module so that components that wish to build @@ -271,8 +271,8 @@ public interface CentralSurfacesDependenciesModule { /** */ @Binds - QSCarrierGroupController.SlotIndexResolver provideSlotIndexResolver( - QSCarrierGroupController.SubscriptionManagerSlotIndexResolver impl); + ShadeCarrierGroupController.SlotIndexResolver provideSlotIndexResolver( + ShadeCarrierGroupController.SubscriptionManagerSlotIndexResolver impl); /** */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index f7790e861e27..789873675bfa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -22,7 +22,6 @@ import static android.app.Notification.CATEGORY_EVENT; import static android.app.Notification.CATEGORY_MESSAGE; import static android.app.Notification.CATEGORY_REMINDER; import static android.app.Notification.FLAG_BUBBLE; -import static android.app.Notification.FLAG_FOREGROUND_SERVICE; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT; @@ -825,8 +824,7 @@ public final class NotificationEntry extends ListEntry { return false; } - if ((mSbn.getNotification().flags - & FLAG_FOREGROUND_SERVICE) != 0) { + if (mSbn.getNotification().isFgsOrUij()) { return true; } if (mSbn.getNotification().isMediaNotification()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java index ca762fc1ddc2..a48870ba9f45 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java @@ -630,6 +630,11 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter return false; } + if (notification.isUserInitiatedJob()) { + if (log) mLogger.logMaybeHeadsUpDespiteOldWhen(entry, when, age, "user initiated job"); + return false; + } + if (log) mLogger.logNoHeadsUpOldWhen(entry, when, age); final int uid = entry.getSbn().getUid(); final String packageName = entry.getSbn().getPackageName(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapper.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapper.kt new file mode 100644 index 000000000000..f2216fce6fef --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapper.kt @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.notification.interruption + +import com.android.internal.annotations.VisibleForTesting +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND +import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider.Decision +import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider.FullScreenIntentDecision + +/** + * Wraps a [NotificationInterruptStateProvider] to convert it to the new + * [VisualInterruptionDecisionProvider] interface. + */ +@SysUISingleton +class NotificationInterruptStateProviderWrapper( + private val wrapped: NotificationInterruptStateProvider +) : VisualInterruptionDecisionProvider { + + @VisibleForTesting + enum class DecisionImpl(override val shouldInterrupt: Boolean) : Decision { + SHOULD_INTERRUPT(shouldInterrupt = true), + SHOULD_NOT_INTERRUPT(shouldInterrupt = false); + + companion object { + fun of(booleanDecision: Boolean) = + if (booleanDecision) SHOULD_INTERRUPT else SHOULD_NOT_INTERRUPT + } + } + + @VisibleForTesting + class FullScreenIntentDecisionImpl( + val originalEntry: NotificationEntry, + val originalDecision: NotificationInterruptStateProvider.FullScreenIntentDecision + ) : FullScreenIntentDecision { + override val shouldInterrupt = originalDecision.shouldLaunch + override val wouldInterruptWithoutDnd = originalDecision == NO_FSI_SUPPRESSED_ONLY_BY_DND + } + + override fun addSuppressor(suppressor: NotificationInterruptSuppressor) { + wrapped.addSuppressor(suppressor) + } + + override fun makeUnloggedHeadsUpDecision(entry: NotificationEntry): Decision = + wrapped.checkHeadsUp(entry, /* log= */ false).let { DecisionImpl.of(it) } + + override fun makeAndLogHeadsUpDecision(entry: NotificationEntry): Decision = + wrapped.checkHeadsUp(entry, /* log= */ true).let { DecisionImpl.of(it) } + + override fun makeUnloggedFullScreenIntentDecision(entry: NotificationEntry) = + wrapped.getFullScreenIntentDecision(entry).let { FullScreenIntentDecisionImpl(entry, it) } + + override fun logFullScreenIntentDecision(decision: FullScreenIntentDecision) { + (decision as FullScreenIntentDecisionImpl).let { + wrapped.logFullScreenIntentDecision(it.originalEntry, it.originalDecision) + } + } + + override fun makeAndLogBubbleDecision(entry: NotificationEntry): Decision = + wrapped.shouldBubbleUp(entry).let { DecisionImpl.of(it) } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProvider.kt new file mode 100644 index 000000000000..c0f4fcda56bb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProvider.kt @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.notification.interruption + +import com.android.systemui.statusbar.notification.collection.NotificationEntry + +/** + * Decides whether a notification should visually interrupt the user in various ways. + * + * These include displaying the notification as heads-up (peeking while the device is awake or + * pulsing while the device is dozing), displaying the notification as a bubble, and launching a + * full-screen intent for the notification. + */ +interface VisualInterruptionDecisionProvider { + /** + * Represents the decision to visually interrupt or not. + * + * Used for heads-up and bubble decisions; subclassed by [FullScreenIntentDecision] for + * full-screen intent decisions. + * + * @property[shouldInterrupt] whether a visual interruption should be triggered + */ + interface Decision { + val shouldInterrupt: Boolean + } + + /** + * Represents the decision to launch a full-screen intent for a notification or not. + * + * @property[wouldInterruptWithoutDnd] whether a full-screen intent should not be launched only + * because Do Not Disturb has suppressed it + */ + interface FullScreenIntentDecision : Decision { + val wouldInterruptWithoutDnd: Boolean + } + + /** + * Adds a [component][suppressor] that can suppress visual interruptions. + * + * This class may call suppressors in any order. + * + * @param[suppressor] the suppressor to add + */ + fun addSuppressor(suppressor: NotificationInterruptSuppressor) + + /** + * Decides whether a [notification][entry] should display as heads-up or not, but does not log + * that decision. + * + * @param[entry] the notification that this decision is about + * @return the decision to display that notification as heads-up or not + */ + fun makeUnloggedHeadsUpDecision(entry: NotificationEntry): Decision + + /** + * Decides whether a [notification][entry] should display as heads-up or not, and logs that + * decision. + * + * If the device is awake, the decision will consider whether the notification should "peek" + * (slide in from the top of the screen over the current activity). + * + * If the device is dozing, the decision will consider whether the notification should "pulse" + * (wake the screen up and display the ambient view of the notification). + * + * @see[makeUnloggedHeadsUpDecision] + * + * @param[entry] the notification that this decision is about + * @return the decision to display that notification as heads-up or not + */ + fun makeAndLogHeadsUpDecision(entry: NotificationEntry): Decision + + /** + * Decides whether a [notification][entry] should launch a full-screen intent or not, but does + * not log that decision. + * + * The returned decision can be logged by passing it to [logFullScreenIntentDecision]. + * + * @see[makeAndLogHeadsUpDecision] + * + * @param[entry] the notification that this decision is about + * @return the decision to launch a full-screen intent for that notification or not + */ + fun makeUnloggedFullScreenIntentDecision(entry: NotificationEntry): FullScreenIntentDecision + + /** + * Logs a previous [decision] to launch a full-screen intent or not. + * + * @param[decision] the decision to log + */ + fun logFullScreenIntentDecision(decision: FullScreenIntentDecision) + + /** + * Decides whether a [notification][entry] should display as a bubble or not. + * + * @param[entry] the notification that this decision is about + * @return the decision to display that notification as a bubble or not + */ + fun makeAndLogBubbleDecision(entry: NotificationEntry): Decision +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index cf5ecdddf854..6742e4f3041e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -163,7 +163,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp private PendingAuthenticated mPendingAuthenticated = null; private boolean mHasScreenTurnedOnSinceAuthenticating; private boolean mFadedAwayAfterWakeAndUnlock; - private Set<BiometricModeListener> mBiometricModeListeners = new HashSet<>(); + private Set<BiometricUnlockEventsListener> mBiometricUnlockEventsListeners = new HashSet<>(); private final MetricsLogger mMetricsLogger; private final AuthController mAuthController; @@ -314,14 +314,14 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp mKeyguardViewController = keyguardViewController; } - /** Adds a {@link BiometricModeListener}. */ - public void addBiometricModeListener(BiometricModeListener listener) { - mBiometricModeListeners.add(listener); + /** Adds a {@link BiometricUnlockEventsListener}. */ + public void addListener(BiometricUnlockEventsListener listener) { + mBiometricUnlockEventsListeners.add(listener); } - /** Removes a {@link BiometricModeListener}. */ - public void removeBiometricModeListener(BiometricModeListener listener) { - mBiometricModeListeners.remove(listener); + /** Removes a {@link BiometricUnlockEventsListener}. */ + public void removeListener(BiometricUnlockEventsListener listener) { + mBiometricUnlockEventsListeners.remove(listener); } private final Runnable mReleaseBiometricWakeLockRunnable = new Runnable() { @@ -387,7 +387,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp @Override public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType, boolean isStrongBiometric) { - Trace.beginSection("BiometricUnlockController#onBiometricAuthenticated"); + Trace.beginSection("BiometricUnlockController#onBiometricUnlocked"); if (mUpdateMonitor.isGoingToSleep()) { mLogger.deferringAuthenticationDueToSleep(userId, biometricSourceType, @@ -411,10 +411,15 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp mKeyguardViewMediator.userActivity(); startWakeAndUnlock(biometricSourceType, isStrongBiometric); } else { - mLogger.d("onBiometricAuthenticated aborted by bypass controller"); + mLogger.d("onBiometricUnlocked aborted by bypass controller"); } } + /** + * Wake and unlock the device in response to successful authentication using biometrics. + * @param biometricSourceType Biometric source that was used to authenticate. + * @param isStrongBiometric + */ public void startWakeAndUnlock(BiometricSourceType biometricSourceType, boolean isStrongBiometric) { int mode = calculateMode(biometricSourceType, isStrongBiometric); @@ -422,6 +427,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp || mode == MODE_WAKE_AND_UNLOCK_PULSING || mode == MODE_UNLOCK_COLLAPSING || mode == MODE_WAKE_AND_UNLOCK_FROM_DREAM || mode == MODE_DISMISS_BOUNCER) { vibrateSuccess(biometricSourceType); + onBiometricUnlockedWithKeyguardDismissal(biometricSourceType); } startWakeAndUnlock(mode); } @@ -502,11 +508,17 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp } private void onModeChanged(@WakeAndUnlockMode int mode) { - for (BiometricModeListener listener : mBiometricModeListeners) { + for (BiometricUnlockEventsListener listener : mBiometricUnlockEventsListeners) { listener.onModeChanged(mode); } } + private void onBiometricUnlockedWithKeyguardDismissal(BiometricSourceType biometricSourceType) { + for (BiometricUnlockEventsListener listener : mBiometricUnlockEventsListeners) { + listener.onBiometricUnlockedWithKeyguardDismissal(biometricSourceType); + } + } + public boolean hasPendingAuthentication() { return mPendingAuthenticated != null && mUpdateMonitor @@ -777,7 +789,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp mMode = MODE_NONE; mBiometricType = null; mNotificationShadeWindowController.setForceDozeBrightness(false); - for (BiometricModeListener listener : mBiometricModeListeners) { + for (BiometricUnlockEventsListener listener : mBiometricUnlockEventsListeners) { listener.onResetMode(); } mNumConsecutiveFpFailures = 0; @@ -895,10 +907,17 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp } /** An interface to interact with the {@link BiometricUnlockController}. */ - public interface BiometricModeListener { + public interface BiometricUnlockEventsListener { /** Called when {@code mMode} is reset to {@link #MODE_NONE}. */ default void onResetMode() {} /** Called when {@code mMode} has changed in {@link #startWakeAndUnlock(int)}. */ default void onModeChanged(@WakeAndUnlockMode int mode) {} + + /** + * Called when the device is unlocked successfully using biometrics with the keyguard also + * being dismissed. + */ + default void onBiometricUnlockedWithKeyguardDismissal( + BiometricSourceType biometricSourceType) { } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index aabe0cb9794c..0c8e9e56b04a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -1675,8 +1675,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mStatusBarStateController.addCallback(mStateListener, SysuiStatusBarStateController.RANK_STATUS_BAR); mBiometricUnlockController = mBiometricUnlockControllerLazy.get(); - mBiometricUnlockController.addBiometricModeListener( - new BiometricUnlockController.BiometricModeListener() { + mBiometricUnlockController.addListener( + new BiometricUnlockController.BiometricUnlockEventsListener() { @Override public void onResetMode() { setWakeAndUnlocking(false); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt index e4227dce94e7..d433814d7ce4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt @@ -29,6 +29,7 @@ import com.android.systemui.R import com.android.systemui.keyguard.ui.binder.KeyguardBottomAreaViewBinder import com.android.systemui.keyguard.ui.binder.KeyguardBottomAreaViewBinder.bind import com.android.systemui.keyguard.ui.viewmodel.KeyguardBottomAreaViewModel +import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager import com.android.systemui.statusbar.VibratorHelper @@ -57,7 +58,7 @@ constructor( } private var ambientIndicationArea: View? = null - private lateinit var binding: KeyguardBottomAreaViewBinder.Binding + private var binding: KeyguardBottomAreaViewBinder.Binding? = null private var lockIconViewController: LockIconViewController? = null /** Initializes the view. */ @@ -67,13 +68,16 @@ constructor( lockIconViewController: LockIconViewController? = null, messageDisplayer: MessageDisplayer? = null, vibratorHelper: VibratorHelper? = null, + activityStarter: ActivityStarter? = null, ) { + binding?.destroy() binding = bind( this, viewModel, falsingManager, vibratorHelper, + activityStarter, ) { messageDisplayer?.display(it) } @@ -114,12 +118,12 @@ constructor( override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - binding.onConfigurationChanged() + binding?.onConfigurationChanged() } /** Returns a list of animators to use to animate the indication areas. */ val indicationAreaAnimators: List<ViewPropertyAnimator> - get() = binding.getIndicationAreaAnimators() + get() = checkNotNull(binding).getIndicationAreaAnimators() override fun hasOverlappingRendering(): Boolean { return false @@ -139,7 +143,7 @@ constructor( super.onLayout(changed, left, top, right, bottom) findViewById<View>(R.id.ambient_indication_container)?.let { val (ambientLeft, ambientTop) = it.locationOnScreen - if (binding.shouldConstrainToTopOfLockIcon()) { + if (binding?.shouldConstrainToTopOfLockIcon() == true) { // make top of ambient indication view the bottom of the lock icon it.layout( ambientLeft, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt index b3031515ae9d..c8174669cc65 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt @@ -85,17 +85,16 @@ class ScreenOffAnimationController @Inject constructor( /** * Called when keyguard is about to be displayed and allows to perform custom animation - * - * @return A handle that can be used for cancelling the animation, if necessary */ - fun animateInKeyguard(keyguardView: View, after: Runnable): AnimatorHandle? { - animations.forEach { + fun animateInKeyguard(keyguardView: View, after: Runnable) = + animations.firstOrNull { if (it.shouldAnimateInKeyguard()) { - return@animateInKeyguard it.animateInKeyguard(keyguardView, after) + it.animateInKeyguard(keyguardView, after) + true + } else { + false } } - return null - } /** * If returns true it will disable propagating touches to apps and keyguard @@ -212,10 +211,7 @@ interface ScreenOffAnimation { fun onAlwaysOnChanged(alwaysOn: Boolean) {} fun shouldAnimateInKeyguard(): Boolean = false - fun animateInKeyguard(keyguardView: View, after: Runnable): AnimatorHandle? { - after.run() - return null - } + fun animateInKeyguard(keyguardView: View, after: Runnable) = after.run() fun shouldDelayKeyguardShow(): Boolean = false fun isKeyguardShowDelayed(): Boolean = false @@ -228,7 +224,3 @@ interface ScreenOffAnimation { fun shouldAnimateDozingChange(): Boolean = true fun shouldAnimateClockChange(): Boolean = true } - -interface AnimatorHandle { - fun cancel() -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 46603df955d7..d3aa4bf33d04 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -405,6 +405,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump if (mKeyguardStateController.isKeyguardFadingAway()) { mStatusBarKeyguardViewManager.onKeyguardFadedAway(); } + dispatchScrimsVisible(); } }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 30d2295206d8..a8a834f1e8f4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -558,8 +558,10 @@ public interface StatusBarIconController { mGroup.addView(view, index, onCreateLayoutParams()); if (mIsInDemoMode) { + Context mobileContext = mMobileContextProvider + .getMobileContextForSub(subId, mContext); mDemoStatusIcons.addModernMobileView( - mContext, + mobileContext, mMobileIconsViewModel.getLogger(), subId); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java index edfc95fcc2e7..c623201b2a6b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java @@ -618,9 +618,6 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte if ((flags & Notification.FLAG_AUTO_CANCEL) != Notification.FLAG_AUTO_CANCEL) { return false; } - if ((flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) { - return false; - } return true; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index de7bf3c021dd..d731f8886536 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -230,7 +230,7 @@ public class StatusBarSignalPolicy implements SignalCallback, if (state == null) { return; } - if (statusIcon.icon == R.drawable.ic_qs_no_calling_sms) { + if (statusIcon.icon == R.drawable.ic_shade_no_calling_sms) { state.isNoCalling = statusIcon.visible; state.noCallingDescription = statusIcon.contentDescription; } else { @@ -422,7 +422,7 @@ public class StatusBarSignalPolicy implements SignalCallback, private CallIndicatorIconState(int subId) { this.subId = subId; - this.noCallingResId = R.drawable.ic_qs_no_calling_sms; + this.noCallingResId = R.drawable.ic_shade_no_calling_sms; this.callStrengthResId = TelephonyIcons.MOBILE_CALL_STRENGTH_ICONS[0]; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java index 50cce45cd87a..6dc8065b2822 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java @@ -16,6 +16,12 @@ package com.android.systemui.statusbar.phone; public interface StatusBarWindowCallback { - void onStateChanged(boolean keyguardShowing, boolean keyguardOccluded, boolean bouncerShowing, - boolean isDozing, boolean panelExpanded, boolean isDreaming); + /** + * Invoked when the internal state of NotificationShadeWindowControllerImpl changes. + * Some of the flags passed as argument to the callback might have changed, but this is not + * guaranteed. + */ + void onStateChanged(boolean keyguardShowing, boolean keyguardOccluded, + boolean keyguardGoingAway, boolean bouncerShowing, boolean isDozing, + boolean panelExpanded, boolean isDreaming); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt index deb041454da4..118bfc55dd4c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt @@ -160,7 +160,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( * Animates in the provided keyguard view, ending in the same position that it will be in on * AOD. */ - override fun animateInKeyguard(keyguardView: View, after: Runnable): AnimatorHandle { + override fun animateInKeyguard(keyguardView: View, after: Runnable) { shouldAnimateInKeyguard = false keyguardView.alpha = 0f keyguardView.visibility = View.VISIBLE @@ -175,36 +175,11 @@ class UnlockedScreenOffAnimationController @Inject constructor( // We animate the Y properly separately using the PropertyAnimator, as the panel // view also needs to update the end position. PropertyAnimator.cancelAnimation(keyguardView, AnimatableProperty.Y) + PropertyAnimator.setProperty<View>(keyguardView, AnimatableProperty.Y, currentY, + AnimationProperties().setDuration(duration.toLong()), + true /* animate */) - // Start the animation on the next frame using Choreographer APIs. animateInKeyguard() is - // called while the system is busy processing lots of requests, so delaying the animation a - // frame will mitigate jank. In the event the animation is cancelled before the next frame - // is called, this callback will be removed - val keyguardAnimator = keyguardView.animate() - val nextFrameCallback = TraceUtils.namedRunnable("startAnimateInKeyguard") { - PropertyAnimator.setProperty(keyguardView, AnimatableProperty.Y, currentY, - AnimationProperties().setDuration(duration.toLong()), - true /* animate */) - keyguardAnimator.start() - } - DejankUtils.postAfterTraversal(nextFrameCallback) - val animatorHandle = object : AnimatorHandle { - private var hasCancelled = false - override fun cancel() { - if (!hasCancelled) { - DejankUtils.removeCallbacks(nextFrameCallback) - // If we're cancelled, reset state flags/listeners. The end action above - // will not be called, which is what we want since that will finish the - // screen off animation and show the lockscreen, which we don't want if we - // were cancelled. - aodUiAnimationPlaying = false - decidedToAnimateGoingToSleep = null - keyguardView.animate().setListener(null) - hasCancelled = true - } - } - } - keyguardAnimator + keyguardView.animate() .setDuration(duration.toLong()) .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .alpha(1f) @@ -230,7 +205,14 @@ class UnlockedScreenOffAnimationController @Inject constructor( } .setListener(object : AnimatorListenerAdapter() { override fun onAnimationCancel(animation: Animator?) { - animatorHandle.cancel() + // If we're cancelled, reset state flags/listeners. The end action above + // will not be called, which is what we want since that will finish the + // screen off animation and show the lockscreen, which we don't want if we + // were cancelled. + aodUiAnimationPlaying = false + decidedToAnimateGoingToSleep = null + keyguardView.animate().setListener(null) + interactionJankMonitor.cancel(CUJ_SCREEN_OFF_SHOW_AOD) } @@ -240,7 +222,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( CUJ_SCREEN_OFF_SHOW_AOD) } }) - return animatorHandle + .start() } override fun onStartedWakingUp() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt index dfa68383bd03..c73cc9efe85c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt @@ -18,10 +18,10 @@ package com.android.systemui.statusbar.phone.ongoingcall import android.app.ActivityManager import android.app.IActivityManager -import android.app.IUidObserver import android.app.Notification import android.app.Notification.CallStyle.CALL_TYPE_ONGOING import android.app.PendingIntent +import android.app.UidObserver import android.content.Context import android.util.Log import android.view.View @@ -319,7 +319,7 @@ class OngoingCallController @Inject constructor( } /** Our implementation of a [IUidObserver]. */ - inner class CallAppUidObserver : IUidObserver.Stub() { + inner class CallAppUidObserver : UidObserver() { /** True if the application managing the call is visible to the user. */ var isCallAppVisible: Boolean = false private set @@ -387,12 +387,6 @@ class OngoingCallController @Inject constructor( } } } - - override fun onUidGone(uid: Int, disabled: Boolean) {} - override fun onUidActive(uid: Int) {} - override fun onUidIdle(uid: Int, disabled: Boolean) {} - override fun onUidCachedChanged(uid: Int, cached: Boolean) {} - override fun onUidProcAdjChanged(uid: Int) {} } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt index 90c32dc08045..3a11635f75c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt @@ -40,6 +40,9 @@ interface MobileConnectionRepository { /** The subscriptionId that this connection represents */ val subId: Int + /** The carrierId for this connection. See [TelephonyManager.getSimCarrierId] */ + val carrierId: StateFlow<Int> + /** * The table log buffer created for this connection. Will have the name "MobileConnectionLog * [subId]" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionsRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionsRepository.kt index fa712872eb13..ea77163f0556 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionsRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionsRepository.kt @@ -60,6 +60,13 @@ interface MobileConnectionsRepository { */ val mobileIsDefault: StateFlow<Boolean> + /** + * True if the device currently has a carrier merged connection. + * + * See [CarrierMergedConnectionRepository] for more info. + */ + val hasCarrierMergedConnection: Flow<Boolean> + /** True if the default network connection is validated and false otherwise. */ val defaultConnectionIsValidated: StateFlow<Boolean> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcher.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcher.kt index 44b5b3fa2591..eb20bba0d21f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcher.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcher.kt @@ -159,6 +159,15 @@ constructor( .flatMapLatest { it.mobileIsDefault } .stateIn(scope, SharingStarted.WhileSubscribed(), realRepository.mobileIsDefault.value) + override val hasCarrierMergedConnection: StateFlow<Boolean> = + activeRepo + .flatMapLatest { it.hasCarrierMergedConnection } + .stateIn( + scope, + SharingStarted.WhileSubscribed(), + realRepository.hasCarrierMergedConnection.value, + ) + override val defaultConnectionIsValidated: StateFlow<Boolean> = activeRepo .flatMapLatest { it.defaultConnectionIsValidated } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt index 809772eec2f0..6b86432b8171 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository.demo import android.telephony.CellSignalStrength +import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID import android.telephony.TelephonyManager import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.log.table.logDiffsForTable @@ -25,6 +26,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameMode import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository import com.android.systemui.statusbar.pipeline.mobile.data.repository.demo.model.FakeNetworkEventModel +import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Companion.COL_CARRIER_ID import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Companion.COL_CARRIER_NETWORK_CHANGE import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Companion.COL_CDMA_LEVEL import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Companion.COL_EMERGENCY @@ -52,6 +54,17 @@ class DemoMobileConnectionRepository( override val tableLogBuffer: TableLogBuffer, val scope: CoroutineScope, ) : MobileConnectionRepository { + private val _carrierId = MutableStateFlow(INVALID_SUBSCRIPTION_ID) + override val carrierId = + _carrierId + .logDiffsForTable( + tableLogBuffer, + columnPrefix = "", + columnName = COL_CARRIER_ID, + _carrierId.value, + ) + .stateIn(scope, SharingStarted.WhileSubscribed(), _carrierId.value) + private val _isEmergencyOnly = MutableStateFlow(false) override val isEmergencyOnly = _isEmergencyOnly @@ -186,6 +199,8 @@ class DemoMobileConnectionRepository( dataEnabled.value = true networkName.value = NetworkNameModel.IntentDerived(event.name) + _carrierId.value = event.carrierId ?: INVALID_SUBSCRIPTION_ID + cdmaRoaming.value = event.roaming _isRoaming.value = event.roaming // TODO(b/261029387): not yet supported @@ -208,6 +223,8 @@ class DemoMobileConnectionRepository( // This is always true here, because we split out disabled states at the data-source level dataEnabled.value = true networkName.value = NetworkNameModel.IntentDerived(CARRIER_MERGED_NAME) + // TODO(b/276943904): is carrierId a thing with carrier merged networks? + _carrierId.value = INVALID_SUBSCRIPTION_ID numberOfLevels.value = event.numberOfLevels cdmaRoaming.value = false _primaryLevel.value = event.level diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt index 737bc6826d08..0e4ceebcc854 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt @@ -160,6 +160,9 @@ constructor( override val mobileIsDefault: StateFlow<Boolean> = MutableStateFlow(true) // TODO(b/261029387): not yet supported + override val hasCarrierMergedConnection = MutableStateFlow(false) + + // TODO(b/261029387): not yet supported override val defaultConnectionIsValidated: StateFlow<Boolean> = MutableStateFlow(true) override fun getRepoForSubId(subId: Int): DemoMobileConnectionRepository { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt index 94d6d0b1db44..a609917351d9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository.prod import android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN +import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID import android.telephony.TelephonyManager import android.util.Log import com.android.systemui.dagger.SysUISingleton @@ -157,6 +158,7 @@ class CarrierMergedConnectionRepository( .stateIn(scope, SharingStarted.WhileSubscribed(), DataConnectionState.Disconnected) override val isRoaming = MutableStateFlow(false).asStateFlow() + override val carrierId = MutableStateFlow(INVALID_SUBSCRIPTION_ID).asStateFlow() override val isEmergencyOnly = MutableStateFlow(false).asStateFlow() override val operatorAlphaShort = MutableStateFlow(null).asStateFlow() override val isInService = MutableStateFlow(true).asStateFlow() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt index b3737ecd1e0b..8869dfe02697 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt @@ -109,6 +109,11 @@ class FullMobileConnectionRepository( .stateIn(scope, SharingStarted.WhileSubscribed(), initial) } + override val carrierId = + activeRepo + .flatMapLatest { it.carrierId } + .stateIn(scope, SharingStarted.WhileSubscribed(), activeRepo.value.carrierId.value) + override val cdmaRoaming = activeRepo .flatMapLatest { it.cdmaRoaming } @@ -321,13 +326,14 @@ class FullMobileConnectionRepository( } companion object { + const val COL_CARRIER_ID = "carrierId" + const val COL_CARRIER_NETWORK_CHANGE = "carrierNetworkChangeActive" + const val COL_CDMA_LEVEL = "cdmaLevel" const val COL_EMERGENCY = "emergencyOnly" - const val COL_ROAMING = "roaming" - const val COL_OPERATOR = "operatorName" - const val COL_IS_IN_SERVICE = "isInService" const val COL_IS_GSM = "isGsm" - const val COL_CDMA_LEVEL = "cdmaLevel" + const val COL_IS_IN_SERVICE = "isInService" + const val COL_OPERATOR = "operatorName" const val COL_PRIMARY_LEVEL = "primaryLevel" - const val COL_CARRIER_NETWORK_CHANGE = "carrierNetworkChangeActive" + const val COL_ROAMING = "roaming" } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt index d0c6215a55d8..b475183d98c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository.prod -import android.content.Context +import android.content.Intent import android.content.IntentFilter import android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN import android.telephony.CellSignalStrengthCdma @@ -31,6 +31,7 @@ import android.telephony.TelephonyManager.ERI_FLASH import android.telephony.TelephonyManager.ERI_ON import android.telephony.TelephonyManager.EXTRA_SUBSCRIPTION_ID import android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN +import android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID import com.android.settingslib.Utils import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.qualifiers.Application @@ -65,6 +66,7 @@ import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.scan import kotlinx.coroutines.flow.stateIn @@ -75,7 +77,6 @@ import kotlinx.coroutines.flow.stateIn @Suppress("EXPERIMENTAL_IS_NOT_ENABLED") @OptIn(ExperimentalCoroutinesApi::class) class MobileConnectionRepositoryImpl( - private val context: Context, override val subId: Int, defaultNetworkName: NetworkNameModel, networkNameSeparator: String, @@ -293,6 +294,23 @@ class MobileConnectionRepositoryImpl( } .stateIn(scope, SharingStarted.WhileSubscribed(), false) + override val carrierId = + broadcastDispatcher + .broadcastFlow( + filter = + IntentFilter(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED), + map = { intent, _ -> intent }, + ) + .filter { intent -> + intent.getIntExtra(EXTRA_SUBSCRIPTION_ID, INVALID_SUBSCRIPTION_ID) == subId + } + .map { it.carrierId() } + .onStart { + // Make sure we get the initial carrierId + emit(telephonyManager.simCarrierId) + } + .stateIn(scope, SharingStarted.WhileSubscribed(), telephonyManager.simCarrierId) + override val networkName: StateFlow<NetworkNameModel> = broadcastDispatcher .broadcastFlow( @@ -317,7 +335,6 @@ class MobileConnectionRepositoryImpl( @Inject constructor( private val broadcastDispatcher: BroadcastDispatcher, - private val context: Context, private val telephonyManager: TelephonyManager, private val logger: MobileInputLogger, private val carrierConfigRepository: CarrierConfigRepository, @@ -332,7 +349,6 @@ class MobileConnectionRepositoryImpl( networkNameSeparator: String, ): MobileConnectionRepository { return MobileConnectionRepositoryImpl( - context, subId, defaultNetworkName, networkNameSeparator, @@ -349,6 +365,9 @@ class MobileConnectionRepositoryImpl( } } +private fun Intent.carrierId(): Int = + getIntExtra(TelephonyManager.EXTRA_CARRIER_ID, UNKNOWN_CARRIER_ID) + /** * Wrap every [TelephonyCallback] we care about in a data class so we can accept them in a single * shared flow and then split them back out into other flows. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt index 45d50c103909..0e9b6c56437e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt @@ -59,6 +59,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map @@ -257,18 +258,32 @@ constructor( override val mobileIsDefault: StateFlow<Boolean> = connectivityRepository.defaultConnections - // Because carrier merged networks are displayed as mobile networks, they're - // part of the `isDefault` calculation. See b/272586234. - .map { it.mobile.isDefault || it.carrierMerged.isDefault } + .map { it.mobile.isDefault } .distinctUntilChanged() .logDiffsForTable( tableLogger, - columnPrefix = "", + columnPrefix = LOGGING_PREFIX, columnName = "mobileIsDefault", initialValue = false, ) .stateIn(scope, SharingStarted.WhileSubscribed(), false) + override val hasCarrierMergedConnection: StateFlow<Boolean> = + combine( + connectivityRepository.defaultConnections, + carrierMergedSubId, + ) { defaultConnections, carrierMergedSubId -> + defaultConnections.carrierMerged.isDefault || carrierMergedSubId != null + } + .distinctUntilChanged() + .logDiffsForTable( + tableLogger, + columnPrefix = LOGGING_PREFIX, + columnName = "hasCarrierMergedConnection", + initialValue = false, + ) + .stateIn(scope, SharingStarted.WhileSubscribed(), false) + override val defaultConnectionIsValidated: StateFlow<Boolean> = connectivityRepository.defaultConnections .map { it.isValidated } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt index 22351f8b2821..b36ba3845fe9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt @@ -16,15 +16,21 @@ package com.android.systemui.statusbar.pipeline.mobile.domain.interactor +import android.content.Context import android.telephony.CarrierConfigManager import com.android.settingslib.SignalIcon.MobileIconGroup -import com.android.settingslib.mobile.TelephonyIcons.NOT_DEFAULT_DATA +import com.android.settingslib.mobile.MobileIconCarrierIdOverrides +import com.android.settingslib.mobile.MobileIconCarrierIdOverridesImpl import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.log.table.TableLogBuffer +import com.android.systemui.log.table.logDiffsForTable import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Connected import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel.DefaultIcon +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel.OverriddenIcon import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -34,8 +40,6 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.mapLatest -import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn interface MobileIconInteractor { @@ -76,7 +80,7 @@ interface MobileIconInteractor { val alwaysUseCdmaLevel: StateFlow<Boolean> /** Observable for RAT type (network type) indicator */ - val networkTypeIconGroup: StateFlow<MobileIconGroup> + val networkTypeIconGroup: StateFlow<NetworkTypeIconModel> /** * Provider name for this network connection. The name can be one of 3 values: @@ -119,10 +123,11 @@ class MobileIconInteractorImpl( override val mobileIsDefault: StateFlow<Boolean>, defaultMobileIconMapping: StateFlow<Map<String, MobileIconGroup>>, defaultMobileIconGroup: StateFlow<MobileIconGroup>, - defaultDataSubId: StateFlow<Int>, override val isDefaultConnectionFailed: StateFlow<Boolean>, override val isForceHidden: Flow<Boolean>, connectionRepository: MobileConnectionRepository, + private val context: Context, + val carrierIdOverrides: MobileIconCarrierIdOverrides = MobileIconCarrierIdOverridesImpl() ) : MobileIconInteractor { override val tableLogBuffer: TableLogBuffer = connectionRepository.tableLogBuffer @@ -130,14 +135,14 @@ class MobileIconInteractorImpl( override val isDataEnabled: StateFlow<Boolean> = connectionRepository.dataEnabled - private val isDefault = - defaultDataSubId - .mapLatest { connectionRepository.subId == it } - .stateIn( - scope, - SharingStarted.WhileSubscribed(), - connectionRepository.subId == defaultDataSubId.value - ) + // True if there exists _any_ icon override for this carrierId. Note that overrides can include + // any or none of the icon groups defined in MobileMappings, so we still need to check on a + // per-network-type basis whether or not the given icon group is overridden + private val carrierIdIconOverrideExists = + connectionRepository.carrierId + .map { carrierIdOverrides.carrierIdEntryExists(it) } + .distinctUntilChanged() + .stateIn(scope, SharingStarted.WhileSubscribed(), false) override val isDefaultDataEnabled = defaultSubscriptionHasDataEnabled @@ -157,36 +162,57 @@ class MobileIconInteractorImpl( connectionRepository.networkName.value ) - /** Observable for the current RAT indicator icon ([MobileIconGroup]) */ - override val networkTypeIconGroup: StateFlow<MobileIconGroup> = + /** What the mobile icon would be before carrierId overrides */ + private val defaultNetworkType: StateFlow<MobileIconGroup> = combine( connectionRepository.resolvedNetworkType, defaultMobileIconMapping, defaultMobileIconGroup, - isDefault, - ) { resolvedNetworkType, mapping, defaultGroup, isDefault -> - if (!isDefault) { - return@combine NOT_DEFAULT_DATA - } - + ) { resolvedNetworkType, mapping, defaultGroup -> when (resolvedNetworkType) { is ResolvedNetworkType.CarrierMergedNetworkType -> resolvedNetworkType.iconGroupOverride - else -> mapping[resolvedNetworkType.lookupKey] ?: defaultGroup + else -> { + mapping[resolvedNetworkType.lookupKey] ?: defaultGroup + } } } - .distinctUntilChanged() - .onEach { - // Doesn't use [logDiffsForTable] because [MobileIconGroup] can't implement the - // [Diffable] interface. - tableLogBuffer.logChange( - prefix = "", - columnName = "networkTypeIcon", - value = it.name - ) - } .stateIn(scope, SharingStarted.WhileSubscribed(), defaultMobileIconGroup.value) + override val networkTypeIconGroup = + combine( + defaultNetworkType, + carrierIdIconOverrideExists, + ) { networkType, overrideExists -> + // DefaultIcon comes out of the icongroup lookup, we check for overrides here + if (overrideExists) { + val iconOverride = + carrierIdOverrides.getOverrideFor( + connectionRepository.carrierId.value, + networkType.name, + context.resources, + ) + if (iconOverride > 0) { + OverriddenIcon(networkType, iconOverride) + } else { + DefaultIcon(networkType) + } + } else { + DefaultIcon(networkType) + } + } + .distinctUntilChanged() + .logDiffsForTable( + tableLogBuffer = tableLogBuffer, + columnPrefix = "", + initialValue = DefaultIcon(defaultMobileIconGroup.value), + ) + .stateIn( + scope, + SharingStarted.WhileSubscribed(), + DefaultIcon(defaultMobileIconGroup.value), + ) + override val isEmergencyOnly = connectionRepository.isEmergencyOnly override val isRoaming: StateFlow<Boolean> = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt index 6c8310ac3d29..eec91a0bca82 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.pipeline.mobile.domain.interactor +import android.content.Context import android.telephony.CarrierConfigManager import android.telephony.SubscriptionManager import com.android.settingslib.SignalIcon.MobileIconGroup @@ -75,9 +76,6 @@ interface MobileIconsInteractor { /** True if the CDMA level should be preferred over the primary level. */ val alwaysUseCdmaLevel: StateFlow<Boolean> - /** Tracks the subscriptionId set as the default for data connections */ - val defaultDataSubId: StateFlow<Int> - /** The icon mapping from network type to [MobileIconGroup] for the default subscription */ val defaultMobileIconMapping: StateFlow<Map<String, MobileIconGroup>> @@ -112,9 +110,25 @@ constructor( connectivityRepository: ConnectivityRepository, userSetupRepo: UserSetupRepository, @Application private val scope: CoroutineScope, + private val context: Context, ) : MobileIconsInteractor { - override val mobileIsDefault = mobileConnectionsRepo.mobileIsDefault + override val mobileIsDefault = + combine( + mobileConnectionsRepo.mobileIsDefault, + mobileConnectionsRepo.hasCarrierMergedConnection, + ) { mobileIsDefault, hasCarrierMergedConnection -> + // Because carrier merged networks are displayed as mobile networks, they're part of + // the `isDefault` calculation. See b/272586234. + mobileIsDefault || hasCarrierMergedConnection + } + .logDiffsForTable( + tableLogger, + LOGGING_PREFIX, + columnName = "mobileIsDefault", + initialValue = false, + ) + .stateIn(scope, SharingStarted.WhileSubscribed(), false) override val activeDataConnectionHasDataEnabled: StateFlow<Boolean> = mobileConnectionsRepo.activeMobileDataRepository @@ -184,8 +198,6 @@ constructor( ) .stateIn(scope, SharingStarted.WhileSubscribed(), listOf()) - override val defaultDataSubId = mobileConnectionsRepo.defaultDataSubId - /** * Copied from the old pipeline. We maintain a 2s period of time where we will keep the * validated bit from the old active network (A) while data is changing to the new one (B). @@ -282,10 +294,10 @@ constructor( mobileIsDefault, defaultMobileIconMapping, defaultMobileIconGroup, - defaultDataSubId, isDefaultConnectionFailed, isForceHidden, mobileConnectionsRepo.getRepoForSubId(subId), + context, ) companion object { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/NetworkTypeIconModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/NetworkTypeIconModel.kt new file mode 100644 index 000000000000..6ea5f90ddc71 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/NetworkTypeIconModel.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.pipeline.mobile.domain.model + +import com.android.settingslib.SignalIcon.MobileIconGroup +import com.android.systemui.log.table.Diffable +import com.android.systemui.log.table.TableRowLogger + +/** + * A data wrapper class for [MobileIconGroup]. One lingering nuance of this pipeline is its + * dependency on MobileMappings for its lookup from NetworkType -> NetworkTypeIcon. And because + * MobileMappings is a static map of (netType, icon) that knows nothing of `carrierId`, we need the + * concept of a "default" or "overridden" icon type. + * + * Until we can remove that dependency on MobileMappings, we should just allow for the composition + * of overriding an icon id using the lookup defined in [MobileIconCarrierIdOverrides]. By using the + * [overrideIcon] method defined below, we can create any arbitrarily overridden network type icon. + */ +sealed interface NetworkTypeIconModel : Diffable<NetworkTypeIconModel> { + val contentDescription: Int + val iconId: Int + val name: String + + data class DefaultIcon( + val iconGroup: MobileIconGroup, + ) : NetworkTypeIconModel { + override val contentDescription = iconGroup.dataContentDescription + override val iconId = iconGroup.dataType + override val name = iconGroup.name + + override fun logDiffs(prevVal: NetworkTypeIconModel, row: TableRowLogger) { + if (prevVal !is DefaultIcon || prevVal.name != name) { + row.logChange(COL_NETWORK_ICON, name) + } + } + } + + data class OverriddenIcon( + val iconGroup: MobileIconGroup, + override val iconId: Int, + ) : NetworkTypeIconModel { + override val contentDescription = iconGroup.dataContentDescription + override val name = iconGroup.name + + override fun logDiffs(prevVal: NetworkTypeIconModel, row: TableRowLogger) { + if (prevVal !is OverriddenIcon || prevVal.name != name || prevVal.iconId != iconId) { + row.logChange(COL_NETWORK_ICON, "Ovrd($name)") + } + } + } + + companion object { + const val COL_NETWORK_ICON = "networkTypeIcon" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt index 0fd007cf40ef..dce7bf21fadd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt @@ -146,11 +146,10 @@ constructor( combine( iconInteractor.isDataConnected, iconInteractor.isDataEnabled, - iconInteractor.isDefaultConnectionFailed, iconInteractor.alwaysShowDataRatIcon, iconInteractor.mobileIsDefault, - ) { dataConnected, dataEnabled, failedConnection, alwaysShow, mobileIsDefault -> - alwaysShow || (dataConnected && dataEnabled && !failedConnection && mobileIsDefault) + ) { dataConnected, dataEnabled, alwaysShow, mobileIsDefault -> + alwaysShow || (dataEnabled && dataConnected && mobileIsDefault) } .distinctUntilChanged() .logDiffsForTable( @@ -167,10 +166,13 @@ constructor( showNetworkTypeIcon, ) { networkTypeIconGroup, shouldShow -> val desc = - if (networkTypeIconGroup.dataContentDescription != 0) - ContentDescription.Resource(networkTypeIconGroup.dataContentDescription) + if (networkTypeIconGroup.contentDescription != 0) + ContentDescription.Resource(networkTypeIconGroup.contentDescription) + else null + val icon = + if (networkTypeIconGroup.iconId != 0) + Icon.Resource(networkTypeIconGroup.iconId, desc) else null - val icon = Icon.Resource(networkTypeIconGroup.dataType, desc) return@combine when { !shouldShow -> null else -> icon diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepository.kt index 6479f3d9f8a6..731f1e028470 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepository.kt @@ -44,11 +44,11 @@ import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnecti import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel.Ethernet import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel.Mobile import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel.Wifi +import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl.Companion.getMainOrUnderlyingWifiInfo import com.android.systemui.tuner.TunerService import java.io.PrintWriter import javax.inject.Inject import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow @@ -68,12 +68,12 @@ interface ConnectivityRepository { val defaultConnections: StateFlow<DefaultConnectionModel> } -@OptIn(ExperimentalCoroutinesApi::class) +@SuppressLint("MissingPermission") @SysUISingleton class ConnectivityRepositoryImpl @Inject constructor( - connectivityManager: ConnectivityManager, + private val connectivityManager: ConnectivityManager, private val connectivitySlots: ConnectivitySlots, context: Context, dumpManager: DumpManager, @@ -144,15 +144,14 @@ constructor( ) { logger.logOnDefaultCapabilitiesChanged(network, networkCapabilities) + val wifiInfo = + networkCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + val isWifiDefault = - networkCapabilities.hasTransport(TRANSPORT_WIFI) || - networkCapabilities.getMainOrUnderlyingWifiInfo() != null + networkCapabilities.hasTransport(TRANSPORT_WIFI) || wifiInfo != null val isMobileDefault = networkCapabilities.hasTransport(TRANSPORT_CELLULAR) - val isCarrierMergedDefault = - networkCapabilities - .getMainOrUnderlyingWifiInfo() - ?.isCarrierMerged == true + val isCarrierMergedDefault = wifiInfo?.isCarrierMerged == true val isEthernetDefault = networkCapabilities.hasTransport(TRANSPORT_ETHERNET) @@ -209,7 +208,32 @@ constructor( * always use [WifiInfo] if it's available, so we need to check the underlying transport * info. */ - fun NetworkCapabilities.getMainOrUnderlyingWifiInfo(): WifiInfo? { + fun NetworkCapabilities.getMainOrUnderlyingWifiInfo( + connectivityManager: ConnectivityManager, + ): WifiInfo? { + val mainWifiInfo = this.getMainWifiInfo() + if (mainWifiInfo != null) { + return mainWifiInfo + } + // Only CELLULAR networks may have underlying wifi information that's relevant to SysUI, + // so skip the underlying network check if it's not CELLULAR. + if (!this.hasTransport(TRANSPORT_CELLULAR)) { + return mainWifiInfo + } + + // Some connections, like VPN connections, may have underlying networks that are + // eventually traced to a wifi or carrier merged connection. So, check those underlying + // networks for possible wifi information as well. See b/225902574. + return this.underlyingNetworks?.firstNotNullOfOrNull { underlyingNetwork -> + connectivityManager.getNetworkCapabilities(underlyingNetwork)?.getMainWifiInfo() + } + } + + /** + * Checks the network capabilities for wifi info, but does *not* check the underlying + * networks. See [getMainOrUnderlyingWifiInfo]. + */ + private fun NetworkCapabilities.getMainWifiInfo(): WifiInfo? { // Wifi info can either come from a WIFI Transport, or from a CELLULAR transport for // virtual networks like VCN. val canHaveWifiInfo = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt index f80aa688268f..b37c44a2f8cd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt @@ -138,7 +138,8 @@ constructor( wifiNetworkChangeEvents.tryEmit(Unit) - val wifiInfo = networkCapabilities.getMainOrUnderlyingWifiInfo() + val wifiInfo = + networkCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) if (wifiInfo?.isPrimary == true) { val wifiNetworkModel = createWifiNetworkModel( diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/nullability.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/nullability.kt index f3b7e0d24a6e..298dacde8128 100644 --- a/packages/SystemUI/src/com/android/systemui/util/kotlin/nullability.kt +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/nullability.kt @@ -26,4 +26,5 @@ inline fun <T : Any, R> transform(value: T?, block: (T) -> R): R? = value?.let(b /** * Assists type-checking to unpack a Java Optional into T? */ +@Suppress("NOTHING_TO_INLINE") inline fun <T> Optional<T>.getOrNull(): T? = orElse(null) diff --git a/packages/SystemUI/src/com/android/systemui/util/service/ObservableServiceConnection.java b/packages/SystemUI/src/com/android/systemui/util/service/ObservableServiceConnection.java index c6da55c1e20a..968dcc95ef50 100644 --- a/packages/SystemUI/src/com/android/systemui/util/service/ObservableServiceConnection.java +++ b/packages/SystemUI/src/com/android/systemui/util/service/ObservableServiceConnection.java @@ -25,6 +25,7 @@ import android.os.IBinder; import android.util.Log; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.settings.UserTracker; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -108,6 +109,7 @@ public class ObservableServiceConnection<T> implements ServiceConnection { private final Context mContext; private final Intent mServiceIntent; + private final UserTracker mUserTracker; private final int mFlags; private final Executor mExecutor; private final ServiceTransformer<T> mTransformer; @@ -127,10 +129,12 @@ public class ObservableServiceConnection<T> implements ServiceConnection { */ @Inject public ObservableServiceConnection(Context context, Intent serviceIntent, + UserTracker userTracker, @Main Executor executor, ServiceTransformer<T> transformer) { mContext = context; mServiceIntent = serviceIntent; + mUserTracker = userTracker; mFlags = Context.BIND_AUTO_CREATE; mExecutor = executor; mTransformer = transformer; @@ -145,7 +149,8 @@ public class ObservableServiceConnection<T> implements ServiceConnection { public boolean bind() { boolean bindResult = false; try { - bindResult = mContext.bindService(mServiceIntent, mFlags, mExecutor, this); + bindResult = mContext.bindServiceAsUser(mServiceIntent, this, mFlags, + mUserTracker.getUserHandle()); } catch (SecurityException e) { Log.d(TAG, "Could not bind to service", e); mContext.unbindService(this); @@ -228,11 +233,13 @@ public class ObservableServiceConnection<T> implements ServiceConnection { @Override public void onServiceConnected(ComponentName name, IBinder service) { - if (DEBUG) { - Log.d(TAG, "onServiceConnected"); - } - mProxy = mTransformer.convert(service); - applyToCallbacksLocked(callback -> callback.onConnected(this, mProxy)); + mExecutor.execute(() -> { + if (DEBUG) { + Log.d(TAG, "onServiceConnected"); + } + mProxy = mTransformer.convert(service); + applyToCallbacksLocked(callback -> callback.onConnected(this, mProxy)); + }); } private void applyToCallbacksLocked(Consumer<Callback<T>> applicator) { @@ -250,16 +257,16 @@ public class ObservableServiceConnection<T> implements ServiceConnection { @Override public void onServiceDisconnected(ComponentName name) { - onDisconnected(DISCONNECT_REASON_DISCONNECTED); + mExecutor.execute(() -> onDisconnected(DISCONNECT_REASON_DISCONNECTED)); } @Override public void onBindingDied(ComponentName name) { - onDisconnected(DISCONNECT_REASON_DISCONNECTED); + mExecutor.execute(() -> onDisconnected(DISCONNECT_REASON_BINDING_DIED)); } @Override public void onNullBinding(ComponentName name) { - onDisconnected(DISCONNECT_REASON_NULL_BINDING); + mExecutor.execute(() -> onDisconnected(DISCONNECT_REASON_NULL_BINDING)); } } diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java index 54b30300ba49..cd1ad1ba788f 100644 --- a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java @@ -125,6 +125,8 @@ public class ImageWallpaper extends WallpaperService { private int mBitmapUsages = 0; private final Object mLock = new Object(); + private boolean mIsLockscreenLiveWallpaperEnabled; + CanvasEngine() { super(); setFixedSizeAllowed(true); @@ -167,8 +169,10 @@ public class ImageWallpaper extends WallpaperService { Log.d(TAG, "onCreate"); } mWallpaperManager = getDisplayContext().getSystemService(WallpaperManager.class); + mIsLockscreenLiveWallpaperEnabled = mWallpaperManager + .isLockscreenLiveWallpaperEnabled(); mSurfaceHolder = surfaceHolder; - Rect dimensions = mWallpaperManager.isLockscreenLiveWallpaperEnabled() + Rect dimensions = mIsLockscreenLiveWallpaperEnabled ? mWallpaperManager.peekBitmapDimensions(getSourceFlag()) : mWallpaperManager.peekBitmapDimensions(); int width = Math.max(MIN_SURFACE_WIDTH, dimensions.width()); @@ -319,7 +323,7 @@ public class ImageWallpaper extends WallpaperService { boolean loadSuccess = false; Bitmap bitmap; try { - bitmap = mWallpaperManager.isLockscreenLiveWallpaperEnabled() + bitmap = mIsLockscreenLiveWallpaperEnabled ? mWallpaperManager.getBitmapAsUser( mUserTracker.getUserId(), false, getSourceFlag()) : mWallpaperManager.getBitmapAsUser(mUserTracker.getUserId(), false); @@ -333,7 +337,7 @@ public class ImageWallpaper extends WallpaperService { // be loaded, we will go into a cycle. Don't do a build where the // default wallpaper can't be loaded. Log.w(TAG, "Unable to load wallpaper!", exception); - if (mWallpaperManager.isLockscreenLiveWallpaperEnabled()) { + if (mIsLockscreenLiveWallpaperEnabled) { mWallpaperManager.clearWallpaper(getWallpaperFlags(), mUserTracker.getUserId()); } else { mWallpaperManager.clearWallpaper( @@ -341,7 +345,7 @@ public class ImageWallpaper extends WallpaperService { } try { - bitmap = mWallpaperManager.isLockscreenLiveWallpaperEnabled() + bitmap = mIsLockscreenLiveWallpaperEnabled ? mWallpaperManager.getBitmapAsUser( mUserTracker.getUserId(), false, getSourceFlag()) : mWallpaperManager.getBitmapAsUser(mUserTracker.getUserId(), false); @@ -365,7 +369,7 @@ public class ImageWallpaper extends WallpaperService { mBitmap.recycle(); } mBitmap = bitmap; - mWideColorGamut = mWallpaperManager.isLockscreenLiveWallpaperEnabled() + mWideColorGamut = mIsLockscreenLiveWallpaperEnabled ? mWallpaperManager.wallpaperSupportsWcg(getSourceFlag()) : mWallpaperManager.wallpaperSupportsWcg(WallpaperManager.FLAG_SYSTEM); diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java index 08f7eaee3011..a4b093d1832a 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java @@ -241,8 +241,8 @@ public class BubblesManager { // Store callback in a field so it won't get GC'd mStatusBarWindowCallback = - (keyguardShowing, keyguardOccluded, bouncerShowing, isDozing, panelExpanded, - isDreaming) -> + (keyguardShowing, keyguardOccluded, keyguardGoingAway, bouncerShowing, isDozing, + panelExpanded, isDreaming) -> mBubbles.onNotificationPanelExpandedChanged(panelExpanded); notificationShadeWindowController.registerCallback(mStatusBarWindowCallback); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt index 480b8f972b4a..a9920ec77c23 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt @@ -32,6 +32,7 @@ import com.android.systemui.plugins.ClockAnimations import com.android.systemui.plugins.ClockController import com.android.systemui.plugins.ClockEvents import com.android.systemui.plugins.ClockFaceController +import com.android.systemui.plugins.ClockFaceConfig import com.android.systemui.plugins.ClockFaceEvents import com.android.systemui.plugins.ClockTickRate import com.android.systemui.plugins.log.LogBuffer @@ -101,8 +102,10 @@ class ClockEventControllerTest : SysuiTestCase() { whenever(largeClockController.events).thenReturn(largeClockEvents) whenever(clock.events).thenReturn(events) whenever(clock.animations).thenReturn(animations) - whenever(smallClockEvents.tickRate).thenReturn(ClockTickRate.PER_MINUTE) - whenever(largeClockEvents.tickRate).thenReturn(ClockTickRate.PER_MINUTE) + whenever(smallClockController.config) + .thenReturn(ClockFaceConfig(tickRate = ClockTickRate.PER_MINUTE)) + whenever(largeClockController.config) + .thenReturn(ClockFaceConfig(tickRate = ClockTickRate.PER_MINUTE)) repository = FakeKeyguardRepository() bouncerRepository = FakeKeyguardBouncerRepository() diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java index b15ac39dc57d..2f627cb5d9d7 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java @@ -315,8 +315,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { } @Test - public void testGetClockAnimationsForwardsToClock() { - assertEquals(mClockAnimations, mController.getClockAnimations()); + public void testGetClock_ForwardsToClock() { + assertEquals(mClockController, mController.getClock()); } @Test @@ -367,9 +367,9 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { } @Test - public void testGetClockAnimations_nullClock_returnsNull() { + public void testGetClock_nullClock_returnsNull() { when(mClockEventController.getClock()).thenReturn(null); - assertNull(mController.getClockAnimations()); + assertNull(mController.getClock()); } private void verifyAttachment(VerificationMode times) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java index 65f8610cfd43..d760189bcfd6 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java @@ -163,8 +163,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { @Captor private ArgumentCaptor<KeyguardSecurityContainer.SwipeListener> mSwipeListenerArgumentCaptor; - private Configuration mConfiguration; - private KeyguardSecurityContainerController mKeyguardSecurityContainerController; private KeyguardPasswordViewController mKeyguardPasswordViewController; private KeyguardPasswordView mKeyguardPasswordView; @@ -172,12 +170,12 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { @Before public void setup() { - mConfiguration = new Configuration(); - mConfiguration.setToDefaults(); // Defaults to ORIENTATION_UNDEFINED. mTestableResources = mContext.getOrCreateTestableResources(); + mTestableResources.getResources().getConfiguration().orientation = + Configuration.ORIENTATION_UNDEFINED; when(mView.getContext()).thenReturn(mContext); - when(mView.getResources()).thenReturn(mContext.getResources()); + when(mView.getResources()).thenReturn(mTestableResources.getResources()); FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(/* width= */ 0, /* height= */ 0); lp.gravity = 0; @@ -254,6 +252,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { @Test public void onResourcesUpdate_callsThroughOnRotationChange() { + clearInvocations(mView); + // Rotation is the same, shouldn't cause an update mKeyguardSecurityContainerController.updateResources(); verify(mView, never()).initMode(eq(MODE_DEFAULT), eq(mGlobalSettings), eq(mFalsingManager), @@ -620,12 +620,12 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { // Set initial gravity mTestableResources.addOverride(R.integer.keyguard_host_view_gravity, Gravity.CENTER); + mTestableResources.addOverride( + R.bool.can_use_one_handed_bouncer, false); // Kick off the initial pass... mKeyguardSecurityContainerController.onInit(); - verify(mView).setLayoutParams(argThat( - (ArgumentMatcher<FrameLayout.LayoutParams>) argument -> - argument.gravity == Gravity.CENTER)); + verify(mView).setLayoutParams(any()); clearInvocations(mView); // Now simulate a config change @@ -633,9 +633,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM); mKeyguardSecurityContainerController.updateResources(); - verify(mView).setLayoutParams(argThat( - (ArgumentMatcher<FrameLayout.LayoutParams>) argument -> - argument.gravity == (Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM))); + verify(mView).setLayoutParams(any()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java index 71449145d668..48f7d924667e 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java @@ -16,17 +16,17 @@ package com.android.keyguard; +import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.graphics.Rect; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import com.android.keyguard.logging.KeyguardLogger; import com.android.systemui.SysuiTestCase; -import com.android.systemui.plugins.ClockAnimations; +import com.android.systemui.plugins.ClockController; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -118,14 +118,10 @@ public class KeyguardStatusViewControllerTest extends SysuiTestCase { } @Test - public void getClockAnimations_forwardsToClockSwitch() { - ClockAnimations mockClockAnimations = mock(ClockAnimations.class); - when(mKeyguardClockSwitchController.getClockAnimations()).thenReturn(mockClockAnimations); + public void getClock_forwardsToClockSwitch() { + ClockController mockClock = mock(ClockController.class); + when(mKeyguardClockSwitchController.getClock()).thenReturn(mockClock); - Rect r1 = new Rect(1, 2, 3, 4); - Rect r2 = new Rect(5, 6, 7, 8); - mController.getClockAnimations().onPositionUpdated(r1, r2, 0.3f); - - verify(mockClockAnimations).onPositionUpdated(r1, r2, 0.3f); + assertEquals(mockClock, mController.getClockController()); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthRippleControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthRippleControllerTest.kt index a245c01d74de..7d9ccb642e47 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthRippleControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthRippleControllerTest.kt @@ -36,7 +36,6 @@ import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.commandline.CommandRegistry import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.CentralSurfaces -import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.leak.RotationUtils @@ -50,6 +49,7 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers import org.mockito.ArgumentMatchers.eq +import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito.`when` import org.mockito.Mockito.never @@ -73,16 +73,28 @@ class AuthRippleControllerTest : SysuiTestCase() { @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor @Mock private lateinit var authController: AuthController @Mock private lateinit var keyguardStateController: KeyguardStateController - @Mock private lateinit var wakefulnessLifecycle: WakefulnessLifecycle - @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController - @Mock private lateinit var bypassController: KeyguardBypassController - @Mock private lateinit var biometricUnlockController: BiometricUnlockController - @Mock private lateinit var udfpsControllerProvider: Provider<UdfpsController> - @Mock private lateinit var udfpsController: UdfpsController - @Mock private lateinit var statusBarStateController: StatusBarStateController - @Mock private lateinit var featureFlags: FeatureFlags - @Mock private lateinit var lightRevealScrim: LightRevealScrim - @Mock private lateinit var fpSensorProp: FingerprintSensorPropertiesInternal + @Mock + private lateinit var wakefulnessLifecycle: WakefulnessLifecycle + @Mock + private lateinit var notificationShadeWindowController: NotificationShadeWindowController + @Mock + private lateinit var biometricUnlockController: BiometricUnlockController + @Mock + private lateinit var udfpsControllerProvider: Provider<UdfpsController> + @Mock + private lateinit var udfpsController: UdfpsController + @Mock + private lateinit var statusBarStateController: StatusBarStateController + @Mock + private lateinit var featureFlags: FeatureFlags + @Mock + private lateinit var lightRevealScrim: LightRevealScrim + @Mock + private lateinit var fpSensorProp: FingerprintSensorPropertiesInternal + + @Captor + private lateinit var biometricUnlockListener: + ArgumentCaptor<BiometricUnlockController.BiometricUnlockEventsListener> @Before fun setUp() { @@ -106,13 +118,12 @@ class AuthRippleControllerTest : SysuiTestCase() { wakefulnessLifecycle, commandRegistry, notificationShadeWindowController, - bypassController, - biometricUnlockController, udfpsControllerProvider, statusBarStateController, featureFlags, KeyguardLogger(logcatLogBuffer(AuthRippleController.TAG)), - rippleView + biometricUnlockController, + rippleView, ) controller.init() `when`(mCentralSurfaces.lightRevealScrim).thenReturn(lightRevealScrim) @@ -134,12 +145,9 @@ class AuthRippleControllerTest : SysuiTestCase() { eq(BiometricSourceType.FINGERPRINT))).thenReturn(true) // WHEN fingerprint authenticated - val captor = ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback::class.java) - verify(keyguardUpdateMonitor).registerCallback(captor.capture()) - captor.value.onBiometricAuthenticated( - 0 /* userId */, - BiometricSourceType.FINGERPRINT /* type */, - false /* isStrongBiometric */) + verify(biometricUnlockController).addListener(biometricUnlockListener.capture()) + biometricUnlockListener.value + .onBiometricUnlockedWithKeyguardDismissal(BiometricSourceType.FINGERPRINT) // THEN update sensor location and show ripple verify(rippleView).setFingerprintSensorLocation(fpsLocation, 0f) @@ -191,51 +199,6 @@ class AuthRippleControllerTest : SysuiTestCase() { } @Test - fun testFaceTriggerBypassEnabled_Ripple() { - // GIVEN face auth sensor exists, keyguard is showing & unlocking with face is allowed - val faceLocation = Point(5, 5) - `when`(authController.faceSensorLocation).thenReturn(faceLocation) - controller.onViewAttached() - - `when`(keyguardStateController.isShowing).thenReturn(true) - `when`(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed( - BiometricSourceType.FACE)).thenReturn(true) - - // WHEN bypass is enabled & face authenticated - `when`(bypassController.canBypass()).thenReturn(true) - val captor = ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback::class.java) - verify(keyguardUpdateMonitor).registerCallback(captor.capture()) - captor.value.onBiometricAuthenticated( - 0 /* userId */, - BiometricSourceType.FACE /* type */, - false /* isStrongBiometric */) - - // THEN show ripple - verify(rippleView).setSensorLocation(faceLocation) - verify(rippleView).startUnlockedRipple(any()) - } - - @Test - fun testFaceTriggerNonBypass_NoRipple() { - // GIVEN face auth sensor exists - val faceLocation = Point(5, 5) - `when`(authController.faceSensorLocation).thenReturn(faceLocation) - controller.onViewAttached() - - // WHEN bypass isn't enabled & face authenticated - `when`(bypassController.canBypass()).thenReturn(false) - val captor = ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback::class.java) - verify(keyguardUpdateMonitor).registerCallback(captor.capture()) - captor.value.onBiometricAuthenticated( - 0 /* userId */, - BiometricSourceType.FACE /* type */, - false /* isStrongBiometric */) - - // THEN no ripple - verify(rippleView, never()).startUnlockedRipple(any()) - } - - @Test fun testNullFaceSensorLocationDoesNothing() { `when`(authController.faceSensorLocation).thenReturn(null) controller.onViewAttached() diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt index bb03764268a6..b2c2ae7458ae 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt @@ -21,6 +21,7 @@ import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_BP import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_OTHER import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_SETTINGS +import android.hardware.biometrics.BiometricOverlayConstants.REASON_ENROLL_ENROLLING import android.hardware.biometrics.BiometricOverlayConstants.ShowReason import android.hardware.fingerprint.FingerprintManager import android.hardware.fingerprint.IUdfpsOverlayControllerCallback @@ -29,6 +30,7 @@ import android.testing.TestableLooper.RunWithLooper import android.view.LayoutInflater import android.view.MotionEvent import android.view.Surface +import android.view.Surface.ROTATION_0 import android.view.Surface.Rotation import android.view.View import android.view.WindowManager @@ -42,6 +44,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ActivityLaunchAnimator import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.plugins.statusbar.StatusBarStateController @@ -159,9 +162,10 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { private fun withRotation(@Rotation rotation: Int, block: () -> Unit) { // Sensor that's in the top left corner of the display in natural orientation. val sensorBounds = Rect(0, 0, SENSOR_WIDTH, SENSOR_HEIGHT) + val overlayBounds = Rect(0, 0, DISPLAY_WIDTH, DISPLAY_HEIGHT) overlayParams = UdfpsOverlayParams( sensorBounds, - sensorBounds, + overlayBounds, DISPLAY_WIDTH, DISPLAY_HEIGHT, scaleFactor = 1f, @@ -314,4 +318,24 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { assertThat(controllerOverlay.matchesRequestId(REQUEST_ID)).isTrue() assertThat(controllerOverlay.matchesRequestId(REQUEST_ID + 1)).isFalse() } + + @Test + fun smallOverlayOnEnrollmentWithA11y() = withRotation(ROTATION_0) { + withReason(REASON_ENROLL_ENROLLING) { + // When a11y enabled during enrollment + whenever(accessibilityManager.isTouchExplorationEnabled).thenReturn(true) + whenever(featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)).thenReturn(true) + + controllerOverlay.show(udfpsController, overlayParams) + verify(windowManager).addView( + eq(controllerOverlay.overlayView), + layoutParamsCaptor.capture() + ) + + // Layout params should use sensor bounds + val lp = layoutParamsCaptor.value + assertThat(lp.width).isEqualTo(overlayParams.sensorBounds.width()) + assertThat(lp.height).isEqualTo(overlayParams.sensorBounds.height()) + } + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java index 445cc8739463..64c028e6a095 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java @@ -1017,7 +1017,7 @@ public class UdfpsControllerTest extends SysuiTestCase { // THEN the display should be unconfigured once. If the timeout action is not // cancelled, the display would be unconfigured twice which would cause two // FP attempts. - verify(mUdfpsView, times(1)).unconfigureDisplay(); + verify(mUdfpsView).unconfigureDisplay(); } else { verify(mUdfpsView, never()).unconfigureDisplay(); } @@ -1301,8 +1301,8 @@ public class UdfpsControllerTest extends SysuiTestCase { mBiometricExecutor.runAllReady(); downEvent.recycle(); - // THEN the touch is pilfered, expected twice (valid overlap and touch on sensor) - verify(mInputManager, times(2)).pilferPointers(any()); + // THEN the touch is pilfered + verify(mInputManager).pilferPointers(any()); } @Test @@ -1340,7 +1340,91 @@ public class UdfpsControllerTest extends SysuiTestCase { downEvent.recycle(); // THEN the touch is NOT pilfered - verify(mInputManager, times(0)).pilferPointers(any()); + verify(mInputManager, never()).pilferPointers(any()); + } + + @Test + public void onTouch_withNewTouchDetection_pilferPointerWhenAltBouncerShowing() + throws RemoteException { + final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L, + 0L); + final TouchProcessorResult processorResultUnchanged = + new TouchProcessorResult.ProcessedTouch(InteractionEvent.UNCHANGED, + 1 /* pointerId */, touchData); + + // Enable new touch detection. + when(mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)).thenReturn(true); + + // Configure UdfpsController to use FingerprintManager as opposed to AlternateTouchProvider. + initUdfpsController(mOpticalProps, false /* hasAlternateTouchProvider */); + + // Configure UdfpsView to not accept the ACTION_DOWN event + when(mUdfpsView.isDisplayConfigured()).thenReturn(false); + when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(false); + + // GIVEN that the alternate bouncer is showing and a11y touch exploration NOT enabled + when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false); + when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(true); + mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, mOpticalProps.sensorId, + BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); + mFgExecutor.runAllReady(); + + verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture()); + + // WHEN ACTION_DOWN is received and touch is not within sensor + when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn( + processorResultUnchanged); + MotionEvent downEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, 0, 0, 0); + mTouchListenerCaptor.getValue().onTouch(mUdfpsView, downEvent); + mBiometricExecutor.runAllReady(); + downEvent.recycle(); + + // THEN the touch is pilfered + verify(mInputManager).pilferPointers(any()); + } + + @Test + public void onTouch_withNewTouchDetection_doNotPilferWhenPullingUpBouncer() + throws RemoteException { + final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L, + 0L); + final TouchProcessorResult processorResultMove = + new TouchProcessorResult.ProcessedTouch(InteractionEvent.DOWN, + 1 /* pointerId */, touchData); + + // Enable new touch detection. + when(mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)).thenReturn(true); + + // Configure UdfpsController to use FingerprintManager as opposed to AlternateTouchProvider. + initUdfpsController(mOpticalProps, false /* hasAlternateTouchProvider */); + + // Configure UdfpsView to accept the ACTION_MOVE event + when(mUdfpsView.isDisplayConfigured()).thenReturn(false); + when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true); + + // GIVEN that the alternate bouncer is not showing and a11y touch exploration NOT enabled + when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false); + when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(false); + mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, mOpticalProps.sensorId, + BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); + mFgExecutor.runAllReady(); + + verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture()); + + // GIVEN a swipe up to bring up primary bouncer is in progress or swipe down for QS + when(mPrimaryBouncerInteractor.isInTransit()).thenReturn(true); + when(mLockscreenShadeTransitionController.getFractionToShade()).thenReturn(1f); + + // WHEN ACTION_MOVE is received and touch is within sensor + when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn( + processorResultMove); + MotionEvent moveEvent = MotionEvent.obtain(0, 0, ACTION_MOVE, 0, 0, 0); + mTouchListenerCaptor.getValue().onTouch(mUdfpsView, moveEvent); + mBiometricExecutor.runAllReady(); + moveEvent.recycle(); + + // THEN the touch is NOT pilfered + verify(mInputManager, never()).pilferPointers(any()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt index 94489adc1bd4..1f2b64d7adbd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt @@ -191,18 +191,11 @@ class LogContextInteractorImplTest : SysuiTestCase() { foldListener.onFoldUpdate(FOLD_UPDATE_FINISH_CLOSED) keyguardTransitionRepository.startTransitionTo(KeyguardState.AOD) - var aod: Boolean? = null - var awake: Boolean? = null var folded: Int? = null var displayState: Int? = null val job = interactor.addBiometricContextListener( object : IBiometricContextListener.Stub() { - override fun onDozeChanged(isAod: Boolean, isAwake: Boolean) { - aod = isAod - awake = isAwake - } - override fun onFoldChanged(foldState: Int) { folded = foldState } @@ -214,8 +207,6 @@ class LogContextInteractorImplTest : SysuiTestCase() { ) runCurrent() - assertThat(aod).isTrue() - assertThat(awake).isFalse() assertThat(folded).isEqualTo(FoldState.FULLY_CLOSED) assertThat(displayState).isEqualTo(AuthenticateOptions.DISPLAY_STATE_AOD) @@ -224,8 +215,6 @@ class LogContextInteractorImplTest : SysuiTestCase() { keyguardTransitionRepository.startTransitionTo(KeyguardState.LOCKSCREEN) runCurrent() - assertThat(aod).isFalse() - assertThat(awake).isTrue() assertThat(folded).isEqualTo(FoldState.HALF_OPENED) assertThat(displayState).isEqualTo(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN) @@ -236,8 +225,6 @@ class LogContextInteractorImplTest : SysuiTestCase() { keyguardTransitionRepository.startTransitionTo(KeyguardState.AOD) runCurrent() - assertThat(aod).isFalse() - assertThat(awake).isTrue() assertThat(folded).isEqualTo(FoldState.HALF_OPENED) assertThat(displayState).isEqualTo(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java index fd6e31ba3bee..18515825967f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java @@ -16,8 +16,6 @@ package com.android.systemui.clipboardoverlay; -import static com.android.systemui.flags.Flags.CLIPBOARD_MINIMIZED_LAYOUT; - import static com.google.android.setupcompat.util.WizardManagerHelper.SETTINGS_SECURE_USER_SETUP_COMPLETE; import static org.junit.Assert.assertEquals; @@ -40,7 +38,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.logging.UiEventLogger; import com.android.systemui.SysuiTestCase; -import com.android.systemui.flags.FakeFeatureFlags; import org.junit.Before; import org.junit.Test; @@ -65,7 +62,6 @@ public class ClipboardListenerTest extends SysuiTestCase { private ClipboardOverlayController mOverlayController; @Mock private ClipboardToast mClipboardToast; - private FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); @Mock private UiEventLogger mUiEventLogger; @@ -99,10 +95,8 @@ public class ClipboardListenerTest extends SysuiTestCase { when(mClipboardManager.getPrimaryClip()).thenReturn(mSampleClipData); when(mClipboardManager.getPrimaryClipSource()).thenReturn(mSampleSource); - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, true); - mClipboardListener = new ClipboardListener(getContext(), mOverlayControllerProvider, - mClipboardToast, mClipboardManager, mFeatureFlags, mUiEventLogger); + mClipboardToast, mClipboardManager, mUiEventLogger); } @@ -222,34 +216,4 @@ public class ClipboardListenerTest extends SysuiTestCase { verify(mClipboardToast, times(1)).showCopiedToast(); verifyZeroInteractions(mOverlayControllerProvider); } - - @Test - public void test_minimizedLayoutFlagOff_usesLegacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - - mClipboardListener.start(); - mClipboardListener.onPrimaryClipChanged(); - - verify(mOverlayControllerProvider).get(); - - verify(mOverlayController).setClipDataLegacy( - mClipDataCaptor.capture(), mStringCaptor.capture()); - - assertEquals(mSampleClipData, mClipDataCaptor.getValue()); - assertEquals(mSampleSource, mStringCaptor.getValue()); - } - - @Test - public void test_minimizedLayoutFlagOn_usesNew() { - mClipboardListener.start(); - mClipboardListener.onPrimaryClipChanged(); - - verify(mOverlayControllerProvider).get(); - - verify(mOverlayController).setClipData( - mClipDataCaptor.capture(), mStringCaptor.capture()); - - assertEquals(mSampleClipData, mClipDataCaptor.getValue()); - assertEquals(mSampleSource, mStringCaptor.getValue()); - } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java index ffd75fb9bbc6..8600b7c48d33 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java @@ -20,9 +20,11 @@ import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED; +import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHARE_TAPPED; +import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_EXPANDED; +import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_MINIMIZED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED; -import static com.android.systemui.flags.Flags.CLIPBOARD_MINIMIZED_LAYOUT; import static com.android.systemui.flags.Flags.CLIPBOARD_REMOTE_BEHAVIOR; import static org.mockito.ArgumentMatchers.any; @@ -120,7 +122,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { new ClipData.Item("Test Item")); mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, false); - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, true); // turned off for legacy tests mOverlayController = new ClipboardOverlayController( mContext, @@ -143,178 +144,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { } @Test - public void test_setClipData_invalidImageData_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - ClipData clipData = new ClipData("", new String[]{"image/png"}, - new ClipData.Item(Uri.parse(""))); - - mOverlayController.setClipDataLegacy(clipData, ""); - - verify(mClipboardOverlayView, times(1)).showDefaultTextPreview(); - verify(mClipboardOverlayView, times(1)).showShareChip(); - verify(mClipboardOverlayView, times(1)).getEnterAnimation(); - } - - @Test - public void test_setClipData_nonImageUri_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - ClipData clipData = new ClipData("", new String[]{"resource/png"}, - new ClipData.Item(Uri.parse(""))); - - mOverlayController.setClipDataLegacy(clipData, ""); - - verify(mClipboardOverlayView, times(1)).showDefaultTextPreview(); - verify(mClipboardOverlayView, times(1)).showShareChip(); - verify(mClipboardOverlayView, times(1)).getEnterAnimation(); - } - - @Test - public void test_setClipData_textData_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - verify(mClipboardOverlayView, times(1)).showTextPreview("Test Item", false); - verify(mClipboardOverlayView, times(1)).showShareChip(); - verify(mClipboardOverlayView, times(1)).getEnterAnimation(); - } - - @Test - public void test_setClipData_sensitiveTextData_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - - ClipDescription description = mSampleClipData.getDescription(); - PersistableBundle b = new PersistableBundle(); - b.putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true); - description.setExtras(b); - ClipData data = new ClipData(description, mSampleClipData.getItemAt(0)); - mOverlayController.setClipDataLegacy(data, ""); - - verify(mClipboardOverlayView, times(1)).showTextPreview("••••••", true); - verify(mClipboardOverlayView, times(1)).showShareChip(); - verify(mClipboardOverlayView, times(1)).getEnterAnimation(); - } - - @Test - public void test_setClipData_repeatedCalls_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - when(mAnimator.isRunning()).thenReturn(true); - - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - verify(mClipboardOverlayView, times(1)).getEnterAnimation(); - } - - @Test - public void test_viewCallbacks_onShareTapped_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - mCallbacks.onShareButtonTapped(); - - verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SHARE_TAPPED, 0, ""); - verify(mClipboardOverlayView, times(1)).getExitAnimation(); - } - - @Test - public void test_viewCallbacks_onDismissTapped_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - mCallbacks.onDismissButtonTapped(); - - verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, ""); - verify(mClipboardOverlayView, times(1)).getExitAnimation(); - } - - @Test - public void test_multipleDismissals_dismissesOnce_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - - mCallbacks.onSwipeDismissInitiated(mAnimator); - mCallbacks.onDismissButtonTapped(); - mCallbacks.onSwipeDismissInitiated(mAnimator); - mCallbacks.onDismissButtonTapped(); - - verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SWIPE_DISMISSED, 0, null); - verify(mUiEventLogger, never()).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED); - } - - @Test - public void test_remoteCopy_withFlagOn_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, true); - when(mClipboardUtils.isRemoteCopy(any(), any(), any())).thenReturn(true); - - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - verify(mTimeoutHandler, never()).resetTimeout(); - } - - @Test - public void test_remoteCopy_withFlagOff_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - when(mClipboardUtils.isRemoteCopy(any(), any(), any())).thenReturn(true); - - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - verify(mTimeoutHandler).resetTimeout(); - } - - @Test - public void test_nonRemoteCopy_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, true); - when(mClipboardUtils.isRemoteCopy(any(), any(), any())).thenReturn(false); - - mOverlayController.setClipDataLegacy(mSampleClipData, ""); - - verify(mTimeoutHandler).resetTimeout(); - } - - @Test - public void test_logsUseLastClipSource_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - - mOverlayController.setClipDataLegacy(mSampleClipData, "first.package"); - mCallbacks.onDismissButtonTapped(); - mOverlayController.setClipDataLegacy(mSampleClipData, "second.package"); - mCallbacks.onDismissButtonTapped(); - - verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "first.package"); - verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "second.package"); - verifyNoMoreInteractions(mUiEventLogger); - } - - @Test - public void test_logOnClipboardActionsShown_legacy() { - mFeatureFlags.set(CLIPBOARD_MINIMIZED_LAYOUT, false); - ClipData.Item item = mSampleClipData.getItemAt(0); - item.setTextLinks(Mockito.mock(TextLinks.class)); - mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, true); - when(mClipboardUtils.isRemoteCopy(any(Context.class), any(ClipData.class), anyString())) - .thenReturn(true); - when(mClipboardUtils.getAction(any(ClipData.Item.class), anyString())) - .thenReturn(Optional.of(Mockito.mock(RemoteAction.class))); - when(mClipboardOverlayView.post(any(Runnable.class))).thenAnswer(new Answer<Object>() { - @Override - public Object answer(InvocationOnMock invocation) throws Throwable { - ((Runnable) invocation.getArgument(0)).run(); - return null; - } - }); - - mOverlayController.setClipDataLegacy( - new ClipData(mSampleClipData.getDescription(), item), "actionShownSource"); - mExecutor.runAllReady(); - - verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_ACTION_SHOWN, 0, "actionShownSource"); - verifyNoMoreInteractions(mUiEventLogger); - } - - // start of refactored setClipData tests - @Test public void test_setClipData_invalidImageData() { ClipData clipData = new ClipData("", new String[]{"image/png"}, new ClipData.Item(Uri.parse(""))); @@ -340,9 +169,10 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { @Test public void test_setClipData_textData() { - mOverlayController.setClipData(mSampleClipData, ""); + mOverlayController.setClipData(mSampleClipData, "abc"); verify(mClipboardOverlayView, times(1)).showTextPreview("Test Item", false); + verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "abc"); verify(mClipboardOverlayView, times(1)).showShareChip(); verify(mClipboardOverlayView, times(1)).getEnterAnimation(); } @@ -440,6 +270,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "first.package"); verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "second.package"); + verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "first.package"); + verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "second.package"); verifyNoMoreInteractions(mUiEventLogger); } @@ -465,6 +297,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { mExecutor.runAllReady(); verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_ACTION_SHOWN, 0, "actionShownSource"); + verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "actionShownSource"); verifyNoMoreInteractions(mUiEventLogger); } @@ -481,11 +314,12 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { public void test_insets_showsMinimized() { when(mClipboardOverlayWindow.getWindowInsets()).thenReturn( getImeInsets(new Rect(0, 0, 0, 1))); - mOverlayController.setClipData(mSampleClipData, ""); + mOverlayController.setClipData(mSampleClipData, "abc"); Animator mockFadeoutAnimator = Mockito.mock(Animator.class); when(mClipboardOverlayView.getMinimizedFadeoutAnimation()).thenReturn(mockFadeoutAnimator); verify(mClipboardOverlayView).setMinimized(true); + verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED, 0, "abc"); verify(mClipboardOverlayView, never()).setMinimized(false); verify(mClipboardOverlayView, never()).showTextPreview(any(), anyBoolean()); @@ -495,6 +329,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { verify(mClipboardOverlayView).setMinimized(false); verify(mClipboardOverlayView).showTextPreview("Test Item", false); + verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED, 0, "abc"); + verify(mUiEventLogger, never()).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "abc"); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtilsTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtilsTest.java index 3d8f04e08825..673b5eb5dc3c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtilsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtilsTest.java @@ -142,81 +142,6 @@ public class ClipboardOverlayUtilsTest extends SysuiTestCase { assertEquals(actionB, result); } - // TODO(b/267162944): Next four tests (marked "legacy") are obsolete once - // CLIPBOARD_MINIMIZED_LAYOUT flag is released and removed - @Test - public void test_getAction_noLinks_returnsEmptyOptional_legacy() { - ClipData.Item item = new ClipData.Item("no text links"); - item.setTextLinks(Mockito.mock(TextLinks.class)); - - Optional<RemoteAction> action = mClipboardUtils.getAction(item, ""); - - assertTrue(action.isEmpty()); - } - - @Test - public void test_getAction_returnsFirstLink_legacy() { - when(mClipDataItem.getTextLinks()).thenReturn(getFakeTextLinksBuilder().build()); - when(mClipDataItem.getText()).thenReturn(""); - RemoteAction actionA = constructRemoteAction("abc"); - RemoteAction actionB = constructRemoteAction("def"); - TextClassification classificationA = Mockito.mock(TextClassification.class); - when(classificationA.getActions()).thenReturn(Lists.newArrayList(actionA)); - TextClassification classificationB = Mockito.mock(TextClassification.class); - when(classificationB.getActions()).thenReturn(Lists.newArrayList(actionB)); - when(mTextClassifier.classifyText(anyString(), anyInt(), anyInt(), isNull())).thenReturn( - classificationA, classificationB); - - RemoteAction result = mClipboardUtils.getAction(mClipDataItem, "test").orElse(null); - - assertEquals(actionA, result); - } - - @Test - public void test_getAction_skipsMatchingComponent_legacy() { - when(mClipDataItem.getTextLinks()).thenReturn(getFakeTextLinksBuilder().build()); - when(mClipDataItem.getText()).thenReturn(""); - RemoteAction actionA = constructRemoteAction("abc"); - RemoteAction actionB = constructRemoteAction("def"); - TextClassification classificationA = Mockito.mock(TextClassification.class); - when(classificationA.getActions()).thenReturn(Lists.newArrayList(actionA)); - TextClassification classificationB = Mockito.mock(TextClassification.class); - when(classificationB.getActions()).thenReturn(Lists.newArrayList(actionB)); - when(mTextClassifier.classifyText(anyString(), anyInt(), anyInt(), isNull())).thenReturn( - classificationA, classificationB); - - RemoteAction result = mClipboardUtils.getAction(mClipDataItem, "abc").orElse(null); - - assertEquals(actionB, result); - } - - @Test - public void test_getAction_skipsShortEntity_legacy() { - TextLinks.Builder textLinks = new TextLinks.Builder("test text of length 22"); - final Map<String, Float> scores = new ArrayMap<>(); - scores.put(TextClassifier.TYPE_EMAIL, 1f); - textLinks.addLink(20, 22, scores); - textLinks.addLink(0, 22, scores); - - when(mClipDataItem.getTextLinks()).thenReturn(textLinks.build()); - when(mClipDataItem.getText()).thenReturn(textLinks.build().getText()); - - RemoteAction actionA = constructRemoteAction("abc"); - RemoteAction actionB = constructRemoteAction("def"); - TextClassification classificationA = Mockito.mock(TextClassification.class); - when(classificationA.getActions()).thenReturn(Lists.newArrayList(actionA)); - TextClassification classificationB = Mockito.mock(TextClassification.class); - when(classificationB.getActions()).thenReturn(Lists.newArrayList(actionB)); - when(mTextClassifier.classifyText(anyString(), eq(20), eq(22), isNull())).thenReturn( - classificationA); - when(mTextClassifier.classifyText(anyString(), eq(0), eq(22), isNull())).thenReturn( - classificationB); - - RemoteAction result = mClipboardUtils.getAction(mClipDataItem, "test").orElse(null); - - assertEquals(actionB, result); - } - @Test public void test_extra_withPackage_returnsTrue() { PersistableBundle b = new PersistableBundle(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogTest.kt new file mode 100644 index 000000000000..7753197afc9b --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogTest.kt @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.contrast + +import android.app.UiModeManager +import android.app.UiModeManager.ContrastUtils.fromContrastLevel +import android.os.Looper +import android.provider.Settings +import android.testing.AndroidTestingRunner +import android.widget.FrameLayout +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.settings.UserTracker +import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.settings.SecureSettings +import com.google.common.util.concurrent.MoreExecutors +import java.util.concurrent.Executor +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.eq +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +/** Test the behaviour of buttons of the [ContrastDialog]. */ +@SmallTest +@RunWith(AndroidTestingRunner::class) +class ContrastDialogTest : SysuiTestCase() { + + private lateinit var mainExecutor: Executor + private lateinit var contrastDialog: ContrastDialog + @Mock private lateinit var mockUiModeManager: UiModeManager + @Mock private lateinit var mockUserTracker: UserTracker + @Mock private lateinit var mockSecureSettings: SecureSettings + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + mainExecutor = MoreExecutors.directExecutor() + whenever(mockUserTracker.userId).thenReturn(context.userId) + } + + @Test + fun testClickButtons_putsContrastInSettings() { + if (Looper.myLooper() == null) Looper.prepare() + contrastDialog = + ContrastDialog( + context, + mainExecutor, + mockUiModeManager, + mockUserTracker, + mockSecureSettings + ) + contrastDialog.show() + try { + contrastDialog.contrastButtons.forEach { + (contrastLevel: Int, clickedButton: FrameLayout) -> + clickedButton.performClick() + verify(mockSecureSettings) + .putFloatForUser( + eq(Settings.Secure.CONTRAST_LEVEL), + eq(fromContrastLevel(contrastLevel)), + eq(context.userId) + ) + } + } finally { + contrastDialog.dismiss() + } + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt index 68846168d17b..f4cc8bcb09a5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt @@ -60,6 +60,12 @@ class ControlsFavoritingActivityTest : SysuiTestCase() { } val TEST_STRUCTURE: CharSequence = "TestStructure" val TEST_APP: CharSequence = "TestApp" + + private fun View.waitForPost() { + val latch = CountDownLatch(1) + post(latch::countDown) + latch.await() + } } @Main private val executor: Executor = MoreExecutors.directExecutor() @@ -140,7 +146,10 @@ class ControlsFavoritingActivityTest : SysuiTestCase() { val rearrangeButton = requireViewById<Button>(R.id.rearrange) assertThat(rearrangeButton.visibility).isEqualTo(View.VISIBLE) assertThat(rearrangeButton.isEnabled).isFalse() - assertThat(requireViewById<Button>(R.id.other_apps).visibility).isEqualTo(View.GONE) + + val otherAppsButton = requireViewById<Button>(R.id.other_apps) + otherAppsButton.waitForPost() + assertThat(otherAppsButton.visibility).isEqualTo(View.GONE) } } @@ -160,7 +169,10 @@ class ControlsFavoritingActivityTest : SysuiTestCase() { val rearrangeButton = requireViewById<Button>(R.id.rearrange) assertThat(rearrangeButton.visibility).isEqualTo(View.GONE) assertThat(rearrangeButton.isEnabled).isFalse() - assertThat(requireViewById<Button>(R.id.other_apps).visibility).isEqualTo(View.VISIBLE) + + val otherAppsButton = requireViewById<Button>(R.id.other_apps) + otherAppsButton.waitForPost() + assertThat(otherAppsButton.visibility).isEqualTo(View.VISIBLE) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java index 6b3ec682b12b..a7d7b93c4044 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java @@ -28,20 +28,29 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.phone.DozeParameters; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; import org.junit.Before; import org.junit.Test; +import java.util.concurrent.Executor; + @SmallTest public class DozeScreenStatePreventingAdapterTest extends SysuiTestCase { + private Executor mExecutor; private DozeMachine.Service mInner; private DozeScreenStatePreventingAdapter mWrapper; @Before public void setup() throws Exception { + mExecutor = new FakeExecutor(new FakeSystemClock()); mInner = mock(DozeMachine.Service.class); - mWrapper = new DozeScreenStatePreventingAdapter(mInner); + mWrapper = new DozeScreenStatePreventingAdapter( + mInner, + mExecutor + ); } @Test @@ -86,7 +95,8 @@ public class DozeScreenStatePreventingAdapterTest extends SysuiTestCase { when(params.getDisplayStateSupported()).thenReturn(false); assertEquals(DozeScreenStatePreventingAdapter.class, - DozeScreenStatePreventingAdapter.wrapIfNeeded(mInner, params).getClass()); + DozeScreenStatePreventingAdapter.wrapIfNeeded(mInner, params, mExecutor) + .getClass()); } @Test @@ -94,6 +104,7 @@ public class DozeScreenStatePreventingAdapterTest extends SysuiTestCase { DozeParameters params = mock(DozeParameters.class); when(params.getDisplayStateSupported()).thenReturn(true); - assertSame(mInner, DozeScreenStatePreventingAdapter.wrapIfNeeded(mInner, params)); + assertSame(mInner, DozeScreenStatePreventingAdapter.wrapIfNeeded(mInner, params, + mExecutor)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapterTest.java index 9ae7217d317e..240d2d7bd35c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapterTest.java @@ -28,20 +28,26 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.phone.DozeParameters; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; import org.junit.Before; import org.junit.Test; +import java.util.concurrent.Executor; + @SmallTest public class DozeSuspendScreenStatePreventingAdapterTest extends SysuiTestCase { + private Executor mExecutor; private DozeMachine.Service mInner; private DozeSuspendScreenStatePreventingAdapter mWrapper; @Before public void setup() throws Exception { + mExecutor = new FakeExecutor(new FakeSystemClock()); mInner = mock(DozeMachine.Service.class); - mWrapper = new DozeSuspendScreenStatePreventingAdapter(mInner); + mWrapper = new DozeSuspendScreenStatePreventingAdapter(mInner, mExecutor); } @Test @@ -92,7 +98,8 @@ public class DozeSuspendScreenStatePreventingAdapterTest extends SysuiTestCase { when(params.getDozeSuspendDisplayStateSupported()).thenReturn(false); assertEquals(DozeSuspendScreenStatePreventingAdapter.class, - DozeSuspendScreenStatePreventingAdapter.wrapIfNeeded(mInner, params).getClass()); + DozeSuspendScreenStatePreventingAdapter.wrapIfNeeded(mInner, params, mExecutor) + .getClass()); } @Test @@ -100,6 +107,7 @@ public class DozeSuspendScreenStatePreventingAdapterTest extends SysuiTestCase { DozeParameters params = mock(DozeParameters.class); when(params.getDozeSuspendDisplayStateSupported()).thenReturn(true); - assertSame(mInner, DozeSuspendScreenStatePreventingAdapter.wrapIfNeeded(mInner, params)); + assertSame(mInner, DozeSuspendScreenStatePreventingAdapter.wrapIfNeeded(mInner, params, + mExecutor)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java index 5fcf414f0251..8fdc4918b9fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java @@ -18,8 +18,8 @@ package com.android.systemui.dreams.complication; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -29,23 +29,45 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.dreams.DreamOverlayStateController; +import com.android.systemui.flags.FakeFeatureFlags; +import com.android.systemui.flags.Flags; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; import java.util.Collection; import java.util.HashSet; @SmallTest @RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper +@TestableLooper.RunWithLooper(setAsMainLooper = true) public class ComplicationCollectionLiveDataTest extends SysuiTestCase { + + private FakeExecutor mExecutor; + private DreamOverlayStateController mStateController; + private ComplicationCollectionLiveData mLiveData; + private FakeFeatureFlags mFeatureFlags; + @Mock + private Observer mObserver; + @Before - public void setUp() throws Exception { - allowTestableLooperAsMainThread(); + public void setUp() { + MockitoAnnotations.initMocks(this); + mFeatureFlags = new FakeFeatureFlags(); + mExecutor = new FakeExecutor(new FakeSystemClock()); + mFeatureFlags.set(Flags.ALWAYS_SHOW_HOME_CONTROLS_ON_DREAMS, true); + mStateController = new DreamOverlayStateController( + mExecutor, + /* overlayEnabled= */ true, + mFeatureFlags); + mLiveData = new ComplicationCollectionLiveData(mStateController); } @Test @@ -53,45 +75,41 @@ public class ComplicationCollectionLiveDataTest extends SysuiTestCase { * Ensures registration and callback lifecycles are respected. */ public void testLifecycle() { - getContext().getMainExecutor().execute(() -> { - final DreamOverlayStateController stateController = - Mockito.mock(DreamOverlayStateController.class); - final ComplicationCollectionLiveData liveData = - new ComplicationCollectionLiveData(stateController); - final HashSet<Complication> complications = new HashSet<>(); - final Observer<Collection<Complication>> observer = Mockito.mock(Observer.class); - complications.add(Mockito.mock(Complication.class)); - - when(stateController.getComplications()).thenReturn(complications); - - liveData.observeForever(observer); - ArgumentCaptor<DreamOverlayStateController.Callback> callbackCaptor = - ArgumentCaptor.forClass(DreamOverlayStateController.Callback.class); - - verify(stateController).addCallback(callbackCaptor.capture()); - verifyUpdate(observer, complications); - - complications.add(Mockito.mock(Complication.class)); - callbackCaptor.getValue().onComplicationsChanged(); - - verifyUpdate(observer, complications); - - callbackCaptor.getValue().onAvailableComplicationTypesChanged(); - - verifyUpdate(observer, complications); - }); + final HashSet<Complication> complications = new HashSet<>(); + mLiveData.observeForever(mObserver); + mExecutor.runAllReady(); + // Verify observer called with empty complications + assertObserverCalledWith(complications); + + addComplication(mock(Complication.class), complications); + assertObserverCalledWith(complications); + + addComplication(mock(Complication.class), complications); + assertObserverCalledWith(complications); + + mStateController.setAvailableComplicationTypes(0); + mExecutor.runAllReady(); + assertObserverCalledWith(complications); + mLiveData.removeObserver(mObserver); } - void verifyUpdate(Observer<Collection<Complication>> observer, - Collection<Complication> targetCollection) { + private void assertObserverCalledWith(Collection<Complication> targetCollection) { ArgumentCaptor<Collection<Complication>> collectionCaptor = ArgumentCaptor.forClass(Collection.class); - verify(observer).onChanged(collectionCaptor.capture()); + verify(mObserver).onChanged(collectionCaptor.capture()); + + final Collection<Complication> collection = collectionCaptor.getValue(); - final Collection collection = collectionCaptor.getValue(); assertThat(collection.containsAll(targetCollection) && targetCollection.containsAll(collection)).isTrue(); - Mockito.clearInvocations(observer); + Mockito.clearInvocations(mObserver); + } + + private void addComplication(Complication complication, + Collection<Complication> complications) { + complications.add(complication); + mStateController.addComplication(complication); + mExecutor.runAllReady(); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index c93e677071cd..0de9608b906f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -66,6 +66,8 @@ import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.dump.DumpManager; +import com.android.systemui.flags.FakeFeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.NotificationShadeWindowControllerImpl; @@ -142,6 +144,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { private @Mock CentralSurfaces mCentralSurfaces; + private FakeFeatureFlags mFeatureFlags; + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -160,6 +164,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { mColorExtractor, mDumpManager, mKeyguardStateController, mScreenOffAnimationController, mAuthController, mShadeExpansionStateManager, mShadeWindowLogger); + mFeatureFlags = new FakeFeatureFlags(); + DejankUtils.setImmediate(true); @@ -515,6 +521,28 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { verify(mStatusBarKeyguardViewManager, never()).reset(anyBoolean()); } + @Test + @TestableLooper.RunWithLooper(setAsMainLooper = true) + public void testNotStartingKeyguardWhenFlagIsDisabled() { + mViewMediator.setShowingLocked(false); + when(mKeyguardStateController.isShowing()).thenReturn(false); + + mFeatureFlags.set(Flags.LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING, false); + mViewMediator.onDreamingStarted(); + assertFalse(mViewMediator.isShowingAndNotOccluded()); + } + + @Test + @TestableLooper.RunWithLooper(setAsMainLooper = true) + public void testStartingKeyguardWhenFlagIsEnabled() { + mViewMediator.setShowingLocked(true); + when(mKeyguardStateController.isShowing()).thenReturn(true); + + mFeatureFlags.set(Flags.LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING, true); + mViewMediator.onDreamingStarted(); + assertTrue(mViewMediator.isShowingAndNotOccluded()); + } + private void createAndStartViewMediator() { mViewMediator = new KeyguardViewMediator( mContext, @@ -545,7 +573,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { () -> mShadeController, () -> mNotificationShadeWindowController, () -> mActivityLaunchAnimator, - () -> mScrimController); + () -> mScrimController, + mFeatureFlags); mViewMediator.start(); mViewMediator.registerCentralSurfaces(mCentralSurfaces, null, null, null, null, null); diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt index 86e8c9accc45..a668af340e7b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt @@ -41,6 +41,7 @@ import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.android.systemui.util.settings.FakeSettings import com.google.common.truth.Truth.assertThat +import java.util.Locale import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope @@ -67,6 +68,7 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { @Before fun setUp() { + context.resources.configuration.setLayoutDirection(Locale.US) config1 = FakeKeyguardQuickAffordanceConfig(FakeCustomizationProviderClient.AFFORDANCE_1) config2 = FakeKeyguardQuickAffordanceConfig(FakeCustomizationProviderClient.AFFORDANCE_2) val testDispatcher = StandardTestDispatcher() @@ -222,6 +224,40 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { } @Test + fun getSlotPickerRepresentations_rightToLeft_slotsReversed() { + context.resources.configuration.setLayoutDirection(Locale("he", "IL")) + val slot1 = "slot1" + val slot2 = "slot2" + val slot3 = "slot3" + context.orCreateTestableResources.addOverride( + R.array.config_keyguardQuickAffordanceSlots, + arrayOf( + "$slot1:2", + "$slot2:4", + "$slot3:5", + ), + ) + + assertThat(underTest.getSlotPickerRepresentations()) + .isEqualTo( + listOf( + KeyguardSlotPickerRepresentation( + id = slot3, + maxSelectedAffordances = 5, + ), + KeyguardSlotPickerRepresentation( + id = slot2, + maxSelectedAffordances = 4, + ), + KeyguardSlotPickerRepresentation( + id = slot1, + maxSelectedAffordances = 2, + ), + ) + ) + } + + @Test fun `selections for secondary user`() = testScope.runTest { userTracker.set( diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt index 0e6f8d4e0720..3fd97da23157 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt @@ -46,10 +46,12 @@ import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.withArgCaptor import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before @@ -59,6 +61,7 @@ import org.mockito.Mock import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(AndroidJUnit4::class) class KeyguardRepositoryImplTest : SysuiTestCase() { @@ -73,6 +76,9 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor @Mock private lateinit var dreamOverlayCallbackController: DreamOverlayCallbackController @Mock private lateinit var dozeParameters: DozeParameters + private val mainDispatcher = StandardTestDispatcher() + private val testDispatcher = StandardTestDispatcher() + private val testScope = TestScope(testDispatcher) private lateinit var underTest: KeyguardRepositoryImpl @@ -92,12 +98,13 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { dozeParameters, authController, dreamOverlayCallbackController, + mainDispatcher ) } @Test fun animateBottomAreaDozingTransitions() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { assertThat(underTest.animateBottomAreaDozingTransitions.value).isEqualTo(false) underTest.setAnimateDozingTransitions(true) @@ -112,7 +119,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun bottomAreaAlpha() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { assertThat(underTest.bottomAreaAlpha.value).isEqualTo(1f) underTest.setBottomAreaAlpha(0.1f) @@ -133,7 +140,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun clockPosition() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { assertThat(underTest.clockPosition.value).isEqualTo(Position(0, 0)) underTest.setClockPosition(0, 1) @@ -151,11 +158,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isKeyguardShowing() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { whenever(keyguardStateController.isShowing).thenReturn(false) var latest: Boolean? = null val job = underTest.isKeyguardShowing.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isFalse() assertThat(underTest.isKeyguardShowing()).isFalse() @@ -164,11 +172,13 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { whenever(keyguardStateController.isShowing).thenReturn(true) captor.value.onKeyguardShowingChanged() + runCurrent() assertThat(latest).isTrue() assertThat(underTest.isKeyguardShowing()).isTrue() whenever(keyguardStateController.isShowing).thenReturn(false) captor.value.onKeyguardShowingChanged() + runCurrent() assertThat(latest).isFalse() assertThat(underTest.isKeyguardShowing()).isFalse() @@ -197,11 +207,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isKeyguardOccluded() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { whenever(keyguardStateController.isOccluded).thenReturn(false) var latest: Boolean? = null val job = underTest.isKeyguardOccluded.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isFalse() val captor = argumentCaptor<KeyguardStateController.Callback>() @@ -209,10 +220,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { whenever(keyguardStateController.isOccluded).thenReturn(true) captor.value.onKeyguardShowingChanged() + runCurrent() assertThat(latest).isTrue() whenever(keyguardStateController.isOccluded).thenReturn(false) captor.value.onKeyguardShowingChanged() + runCurrent() assertThat(latest).isFalse() job.cancel() @@ -220,11 +233,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isKeyguardUnlocked() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { whenever(keyguardStateController.isUnlocked).thenReturn(false) var latest: Boolean? = null val job = underTest.isKeyguardUnlocked.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isFalse() val captor = argumentCaptor<KeyguardStateController.Callback>() @@ -232,10 +246,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { whenever(keyguardStateController.isUnlocked).thenReturn(true) captor.value.onUnlockedChanged() + runCurrent() assertThat(latest).isTrue() whenever(keyguardStateController.isUnlocked).thenReturn(false) captor.value.onUnlockedChanged() + runCurrent() assertThat(latest).isFalse() job.cancel() @@ -243,82 +259,98 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isDozing() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isDozing.onEach { latest = it }.launchIn(this) + runCurrent() val captor = argumentCaptor<DozeHost.Callback>() verify(dozeHost).addCallback(captor.capture()) captor.value.onDozingChanged(true) + runCurrent() assertThat(latest).isTrue() captor.value.onDozingChanged(false) + runCurrent() assertThat(latest).isFalse() job.cancel() + runCurrent() verify(dozeHost).removeCallback(captor.value) } @Test fun `isDozing - starts with correct initial value for isDozing`() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { var latest: Boolean? = null whenever(statusBarStateController.isDozing).thenReturn(true) var job = underTest.isDozing.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isTrue() job.cancel() whenever(statusBarStateController.isDozing).thenReturn(false) job = underTest.isDozing.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isFalse() job.cancel() } @Test fun dozeAmount() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { val values = mutableListOf<Float>() val job = underTest.linearDozeAmount.onEach(values::add).launchIn(this) val captor = argumentCaptor<StatusBarStateController.StateListener>() + runCurrent() verify(statusBarStateController).addCallback(captor.capture()) captor.value.onDozeAmountChanged(0.433f, 0.4f) + runCurrent() captor.value.onDozeAmountChanged(0.498f, 0.5f) + runCurrent() captor.value.onDozeAmountChanged(0.661f, 0.65f) + runCurrent() assertThat(values).isEqualTo(listOf(0f, 0.433f, 0.498f, 0.661f)) job.cancel() + runCurrent() verify(statusBarStateController).removeCallback(captor.value) } @Test fun wakefulness() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { val values = mutableListOf<WakefulnessModel>() val job = underTest.wakefulness.onEach(values::add).launchIn(this) + runCurrent() val captor = argumentCaptor<WakefulnessLifecycle.Observer>() verify(wakefulnessLifecycle).addObserver(captor.capture()) whenever(wakefulnessLifecycle.wakefulness) .thenReturn(WakefulnessLifecycle.WAKEFULNESS_WAKING) captor.value.onStartedWakingUp() + runCurrent() whenever(wakefulnessLifecycle.wakefulness) .thenReturn(WakefulnessLifecycle.WAKEFULNESS_AWAKE) captor.value.onFinishedWakingUp() + runCurrent() whenever(wakefulnessLifecycle.wakefulness) .thenReturn(WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP) captor.value.onStartedGoingToSleep() + runCurrent() whenever(wakefulnessLifecycle.wakefulness) .thenReturn(WakefulnessLifecycle.WAKEFULNESS_ASLEEP) captor.value.onFinishedGoingToSleep() + runCurrent() assertThat(values.map { it.state }) .isEqualTo( @@ -333,12 +365,13 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { ) job.cancel() + runCurrent() verify(wakefulnessLifecycle).removeObserver(captor.value) } @Test fun isUdfpsSupported() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { whenever(keyguardUpdateMonitor.isUdfpsSupported).thenReturn(true) assertThat(underTest.isUdfpsSupported()).isTrue() @@ -348,11 +381,11 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isKeyguardGoingAway() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { whenever(keyguardStateController.isKeyguardGoingAway).thenReturn(false) var latest: Boolean? = null val job = underTest.isKeyguardGoingAway.onEach { latest = it }.launchIn(this) - + runCurrent() assertThat(latest).isFalse() val captor = argumentCaptor<KeyguardStateController.Callback>() @@ -360,10 +393,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { whenever(keyguardStateController.isKeyguardGoingAway).thenReturn(true) captor.value.onKeyguardGoingAwayChanged() + runCurrent() assertThat(latest).isTrue() whenever(keyguardStateController.isKeyguardGoingAway).thenReturn(false) captor.value.onKeyguardGoingAwayChanged() + runCurrent() assertThat(latest).isFalse() job.cancel() @@ -371,20 +406,23 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isDreamingFromKeyguardUpdateMonitor() = - runTest(UnconfinedTestDispatcher()) { + TestScope(mainDispatcher).runTest { whenever(keyguardUpdateMonitor.isDreaming()).thenReturn(false) var latest: Boolean? = null val job = underTest.isDreaming.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isFalse() val captor = argumentCaptor<KeyguardUpdateMonitorCallback>() verify(keyguardUpdateMonitor).registerCallback(captor.capture()) captor.value.onDreamingStateChanged(true) + runCurrent() assertThat(latest).isTrue() captor.value.onDreamingStateChanged(false) + runCurrent() assertThat(latest).isFalse() job.cancel() @@ -392,11 +430,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun isDreamingFromDreamOverlayCallbackController() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { whenever(dreamOverlayCallbackController.isDreaming).thenReturn(false) var latest: Boolean? = null val job = underTest.isDreamingWithOverlay.onEach { latest = it }.launchIn(this) + runCurrent() assertThat(latest).isFalse() val listener = @@ -405,9 +444,11 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { } listener.onStartDream() + runCurrent() assertThat(latest).isTrue() listener.onWakeUp() + runCurrent() assertThat(latest).isFalse() job.cancel() @@ -415,12 +456,13 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun biometricUnlockState() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { val values = mutableListOf<BiometricUnlockModel>() val job = underTest.biometricUnlockState.onEach(values::add).launchIn(this) - val captor = argumentCaptor<BiometricUnlockController.BiometricModeListener>() - verify(biometricUnlockController).addBiometricModeListener(captor.capture()) + runCurrent() + val captor = argumentCaptor<BiometricUnlockController.BiometricUnlockEventsListener>() + verify(biometricUnlockController).addListener(captor.capture()) listOf( BiometricUnlockController.MODE_NONE, @@ -435,6 +477,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { .forEach { whenever(biometricUnlockController.mode).thenReturn(it) captor.value.onModeChanged(it) + runCurrent() } assertThat(values) @@ -454,12 +497,13 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { ) job.cancel() - verify(biometricUnlockController).removeBiometricModeListener(captor.value) + runCurrent() + verify(biometricUnlockController).removeListener(captor.value) } @Test fun dozeTransitionModel() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { // For the initial state whenever(dozeTransitionListener.oldState).thenReturn(DozeMachine.State.UNINITIALIZED) whenever(dozeTransitionListener.newState).thenReturn(DozeMachine.State.UNINITIALIZED) @@ -467,6 +511,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { val values = mutableListOf<DozeTransitionModel>() val job = underTest.dozeTransitionModel.onEach(values::add).launchIn(this) + runCurrent() val listener = withArgCaptor<DozeTransitionCallback> { verify(dozeTransitionListener).addCallback(capture()) @@ -475,20 +520,26 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { // These don't have to reflect real transitions from the DozeMachine. Only that the // transitions are properly emitted listener.onDozeTransition(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE) + runCurrent() listener.onDozeTransition(DozeMachine.State.DOZE, DozeMachine.State.DOZE_AOD) + runCurrent() listener.onDozeTransition(DozeMachine.State.DOZE_AOD_DOCKED, DozeMachine.State.FINISH) + runCurrent() listener.onDozeTransition( DozeMachine.State.DOZE_REQUEST_PULSE, DozeMachine.State.DOZE_PULSING ) + runCurrent() listener.onDozeTransition( DozeMachine.State.DOZE_SUSPEND_TRIGGERS, DozeMachine.State.DOZE_PULSE_DONE ) + runCurrent() listener.onDozeTransition( DozeMachine.State.DOZE_AOD_PAUSING, DozeMachine.State.DOZE_AOD_PAUSED ) + runCurrent() assertThat(values) .isEqualTo( @@ -517,15 +568,17 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { ) job.cancel() + runCurrent() verify(dozeTransitionListener).removeCallback(listener) } @Test fun fingerprintSensorLocation() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { val values = mutableListOf<Point?>() val job = underTest.fingerprintSensorLocation.onEach(values::add).launchIn(this) + runCurrent() val captor = argumentCaptor<AuthController.Callback>() verify(authController).addCallback(captor.capture()) @@ -539,6 +592,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { .onEach { whenever(authController.fingerprintSensorLocation).thenReturn(it) captor.value.onFingerprintLocationChanged() + runCurrent() } .also { dispatchedSensorLocations -> assertThat(values).isEqualTo(listOf(null) + dispatchedSensorLocations) @@ -549,11 +603,12 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun faceSensorLocation() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { val values = mutableListOf<Point?>() val job = underTest.faceSensorLocation.onEach(values::add).launchIn(this) val captor = argumentCaptor<AuthController.Callback>() + runCurrent() verify(authController).addCallback(captor.capture()) // An initial, null value should be initially emitted so that flows combined with this @@ -571,6 +626,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { .onEach { whenever(authController.faceSensorLocation).thenReturn(it) captor.value.onFaceSensorLocationChanged() + runCurrent() } .also { dispatchedSensorLocations -> assertThat(values).isEqualTo(listOf(null) + dispatchedSensorLocations) @@ -581,10 +637,11 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { @Test fun biometricUnlockSource() = - runTest(UnconfinedTestDispatcher()) { + testScope.runTest { val values = mutableListOf<BiometricUnlockSource?>() val job = underTest.biometricUnlockSource.onEach(values::add).launchIn(this) + runCurrent() val captor = argumentCaptor<KeyguardUpdateMonitorCallback>() verify(keyguardUpdateMonitor).registerCallback(captor.capture()) @@ -603,6 +660,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { ) .onEach { biometricSourceType -> captor.value.onBiometricAuthenticated(0, biometricSourceType, false) + runCurrent() } assertThat(values) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt index 51988ef1ab78..77bb12c2cbda 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt @@ -29,20 +29,20 @@ import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.util.mockito.any +import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.advanceTimeBy import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock -import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @@ -51,8 +51,8 @@ import org.mockito.MockitoAnnotations @RunWith(AndroidJUnit4::class) class KeyguardLongPressInteractorTest : SysuiTestCase() { - @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var logger: UiEventLogger + @Mock private lateinit var accessibilityManager: AccessibilityManagerWrapper private lateinit var underTest: KeyguardLongPressInteractor @@ -63,6 +63,14 @@ class KeyguardLongPressInteractorTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) + whenever(accessibilityManager.getRecommendedTimeoutMillis(anyInt(), anyInt())).thenAnswer { + it.arguments[0] + } + + testScope = TestScope() + keyguardRepository = FakeKeyguardRepository() + keyguardTransitionRepository = FakeKeyguardTransitionRepository() + runBlocking { createUnderTest() } } @@ -98,60 +106,117 @@ class KeyguardLongPressInteractorTest : SysuiTestCase() { } @Test - fun `long-pressed - pop-up clicked - starts activity`() = + fun longPressed_menuClicked_showsSettings() = testScope.runTest { - val menu = collectLastValue(underTest.menu) + val isMenuVisible by collectLastValue(underTest.isMenuVisible) + val shouldOpenSettings by collectLastValue(underTest.shouldOpenSettings) runCurrent() - val x = 100 - val y = 123 - underTest.onLongPress(x, y) - assertThat(menu()).isNotNull() - assertThat(menu()?.position?.x).isEqualTo(x) - assertThat(menu()?.position?.y).isEqualTo(y) + underTest.onLongPress() + assertThat(isMenuVisible).isTrue() + + underTest.onMenuTouchGestureEnded(/* isClick= */ true) + + assertThat(isMenuVisible).isFalse() + assertThat(shouldOpenSettings).isTrue() + } + + @Test + fun onSettingsShown_consumesSettingsShowEvent() = + testScope.runTest { + val shouldOpenSettings by collectLastValue(underTest.shouldOpenSettings) + runCurrent() - menu()?.onClicked?.invoke() + underTest.onLongPress() + underTest.onMenuTouchGestureEnded(/* isClick= */ true) + assertThat(shouldOpenSettings).isTrue() - assertThat(menu()).isNull() - verify(activityStarter).dismissKeyguardThenExecute(any(), any(), anyBoolean()) + underTest.onSettingsShown() + assertThat(shouldOpenSettings).isFalse() } @Test - fun `long-pressed - pop-up dismissed - never starts activity`() = + fun onTouchedOutside_neverShowsSettings() = testScope.runTest { - val menu = collectLastValue(underTest.menu) + val isMenuVisible by collectLastValue(underTest.isMenuVisible) + val shouldOpenSettings by collectLastValue(underTest.shouldOpenSettings) runCurrent() - menu()?.onDismissed?.invoke() + underTest.onTouchedOutside() - assertThat(menu()).isNull() - verify(activityStarter, never()).dismissKeyguardThenExecute(any(), any(), anyBoolean()) + assertThat(isMenuVisible).isFalse() + assertThat(shouldOpenSettings).isFalse() + } + + @Test + fun longPressed_openWppDirectlyEnabled_doesNotShowMenu_opensSettings() = + testScope.runTest { + createUnderTest(isOpenWppDirectlyEnabled = true) + val isMenuVisible by collectLastValue(underTest.isMenuVisible) + val shouldOpenSettings by collectLastValue(underTest.shouldOpenSettings) + runCurrent() + + underTest.onLongPress() + + assertThat(isMenuVisible).isFalse() + assertThat(shouldOpenSettings).isTrue() } - @Suppress("DEPRECATION") // We're okay using ACTION_CLOSE_SYSTEM_DIALOGS on system UI. @Test fun `long pressed - close dialogs broadcast received - popup dismissed`() = testScope.runTest { - val menu = collectLastValue(underTest.menu) + val isMenuVisible by collectLastValue(underTest.isMenuVisible) runCurrent() - underTest.onLongPress(123, 456) - assertThat(menu()).isNotNull() + underTest.onLongPress() + assertThat(isMenuVisible).isTrue() fakeBroadcastDispatcher.registeredReceivers.forEach { broadcastReceiver -> broadcastReceiver.onReceive(context, Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) } - assertThat(menu()).isNull() + assertThat(isMenuVisible).isFalse() + } + + @Test + fun closesDialogAfterTimeout() = + testScope.runTest { + val isMenuVisible by collectLastValue(underTest.isMenuVisible) + runCurrent() + + underTest.onLongPress() + assertThat(isMenuVisible).isTrue() + + advanceTimeBy(KeyguardLongPressInteractor.DEFAULT_POPUP_AUTO_HIDE_TIMEOUT_MS) + + assertThat(isMenuVisible).isFalse() + } + + @Test + fun closesDialogAfterTimeout_onlyAfterTouchGestureEnded() = + testScope.runTest { + val isMenuVisible by collectLastValue(underTest.isMenuVisible) + runCurrent() + + underTest.onLongPress() + assertThat(isMenuVisible).isTrue() + underTest.onMenuTouchGestureStarted() + + advanceTimeBy(KeyguardLongPressInteractor.DEFAULT_POPUP_AUTO_HIDE_TIMEOUT_MS) + assertThat(isMenuVisible).isTrue() + + underTest.onMenuTouchGestureEnded(/* isClick= */ false) + advanceTimeBy(KeyguardLongPressInteractor.DEFAULT_POPUP_AUTO_HIDE_TIMEOUT_MS) + assertThat(isMenuVisible).isFalse() } @Test fun `logs when menu is shown`() = testScope.runTest { - collectLastValue(underTest.menu) + collectLastValue(underTest.isMenuVisible) runCurrent() - underTest.onLongPress(100, 123) + underTest.onLongPress() verify(logger) .log(KeyguardLongPressInteractor.LogEvents.LOCK_SCREEN_LONG_PRESS_POPUP_SHOWN) @@ -160,41 +225,61 @@ class KeyguardLongPressInteractorTest : SysuiTestCase() { @Test fun `logs when menu is clicked`() = testScope.runTest { - val menu = collectLastValue(underTest.menu) + collectLastValue(underTest.isMenuVisible) runCurrent() - underTest.onLongPress(100, 123) - menu()?.onClicked?.invoke() + underTest.onLongPress() + underTest.onMenuTouchGestureEnded(/* isClick= */ true) verify(logger) .log(KeyguardLongPressInteractor.LogEvents.LOCK_SCREEN_LONG_PRESS_POPUP_CLICKED) } + @Test + fun showMenu_leaveLockscreen_returnToLockscreen_menuNotVisible() = + testScope.runTest { + val isMenuVisible by collectLastValue(underTest.isMenuVisible) + runCurrent() + underTest.onLongPress() + assertThat(isMenuVisible).isTrue() + + keyguardTransitionRepository.sendTransitionStep( + TransitionStep( + to = KeyguardState.GONE, + ), + ) + assertThat(isMenuVisible).isFalse() + + keyguardTransitionRepository.sendTransitionStep( + TransitionStep( + to = KeyguardState.LOCKSCREEN, + ), + ) + assertThat(isMenuVisible).isFalse() + } + private suspend fun createUnderTest( isLongPressFeatureEnabled: Boolean = true, isRevampedWppFeatureEnabled: Boolean = true, + isOpenWppDirectlyEnabled: Boolean = false, ) { - testScope = TestScope() - keyguardRepository = FakeKeyguardRepository() - keyguardTransitionRepository = FakeKeyguardTransitionRepository() - underTest = KeyguardLongPressInteractor( - unsafeContext = context, scope = testScope.backgroundScope, transitionInteractor = KeyguardTransitionInteractor( repository = keyguardTransitionRepository, ), repository = keyguardRepository, - activityStarter = activityStarter, logger = logger, featureFlags = FakeFeatureFlags().apply { set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, isLongPressFeatureEnabled) set(Flags.REVAMPED_WALLPAPER_UI, isRevampedWppFeatureEnabled) + set(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP, isOpenWppDirectlyEnabled) }, broadcastDispatcher = fakeBroadcastDispatcher, + accessibilityManager = accessibilityManager ) setUpState() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt index 4c8a0a51bcdf..24a47b014152 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt @@ -48,6 +48,7 @@ import org.junit.runner.RunWith import org.mockito.Answers import org.mockito.ArgumentCaptor import org.mockito.Mock +import org.mockito.Mockito.anyInt import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.verify @@ -124,6 +125,17 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { } @Test + fun testShow_isResumed() { + whenever(repository.primaryBouncerShow.value).thenReturn(true) + whenever(keyguardSecurityModel.getSecurityMode(anyInt())) + .thenReturn(KeyguardSecurityModel.SecurityMode.SimPuk) + + underTest.show(true) + verify(repository).setPrimaryShow(false) + verify(repository).setPrimaryShow(true) + } + + @Test fun testHide() { underTest.hide() verify(falsingCollector).onBouncerHidden() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt index bfc09d7c0379..224eec1bf3ac 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt @@ -20,10 +20,12 @@ import android.app.admin.DevicePolicyManager import android.content.Intent import android.os.UserHandle import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogLaunchAnimator import com.android.systemui.animation.Expandable +import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue import com.android.systemui.doze.util.BurnInHelperWrapper @@ -38,10 +40,13 @@ import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanc import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceRemoteUserSelectionManager import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository +import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardLongPressInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardQuickAffordanceInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.domain.quickaffordance.FakeKeyguardQuickAffordanceRegistry import com.android.systemui.keyguard.shared.quickaffordance.ActivationState import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancePosition @@ -51,6 +56,7 @@ import com.android.systemui.settings.UserFileManager import com.android.systemui.settings.UserTracker import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots import com.android.systemui.statusbar.CommandQueue +import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.FakeSharedPreferences import com.android.systemui.util.mockito.any @@ -91,6 +97,8 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger + @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher + @Mock private lateinit var accessibilityManager: AccessibilityManagerWrapper private lateinit var underTest: KeyguardBottomAreaViewModel @@ -134,6 +142,8 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { FakeFeatureFlags().apply { set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, false) set(Flags.FACE_AUTH_REFACTOR, true) + set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, false) + set(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP, false) } val keyguardInteractor = @@ -196,6 +206,19 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { dumpManager = mock(), userHandle = UserHandle.SYSTEM, ) + val keyguardLongPressInteractor = + KeyguardLongPressInteractor( + scope = testScope.backgroundScope, + transitionInteractor = + KeyguardTransitionInteractor( + repository = FakeKeyguardTransitionRepository(), + ), + repository = repository, + logger = UiEventLoggerFake(), + featureFlags = featureFlags, + broadcastDispatcher = broadcastDispatcher, + accessibilityManager = accessibilityManager, + ) underTest = KeyguardBottomAreaViewModel( keyguardInteractor = keyguardInteractor, @@ -216,6 +239,14 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { ), bottomAreaInteractor = KeyguardBottomAreaInteractor(repository = repository), burnInHelperWrapper = burnInHelperWrapper, + longPressViewModel = + KeyguardLongPressViewModel( + interactor = keyguardLongPressInteractor, + ), + settingsMenuViewModel = + KeyguardSettingsMenuViewModel( + interactor = keyguardLongPressInteractor, + ), ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerTest.kt index 20260069c943..b40ebc9bb156 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerTest.kt @@ -24,12 +24,14 @@ import android.view.View.GONE import android.view.View.VISIBLE import android.widget.FrameLayout import com.android.systemui.SysuiTestCase +import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.notification.stack.MediaContainerView import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.animation.UniqueObjectHostView +import com.android.systemui.util.mockito.whenever import com.android.systemui.util.settings.FakeSettings import com.android.systemui.utils.os.FakeHandler import com.google.common.truth.Truth.assertThat @@ -39,8 +41,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock +import org.mockito.Mockito.any +import org.mockito.Mockito.doAnswer import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` as whenever import org.mockito.junit.MockitoJUnit @SmallTest @@ -61,9 +64,16 @@ class KeyguardMediaControllerTest : SysuiTestCase() { private lateinit var keyguardMediaController: KeyguardMediaController private lateinit var testableLooper: TestableLooper private lateinit var fakeHandler: FakeHandler + private lateinit var statusBarStateListener: StatusBarStateController.StateListener @Before fun setup() { + doAnswer { + statusBarStateListener = it.arguments[0] as StatusBarStateController.StateListener + return@doAnswer Unit + } + .whenever(statusBarStateController) + .addCallback(any(StatusBarStateController.StateListener::class.java)) // default state is positive, media should show up whenever(mediaHost.visible).thenReturn(true) whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) @@ -170,4 +180,31 @@ class KeyguardMediaControllerTest : SysuiTestCase() { fun testMediaHost_expandedPlayer() { verify(mediaHost).expansion = MediaHostState.EXPANDED } + + @Test + fun dozing_inSplitShade_mediaIsHidden() { + val splitShadeContainer = FrameLayout(context) + keyguardMediaController.attachSplitShadeContainer(splitShadeContainer) + keyguardMediaController.useSplitShade = true + + setDozing() + + assertThat(splitShadeContainer.visibility).isEqualTo(GONE) + } + + @Test + fun dozing_inSingleShade_mediaIsVisible() { + val splitShadeContainer = FrameLayout(context) + keyguardMediaController.attachSplitShadeContainer(splitShadeContainer) + keyguardMediaController.useSplitShade = false + + setDozing() + + assertThat(mediaContainerView.visibility).isEqualTo(VISIBLE) + } + + private fun setDozing() { + whenever(statusBarStateController.isDozing).thenReturn(true) + statusBarStateListener.onDozingChanged(true) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt index 543875dc31cf..aace5661862b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt @@ -101,6 +101,7 @@ import dagger.Lazy import junit.framework.Assert.assertTrue import org.junit.After import org.junit.Before +import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -2199,6 +2200,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test + @Ignore("b/276920368") fun bindRecommendation_carouselNotFitThreeRecs() { useRealConstraintSets() setupUpdatedRecommendationViewHolder() diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java index 17d8799b4f84..7f7952feb10b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java @@ -532,7 +532,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE); - assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE); + assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE); assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE); assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE); assertThat(mViewHolder.mStatusIcon.getVisibility()).isEqualTo(View.VISIBLE); diff --git a/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt index acde887818aa..19f9960558b2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt @@ -22,6 +22,8 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState @@ -31,6 +33,8 @@ import com.android.systemui.multishade.data.remoteproxy.MultiShadeInputProxy import com.android.systemui.multishade.data.repository.MultiShadeRepository import com.android.systemui.multishade.shared.model.ProxiedInputModel import com.android.systemui.multishade.shared.model.ShadeId +import com.android.systemui.shade.ShadeController +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestScope @@ -42,6 +46,10 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import org.mockito.Mock +import org.mockito.Mockito.anyBoolean +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations @OptIn(ExperimentalCoroutinesApi::class) @SmallTest @@ -57,9 +65,11 @@ class MultiShadeMotionEventInteractorTest : SysuiTestCase() { private val touchSlop: Int = ViewConfiguration.get(context).scaledTouchSlop private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository private lateinit var falsingManager: FalsingManagerFake + @Mock private lateinit var shadeController: ShadeController @Before fun setUp() { + MockitoAnnotations.initMocks(this) testScope = TestScope() motionEvents = mutableSetOf() @@ -75,18 +85,23 @@ class MultiShadeMotionEventInteractorTest : SysuiTestCase() { repository = repository, inputProxy = inputProxy, ) + val featureFlags = FakeFeatureFlags() + featureFlags.set(Flags.DUAL_SHADE, true) keyguardTransitionRepository = FakeKeyguardTransitionRepository() falsingManager = FalsingManagerFake() + underTest = MultiShadeMotionEventInteractor( applicationContext = context, applicationScope = testScope.backgroundScope, multiShadeInteractor = interactor, + featureFlags = featureFlags, keyguardTransitionInteractor = KeyguardTransitionInteractor( repository = keyguardTransitionRepository, ), falsingManager = falsingManager, + shadeController = shadeController, ) } @@ -96,6 +111,39 @@ class MultiShadeMotionEventInteractorTest : SysuiTestCase() { } @Test + fun listenForIsAnyShadeExpanded_expanded_makesWindowViewVisible() = + testScope.runTest { + whenever(shadeController.isKeyguard).thenReturn(false) + repository.setExpansion(ShadeId.LEFT, 0.1f) + val expanded by collectLastValue(interactor.isAnyShadeExpanded) + assertThat(expanded).isTrue() + + verify(shadeController).makeExpandedVisible(anyBoolean()) + } + + @Test + fun listenForIsAnyShadeExpanded_collapsed_makesWindowViewInvisible() = + testScope.runTest { + whenever(shadeController.isKeyguard).thenReturn(false) + repository.setForceCollapseAll(true) + val expanded by collectLastValue(interactor.isAnyShadeExpanded) + assertThat(expanded).isFalse() + + verify(shadeController).makeExpandedInvisible() + } + + @Test + fun listenForIsAnyShadeExpanded_collapsedOnKeyguard_makesWindowViewVisible() = + testScope.runTest { + whenever(shadeController.isKeyguard).thenReturn(true) + repository.setForceCollapseAll(true) + val expanded by collectLastValue(interactor.isAnyShadeExpanded) + assertThat(expanded).isFalse() + + verify(shadeController).makeExpandedVisible(anyBoolean()) + } + + @Test fun shouldIntercept_initialDown_returnsFalse() = testScope.runTest { assertThat(underTest.shouldIntercept(motionEvent(MotionEvent.ACTION_DOWN))).isFalse() diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt index c96853d1a406..a0c376ff1a1c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt @@ -30,6 +30,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.notetask.NoteTaskController import com.android.systemui.notetask.NoteTaskEntryPoint import com.android.systemui.settings.FakeUserTracker +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.whenever import org.junit.After @@ -38,6 +39,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock +import org.mockito.Mockito.never import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @@ -86,15 +88,28 @@ class LaunchNoteTaskActivityTest : SysuiTestCase() { @Test fun startActivityOnWorkProfileUser_shouldLaunchProxyActivity() { + val mainUserHandle: UserHandle = mainUser.userHandle userTracker.set(listOf(mainUser, workProfileUser), selectedUserIndex = 1) whenever(userManager.isManagedProfile).thenReturn(true) + whenever(userManager.mainUser).thenReturn(mainUserHandle) activityRule.launchActivity(/* startIntent= */ null) - val mainUserHandle: UserHandle = mainUser.userHandle verify(noteTaskController).startNoteTaskProxyActivityForUser(eq(mainUserHandle)) } + @Test + fun startActivityOnWorkProfileUser_noMainUser_shouldNotLaunch() { + userTracker.set(listOf(mainUser, workProfileUser), selectedUserIndex = 1) + whenever(userManager.isManagedProfile).thenReturn(true) + whenever(userManager.mainUser).thenReturn(null) + + activityRule.launchActivity(/* startIntent= */ null) + + verify(noteTaskController, never()).showNoteTask(any()) + verify(noteTaskController, never()).startNoteTaskProxyActivityForUser(any()) + } + private companion object { val mainUser = UserInfo(/* id= */ 0, /* name= */ "primary", /* flags= */ UserInfo.FLAG_MAIN) val workProfileUser = diff --git a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt index eb7b481e5244..8cb5d31fff22 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt @@ -19,6 +19,7 @@ package com.android.systemui.recents import android.content.ComponentName import android.content.pm.PackageManager import android.content.pm.ResolveInfo +import android.os.PowerManager import android.testing.AndroidTestingRunner import android.testing.TestableContext import android.testing.TestableLooper @@ -30,6 +31,7 @@ import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager import com.android.systemui.keyguard.KeyguardUnlockAnimationController import com.android.systemui.keyguard.ScreenLifecycle +import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.model.SysUiState import com.android.systemui.navigationbar.NavigationBarController import com.android.systemui.navigationbar.NavigationModeController @@ -37,16 +39,17 @@ import com.android.systemui.recents.OverviewProxyService.ACTION_QUICKSTEP import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.settings.UserTracker import com.android.systemui.shared.recents.IOverviewProxy -import com.android.systemui.shared.system.QuickStepContract.SCREEN_STATE_OFF -import com.android.systemui.shared.system.QuickStepContract.SCREEN_STATE_ON -import com.android.systemui.shared.system.QuickStepContract.SCREEN_STATE_TURNING_OFF -import com.android.systemui.shared.system.QuickStepContract.SCREEN_STATE_TURNING_ON -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_STATE_MASK +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK +import com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_ASLEEP +import com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_AWAKE +import com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_GOING_TO_SLEEP +import com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_WAKING import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.phone.CentralSurfaces import com.android.systemui.unfold.progress.UnfoldTransitionProgressForwarder import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.time.FakeSystemClock import com.android.wm.shell.sysui.ShellInterface import com.google.common.util.concurrent.MoreExecutors import dagger.Lazy @@ -60,6 +63,7 @@ import org.mockito.ArgumentMatchers import org.mockito.Mock import org.mockito.Mockito.any import org.mockito.Mockito.anyInt +import org.mockito.Mockito.clearInvocations import org.mockito.Mockito.intThat import org.mockito.Mockito.mock import org.mockito.Mockito.verify @@ -75,8 +79,11 @@ class OverviewProxyServiceTest : SysuiTestCase() { private lateinit var subject: OverviewProxyService private val dumpManager = DumpManager() private val displayTracker = FakeDisplayTracker(mContext) + private val fakeSystemClock = FakeSystemClock() private val sysUiState = SysUiState(displayTracker) private val screenLifecycle = ScreenLifecycle(dumpManager) + private val wakefulnessLifecycle = + WakefulnessLifecycle(mContext, null, fakeSystemClock, dumpManager) @Mock private lateinit var overviewProxy: IOverviewProxy.Stub @Mock private lateinit var packageManager: PackageManager @@ -130,6 +137,7 @@ class OverviewProxyServiceTest : SysuiTestCase() { sysUiState, userTracker, screenLifecycle, + wakefulnessLifecycle, uiEventLogger, displayTracker, sysuiUnlockAnimationController, @@ -145,42 +153,48 @@ class OverviewProxyServiceTest : SysuiTestCase() { } @Test - fun `ScreenLifecycle - screenTurnedOn triggers SysUI state flag changes `() { - screenLifecycle.dispatchScreenTurnedOn() + fun `WakefulnessLifecycle - dispatchFinishedWakingUp sets SysUI flag to AWAKE`() { + // WakefulnessLifecycle is initialized to AWAKE initially, and won't emit a noop. + wakefulnessLifecycle.dispatchFinishedGoingToSleep() + clearInvocations(overviewProxy) + + wakefulnessLifecycle.dispatchFinishedWakingUp() verify(overviewProxy) .onSystemUiStateChanged( - intThat { it and SYSUI_STATE_SCREEN_STATE_MASK == SCREEN_STATE_ON } + intThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_AWAKE } ) } @Test - fun `ScreenLifecycle - screenTurningOn triggers SysUI state flag changes `() { - screenLifecycle.dispatchScreenTurningOn() + fun `WakefulnessLifecycle - dispatchStartedWakingUp sets SysUI flag to WAKING`() { + wakefulnessLifecycle.dispatchStartedWakingUp(PowerManager.WAKE_REASON_UNKNOWN) verify(overviewProxy) .onSystemUiStateChanged( - intThat { it and SYSUI_STATE_SCREEN_STATE_MASK == SCREEN_STATE_TURNING_ON } + intThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_WAKING } ) } @Test - fun `ScreenLifecycle - screenTurnedOff triggers SysUI state flag changes `() { - screenLifecycle.dispatchScreenTurnedOff() + fun `WakefulnessLifecycle - dispatchFinishedGoingToSleep sets SysUI flag to ASLEEP`() { + wakefulnessLifecycle.dispatchFinishedGoingToSleep() verify(overviewProxy) .onSystemUiStateChanged( - intThat { it and SYSUI_STATE_SCREEN_STATE_MASK == SCREEN_STATE_OFF } + intThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_ASLEEP } ) } @Test - fun `ScreenLifecycle - screenTurningOff triggers SysUI state flag changes `() { - screenLifecycle.dispatchScreenTurningOff() + fun `WakefulnessLifecycle - dispatchStartedGoingToSleep sets SysUI flag to GOING_TO_SLEEP`() { + wakefulnessLifecycle.dispatchStartedGoingToSleep( + PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON + ) verify(overviewProxy) .onSystemUiStateChanged( - intThat { it and SYSUI_STATE_SCREEN_STATE_MASK == SCREEN_STATE_TURNING_OFF } + intThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_GOING_TO_SLEEP } ) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java index b55fe3677256..67b1099c1e0a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java @@ -20,8 +20,10 @@ import static com.android.systemui.flags.Flags.SCREENSHOT_APP_CLIPS; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; @@ -29,6 +31,8 @@ import android.content.Context; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; +import android.os.UserHandle; +import android.os.UserManager; import androidx.test.runner.AndroidJUnit4; @@ -42,6 +46,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.util.Optional; @@ -58,6 +63,9 @@ public final class AppClipsServiceTest extends SysuiTestCase { @Mock private Optional<Bubbles> mOptionalBubbles; @Mock private Bubbles mBubbles; @Mock private DevicePolicyManager mDevicePolicyManager; + @Mock private UserManager mUserManager; + + private AppClipsService mAppClipsService; @Before public void setUp() { @@ -119,26 +127,53 @@ public final class AppClipsServiceTest extends SysuiTestCase { @Test public void allPrerequisitesSatisfy_shouldReturnTrue() throws RemoteException { + mockToSatisfyAllPrerequisites(); + + assertThat(getInterfaceWithRealContext() + .canLaunchCaptureContentActivityForNote(FAKE_TASK_ID)).isTrue(); + } + + @Test + public void isManagedProfile_shouldUseProxyConnection() throws RemoteException { + when(mUserManager.isManagedProfile()).thenReturn(true); + when(mUserManager.getMainUser()).thenReturn(UserHandle.SYSTEM); + IAppClipsService service = getInterfaceWithRealContext(); + mAppClipsService.mProxyConnectorToMainProfile = + Mockito.spy(mAppClipsService.mProxyConnectorToMainProfile); + + service.canLaunchCaptureContentActivityForNote(FAKE_TASK_ID); + + verify(mAppClipsService.mProxyConnectorToMainProfile).postForResult(any()); + } + + @Test + public void isManagedProfile_noMainUser_shouldReturnFalse() { + when(mUserManager.isManagedProfile()).thenReturn(true); + when(mUserManager.getMainUser()).thenReturn(null); + + getInterfaceWithRealContext(); + + assertThat(mAppClipsService.mProxyConnectorToMainProfile).isNull(); + } + + private void mockToSatisfyAllPrerequisites() { when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); when(mOptionalBubbles.isEmpty()).thenReturn(false); when(mOptionalBubbles.get()).thenReturn(mBubbles); when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(true); when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(false); - - assertThat(getInterfaceWithRealContext() - .canLaunchCaptureContentActivityForNote(FAKE_TASK_ID)).isTrue(); } private IAppClipsService getInterfaceWithRealContext() { - AppClipsService appClipsService = new AppClipsService(getContext(), mFeatureFlags, - mOptionalBubbles, mDevicePolicyManager); - return getInterfaceFromService(appClipsService); + mAppClipsService = new AppClipsService(getContext(), mFeatureFlags, + mOptionalBubbles, mDevicePolicyManager, mUserManager); + return getInterfaceFromService(mAppClipsService); } private IAppClipsService getInterfaceWithMockContext() { - AppClipsService appClipsService = new AppClipsService(mMockContext, mFeatureFlags, - mOptionalBubbles, mDevicePolicyManager); - return getInterfaceFromService(appClipsService); + mAppClipsService = new AppClipsService(mMockContext, mFeatureFlags, + mOptionalBubbles, mDevicePolicyManager, mUserManager); + return getInterfaceFromService(mAppClipsService); } private static IAppClipsService getInterfaceFromService(AppClipsService appClipsService) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java index ad06dcc6f327..31a33d4ff908 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java @@ -49,6 +49,8 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.os.UserHandle; +import android.os.UserManager; import android.testing.AndroidTestingRunner; import androidx.test.rule.ActivityTestRule; @@ -98,6 +100,9 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { private UserTracker mUserTracker; @Mock private UiEventLogger mUiEventLogger; + @Mock + private UserManager mUserManager; + @Main private Handler mMainHandler; @@ -109,7 +114,7 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { protected AppClipsTrampolineActivityTestable create(Intent unUsed) { return new AppClipsTrampolineActivityTestable(mDevicePolicyManager, mFeatureFlags, mOptionalBubbles, mNoteTaskController, mPackageManager, - mUserTracker, mUiEventLogger, mMainHandler); + mUserTracker, mUiEventLogger, mUserManager, mMainHandler); } }; @@ -264,6 +269,40 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { verify(mUiEventLogger).log(SCREENSHOT_FOR_NOTE_TRIGGERED, TEST_UID, TEST_CALLING_PACKAGE); } + @Test + public void startAppClipsActivity_throughWPUser_shouldStartMainUserActivity() + throws NameNotFoundException { + when(mUserManager.isManagedProfile()).thenReturn(true); + when(mUserManager.getMainUser()).thenReturn(UserHandle.SYSTEM); + mockToSatisfyAllPrerequisites(); + + AppClipsTrampolineActivityTestable activity = mActivityRule.launchActivity(mActivityIntent); + waitForIdleSync(); + + Intent actualIntent = activity.mStartedIntent; + assertThat(actualIntent.getComponent()).isEqualTo( + new ComponentName(mContext, AppClipsTrampolineActivity.class)); + assertThat(actualIntent.getFlags()).isEqualTo(Intent.FLAG_ACTIVITY_FORWARD_RESULT); + assertThat(activity.mStartingUser).isEqualTo(UserHandle.SYSTEM); + } + + @Test + public void startAppClipsActivity_throughWPUser_noMainUser_shouldFinishWithFailed() + throws NameNotFoundException { + when(mUserManager.isManagedProfile()).thenReturn(true); + when(mUserManager.getMainUser()).thenReturn(null); + + mockToSatisfyAllPrerequisites(); + + mActivityRule.launchActivity(mActivityIntent); + waitForIdleSync(); + + ActivityResult actualResult = mActivityRule.getActivityResult(); + assertThat(actualResult.getResultCode()).isEqualTo(Activity.RESULT_OK); + assertThat(getStatusCodeExtra(actualResult.getResultData())) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_FAILED); + } + private void mockToSatisfyAllPrerequisites() throws NameNotFoundException { when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); when(mOptionalBubbles.isEmpty()).thenReturn(false); @@ -282,6 +321,9 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { public static final class AppClipsTrampolineActivityTestable extends AppClipsTrampolineActivity { + Intent mStartedIntent; + UserHandle mStartingUser; + public AppClipsTrampolineActivityTestable(DevicePolicyManager devicePolicyManager, FeatureFlags flags, Optional<Bubbles> optionalBubbles, @@ -289,9 +331,10 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { PackageManager packageManager, UserTracker userTracker, UiEventLogger uiEventLogger, + UserManager userManager, @Main Handler mainHandler) { super(devicePolicyManager, flags, optionalBubbles, noteTaskController, packageManager, - userTracker, uiEventLogger, mainHandler); + userTracker, uiEventLogger, userManager, mainHandler); } @Override @@ -303,6 +346,12 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { public void startActivity(Intent unUsed) { // Ignore this intent to avoid App Clips screenshot editing activity from starting. } + + @Override + public void startActivityAsUser(Intent startedIntent, UserHandle startingUser) { + mStartedIntent = startedIntent; + mStartingUser = startingUser; + } } private static int getStatusCodeExtra(Intent intent) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index 1bd13aadc1f9..99979976a122 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -103,8 +103,10 @@ import com.android.systemui.media.controls.pipeline.MediaDataManager; import com.android.systemui.media.controls.ui.KeyguardMediaController; import com.android.systemui.media.controls.ui.MediaHierarchyManager; import com.android.systemui.model.SysUiState; +import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationModeController; +import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.QSFragment; @@ -286,6 +288,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Mock protected GoneToDreamingTransitionViewModel mGoneToDreamingTransitionViewModel; @Mock protected KeyguardTransitionInteractor mKeyguardTransitionInteractor; + @Mock protected MultiShadeInteractor mMultiShadeInteractor; @Mock protected KeyguardLongPressViewModel mKeyuardLongPressViewModel; @Mock protected AlternateBouncerInteractor mAlternateBouncerInteractor; @Mock protected MotionEvent mDownMotionEvent; @@ -293,6 +296,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Captor protected ArgumentCaptor<NotificationStackScrollLayout.OnEmptySpaceClickListener> mEmptySpaceClickListenerCaptor; + @Mock protected ActivityStarter mActivityStarter; protected KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor; protected KeyguardInteractor mKeyguardInteractor; @@ -570,9 +574,11 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mLockscreenToOccludedTransitionViewModel, mMainDispatcher, mKeyguardTransitionInteractor, + () -> mMultiShadeInteractor, mDumpManager, mKeyuardLongPressViewModel, - mKeyguardInteractor); + mKeyguardInteractor, + mActivityStarter); mNotificationPanelViewController.initDependencies( mCentralSurfaces, null, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index 2a108239bac5..bc8ab1faf9eb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt @@ -86,6 +86,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Mock private lateinit var notificationShadeDepthController: NotificationShadeDepthController @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController @Mock private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController + @Mock private lateinit var shadeController: ShadeController @Mock private lateinit var ambientState: AmbientState @Mock private lateinit var keyguardBouncerViewModel: KeyguardBouncerViewModel @Mock private lateinit var stackScrollLayoutController: NotificationStackScrollLayoutController @@ -173,11 +174,13 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { applicationContext = context, applicationScope = testScope.backgroundScope, multiShadeInteractor = multiShadeInteractor, + featureFlags = featureFlags, keyguardTransitionInteractor = KeyguardTransitionInteractor( repository = FakeKeyguardTransitionRepository(), ), falsingManager = FalsingManagerFake(), + shadeController = shadeController, ) }, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt index 86660a462c59..56385b2ec5da 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt @@ -185,11 +185,13 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { applicationContext = context, applicationScope = testScope.backgroundScope, multiShadeInteractor = multiShadeInteractor, + featureFlags = featureFlags, keyguardTransitionInteractor = KeyguardTransitionInteractor( repository = FakeKeyguardTransitionRepository(), ), falsingManager = FalsingManagerFake(), + shadeController = shadeController, ) }, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt index d5308298202d..b043e97f1054 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt @@ -42,11 +42,11 @@ import com.android.systemui.demomode.DemoModeController import com.android.systemui.dump.DumpManager import com.android.systemui.qs.ChipVisibilityListener import com.android.systemui.qs.HeaderPrivacyIconsController -import com.android.systemui.qs.carrier.QSCarrierGroup -import com.android.systemui.qs.carrier.QSCarrierGroupController import com.android.systemui.shade.ShadeHeaderController.Companion.LARGE_SCREEN_HEADER_CONSTRAINT import com.android.systemui.shade.ShadeHeaderController.Companion.QQS_HEADER_CONSTRAINT import com.android.systemui.shade.ShadeHeaderController.Companion.QS_HEADER_CONSTRAINT +import com.android.systemui.shade.carrier.ShadeCarrierGroup +import com.android.systemui.shade.carrier.ShadeCarrierGroupController import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider import com.android.systemui.statusbar.phone.StatusBarIconController import com.android.systemui.statusbar.phone.StatusIconContainer @@ -88,11 +88,12 @@ class ShadeHeaderControllerTest : SysuiTestCase() { @Mock private lateinit var statusBarIconController: StatusBarIconController @Mock private lateinit var iconManagerFactory: StatusBarIconController.TintedIconManager.Factory @Mock private lateinit var iconManager: StatusBarIconController.TintedIconManager - @Mock private lateinit var qsCarrierGroupController: QSCarrierGroupController - @Mock private lateinit var qsCarrierGroupControllerBuilder: QSCarrierGroupController.Builder + @Mock private lateinit var mShadeCarrierGroupController: ShadeCarrierGroupController + @Mock + private lateinit var mShadeCarrierGroupControllerBuilder: ShadeCarrierGroupController.Builder @Mock private lateinit var clock: Clock @Mock private lateinit var date: VariableDateView - @Mock private lateinit var carrierGroup: QSCarrierGroup + @Mock private lateinit var carrierGroup: ShadeCarrierGroup @Mock private lateinit var batteryMeterView: BatteryMeterView @Mock private lateinit var batteryMeterViewController: BatteryMeterViewController @Mock private lateinit var privacyIconsController: HeaderPrivacyIconsController @@ -131,7 +132,7 @@ class ShadeHeaderControllerTest : SysuiTestCase() { whenever<TextView>(view.findViewById(R.id.date)).thenReturn(date) whenever(date.context).thenReturn(mockedContext) - whenever<QSCarrierGroup>(view.findViewById(R.id.carrier_group)).thenReturn(carrierGroup) + whenever<ShadeCarrierGroup>(view.findViewById(R.id.carrier_group)).thenReturn(carrierGroup) whenever<BatteryMeterView>(view.findViewById(R.id.batteryRemainingIcon)) .thenReturn(batteryMeterView) @@ -142,9 +143,10 @@ class ShadeHeaderControllerTest : SysuiTestCase() { whenever(view.context).thenReturn(viewContext) whenever(view.resources).thenReturn(context.resources) whenever(statusIcons.context).thenReturn(context) - whenever(qsCarrierGroupControllerBuilder.setQSCarrierGroup(any())) - .thenReturn(qsCarrierGroupControllerBuilder) - whenever(qsCarrierGroupControllerBuilder.build()).thenReturn(qsCarrierGroupController) + whenever(mShadeCarrierGroupControllerBuilder.setShadeCarrierGroup(any())) + .thenReturn(mShadeCarrierGroupControllerBuilder) + whenever(mShadeCarrierGroupControllerBuilder.build()) + .thenReturn(mShadeCarrierGroupController) whenever(view.setVisibility(anyInt())).then { viewVisibility = it.arguments[0] as Int null @@ -175,7 +177,7 @@ class ShadeHeaderControllerTest : SysuiTestCase() { variableDateViewControllerFactory, batteryMeterViewController, dumpManager, - qsCarrierGroupControllerBuilder, + mShadeCarrierGroupControllerBuilder, combinedShadeHeadersConstraintManager, demoModeController, qsBatteryModeController, @@ -189,7 +191,7 @@ class ShadeHeaderControllerTest : SysuiTestCase() { @Test fun updateListeners_registersWhenVisible() { makeShadeVisible() - verify(qsCarrierGroupController).setListening(true) + verify(mShadeCarrierGroupController).setListening(true) verify(statusBarIconController).addIconGroup(any()) } @@ -213,7 +215,7 @@ class ShadeHeaderControllerTest : SysuiTestCase() { @Test fun singleCarrier_enablesCarrierIconsInStatusIcons() { - whenever(qsCarrierGroupController.isSingleCarrier).thenReturn(true) + whenever(mShadeCarrierGroupController.isSingleCarrier).thenReturn(true) makeShadeVisible() @@ -222,7 +224,7 @@ class ShadeHeaderControllerTest : SysuiTestCase() { @Test fun dualCarrier_disablesCarrierIconsInStatusIcons() { - whenever(qsCarrierGroupController.isSingleCarrier).thenReturn(false) + whenever(mShadeCarrierGroupController.isSingleCarrier).thenReturn(false) makeShadeVisible() @@ -349,9 +351,9 @@ class ShadeHeaderControllerTest : SysuiTestCase() { verify(batteryMeterViewController).init() verify(batteryMeterViewController).ignoreTunerUpdates() - val inOrder = Mockito.inOrder(qsCarrierGroupControllerBuilder) - inOrder.verify(qsCarrierGroupControllerBuilder).setQSCarrierGroup(carrierGroup) - inOrder.verify(qsCarrierGroupControllerBuilder).build() + val inOrder = Mockito.inOrder(mShadeCarrierGroupControllerBuilder) + inOrder.verify(mShadeCarrierGroupControllerBuilder).setShadeCarrierGroup(carrierGroup) + inOrder.verify(mShadeCarrierGroupControllerBuilder).build() } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/CellSignalStateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/CellSignalStateTest.kt index 75be74b13c87..7a9ef62278a4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/CellSignalStateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/CellSignalStateTest.kt @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier +package com.android.systemui.shade.carrier import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest @@ -45,4 +45,4 @@ class CellSignalStateTest : SysuiTestCase() { assertNotSame(c, other) } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java index 1e7722ae8395..2ef3d60c7754 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier; +package com.android.systemui.shade.carrier; import static com.google.common.truth.Truth.assertThat; @@ -63,13 +63,13 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest -public class QSCarrierGroupControllerTest extends LeakCheckedTest { +public class ShadeCarrierGroupControllerTest extends LeakCheckedTest { - private QSCarrierGroupController mQSCarrierGroupController; + private ShadeCarrierGroupController mShadeCarrierGroupController; private SignalCallback mSignalCallback; private CarrierTextManager.CarrierTextCallback mCallback; @Mock - private QSCarrierGroup mQSCarrierGroup; + private ShadeCarrierGroup mShadeCarrierGroup; @Mock private ActivityStarter mActivityStarter; @Mock @@ -81,14 +81,14 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { @Mock private CarrierConfigTracker mCarrierConfigTracker; @Mock - private QSCarrier mQSCarrier1; + private ShadeCarrier mShadeCarrier1; @Mock - private QSCarrier mQSCarrier2; + private ShadeCarrier mShadeCarrier2; @Mock - private QSCarrier mQSCarrier3; + private ShadeCarrier mShadeCarrier3; private TestableLooper mTestableLooper; @Mock - private QSCarrierGroupController.OnSingleCarrierChangedListener mOnSingleCarrierChangedListener; + private ShadeCarrierGroupController.OnSingleCarrierChangedListener mOnSingleCarrierChangedListener; private FakeSlotIndexResolver mSlotIndexResolver; private ClickListenerTextView mNoCarrierTextView; @@ -116,28 +116,28 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { .setListening(any(CarrierTextManager.CarrierTextCallback.class)); mNoCarrierTextView = new ClickListenerTextView(mContext); - when(mQSCarrierGroup.getNoSimTextView()).thenReturn(mNoCarrierTextView); - when(mQSCarrierGroup.getCarrier1View()).thenReturn(mQSCarrier1); - when(mQSCarrierGroup.getCarrier2View()).thenReturn(mQSCarrier2); - when(mQSCarrierGroup.getCarrier3View()).thenReturn(mQSCarrier3); - when(mQSCarrierGroup.getCarrierDivider1()).thenReturn(new View(mContext)); - when(mQSCarrierGroup.getCarrierDivider2()).thenReturn(new View(mContext)); + when(mShadeCarrierGroup.getNoSimTextView()).thenReturn(mNoCarrierTextView); + when(mShadeCarrierGroup.getCarrier1View()).thenReturn(mShadeCarrier1); + when(mShadeCarrierGroup.getCarrier2View()).thenReturn(mShadeCarrier2); + when(mShadeCarrierGroup.getCarrier3View()).thenReturn(mShadeCarrier3); + when(mShadeCarrierGroup.getCarrierDivider1()).thenReturn(new View(mContext)); + when(mShadeCarrierGroup.getCarrierDivider2()).thenReturn(new View(mContext)); mSlotIndexResolver = new FakeSlotIndexResolver(); - mQSCarrierGroupController = new QSCarrierGroupController.Builder( + mShadeCarrierGroupController = new ShadeCarrierGroupController.Builder( mActivityStarter, handler, TestableLooper.get(this).getLooper(), mNetworkController, mCarrierTextControllerBuilder, mContext, mCarrierConfigTracker, mSlotIndexResolver) - .setQSCarrierGroup(mQSCarrierGroup) + .setShadeCarrierGroup(mShadeCarrierGroup) .build(); - mQSCarrierGroupController.setListening(true); + mShadeCarrierGroupController.setListening(true); } @Test public void testInitiallyMultiCarrier() { - assertFalse(mQSCarrierGroupController.isSingleCarrier()); + assertFalse(mShadeCarrierGroupController.isSingleCarrier()); } @Test // throws no Exception @@ -257,12 +257,12 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { true /* airplaneMode */); mCallback.updateCarrierInfo(info); mTestableLooper.processAllMessages(); - assertEquals(View.GONE, mQSCarrierGroup.getNoSimTextView().getVisibility()); + assertEquals(View.GONE, mShadeCarrierGroup.getNoSimTextView().getVisibility()); } @Test public void testListenerNotCalledOnRegistreation() { - mQSCarrierGroupController + mShadeCarrierGroupController .setOnSingleCarrierChangedListener(mOnSingleCarrierChangedListener); verify(mOnSingleCarrierChangedListener, never()).onSingleCarrierChanged(anyBoolean()); @@ -282,9 +282,9 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { mCallback.updateCarrierInfo(info); mTestableLooper.processAllMessages(); - verify(mQSCarrier1).updateState(any(), eq(true)); - verify(mQSCarrier2).updateState(any(), eq(true)); - verify(mQSCarrier3).updateState(any(), eq(true)); + verify(mShadeCarrier1).updateState(any(), eq(true)); + verify(mShadeCarrier2).updateState(any(), eq(true)); + verify(mShadeCarrier3).updateState(any(), eq(true)); } @Test @@ -301,9 +301,9 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { mCallback.updateCarrierInfo(info); mTestableLooper.processAllMessages(); - verify(mQSCarrier1).updateState(any(), eq(false)); - verify(mQSCarrier2).updateState(any(), eq(false)); - verify(mQSCarrier3).updateState(any(), eq(false)); + verify(mShadeCarrier1).updateState(any(), eq(false)); + verify(mShadeCarrier2).updateState(any(), eq(false)); + verify(mShadeCarrier3).updateState(any(), eq(false)); } @Test @@ -327,7 +327,7 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { mCallback.updateCarrierInfo(singleCarrierInfo); mTestableLooper.processAllMessages(); - mQSCarrierGroupController + mShadeCarrierGroupController .setOnSingleCarrierChangedListener(mOnSingleCarrierChangedListener); reset(mOnSingleCarrierChangedListener); @@ -353,7 +353,7 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { mCallback.updateCarrierInfo(singleCarrierInfo); mTestableLooper.processAllMessages(); - mQSCarrierGroupController + mShadeCarrierGroupController .setOnSingleCarrierChangedListener(mOnSingleCarrierChangedListener); mCallback.updateCarrierInfo(singleCarrierInfo); @@ -375,7 +375,7 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { mCallback.updateCarrierInfo(multiCarrierInfo); mTestableLooper.processAllMessages(); - mQSCarrierGroupController + mShadeCarrierGroupController .setOnSingleCarrierChangedListener(mOnSingleCarrierChangedListener); mCallback.updateCarrierInfo(multiCarrierInfo); @@ -389,12 +389,12 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { ArgumentCaptor<View.OnClickListener> captor = ArgumentCaptor.forClass(View.OnClickListener.class); - verify(mQSCarrier1).setOnClickListener(captor.capture()); - verify(mQSCarrier2).setOnClickListener(captor.getValue()); - verify(mQSCarrier3).setOnClickListener(captor.getValue()); + verify(mShadeCarrier1).setOnClickListener(captor.capture()); + verify(mShadeCarrier2).setOnClickListener(captor.getValue()); + verify(mShadeCarrier3).setOnClickListener(captor.getValue()); assertThat(mNoCarrierTextView.getOnClickListener()).isSameInstanceAs(captor.getValue()); - verify(mQSCarrierGroup, never()).setOnClickListener(any()); + verify(mShadeCarrierGroup, never()).setOnClickListener(any()); } @Test @@ -402,10 +402,10 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { ArgumentCaptor<View.OnClickListener> captor = ArgumentCaptor.forClass(View.OnClickListener.class); - verify(mQSCarrier1).setOnClickListener(captor.capture()); - when(mQSCarrier1.isVisibleToUser()).thenReturn(false); + verify(mShadeCarrier1).setOnClickListener(captor.capture()); + when(mShadeCarrier1.isVisibleToUser()).thenReturn(false); - captor.getValue().onClick(mQSCarrier1); + captor.getValue().onClick(mShadeCarrier1); verifyZeroInteractions(mActivityStarter); } @@ -415,17 +415,17 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { ArgumentCaptor.forClass(View.OnClickListener.class); ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mQSCarrier1).setOnClickListener(listenerCaptor.capture()); - when(mQSCarrier1.isVisibleToUser()).thenReturn(true); + verify(mShadeCarrier1).setOnClickListener(listenerCaptor.capture()); + when(mShadeCarrier1.isVisibleToUser()).thenReturn(true); - listenerCaptor.getValue().onClick(mQSCarrier1); + listenerCaptor.getValue().onClick(mShadeCarrier1); verify(mActivityStarter) .postStartActivityDismissingKeyguard(intentCaptor.capture(), anyInt()); assertThat(intentCaptor.getValue().getAction()) .isEqualTo(Settings.ACTION_WIRELESS_SETTINGS); } - private class FakeSlotIndexResolver implements QSCarrierGroupController.SlotIndexResolver { + private class FakeSlotIndexResolver implements ShadeCarrierGroupController.SlotIndexResolver { public boolean overrideInvalid; @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierTest.java index 9115ab3bacca..44613103a5b2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierTest.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.qs.carrier; +package com.android.systemui.shade.carrier; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,9 +39,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest -public class QSCarrierTest extends SysuiTestCase { +public class ShadeCarrierTest extends SysuiTestCase { - private QSCarrier mQSCarrier; + private ShadeCarrier mShadeCarrier; private TestableLooper mTestableLooper; private int mSignalIconId; @@ -51,7 +51,7 @@ public class QSCarrierTest extends SysuiTestCase { LayoutInflater inflater = LayoutInflater.from(mContext); mContext.ensureTestableResources(); mTestableLooper.runWithLooper(() -> - mQSCarrier = (QSCarrier) inflater.inflate(R.layout.qs_carrier, null)); + mShadeCarrier = (ShadeCarrier) inflater.inflate(R.layout.shade_carrier, null)); // In this case, the id is an actual drawable id mSignalIconId = TelephonyIcons.MOBILE_CALL_STRENGTH_ICONS[0]; @@ -61,76 +61,76 @@ public class QSCarrierTest extends SysuiTestCase { public void testUpdateState_first() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - assertTrue(mQSCarrier.updateState(c, false)); + assertTrue(mShadeCarrier.updateState(c, false)); } @Test public void testUpdateState_same() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - assertTrue(mQSCarrier.updateState(c, false)); - assertFalse(mQSCarrier.updateState(c, false)); + assertTrue(mShadeCarrier.updateState(c, false)); + assertFalse(mShadeCarrier.updateState(c, false)); } @Test public void testUpdateState_changed() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - assertTrue(mQSCarrier.updateState(c, false)); + assertTrue(mShadeCarrier.updateState(c, false)); CellSignalState other = c.changeVisibility(false); - assertTrue(mQSCarrier.updateState(other, false)); + assertTrue(mShadeCarrier.updateState(other, false)); } @Test public void testUpdateState_singleCarrier_first() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - assertTrue(mQSCarrier.updateState(c, true)); + assertTrue(mShadeCarrier.updateState(c, true)); } @Test public void testUpdateState_singleCarrier_noShowIcon() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - mQSCarrier.updateState(c, true); + mShadeCarrier.updateState(c, true); - assertEquals(View.GONE, mQSCarrier.getRSSIView().getVisibility()); + assertEquals(View.GONE, mShadeCarrier.getRSSIView().getVisibility()); } @Test public void testUpdateState_multiCarrier_showIcon() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - mQSCarrier.updateState(c, false); + mShadeCarrier.updateState(c, false); - assertEquals(View.VISIBLE, mQSCarrier.getRSSIView().getVisibility()); + assertEquals(View.VISIBLE, mShadeCarrier.getRSSIView().getVisibility()); } @Test public void testUpdateState_changeSingleMultiSingle() { CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); - mQSCarrier.updateState(c, true); - assertEquals(View.GONE, mQSCarrier.getRSSIView().getVisibility()); + mShadeCarrier.updateState(c, true); + assertEquals(View.GONE, mShadeCarrier.getRSSIView().getVisibility()); - mQSCarrier.updateState(c, false); - assertEquals(View.VISIBLE, mQSCarrier.getRSSIView().getVisibility()); + mShadeCarrier.updateState(c, false); + assertEquals(View.VISIBLE, mShadeCarrier.getRSSIView().getVisibility()); - mQSCarrier.updateState(c, true); - assertEquals(View.GONE, mQSCarrier.getRSSIView().getVisibility()); + mShadeCarrier.updateState(c, true); + assertEquals(View.GONE, mShadeCarrier.getRSSIView().getVisibility()); } @Test public void testCarrierNameMaxWidth_smallScreen_fromResource() { int maxEms = 10; - mContext.getOrCreateTestableResources().addOverride(R.integer.qs_carrier_max_em, maxEms); + mContext.getOrCreateTestableResources().addOverride(R.integer.shade_carrier_max_em, maxEms); mContext.getOrCreateTestableResources() .addOverride(R.bool.config_use_large_screen_shade_header, false); - TextView carrierText = mQSCarrier.requireViewById(R.id.qs_carrier_text); + TextView carrierText = mShadeCarrier.requireViewById(R.id.shade_carrier_text); - mQSCarrier.onConfigurationChanged(mContext.getResources().getConfiguration()); + mShadeCarrier.onConfigurationChanged(mContext.getResources().getConfiguration()); assertEquals(maxEms, carrierText.getMaxEms()); } @@ -138,12 +138,12 @@ public class QSCarrierTest extends SysuiTestCase { @Test public void testCarrierNameMaxWidth_largeScreen_maxInt() { int maxEms = 10; - mContext.getOrCreateTestableResources().addOverride(R.integer.qs_carrier_max_em, maxEms); + mContext.getOrCreateTestableResources().addOverride(R.integer.shade_carrier_max_em, maxEms); mContext.getOrCreateTestableResources() .addOverride(R.bool.config_use_large_screen_shade_header, true); - TextView carrierText = mQSCarrier.requireViewById(R.id.qs_carrier_text); + TextView carrierText = mShadeCarrier.requireViewById(R.id.shade_carrier_text); - mQSCarrier.onConfigurationChanged(mContext.getResources().getConfiguration()); + mShadeCarrier.onConfigurationChanged(mContext.getResources().getConfiguration()); assertEquals(Integer.MAX_VALUE, carrierText.getMaxEms()); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt index 4bb14a1eba0d..ba91d87c659a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt @@ -71,241 +71,241 @@ import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @RunWithLooper class HeadsUpCoordinatorTest : SysuiTestCase() { - private lateinit var mCoordinator: HeadsUpCoordinator + private lateinit var coordinator: HeadsUpCoordinator // captured listeners and pluggables: - private lateinit var mCollectionListener: NotifCollectionListener - private lateinit var mNotifPromoter: NotifPromoter - private lateinit var mNotifLifetimeExtender: NotifLifetimeExtender - private lateinit var mBeforeTransformGroupsListener: OnBeforeTransformGroupsListener - private lateinit var mBeforeFinalizeFilterListener: OnBeforeFinalizeFilterListener - private lateinit var mOnHeadsUpChangedListener: OnHeadsUpChangedListener - private lateinit var mNotifSectioner: NotifSectioner - private lateinit var mActionPressListener: Consumer<NotificationEntry> - - private val mNotifPipeline: NotifPipeline = mock() - private val mLogger = HeadsUpCoordinatorLogger(logcatLogBuffer(), verbose = true) - private val mHeadsUpManager: HeadsUpManager = mock() - private val mHeadsUpViewBinder: HeadsUpViewBinder = mock() - private val mNotificationInterruptStateProvider: NotificationInterruptStateProvider = mock() - private val mRemoteInputManager: NotificationRemoteInputManager = mock() - private val mEndLifetimeExtension: OnEndLifetimeExtensionCallback = mock() - private val mHeaderController: NodeController = mock() - private val mLaunchFullScreenIntentProvider: LaunchFullScreenIntentProvider = mock() - private val mFlags: NotifPipelineFlags = mock() - - private lateinit var mEntry: NotificationEntry - private lateinit var mGroupSummary: NotificationEntry - private lateinit var mGroupPriority: NotificationEntry - private lateinit var mGroupSibling1: NotificationEntry - private lateinit var mGroupSibling2: NotificationEntry - private lateinit var mGroupChild1: NotificationEntry - private lateinit var mGroupChild2: NotificationEntry - private lateinit var mGroupChild3: NotificationEntry - private val mSystemClock = FakeSystemClock() - private val mExecutor = FakeExecutor(mSystemClock) - private val mHuns: ArrayList<NotificationEntry> = ArrayList() - private lateinit var mHelper: NotificationGroupTestHelper + private lateinit var collectionListener: NotifCollectionListener + private lateinit var notifPromoter: NotifPromoter + private lateinit var notifLifetimeExtender: NotifLifetimeExtender + private lateinit var beforeTransformGroupsListener: OnBeforeTransformGroupsListener + private lateinit var beforeFinalizeFilterListener: OnBeforeFinalizeFilterListener + private lateinit var onHeadsUpChangedListener: OnHeadsUpChangedListener + private lateinit var notifSectioner: NotifSectioner + private lateinit var actionPressListener: Consumer<NotificationEntry> + + private val notifPipeline: NotifPipeline = mock() + private val logger = HeadsUpCoordinatorLogger(logcatLogBuffer(), verbose = true) + private val headsUpManager: HeadsUpManager = mock() + private val headsUpViewBinder: HeadsUpViewBinder = mock() + private val notificationInterruptStateProvider: NotificationInterruptStateProvider = mock() + private val remoteInputManager: NotificationRemoteInputManager = mock() + private val endLifetimeExtension: OnEndLifetimeExtensionCallback = mock() + private val headerController: NodeController = mock() + private val launchFullScreenIntentProvider: LaunchFullScreenIntentProvider = mock() + private val flags: NotifPipelineFlags = mock() + + private lateinit var entry: NotificationEntry + private lateinit var groupSummary: NotificationEntry + private lateinit var groupPriority: NotificationEntry + private lateinit var groupSibling1: NotificationEntry + private lateinit var groupSibling2: NotificationEntry + private lateinit var groupChild1: NotificationEntry + private lateinit var groupChild2: NotificationEntry + private lateinit var groupChild3: NotificationEntry + private val systemClock = FakeSystemClock() + private val executor = FakeExecutor(systemClock) + private val huns: ArrayList<NotificationEntry> = ArrayList() + private lateinit var helper: NotificationGroupTestHelper @Before fun setUp() { MockitoAnnotations.initMocks(this) - mHelper = NotificationGroupTestHelper(mContext) - mCoordinator = HeadsUpCoordinator( - mLogger, - mSystemClock, - mHeadsUpManager, - mHeadsUpViewBinder, - mNotificationInterruptStateProvider, - mRemoteInputManager, - mLaunchFullScreenIntentProvider, - mFlags, - mHeaderController, - mExecutor) - mCoordinator.attach(mNotifPipeline) + helper = NotificationGroupTestHelper(mContext) + coordinator = HeadsUpCoordinator( + logger, + systemClock, + headsUpManager, + headsUpViewBinder, + notificationInterruptStateProvider, + remoteInputManager, + launchFullScreenIntentProvider, + flags, + headerController, + executor) + coordinator.attach(notifPipeline) // capture arguments: - mCollectionListener = withArgCaptor { - verify(mNotifPipeline).addCollectionListener(capture()) + collectionListener = withArgCaptor { + verify(notifPipeline).addCollectionListener(capture()) } - mNotifPromoter = withArgCaptor { - verify(mNotifPipeline).addPromoter(capture()) + notifPromoter = withArgCaptor { + verify(notifPipeline).addPromoter(capture()) } - mNotifLifetimeExtender = withArgCaptor { - verify(mNotifPipeline).addNotificationLifetimeExtender(capture()) + notifLifetimeExtender = withArgCaptor { + verify(notifPipeline).addNotificationLifetimeExtender(capture()) } - mBeforeTransformGroupsListener = withArgCaptor { - verify(mNotifPipeline).addOnBeforeTransformGroupsListener(capture()) + beforeTransformGroupsListener = withArgCaptor { + verify(notifPipeline).addOnBeforeTransformGroupsListener(capture()) } - mBeforeFinalizeFilterListener = withArgCaptor { - verify(mNotifPipeline).addOnBeforeFinalizeFilterListener(capture()) + beforeFinalizeFilterListener = withArgCaptor { + verify(notifPipeline).addOnBeforeFinalizeFilterListener(capture()) } - mOnHeadsUpChangedListener = withArgCaptor { - verify(mHeadsUpManager).addListener(capture()) + onHeadsUpChangedListener = withArgCaptor { + verify(headsUpManager).addListener(capture()) } - mActionPressListener = withArgCaptor { - verify(mRemoteInputManager).addActionPressListener(capture()) + actionPressListener = withArgCaptor { + verify(remoteInputManager).addActionPressListener(capture()) } - given(mHeadsUpManager.allEntries).willAnswer { mHuns.stream() } - given(mHeadsUpManager.isAlerting(anyString())).willAnswer { invocation -> + given(headsUpManager.allEntries).willAnswer { huns.stream() } + given(headsUpManager.isAlerting(anyString())).willAnswer { invocation -> val key = invocation.getArgument<String>(0) - mHuns.any { entry -> entry.key == key } + huns.any { entry -> entry.key == key } } - given(mHeadsUpManager.canRemoveImmediately(anyString())).willAnswer { invocation -> + given(headsUpManager.canRemoveImmediately(anyString())).willAnswer { invocation -> val key = invocation.getArgument<String>(0) - !mHuns.any { entry -> entry.key == key } + !huns.any { entry -> entry.key == key } } - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) - mNotifSectioner = mCoordinator.sectioner - mNotifLifetimeExtender.setCallback(mEndLifetimeExtension) - mEntry = NotificationEntryBuilder().build() + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) + notifSectioner = coordinator.sectioner + notifLifetimeExtender.setCallback(endLifetimeExtension) + entry = NotificationEntryBuilder().build() // Same summary we can use for either set of children - mGroupSummary = mHelper.createSummaryNotification(GROUP_ALERT_ALL, 0, "summary", 500) + groupSummary = helper.createSummaryNotification(GROUP_ALERT_ALL, 0, "summary", 500) // One set of children with GROUP_ALERT_SUMMARY - mGroupPriority = mHelper.createChildNotification(GROUP_ALERT_SUMMARY, 0, "priority", 400) - mGroupSibling1 = mHelper.createChildNotification(GROUP_ALERT_SUMMARY, 1, "sibling", 300) - mGroupSibling2 = mHelper.createChildNotification(GROUP_ALERT_SUMMARY, 2, "sibling", 200) + groupPriority = helper.createChildNotification(GROUP_ALERT_SUMMARY, 0, "priority", 400) + groupSibling1 = helper.createChildNotification(GROUP_ALERT_SUMMARY, 1, "sibling", 300) + groupSibling2 = helper.createChildNotification(GROUP_ALERT_SUMMARY, 2, "sibling", 200) // Another set of children with GROUP_ALERT_ALL - mGroupChild1 = mHelper.createChildNotification(GROUP_ALERT_ALL, 1, "child", 350) - mGroupChild2 = mHelper.createChildNotification(GROUP_ALERT_ALL, 2, "child", 250) - mGroupChild3 = mHelper.createChildNotification(GROUP_ALERT_ALL, 3, "child", 150) + groupChild1 = helper.createChildNotification(GROUP_ALERT_ALL, 1, "child", 350) + groupChild2 = helper.createChildNotification(GROUP_ALERT_ALL, 2, "child", 250) + groupChild3 = helper.createChildNotification(GROUP_ALERT_ALL, 3, "child", 150) // Set the default FSI decision setShouldFullScreen(any(), FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) // Run tests with default feature flag state - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(Flags.FSI_ON_DND_UPDATE.default) + whenever(flags.fsiOnDNDUpdate()).thenReturn(Flags.FSI_ON_DND_UPDATE.default) } @Test fun testCancelStickyNotification() { - whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true) - addHUN(mEntry) - whenever(mHeadsUpManager.canRemoveImmediately(anyString())).thenReturn(false, true) - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 0L) - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - mExecutor.advanceClockToLast() - mExecutor.runAllReady() - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(false)) - verify(mHeadsUpManager, times(1)).removeNotification(anyString(), eq(true)) + whenever(headsUpManager.isSticky(anyString())).thenReturn(true) + addHUN(entry) + whenever(headsUpManager.canRemoveImmediately(anyString())).thenReturn(false, true) + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 0L) + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + executor.advanceClockToLast() + executor.runAllReady() + verify(headsUpManager, times(0)).removeNotification(anyString(), eq(false)) + verify(headsUpManager, times(1)).removeNotification(anyString(), eq(true)) } @Test fun testCancelAndReAddStickyNotification() { - whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true) - addHUN(mEntry) - whenever(mHeadsUpManager.canRemoveImmediately(anyString())).thenReturn(false, true, false) - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - addHUN(mEntry) - assertFalse(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - mExecutor.advanceClockToLast() - mExecutor.runAllReady() - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(false)) - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(true)) + whenever(headsUpManager.isSticky(anyString())).thenReturn(true) + addHUN(entry) + whenever(headsUpManager.canRemoveImmediately(anyString())).thenReturn(false, true, false) + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + addHUN(entry) + assertFalse(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + executor.advanceClockToLast() + executor.runAllReady() + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + verify(headsUpManager, times(0)).removeNotification(anyString(), eq(false)) + verify(headsUpManager, times(0)).removeNotification(anyString(), eq(true)) } @Test fun hunNotRemovedWhenExtensionCancelled() { - whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true) - addHUN(mEntry) - whenever(mHeadsUpManager.canRemoveImmediately(anyString())).thenReturn(false) - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - mNotifLifetimeExtender.cancelLifetimeExtension(mEntry) - mExecutor.advanceClockToLast() - mExecutor.runAllReady() - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), any()) + whenever(headsUpManager.isSticky(anyString())).thenReturn(true) + addHUN(entry) + whenever(headsUpManager.canRemoveImmediately(anyString())).thenReturn(false) + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + notifLifetimeExtender.cancelLifetimeExtension(entry) + executor.advanceClockToLast() + executor.runAllReady() + verify(headsUpManager, times(0)).removeNotification(anyString(), any()) } @Test fun hunExtensionCancelledWhenHunActionPressed() { - whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true) - addHUN(mEntry) - whenever(mHeadsUpManager.canRemoveImmediately(anyString())).thenReturn(false) - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - mActionPressListener.accept(mEntry) - mExecutor.advanceClockToLast() - mExecutor.runAllReady() - verify(mHeadsUpManager, times(1)).removeNotification(eq(mEntry.key), eq(true)) + whenever(headsUpManager.isSticky(anyString())).thenReturn(true) + addHUN(entry) + whenever(headsUpManager.canRemoveImmediately(anyString())).thenReturn(false) + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L) + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + actionPressListener.accept(entry) + executor.advanceClockToLast() + executor.runAllReady() + verify(headsUpManager, times(1)).removeNotification(eq(entry.key), eq(true)) } @Test fun testCancelUpdatedStickyNotification() { - whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true) - addHUN(mEntry) - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L) - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - addHUN(mEntry) - mExecutor.advanceClockToLast() - mExecutor.runAllReady() - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(false)) - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(true)) + whenever(headsUpManager.isSticky(anyString())).thenReturn(true) + addHUN(entry) + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L) + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + addHUN(entry) + executor.advanceClockToLast() + executor.runAllReady() + verify(headsUpManager, times(0)).removeNotification(anyString(), eq(false)) + verify(headsUpManager, times(0)).removeNotification(anyString(), eq(true)) } @Test fun testCancelNotification() { - whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(false) - addHUN(mEntry) - whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L) - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0)) - mExecutor.advanceClockToLast() - mExecutor.runAllReady() - verify(mHeadsUpManager, times(1)).removeNotification(anyString(), eq(false)) - verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(true)) + whenever(headsUpManager.isSticky(anyString())).thenReturn(false) + addHUN(entry) + whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L) + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, 0)) + executor.advanceClockToLast() + executor.runAllReady() + verify(headsUpManager, times(1)).removeNotification(anyString(), eq(false)) + verify(headsUpManager, times(0)).removeNotification(anyString(), eq(true)) } @Test fun testOnEntryAdded_shouldFullScreen() { - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_EXPECTED_NOT_TO_HUN) - mCollectionListener.onEntryAdded(mEntry) - verify(mLaunchFullScreenIntentProvider).launchFullScreenIntent(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_EXPECTED_NOT_TO_HUN) + collectionListener.onEntryAdded(entry) + verify(launchFullScreenIntentProvider).launchFullScreenIntent(entry) } @Test fun testOnEntryAdded_shouldNotFullScreen() { - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) - mCollectionListener.onEntryAdded(mEntry) - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) + collectionListener.onEntryAdded(entry) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) } @Test fun testPromotesAddedHUN() { // GIVEN the current entry should heads up - whenever(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(true) + setShouldHeadsUp(entry, true) // WHEN the notification is added but not yet binding - mCollectionListener.onEntryAdded(mEntry) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mEntry), any()) + collectionListener.onEntryAdded(entry) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(entry), any()) // THEN only promote mEntry - assertTrue(mNotifPromoter.shouldPromoteToTopLevel(mEntry)) + assertTrue(notifPromoter.shouldPromoteToTopLevel(entry)) } @Test fun testPromotesBindingHUN() { // GIVEN the current entry should heads up - whenever(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(true) + setShouldHeadsUp(entry, true) // WHEN the notification started binding on the previous run - mCollectionListener.onEntryAdded(mEntry) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) - verify(mHeadsUpViewBinder).bindHeadsUpView(eq(mEntry), any()) + collectionListener.onEntryAdded(entry) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) + verify(headsUpViewBinder).bindHeadsUpView(eq(entry), any()) // THEN only promote mEntry - assertTrue(mNotifPromoter.shouldPromoteToTopLevel(mEntry)) + assertTrue(notifPromoter.shouldPromoteToTopLevel(entry)) } @Test fun testPromotesCurrentHUN() { // GIVEN the current HUN is set to mEntry - addHUN(mEntry) + addHUN(entry) // THEN only promote the current HUN, mEntry - assertTrue(mNotifPromoter.shouldPromoteToTopLevel(mEntry)) - assertFalse(mNotifPromoter.shouldPromoteToTopLevel(NotificationEntryBuilder() + assertTrue(notifPromoter.shouldPromoteToTopLevel(entry)) + assertFalse(notifPromoter.shouldPromoteToTopLevel(NotificationEntryBuilder() .setPkg("test-package2") .build())) } @@ -313,11 +313,11 @@ class HeadsUpCoordinatorTest : SysuiTestCase() { @Test fun testIncludeInSectionCurrentHUN() { // GIVEN the current HUN is set to mEntry - addHUN(mEntry) + addHUN(entry) // THEN only section the current HUN, mEntry - assertTrue(mNotifSectioner.isInSection(mEntry)) - assertFalse(mNotifSectioner.isInSection(NotificationEntryBuilder() + assertTrue(notifSectioner.isInSection(entry)) + assertFalse(notifSectioner.isInSection(NotificationEntryBuilder() .setPkg("test-package") .build())) } @@ -325,11 +325,11 @@ class HeadsUpCoordinatorTest : SysuiTestCase() { @Test fun testLifetimeExtendsCurrentHUN() { // GIVEN there is a HUN, mEntry - addHUN(mEntry) + addHUN(entry) // THEN only the current HUN, mEntry, should be lifetimeExtended - assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, /* cancellationReason */ 0)) - assertFalse(mNotifLifetimeExtender.maybeExtendLifetime( + assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, /* cancellationReason */ 0)) + assertFalse(notifLifetimeExtender.maybeExtendLifetime( NotificationEntryBuilder() .setPkg("test-package") .build(), /* cancellationReason */ 0)) @@ -338,726 +338,752 @@ class HeadsUpCoordinatorTest : SysuiTestCase() { @Test fun testShowHUNOnInflationFinished() { // WHEN a notification should HUN and its inflation is finished - whenever(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(true) + setShouldHeadsUp(entry, true) - mCollectionListener.onEntryAdded(mEntry) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) - verify(mHeadsUpManager, never()).showNotification(mEntry) + collectionListener.onEntryAdded(entry) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) + verify(headsUpManager, never()).showNotification(entry) withArgCaptor<BindCallback> { - verify(mHeadsUpViewBinder).bindHeadsUpView(eq(mEntry), capture()) - }.onBindFinished(mEntry) + verify(headsUpViewBinder).bindHeadsUpView(eq(entry), capture()) + }.onBindFinished(entry) // THEN we tell the HeadsUpManager to show the notification - verify(mHeadsUpManager).showNotification(mEntry) + verify(headsUpManager).showNotification(entry) } @Test fun testNoHUNOnInflationFinished() { // WHEN a notification shouldn't HUN and its inflation is finished - whenever(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(false) - mCollectionListener.onEntryAdded(mEntry) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldHeadsUp(entry, false) + collectionListener.onEntryAdded(entry) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN we never bind the heads up view or tell HeadsUpManager to show the notification - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mEntry), any()) - verify(mHeadsUpManager, never()).showNotification(mEntry) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(entry), any()) + verify(headsUpManager, never()).showNotification(entry) } @Test fun testOnEntryUpdated_toAlert() { // GIVEN that an entry is posted that should not heads up - setShouldHeadsUp(mEntry, false) - mCollectionListener.onEntryAdded(mEntry) + setShouldHeadsUp(entry, false) + collectionListener.onEntryAdded(entry) // WHEN it's updated to heads up - setShouldHeadsUp(mEntry) - mCollectionListener.onEntryUpdated(mEntry) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldHeadsUp(entry) + collectionListener.onEntryUpdated(entry) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN the notification alerts - finishBind(mEntry) - verify(mHeadsUpManager).showNotification(mEntry) + finishBind(entry) + verify(headsUpManager).showNotification(entry) } @Test fun testOnEntryUpdated_toNotAlert() { // GIVEN that an entry is posted that should heads up - setShouldHeadsUp(mEntry) - mCollectionListener.onEntryAdded(mEntry) + setShouldHeadsUp(entry) + collectionListener.onEntryAdded(entry) // WHEN it's updated to not heads up - setShouldHeadsUp(mEntry, false) - mCollectionListener.onEntryUpdated(mEntry) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldHeadsUp(entry, false) + collectionListener.onEntryUpdated(entry) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN the notification is never bound or shown - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) } @Test fun testOnEntryRemovedRemovesHeadsUpNotification() { // GIVEN the current HUN is mEntry - addHUN(mEntry) + addHUN(entry) // WHEN mEntry is removed from the notification collection - mCollectionListener.onEntryRemoved(mEntry, /* cancellation reason */ 0) - whenever(mRemoteInputManager.isSpinning(any())).thenReturn(false) + collectionListener.onEntryRemoved(entry, /* cancellation reason */ 0) + whenever(remoteInputManager.isSpinning(any())).thenReturn(false) // THEN heads up manager should remove the entry - verify(mHeadsUpManager).removeNotification(mEntry.key, false) + verify(headsUpManager).removeNotification(entry.key, false) } private fun addHUN(entry: NotificationEntry) { - mHuns.add(entry) - whenever(mHeadsUpManager.topEntry).thenReturn(entry) - mOnHeadsUpChangedListener.onHeadsUpStateChanged(entry, true) - mNotifLifetimeExtender.cancelLifetimeExtension(entry) + huns.add(entry) + whenever(headsUpManager.topEntry).thenReturn(entry) + onHeadsUpChangedListener.onHeadsUpStateChanged(entry, true) + notifLifetimeExtender.cancelLifetimeExtension(entry) } @Test fun testTransferIsolatedChildAlert_withGroupAlertSummary() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mGroupSummary, mGroupSibling1)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs).thenReturn(listOf(groupSummary, groupSibling1)) - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupSibling1) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mGroupSibling1)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mGroupSibling1)) + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupSibling1) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupSibling1)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupSibling1)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupSibling1) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupSibling1) + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupSibling1) // In addition make sure we have explicitly marked the summary as having interrupted due // to the alert being transferred - assertTrue(mGroupSummary.hasInterrupted()) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testTransferIsolatedChildAlert_withGroupAlertAll() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mGroupSummary, mGroupChild1)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs).thenReturn(listOf(groupSummary, groupChild1)) - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupChild1) - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mGroupChild1)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mGroupChild1)) + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupChild1) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupChild1)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupChild1)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupChild1) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupChild1) - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupChild1) - assertTrue(mGroupSummary.hasInterrupted()) + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupChild1) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testTransferTwoIsolatedChildAlert_withGroupAlertSummary() { // WHEN a notification should HUN and its inflation is finished - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupSibling1, mGroupSibling2, mGroupPriority)) - - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupSibling1) - mCollectionListener.onEntryAdded(mGroupSibling2) - val entryList = listOf(mGroupSibling1, mGroupSibling2) - mBeforeTransformGroupsListener.onBeforeTransformGroups(entryList) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(entryList) - - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupSibling1) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling2), any()) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupSibling1, groupSibling2, groupPriority)) + + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupSibling1) + collectionListener.onEntryAdded(groupSibling2) + val entryList = listOf(groupSibling1, groupSibling2) + beforeTransformGroupsListener.onBeforeTransformGroups(entryList) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(entryList) + + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupSibling1) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling2), any()) // THEN we tell the HeadsUpManager to show the notification - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling2) - assertTrue(mGroupSummary.hasInterrupted()) + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupSibling1) + verify(headsUpManager, never()).showNotification(groupSibling2) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testTransferTwoIsolatedChildAlert_withGroupAlertAll() { // WHEN a notification should HUN and its inflation is finished - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupChild1, mGroupChild2, mGroupPriority)) - - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupChild1) - mCollectionListener.onEntryAdded(mGroupChild2) - val entryList = listOf(mGroupChild1, mGroupChild2) - mBeforeTransformGroupsListener.onBeforeTransformGroups(entryList) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(entryList) - - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupChild1) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupChild2), any()) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupChild1, groupChild2, groupPriority)) + + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupChild1) + collectionListener.onEntryAdded(groupChild2) + val entryList = listOf(groupChild1, groupChild2) + beforeTransformGroupsListener.onBeforeTransformGroups(entryList) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(entryList) + + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupChild1) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupChild2), any()) // THEN we tell the HeadsUpManager to show the notification - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupChild1) - verify(mHeadsUpManager, never()).showNotification(mGroupChild2) - assertTrue(mGroupSummary.hasInterrupted()) + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupChild1) + verify(headsUpManager, never()).showNotification(groupChild2) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testTransferToPriorityOnAddWithTwoSiblings() { // WHEN a notification should HUN and its inflation is finished - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupSibling1, mGroupSibling2, mGroupPriority)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupSibling1, groupSibling2, groupPriority)) - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupPriority) - mCollectionListener.onEntryAdded(mGroupSibling1) - mCollectionListener.onEntryAdded(mGroupSibling2) + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupPriority) + collectionListener.onEntryAdded(groupSibling1) + collectionListener.onEntryAdded(groupSibling2) val beforeTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupPriority, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupPriority, groupSibling2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) val afterTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupSibling2)) .build() - mBeforeFinalizeFilterListener - .onBeforeFinalizeFilter(listOf(mGroupPriority, afterTransformGroup)) + beforeFinalizeFilterListener + .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupPriority) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling1), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling2), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupPriority) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling1), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling2), any()) // THEN we tell the HeadsUpManager to show the notification - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupPriority) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling2) - assertTrue(mGroupSummary.hasInterrupted()) + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupPriority) + verify(headsUpManager, never()).showNotification(groupSibling1) + verify(headsUpManager, never()).showNotification(groupSibling2) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testTransferToPriorityOnUpdateWithTwoSiblings() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupSibling1, mGroupSibling2, mGroupPriority)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupSibling1, groupSibling2, groupPriority)) - mCollectionListener.onEntryUpdated(mGroupSummary) - mCollectionListener.onEntryUpdated(mGroupPriority) - mCollectionListener.onEntryUpdated(mGroupSibling1) - mCollectionListener.onEntryUpdated(mGroupSibling2) + collectionListener.onEntryUpdated(groupSummary) + collectionListener.onEntryUpdated(groupPriority) + collectionListener.onEntryUpdated(groupSibling1) + collectionListener.onEntryUpdated(groupSibling2) val beforeTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupPriority, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupPriority, groupSibling2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) val afterTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupSibling2)) .build() - mBeforeFinalizeFilterListener - .onBeforeFinalizeFilter(listOf(mGroupPriority, afterTransformGroup)) - - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupPriority) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling1), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling2), any()) - - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupPriority) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling2) - assertTrue(mGroupSummary.hasInterrupted()) + beforeFinalizeFilterListener + .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup)) + + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupPriority) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling1), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling2), any()) + + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupPriority) + verify(headsUpManager, never()).showNotification(groupSibling1) + verify(headsUpManager, never()).showNotification(groupSibling2) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testTransferToPriorityOnUpdateWithTwoNonUpdatedSiblings() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupSibling1, mGroupSibling2, mGroupPriority)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupSibling1, groupSibling2, groupPriority)) - mCollectionListener.onEntryUpdated(mGroupSummary) - mCollectionListener.onEntryUpdated(mGroupPriority) + collectionListener.onEntryUpdated(groupSummary) + collectionListener.onEntryUpdated(groupPriority) val beforeTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupPriority, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupPriority, groupSibling2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) val afterTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupSibling2)) .build() - mBeforeFinalizeFilterListener - .onBeforeFinalizeFilter(listOf(mGroupPriority, afterTransformGroup)) - - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupPriority) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling1), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling2), any()) - - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupPriority) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling2) - assertTrue(mGroupSummary.hasInterrupted()) + beforeFinalizeFilterListener + .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup)) + + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupPriority) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling1), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling2), any()) + + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupPriority) + verify(headsUpManager, never()).showNotification(groupSibling1) + verify(headsUpManager, never()).showNotification(groupSibling2) + assertTrue(groupSummary.hasInterrupted()) } @Test fun testNoTransferToPriorityOnUpdateOfTwoSiblings() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupSibling1, mGroupSibling2, mGroupPriority)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupSibling1, groupSibling2, groupPriority)) - mCollectionListener.onEntryUpdated(mGroupSummary) - mCollectionListener.onEntryUpdated(mGroupSibling1) - mCollectionListener.onEntryUpdated(mGroupSibling2) + collectionListener.onEntryUpdated(groupSummary) + collectionListener.onEntryUpdated(groupSibling1) + collectionListener.onEntryUpdated(groupSibling2) val beforeTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupPriority, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupPriority, groupSibling2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) val afterTransformGroup = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupSibling2)) .build() - mBeforeFinalizeFilterListener - .onBeforeFinalizeFilter(listOf(mGroupPriority, afterTransformGroup)) - - finishBind(mGroupSummary) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupPriority), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling1), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling2), any()) - - verify(mHeadsUpManager).showNotification(mGroupSummary) - verify(mHeadsUpManager, never()).showNotification(mGroupPriority) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling2) + beforeFinalizeFilterListener + .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup)) + + finishBind(groupSummary) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupPriority), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling1), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling2), any()) + + verify(headsUpManager).showNotification(groupSummary) + verify(headsUpManager, never()).showNotification(groupPriority) + verify(headsUpManager, never()).showNotification(groupSibling1) + verify(headsUpManager, never()).showNotification(groupSibling2) } @Test fun testNoTransferTwoChildAlert_withGroupAlertSummary() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupSibling1, mGroupSibling2)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupSibling1, groupSibling2)) - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupSibling1) - mCollectionListener.onEntryAdded(mGroupSibling2) + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupSibling1) + collectionListener.onEntryAdded(groupSibling2) val groupEntry = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupSibling1, mGroupSibling2)) + .setSummary(groupSummary) + .setChildren(listOf(groupSibling1, groupSibling2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry)) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry)) - finishBind(mGroupSummary) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling1), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSibling2), any()) + finishBind(groupSummary) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling1), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSibling2), any()) - verify(mHeadsUpManager).showNotification(mGroupSummary) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling1) - verify(mHeadsUpManager, never()).showNotification(mGroupSibling2) + verify(headsUpManager).showNotification(groupSummary) + verify(headsUpManager, never()).showNotification(groupSibling1) + verify(headsUpManager, never()).showNotification(groupSibling2) } @Test fun testNoTransferTwoChildAlert_withGroupAlertAll() { - setShouldHeadsUp(mGroupSummary) - whenever(mNotifPipeline.allNotifs) - .thenReturn(listOf(mGroupSummary, mGroupChild1, mGroupChild2)) + setShouldHeadsUp(groupSummary) + whenever(notifPipeline.allNotifs) + .thenReturn(listOf(groupSummary, groupChild1, groupChild2)) - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupChild1) - mCollectionListener.onEntryAdded(mGroupChild2) + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupChild1) + collectionListener.onEntryAdded(groupChild2) val groupEntry = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupChild1, mGroupChild2)) + .setSummary(groupSummary) + .setChildren(listOf(groupChild1, groupChild2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry)) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry)) - finishBind(mGroupSummary) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupChild1), any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupChild2), any()) + finishBind(groupSummary) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupChild1), any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupChild2), any()) - verify(mHeadsUpManager).showNotification(mGroupSummary) - verify(mHeadsUpManager, never()).showNotification(mGroupChild1) - verify(mHeadsUpManager, never()).showNotification(mGroupChild2) + verify(headsUpManager).showNotification(groupSummary) + verify(headsUpManager, never()).showNotification(groupChild1) + verify(headsUpManager, never()).showNotification(groupChild2) } @Test fun testNoTransfer_groupSummaryNotAlerting() { // When we have a group where the summary should not alert and exactly one child should // alert, we should never mark the group summary as interrupted (because it doesn't). - setShouldHeadsUp(mGroupSummary, false) - setShouldHeadsUp(mGroupChild1, true) - setShouldHeadsUp(mGroupChild2, false) + setShouldHeadsUp(groupSummary, false) + setShouldHeadsUp(groupChild1, true) + setShouldHeadsUp(groupChild2, false) - mCollectionListener.onEntryAdded(mGroupSummary) - mCollectionListener.onEntryAdded(mGroupChild1) - mCollectionListener.onEntryAdded(mGroupChild2) + collectionListener.onEntryAdded(groupSummary) + collectionListener.onEntryAdded(groupChild1) + collectionListener.onEntryAdded(groupChild2) val groupEntry = GroupEntryBuilder() - .setSummary(mGroupSummary) - .setChildren(listOf(mGroupChild1, mGroupChild2)) + .setSummary(groupSummary) + .setChildren(listOf(groupChild1, groupChild2)) .build() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry)) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry)) - - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupSummary), any()) - finishBind(mGroupChild1) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mGroupChild2), any()) - - verify(mHeadsUpManager, never()).showNotification(mGroupSummary) - verify(mHeadsUpManager).showNotification(mGroupChild1) - verify(mHeadsUpManager, never()).showNotification(mGroupChild2) - assertFalse(mGroupSummary.hasInterrupted()) + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry)) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry)) + + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any()) + finishBind(groupChild1) + verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupChild2), any()) + + verify(headsUpManager, never()).showNotification(groupSummary) + verify(headsUpManager).showNotification(groupChild1) + verify(headsUpManager, never()).showNotification(groupChild2) + assertFalse(groupSummary.hasInterrupted()) } @Test fun testOnRankingApplied_newEntryShouldAlert() { // GIVEN that mEntry has never interrupted in the past, and now should // and is new enough to do so - assertFalse(mEntry.hasInterrupted()) - mCoordinator.setUpdateTime(mEntry, mSystemClock.currentTimeMillis()) - setShouldHeadsUp(mEntry) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) + assertFalse(entry.hasInterrupted()) + coordinator.setUpdateTime(entry, systemClock.currentTimeMillis()) + setShouldHeadsUp(entry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) // WHEN a ranking applied update occurs - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN the notification is shown - finishBind(mEntry) - verify(mHeadsUpManager).showNotification(mEntry) + finishBind(entry) + verify(headsUpManager).showNotification(entry) } @Test fun testOnRankingApplied_alreadyAlertedEntryShouldNotAlertAgain() { // GIVEN that mEntry has alerted in the past, even if it's new - mEntry.setInterruption() - mCoordinator.setUpdateTime(mEntry, mSystemClock.currentTimeMillis()) - setShouldHeadsUp(mEntry) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) + entry.setInterruption() + coordinator.setUpdateTime(entry, systemClock.currentTimeMillis()) + setShouldHeadsUp(entry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) // WHEN a ranking applied update occurs - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN the notification is never bound or shown - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) } @Test fun testOnRankingApplied_entryUpdatedToHun() { // GIVEN that mEntry is added in a state where it should not HUN - setShouldHeadsUp(mEntry, false) - mCollectionListener.onEntryAdded(mEntry) + setShouldHeadsUp(entry, false) + collectionListener.onEntryAdded(entry) // and it is then updated such that it should now HUN - setShouldHeadsUp(mEntry) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) + setShouldHeadsUp(entry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) // WHEN a ranking applied update occurs - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN the notification is shown - finishBind(mEntry) - verify(mHeadsUpManager).showNotification(mEntry) + finishBind(entry) + verify(headsUpManager).showNotification(entry) } @Test fun testOnRankingApplied_entryUpdatedButTooOld() { // GIVEN that mEntry is added in a state where it should not HUN - setShouldHeadsUp(mEntry, false) - mCollectionListener.onEntryAdded(mEntry) + setShouldHeadsUp(entry, false) + collectionListener.onEntryAdded(entry) // and it was actually added 10s ago - mCoordinator.setUpdateTime(mEntry, mSystemClock.currentTimeMillis() - 10000) + coordinator.setUpdateTime(entry, systemClock.currentTimeMillis() - 10000) // WHEN it is updated to HUN and then a ranking update occurs - setShouldHeadsUp(mEntry) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldHeadsUp(entry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN the notification is never bound or shown - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) } @Test fun onEntryAdded_whenLaunchingFSI_doesLogDecision() { // GIVEN A new notification can FSI - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - mCollectionListener.onEntryAdded(mEntry) - - verify(mLaunchFullScreenIntentProvider).launchFullScreenIntent(mEntry) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision( - mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + collectionListener.onEntryAdded(entry) + + verify(launchFullScreenIntentProvider).launchFullScreenIntent(entry) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE + ) } @Test fun onEntryAdded_whenNotLaunchingFSI_doesLogDecision() { // GIVEN A new notification can't FSI - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) - mCollectionListener.onEntryAdded(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) + collectionListener.onEntryAdded(entry) - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision( - mEntry, FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verifyLoggedFullScreenIntentDecision(entry, FullScreenIntentDecision.NO_FULL_SCREEN_INTENT) } @Test fun onEntryAdded_whenNotLaunchingFSIBecauseOfDnd_doesLogDecision() { // GIVEN A new notification can't FSI because of DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onEntryAdded(mEntry) - - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision( - mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onEntryAdded(entry) + + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND + ) } @Test fun testOnRankingApplied_noFSIOnUpdateWhenFlagOff() { // Ensure the feature flag is off - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(false) + whenever(flags.fsiOnDNDUpdate()).thenReturn(false) // GIVEN that mEntry was previously suppressed from full-screen only by DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onEntryAdded(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onEntryAdded(entry) // Verify that this causes a log - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision( - mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - clearInvocations(mNotificationInterruptStateProvider) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND + ) + clearInterruptionProviderInvocations() // and it is then updated to allow full screen - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) - mCollectionListener.onRankingApplied() + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) + collectionListener.onRankingApplied() // THEN it should not full screen because the feature is off - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) // VERIFY that no additional logging happens either - verify(mNotificationInterruptStateProvider, never()) - .logFullScreenIntentDecision(any(), any()) + verifyNoFullScreenIntentDecisionLogged() } @Test fun testOnRankingApplied_updateToFullScreen() { // Turn on the feature - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(true) + whenever(flags.fsiOnDNDUpdate()).thenReturn(true) // GIVEN that mEntry was previously suppressed from full-screen only by DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onEntryAdded(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onEntryAdded(entry) // at this point, it should not have full screened, but should have logged - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision(mEntry, - FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - clearInvocations(mNotificationInterruptStateProvider) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND + ) + clearInterruptionProviderInvocations() // and it is then updated to allow full screen AND HUN - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - setShouldHeadsUp(mEntry) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + setShouldHeadsUp(entry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN it should full screen and log but it should NOT HUN - verify(mLaunchFullScreenIntentProvider).launchFullScreenIntent(mEntry) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision(mEntry, - FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - clearInvocations(mNotificationInterruptStateProvider) + verify(launchFullScreenIntentProvider).launchFullScreenIntent(entry) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE + ) + clearInterruptionProviderInvocations() // WHEN ranking updates again and the pipeline reruns - clearInvocations(mLaunchFullScreenIntentProvider) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + clearInvocations(launchFullScreenIntentProvider) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // VERIFY that the FSI does not launch again or log - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mNotificationInterruptStateProvider, never()) - .logFullScreenIntentDecision(any(), any()) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verifyNoFullScreenIntentDecisionLogged() } @Test fun testOnRankingApplied_withOnlyDndSuppressionAllowsFsiLater() { // Turn on the feature - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(true) + whenever(flags.fsiOnDNDUpdate()).thenReturn(true) // GIVEN that mEntry was previously suppressed from full-screen only by DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onEntryAdded(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onEntryAdded(entry) // at this point, it should not have full screened, but should have logged - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision(mEntry, - FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - clearInvocations(mNotificationInterruptStateProvider) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND + ) + clearInterruptionProviderInvocations() // ranking is applied with only DND blocking FSI - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN it should still not yet full screen or HUN - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) // Same decision as before; is not logged - verify(mNotificationInterruptStateProvider, never()) - .logFullScreenIntentDecision(any(), any()) - clearInvocations(mNotificationInterruptStateProvider) + verifyNoFullScreenIntentDecisionLogged() + clearInterruptionProviderInvocations() // and it is then updated to allow full screen AND HUN - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - setShouldHeadsUp(mEntry) - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + setShouldHeadsUp(entry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN it should full screen and log but it should NOT HUN - verify(mLaunchFullScreenIntentProvider).launchFullScreenIntent(mEntry) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) - verify(mNotificationInterruptStateProvider).logFullScreenIntentDecision(mEntry, - FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - clearInvocations(mNotificationInterruptStateProvider) + verify(launchFullScreenIntentProvider).launchFullScreenIntent(entry) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) + verifyLoggedFullScreenIntentDecision( + entry, + FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE + ) + clearInterruptionProviderInvocations() } @Test fun testOnRankingApplied_newNonFullScreenAnswerInvalidatesCandidate() { // Turn on the feature - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(true) + whenever(flags.fsiOnDNDUpdate()).thenReturn(true) // GIVEN that mEntry was previously suppressed from full-screen only by DND - whenever(mNotifPipeline.allNotifs).thenReturn(listOf(mEntry)) - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onEntryAdded(mEntry) + whenever(notifPipeline.allNotifs).thenReturn(listOf(entry)) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onEntryAdded(entry) // at this point, it should not have full screened - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(mEntry) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(entry) // now some other condition blocks FSI in addition to DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_BY_DND) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_BY_DND) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // THEN it should NOT full screen or HUN - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - verify(mHeadsUpViewBinder, never()).bindHeadsUpView(any(), any()) - verify(mHeadsUpManager, never()).showNotification(any()) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any()) + verify(headsUpManager, never()).showNotification(any()) // NOW the DND logic changes and FSI and HUN are available - clearInvocations(mLaunchFullScreenIntentProvider) - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - setShouldHeadsUp(mEntry) - mCollectionListener.onRankingApplied() - mBeforeTransformGroupsListener.onBeforeTransformGroups(listOf(mEntry)) - mBeforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(mEntry)) + clearInvocations(launchFullScreenIntentProvider) + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + setShouldHeadsUp(entry) + collectionListener.onRankingApplied() + beforeTransformGroupsListener.onBeforeTransformGroups(listOf(entry)) + beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry)) // VERIFY that the FSI didn't happen, but that we do HUN - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) - finishBind(mEntry) - verify(mHeadsUpManager).showNotification(mEntry) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(any()) + finishBind(entry) + verify(headsUpManager).showNotification(entry) } @Test fun testOnRankingApplied_noFSIWhenAlsoSuppressedForOtherReasons() { // Feature on - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(true) + whenever(flags.fsiOnDNDUpdate()).thenReturn(true) // GIVEN that mEntry is suppressed by DND (functionally), but not *only* DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_BY_DND) - mCollectionListener.onEntryAdded(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_BY_DND) + collectionListener.onEntryAdded(entry) // and it is updated to full screen later - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) - mCollectionListener.onRankingApplied() + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE) + collectionListener.onRankingApplied() // THEN it should still not full screen because something else was blocking it before - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(mEntry) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(entry) } @Test fun testOnRankingApplied_noFSIWhenTooOld() { // Feature on - whenever(mFlags.fsiOnDNDUpdate()).thenReturn(true) + whenever(flags.fsiOnDNDUpdate()).thenReturn(true) // GIVEN that mEntry is suppressed only by DND - setShouldFullScreen(mEntry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) - mCollectionListener.onEntryAdded(mEntry) + setShouldFullScreen(entry, FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) + collectionListener.onEntryAdded(entry) // but it's >10s old - mCoordinator.addForFSIReconsideration(mEntry, mSystemClock.currentTimeMillis() - 10000) + coordinator.addForFSIReconsideration(entry, systemClock.currentTimeMillis() - 10000) // and it is updated to full screen later - setShouldFullScreen(mEntry, FullScreenIntentDecision.FSI_EXPECTED_NOT_TO_HUN) - mCollectionListener.onRankingApplied() + setShouldFullScreen(entry, FullScreenIntentDecision.FSI_EXPECTED_NOT_TO_HUN) + collectionListener.onRankingApplied() // THEN it should still not full screen because it's too old - verify(mLaunchFullScreenIntentProvider, never()).launchFullScreenIntent(mEntry) + verify(launchFullScreenIntentProvider, never()).launchFullScreenIntent(entry) } private fun setShouldHeadsUp(entry: NotificationEntry, should: Boolean = true) { - whenever(mNotificationInterruptStateProvider.shouldHeadsUp(entry)).thenReturn(should) - whenever(mNotificationInterruptStateProvider.checkHeadsUp(eq(entry), any())) + whenever(notificationInterruptStateProvider.shouldHeadsUp(entry)).thenReturn(should) + whenever(notificationInterruptStateProvider.checkHeadsUp(eq(entry), any())) .thenReturn(should) } private fun setShouldFullScreen(entry: NotificationEntry, decision: FullScreenIntentDecision) { - whenever(mNotificationInterruptStateProvider.getFullScreenIntentDecision(entry)) + whenever(notificationInterruptStateProvider.getFullScreenIntentDecision(entry)) .thenReturn(decision) } + private fun verifyLoggedFullScreenIntentDecision( + entry: NotificationEntry, + decision: FullScreenIntentDecision + ) { + verify(notificationInterruptStateProvider).logFullScreenIntentDecision(entry, decision) + } + + private fun verifyNoFullScreenIntentDecisionLogged() { + verify(notificationInterruptStateProvider, never()) + .logFullScreenIntentDecision(any(), any()) + } + + private fun clearInterruptionProviderInvocations() { + clearInvocations(notificationInterruptStateProvider) + } + private fun finishBind(entry: NotificationEntry) { - verify(mHeadsUpManager, never()).showNotification(entry) + verify(headsUpManager, never()).showNotification(entry) withArgCaptor<BindCallback> { - verify(mHeadsUpViewBinder).bindHeadsUpView(eq(entry), capture()) + verify(headsUpViewBinder).bindHeadsUpView(eq(entry), capture()) }.onBindFinished(entry) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapperTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapperTest.kt new file mode 100644 index 000000000000..cbb08946a1b0 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapperTest.kt @@ -0,0 +1,78 @@ +package com.android.systemui.statusbar.notification.interruption + +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision.NO_FSI_NOT_IMPORTANT_ENOUGH +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision.NO_FSI_SUPPRESSED_BY_DND +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper.DecisionImpl +import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper.FullScreenIntentDecisionImpl +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class NotificationInterruptStateProviderWrapperTest : SysuiTestCase() { + + @Test + fun decisionOfTrue() { + assertTrue(DecisionImpl.of(true).shouldInterrupt) + } + + @Test + fun decisionOfFalse() { + assertFalse(DecisionImpl.of(false).shouldInterrupt) + } + + @Test + fun decisionOfTrueInterned() { + assertEquals(DecisionImpl.of(true), DecisionImpl.of(true)) + } + + @Test + fun decisionOfFalseInterned() { + assertEquals(DecisionImpl.of(false), DecisionImpl.of(false)) + } + + @Test + fun fullScreenIntentDecisionShouldInterrupt() { + makeFsiDecision(FSI_DEVICE_NOT_INTERACTIVE).let { + assertTrue(it.shouldInterrupt) + assertFalse(it.wouldInterruptWithoutDnd) + } + } + + @Test + fun fullScreenIntentDecisionShouldNotInterrupt() { + makeFsiDecision(NO_FSI_NOT_IMPORTANT_ENOUGH).let { + assertFalse(it.shouldInterrupt) + assertFalse(it.wouldInterruptWithoutDnd) + } + } + + @Test + fun fullScreenIntentDecisionWouldInterruptWithoutDnd() { + makeFsiDecision(NO_FSI_SUPPRESSED_ONLY_BY_DND).let { + assertFalse(it.shouldInterrupt) + assertTrue(it.wouldInterruptWithoutDnd) + } + } + + @Test + fun fullScreenIntentDecisionWouldNotInterruptEvenWithoutDnd() { + makeFsiDecision(NO_FSI_SUPPRESSED_BY_DND).let { + assertFalse(it.shouldInterrupt) + assertFalse(it.wouldInterruptWithoutDnd) + } + } + + private fun makeFsiDecision(originalDecision: FullScreenIntentDecision) = + FullScreenIntentDecisionImpl(NotificationEntryBuilder().build(), originalDecision) +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java index 68d67ca20007..89f8bdbfe05b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java @@ -89,7 +89,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { @Mock private KeyguardViewMediator mKeyguardViewMediator; @Mock - private BiometricUnlockController.BiometricModeListener mBiometricModeListener; + private BiometricUnlockController.BiometricUnlockEventsListener mBiometricUnlockEventsListener; @Mock private KeyguardStateController mKeyguardStateController; @Mock @@ -145,7 +145,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { mSystemClock ); mBiometricUnlockController.setKeyguardViewController(mStatusBarKeyguardViewManager); - mBiometricUnlockController.addBiometricModeListener(mBiometricModeListener); + mBiometricUnlockController.addListener(mBiometricUnlockEventsListener); when(mUpdateMonitor.getStrongAuthTracker()).thenReturn(mStrongAuthTracker); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt index 44fbd5b99894..6306a36d9730 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository +import android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel @@ -29,6 +30,7 @@ class FakeMobileConnectionRepository( override val subId: Int, override val tableLogBuffer: TableLogBuffer, ) : MobileConnectionRepository { + override val carrierId = MutableStateFlow(UNKNOWN_CARRIER_ID) override val isEmergencyOnly = MutableStateFlow(false) override val isRoaming = MutableStateFlow(false) override val operatorAlphaShort: MutableStateFlow<String?> = MutableStateFlow(null) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionsRepository.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionsRepository.kt index f9c72d523673..3591c1740329 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionsRepository.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionsRepository.kt @@ -67,6 +67,8 @@ class FakeMobileConnectionsRepository( override val mobileIsDefault = MutableStateFlow(false) + override val hasCarrierMergedConnection = MutableStateFlow(false) + override val defaultConnectionIsValidated = MutableStateFlow(false) private val subIdRepos = mutableMapOf<Int, MobileConnectionRepository>() diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt index f2bb66a501ec..423c47661fa3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt @@ -593,7 +593,6 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() { val realRepo = MobileConnectionRepositoryImpl( - context, SUB_ID, defaultNetworkName = NetworkNameModel.Default("default"), networkNameSeparator = SEP, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt index 934e1c64c6da..d1df6e3c2072 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt @@ -42,6 +42,7 @@ import android.telephony.TelephonyManager.DATA_SUSPENDED import android.telephony.TelephonyManager.DATA_UNKNOWN import android.telephony.TelephonyManager.ERI_OFF import android.telephony.TelephonyManager.ERI_ON +import android.telephony.TelephonyManager.EXTRA_CARRIER_ID import android.telephony.TelephonyManager.EXTRA_PLMN import android.telephony.TelephonyManager.EXTRA_SHOW_PLMN import android.telephony.TelephonyManager.EXTRA_SHOW_SPN @@ -116,7 +117,6 @@ class MobileConnectionRepositoryTest : SysuiTestCase() { underTest = MobileConnectionRepositoryImpl( - context, SUB_1_ID, DEFAULT_NAME, SEP, @@ -359,6 +359,36 @@ class MobileConnectionRepositoryTest : SysuiTestCase() { } @Test + fun carrierId_initialValueCaptured() = + testScope.runTest { + whenever(telephonyManager.simCarrierId).thenReturn(1234) + + var latest: Int? = null + val job = underTest.carrierId.onEach { latest = it }.launchIn(this) + + assertThat(latest).isEqualTo(1234) + + job.cancel() + } + + @Test + fun carrierId_updatesOnBroadcast() = + testScope.runTest { + whenever(telephonyManager.simCarrierId).thenReturn(1234) + + var latest: Int? = null + val job = underTest.carrierId.onEach { latest = it }.launchIn(this) + + fakeBroadcastDispatcher.registeredReceivers.forEach { receiver -> + receiver.onReceive(context, carrierIdIntent(carrierId = 4321)) + } + + assertThat(latest).isEqualTo(4321) + + job.cancel() + } + + @Test fun carrierNetworkChange() = testScope.runTest { var latest: Boolean? = null @@ -796,6 +826,15 @@ class MobileConnectionRepositoryTest : SysuiTestCase() { return MobileTelephonyHelpers.getTelephonyCallbackForType(telephonyManager) } + private fun carrierIdIntent( + subId: Int = SUB_1_ID, + carrierId: Int, + ): Intent = + Intent(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED).apply { + putExtra(EXTRA_SUBSCRIPTION_ID, subId) + putExtra(EXTRA_CARRIER_ID, carrierId) + } + private fun spnIntent( subId: Int = SUB_1_ID, showSpn: Boolean = true, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionTelephonySmokeTests.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionTelephonySmokeTests.kt index 9da9ff72d380..4f15aed00230 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionTelephonySmokeTests.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionTelephonySmokeTests.kt @@ -117,7 +117,6 @@ class MobileConnectionTelephonySmokeTests : SysuiTestCase() { underTest = MobileConnectionRepositoryImpl( - context, SUB_1_ID, DEFAULT_NAME, SEP, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt index ddff17aef2de..7cc59b67414b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt @@ -68,6 +68,7 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.yield import org.junit.After import org.junit.Assert.assertThrows import org.junit.Assert.assertTrue @@ -155,7 +156,6 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { connectionFactory = MobileConnectionRepositoryImpl.Factory( fakeBroadcastDispatcher, - context = context, telephonyManager = telephonyManager, bgDispatcher = IMMEDIATE, logger = logger, @@ -767,9 +767,66 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { job.cancel() } + @Test + fun mobileIsDefault_carrierMergedViaMobile_isDefault() = + runBlocking(IMMEDIATE) { + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val caps = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(carrierMergedInfo) + } + + var latest: Boolean? = null + val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + + assertThat(latest).isTrue() + + job.cancel() + } + + @Test + fun mobileIsDefault_wifiDefault_mobileNotDefault() = + runBlocking(IMMEDIATE) { + val caps = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + } + + var latest: Boolean? = null + val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + + assertThat(latest).isFalse() + + job.cancel() + } + + @Test + fun mobileIsDefault_ethernetDefault_mobileNotDefault() = + runBlocking(IMMEDIATE) { + val caps = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_ETHERNET)).thenReturn(true) + } + + var latest: Boolean? = null + val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + + assertThat(latest).isFalse() + + job.cancel() + } + /** Regression test for b/272586234. */ @Test - fun mobileIsDefault_carrierMergedViaWifi_isDefault() = + fun hasCarrierMergedConnection_carrierMergedViaWifi_isTrue() = runBlocking(IMMEDIATE) { val carrierMergedInfo = mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } @@ -780,9 +837,10 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } var latest: Boolean? = null - val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + yield() assertThat(latest).isTrue() @@ -790,7 +848,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } @Test - fun mobileIsDefault_carrierMergedViaMobile_isDefault() = + fun hasCarrierMergedConnection_carrierMergedViaMobile_isTrue() = runBlocking(IMMEDIATE) { val carrierMergedInfo = mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } @@ -801,9 +859,10 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } var latest: Boolean? = null - val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + yield() assertThat(latest).isTrue() @@ -812,7 +871,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { /** Regression test for b/272586234. */ @Test - fun mobileIsDefault_carrierMergedViaWifiWithVcnTransport_isDefault() = + fun hasCarrierMergedConnection_carrierMergedViaWifiWithVcnTransport_isTrue() = runBlocking(IMMEDIATE) { val carrierMergedInfo = mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } @@ -823,9 +882,10 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } var latest: Boolean? = null - val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + yield() assertThat(latest).isTrue() @@ -833,7 +893,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } @Test - fun mobileIsDefault_carrierMergedViaMobileWithVcnTransport_isDefault() = + fun hasCarrierMergedConnection_carrierMergedViaMobileWithVcnTransport_isTrue() = runBlocking(IMMEDIATE) { val carrierMergedInfo = mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } @@ -844,9 +904,10 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } var latest: Boolean? = null - val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + yield() assertThat(latest).isTrue() @@ -854,37 +915,100 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { } @Test - fun mobileIsDefault_wifiDefault_mobileNotDefault() = + fun hasCarrierMergedConnection_isCarrierMergedViaUnderlyingWifi_isTrue() = runBlocking(IMMEDIATE) { - val caps = + var latest: Boolean? = null + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) + + val underlyingNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val underlyingWifiCapabilities = mock<NetworkCapabilities>().also { whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(carrierMergedInfo) } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) - var latest: Boolean? = null - val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + // WHEN the main capabilities have an underlying carrier merged network via WIFI + // transport and WifiInfo + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } - getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + yield() - assertThat(latest).isFalse() + // THEN there's a carrier merged connection + assertThat(latest).isTrue() job.cancel() } @Test - fun mobileIsDefault_ethernetDefault_mobileNotDefault() = + fun hasCarrierMergedConnection_isCarrierMergedViaUnderlyingCellular_isTrue() = runBlocking(IMMEDIATE) { - val caps = + var latest: Boolean? = null + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) + + val underlyingCarrierMergedNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val underlyingCapabilities = mock<NetworkCapabilities>().also { - whenever(it.hasTransport(TRANSPORT_ETHERNET)).thenReturn(true) + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(VcnTransportInfo(carrierMergedInfo)) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingCarrierMergedNetwork)) + .thenReturn(underlyingCapabilities) + + // WHEN the main capabilities have an underlying carrier merged network via CELLULAR + // transport and VcnTransportInfo + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks) + .thenReturn(listOf(underlyingCarrierMergedNetwork)) } + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + yield() + + // THEN there's a carrier merged connection + assertThat(latest).isTrue() + + job.cancel() + } + + /** Regression test for b/272586234. */ + @Test + fun hasCarrierMergedConnection_defaultNotCarrierMerged_butWifiRepoHasCarrierMerged_isTrue() = + runBlocking(IMMEDIATE) { var latest: Boolean? = null - val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + val job = underTest.hasCarrierMergedConnection.onEach { latest = it }.launchIn(this) + // WHEN the default callback isn't carrier merged + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(false) } + val caps = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(carrierMergedInfo) + } getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, caps) + yield() - assertThat(latest).isFalse() + // BUT the wifi repo has gotten updates that it *is* carrier merged + wifiRepository.setWifiNetwork(WIFI_NETWORK_CM) + yield() + + // THEN hasCarrierMergedConnection is true + assertThat(latest).isTrue() job.cancel() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconInteractor.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconInteractor.kt index 8d2c5695c7c4..f054422e6524 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconInteractor.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconInteractor.kt @@ -17,11 +17,11 @@ package com.android.systemui.statusbar.pipeline.mobile.domain.interactor import android.telephony.CellSignalStrength -import com.android.settingslib.SignalIcon import com.android.settingslib.mobile.TelephonyIcons import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import kotlinx.coroutines.flow.MutableStateFlow @@ -42,8 +42,10 @@ class FakeMobileIconInteractor( override val mobileIsDefault = MutableStateFlow(true) - private val _iconGroup = MutableStateFlow<SignalIcon.MobileIconGroup>(TelephonyIcons.THREE_G) - override val networkTypeIconGroup = _iconGroup + override val networkTypeIconGroup = + MutableStateFlow<NetworkTypeIconModel>( + NetworkTypeIconModel.DefaultIcon(TelephonyIcons.THREE_G) + ) override val networkName = MutableStateFlow(NetworkNameModel.IntentDerived("demo mode")) @@ -73,10 +75,6 @@ class FakeMobileIconInteractor( override val isForceHidden = MutableStateFlow(false) - fun setIconGroup(group: SignalIcon.MobileIconGroup) { - _iconGroup.value = group - } - fun setIsEmergencyOnly(emergency: Boolean) { _isEmergencyOnly.value = emergency } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconsInteractor.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconsInteractor.kt index d6fdad417b31..3ced7b2c4e6e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconsInteractor.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconsInteractor.kt @@ -59,7 +59,6 @@ class FakeMobileIconsInteractor( override val alwaysShowDataRatIcon = MutableStateFlow(false) override val alwaysUseCdmaLevel = MutableStateFlow(false) - override val defaultDataSubId = MutableStateFlow(DEFAULT_DATA_SUB_ID) override val mobileIsDefault = MutableStateFlow(false) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt index 2054e8b12eff..8d7f0f6035cc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt @@ -19,7 +19,8 @@ package com.android.systemui.statusbar.pipeline.mobile.domain.interactor import android.telephony.CellSignalStrength import android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN import androidx.test.filters.SmallTest -import com.android.settingslib.SignalIcon.MobileIconGroup +import com.android.settingslib.mobile.MobileIconCarrierIdOverrides +import com.android.settingslib.mobile.MobileIconCarrierIdOverridesImpl import com.android.settingslib.mobile.TelephonyIcons import com.android.systemui.SysuiTestCase import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState @@ -31,18 +32,24 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobile import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor.Companion.FIVE_G_OVERRIDE import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor.Companion.FOUR_G import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor.Companion.THREE_G +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.yield +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.anyString +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest class MobileIconInteractorTest : SysuiTestCase() { private lateinit var underTest: MobileIconInteractor @@ -50,29 +57,17 @@ class MobileIconInteractorTest : SysuiTestCase() { private val mobileIconsInteractor = FakeMobileIconsInteractor(mobileMappingsProxy, mock()) private val connectionRepository = FakeMobileConnectionRepository(SUB_1_ID, mock()) - private val scope = CoroutineScope(IMMEDIATE) + private val testDispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(testDispatcher) @Before fun setUp() { - underTest = - MobileIconInteractorImpl( - scope, - mobileIconsInteractor.activeDataConnectionHasDataEnabled, - mobileIconsInteractor.alwaysShowDataRatIcon, - mobileIconsInteractor.alwaysUseCdmaLevel, - mobileIconsInteractor.mobileIsDefault, - mobileIconsInteractor.defaultMobileIconMapping, - mobileIconsInteractor.defaultMobileIconGroup, - mobileIconsInteractor.defaultDataSubId, - mobileIconsInteractor.isDefaultConnectionFailed, - mobileIconsInteractor.isForceHidden, - connectionRepository, - ) + underTest = createInteractor() } @Test fun gsm_level_default_unknown() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.isGsm.value = true var latest: Int? = null @@ -85,7 +80,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun gsm_usesGsmLevel() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.isGsm.value = true connectionRepository.primaryLevel.value = GSM_LEVEL connectionRepository.cdmaLevel.value = CDMA_LEVEL @@ -100,7 +95,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun gsm_alwaysShowCdmaTrue_stillUsesGsmLevel() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.isGsm.value = true connectionRepository.primaryLevel.value = GSM_LEVEL connectionRepository.cdmaLevel.value = CDMA_LEVEL @@ -116,7 +111,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun notGsm_level_default_unknown() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.isGsm.value = false var latest: Int? = null @@ -128,7 +123,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun notGsm_alwaysShowCdmaTrue_usesCdmaLevel() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.isGsm.value = false connectionRepository.primaryLevel.value = GSM_LEVEL connectionRepository.cdmaLevel.value = CDMA_LEVEL @@ -144,7 +139,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun notGsm_alwaysShowCdmaFalse_usesPrimaryLevel() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.isGsm.value = false connectionRepository.primaryLevel.value = GSM_LEVEL connectionRepository.cdmaLevel.value = CDMA_LEVEL @@ -160,7 +155,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun numberOfLevels_comesFromRepo() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Int? = null val job = underTest.numberOfLevels.onEach { latest = it }.launchIn(this) @@ -175,101 +170,106 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun iconGroup_three_g() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.resolvedNetworkType.value = DefaultNetworkType(mobileMappingsProxy.toIconKey(THREE_G)) - var latest: MobileIconGroup? = null + var latest: NetworkTypeIconModel? = null val job = underTest.networkTypeIconGroup.onEach { latest = it }.launchIn(this) - assertThat(latest).isEqualTo(TelephonyIcons.THREE_G) + assertThat(latest).isEqualTo(NetworkTypeIconModel.DefaultIcon(TelephonyIcons.THREE_G)) job.cancel() } @Test fun iconGroup_updates_on_change() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.resolvedNetworkType.value = DefaultNetworkType(mobileMappingsProxy.toIconKey(THREE_G)) - var latest: MobileIconGroup? = null + var latest: NetworkTypeIconModel? = null val job = underTest.networkTypeIconGroup.onEach { latest = it }.launchIn(this) connectionRepository.resolvedNetworkType.value = DefaultNetworkType(mobileMappingsProxy.toIconKey(FOUR_G)) - yield() - assertThat(latest).isEqualTo(TelephonyIcons.FOUR_G) + assertThat(latest).isEqualTo(NetworkTypeIconModel.DefaultIcon(TelephonyIcons.FOUR_G)) job.cancel() } @Test fun iconGroup_5g_override_type() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.resolvedNetworkType.value = OverrideNetworkType(mobileMappingsProxy.toIconKeyOverride(FIVE_G_OVERRIDE)) - var latest: MobileIconGroup? = null + var latest: NetworkTypeIconModel? = null val job = underTest.networkTypeIconGroup.onEach { latest = it }.launchIn(this) - assertThat(latest).isEqualTo(TelephonyIcons.NR_5G) + assertThat(latest).isEqualTo(NetworkTypeIconModel.DefaultIcon(TelephonyIcons.NR_5G)) job.cancel() } @Test fun iconGroup_default_if_no_lookup() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.resolvedNetworkType.value = DefaultNetworkType(mobileMappingsProxy.toIconKey(NETWORK_TYPE_UNKNOWN)) - var latest: MobileIconGroup? = null + var latest: NetworkTypeIconModel? = null val job = underTest.networkTypeIconGroup.onEach { latest = it }.launchIn(this) - assertThat(latest).isEqualTo(FakeMobileIconsInteractor.DEFAULT_ICON) + assertThat(latest) + .isEqualTo(NetworkTypeIconModel.DefaultIcon(FakeMobileIconsInteractor.DEFAULT_ICON)) job.cancel() } @Test fun iconGroup_carrierMerged_usesOverride() = - runBlocking(IMMEDIATE) { + testScope.runTest { connectionRepository.resolvedNetworkType.value = CarrierMergedNetworkType - var latest: MobileIconGroup? = null + var latest: NetworkTypeIconModel? = null val job = underTest.networkTypeIconGroup.onEach { latest = it }.launchIn(this) - assertThat(latest).isEqualTo(CarrierMergedNetworkType.iconGroupOverride) + assertThat(latest) + .isEqualTo( + NetworkTypeIconModel.DefaultIcon(CarrierMergedNetworkType.iconGroupOverride) + ) job.cancel() } @Test - fun `icon group - checks default data`() = - runBlocking(IMMEDIATE) { - mobileIconsInteractor.defaultDataSubId.value = SUB_1_ID + fun overrideIcon_usesCarrierIdOverride() = + testScope.runTest { + val overrides = + mock<MobileIconCarrierIdOverrides>().also { + whenever(it.carrierIdEntryExists(anyInt())).thenReturn(true) + whenever(it.getOverrideFor(anyInt(), anyString(), any())).thenReturn(1234) + } + + underTest = createInteractor(overrides) + connectionRepository.resolvedNetworkType.value = DefaultNetworkType(mobileMappingsProxy.toIconKey(THREE_G)) - var latest: MobileIconGroup? = null + var latest: NetworkTypeIconModel? = null val job = underTest.networkTypeIconGroup.onEach { latest = it }.launchIn(this) - assertThat(latest).isEqualTo(TelephonyIcons.THREE_G) - - // Default data sub id changes to something else - mobileIconsInteractor.defaultDataSubId.value = 123 - yield() - - assertThat(latest).isEqualTo(TelephonyIcons.NOT_DEFAULT_DATA) + assertThat(latest) + .isEqualTo(NetworkTypeIconModel.OverriddenIcon(TelephonyIcons.THREE_G, 1234)) job.cancel() } @Test fun alwaysShowDataRatIcon_matchesParent() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.alwaysShowDataRatIcon.onEach { latest = it }.launchIn(this) @@ -284,7 +284,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun alwaysUseCdmaLevel_matchesParent() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.alwaysUseCdmaLevel.onEach { latest = it }.launchIn(this) @@ -299,7 +299,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun test_isDefaultDataEnabled_matchesParent() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isDefaultDataEnabled.onEach { latest = it }.launchIn(this) @@ -314,7 +314,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun test_isDefaultConnectionFailed_matchedParent() = - runBlocking(IMMEDIATE) { + testScope.runTest { val job = underTest.isDefaultConnectionFailed.launchIn(this) mobileIconsInteractor.isDefaultConnectionFailed.value = false @@ -328,12 +328,11 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun dataState_connected() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isDataConnected.onEach { latest = it }.launchIn(this) connectionRepository.dataConnectionState.value = DataConnectionState.Connected - yield() assertThat(latest).isTrue() @@ -342,7 +341,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun dataState_notConnected() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isDataConnected.onEach { latest = it }.launchIn(this) @@ -355,7 +354,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun `isInService - uses repository value`() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isInService.onEach { latest = it }.launchIn(this) @@ -372,19 +371,17 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun `roaming - is gsm - uses connection model`() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isRoaming.onEach { latest = it }.launchIn(this) connectionRepository.cdmaRoaming.value = true connectionRepository.isGsm.value = true connectionRepository.isRoaming.value = false - yield() assertThat(latest).isFalse() connectionRepository.isRoaming.value = true - yield() assertThat(latest).isTrue() @@ -393,21 +390,19 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun `roaming - is cdma - uses cdma roaming bit`() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isRoaming.onEach { latest = it }.launchIn(this) connectionRepository.cdmaRoaming.value = false connectionRepository.isGsm.value = false connectionRepository.isRoaming.value = true - yield() assertThat(latest).isFalse() connectionRepository.cdmaRoaming.value = true connectionRepository.isGsm.value = false connectionRepository.isRoaming.value = false - yield() assertThat(latest).isTrue() @@ -416,7 +411,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun `roaming - false while carrierNetworkChangeActive`() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isRoaming.onEach { latest = it }.launchIn(this) @@ -424,13 +419,11 @@ class MobileIconInteractorTest : SysuiTestCase() { connectionRepository.isGsm.value = false connectionRepository.isRoaming.value = true connectionRepository.carrierNetworkChangeActive.value = true - yield() assertThat(latest).isFalse() connectionRepository.cdmaRoaming.value = true connectionRepository.isGsm.value = true - yield() assertThat(latest).isFalse() @@ -439,7 +432,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun `network name - uses operatorAlphaShot when non null and repo is default`() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: NetworkNameModel? = null val job = underTest.networkName.onEach { latest = it }.launchIn(this) @@ -448,20 +441,17 @@ class MobileIconInteractorTest : SysuiTestCase() { // Default network name, operator name is non-null, uses the operator name connectionRepository.networkName.value = DEFAULT_NAME connectionRepository.operatorAlphaShort.value = testOperatorName - yield() assertThat(latest).isEqualTo(NetworkNameModel.IntentDerived(testOperatorName)) // Default network name, operator name is null, uses the default connectionRepository.operatorAlphaShort.value = null - yield() assertThat(latest).isEqualTo(DEFAULT_NAME) // Derived network name, operator name non-null, uses the derived name connectionRepository.networkName.value = DERIVED_NAME connectionRepository.operatorAlphaShort.value = testOperatorName - yield() assertThat(latest).isEqualTo(DERIVED_NAME) @@ -470,7 +460,7 @@ class MobileIconInteractorTest : SysuiTestCase() { @Test fun isForceHidden_matchesParent() = - runBlocking(IMMEDIATE) { + testScope.runTest { var latest: Boolean? = null val job = underTest.isForceHidden.onEach { latest = it }.launchIn(this) @@ -483,9 +473,25 @@ class MobileIconInteractorTest : SysuiTestCase() { job.cancel() } - companion object { - private val IMMEDIATE = Dispatchers.Main.immediate + private fun createInteractor( + overrides: MobileIconCarrierIdOverrides = MobileIconCarrierIdOverridesImpl() + ) = + MobileIconInteractorImpl( + testScope.backgroundScope, + mobileIconsInteractor.activeDataConnectionHasDataEnabled, + mobileIconsInteractor.alwaysShowDataRatIcon, + mobileIconsInteractor.alwaysUseCdmaLevel, + mobileIconsInteractor.mobileIsDefault, + mobileIconsInteractor.defaultMobileIconMapping, + mobileIconsInteractor.defaultMobileIconGroup, + mobileIconsInteractor.isDefaultConnectionFailed, + mobileIconsInteractor.isForceHidden, + connectionRepository, + context, + overrides, + ) + companion object { private const val GSM_LEVEL = 1 private const val CDMA_LEVEL = 2 diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt index 898e89770394..dc683868f727 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt @@ -88,6 +88,7 @@ class MobileIconsInteractorTest : SysuiTestCase() { connectivityRepository, userSetupRepository, testScope.backgroundScope, + context, ) } @@ -455,20 +456,63 @@ class MobileIconsInteractorTest : SysuiTestCase() { } @Test - fun mobileIsDefault_usesRepoValue() = + fun mobileIsDefault_mobileFalseAndCarrierMergedFalse_false() = + testScope.runTest { + var latest: Boolean? = null + val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + + connectionsRepository.mobileIsDefault.value = false + connectionsRepository.hasCarrierMergedConnection.value = false + + assertThat(latest).isFalse() + + job.cancel() + } + + @Test + fun mobileIsDefault_mobileTrueAndCarrierMergedFalse_true() = testScope.runTest { var latest: Boolean? = null val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) connectionsRepository.mobileIsDefault.value = true + connectionsRepository.hasCarrierMergedConnection.value = false + assertThat(latest).isTrue() + job.cancel() + } + + /** Regression test for b/272586234. */ + @Test + fun mobileIsDefault_mobileFalseAndCarrierMergedTrue_true() = + testScope.runTest { + var latest: Boolean? = null + val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) + connectionsRepository.mobileIsDefault.value = false - assertThat(latest).isFalse() + connectionsRepository.hasCarrierMergedConnection.value = true + + assertThat(latest).isTrue() + + job.cancel() + } + + @Test + fun mobileIsDefault_updatesWhenRepoUpdates() = + testScope.runTest { + var latest: Boolean? = null + val job = underTest.mobileIsDefault.onEach { latest = it }.launchIn(this) connectionsRepository.mobileIsDefault.value = true assertThat(latest).isTrue() + connectionsRepository.mobileIsDefault.value = false + assertThat(latest).isFalse() + + connectionsRepository.hasCarrierMergedConnection.value = true + assertThat(latest).isTrue() + job.cancel() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt index a6d915243f60..e99be864e73f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt @@ -24,6 +24,7 @@ import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconInteractor +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel import com.android.systemui.statusbar.pipeline.mobile.ui.model.SignalIconModel import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconViewModelTest.Companion.defaultSignal import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants @@ -71,9 +72,9 @@ class LocationBasedMobileIconViewModelTest : SysuiTestCase() { setLevel(1) setIsDefaultDataEnabled(true) setIsFailedConnection(false) - setIconGroup(TelephonyIcons.THREE_G) setIsEmergencyOnly(false) setNumberOfLevels(4) + networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(TelephonyIcons.THREE_G) isDataConnected.value = true } commonImpl = diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt index 8ea8f87e6aff..1b6ab4d7af96 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt @@ -20,6 +20,7 @@ import androidx.test.filters.SmallTest import com.android.settingslib.AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH import com.android.settingslib.AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH_NONE import com.android.settingslib.mobile.TelephonyIcons.THREE_G +import com.android.settingslib.mobile.TelephonyIcons.UNKNOWN import com.android.systemui.SysuiTestCase import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon @@ -27,6 +28,7 @@ import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconInteractor +import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel import com.android.systemui.statusbar.pipeline.mobile.ui.model.SignalIconModel import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel @@ -76,9 +78,9 @@ class MobileIconViewModelTest : SysuiTestCase() { setLevel(1) setIsDefaultDataEnabled(true) setIsFailedConnection(false) - setIconGroup(THREE_G) setIsEmergencyOnly(false) setNumberOfLevels(4) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) isDataConnected.value = true } createAndSetViewModel() @@ -255,7 +257,7 @@ class MobileIconViewModelTest : SysuiTestCase() { THREE_G.dataType, ContentDescription.Resource(THREE_G.dataContentDescription) ) - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) var latest: Icon? = null val job = underTest.networkTypeIcon.onEach { latest = it }.launchIn(this) @@ -266,10 +268,11 @@ class MobileIconViewModelTest : SysuiTestCase() { } @Test - fun networkType_nullWhenDisabled() = + fun networkType_null_whenDisabled() = testScope.runTest { - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.setIsDataEnabled(false) + interactor.mobileIsDefault.value = true var latest: Icon? = null val job = underTest.networkTypeIcon.onEach { latest = it }.launchIn(this) @@ -279,15 +282,21 @@ class MobileIconViewModelTest : SysuiTestCase() { } @Test - fun networkType_nullWhenFailedConnection() = + fun networkTypeIcon_notNull_whenEnabled() = testScope.runTest { - interactor.setIconGroup(THREE_G) + val expected = + Icon.Resource( + THREE_G.dataType, + ContentDescription.Resource(THREE_G.dataContentDescription) + ) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.setIsDataEnabled(true) - interactor.setIsFailedConnection(true) + interactor.isDataConnected.value = true + interactor.mobileIsDefault.value = true var latest: Icon? = null val job = underTest.networkTypeIcon.onEach { latest = it }.launchIn(this) - assertThat(latest).isNull() + assertThat(latest).isEqualTo(expected) job.cancel() } @@ -301,11 +310,11 @@ class MobileIconViewModelTest : SysuiTestCase() { ContentDescription.Resource(THREE_G.dataContentDescription) ) - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) var latest: Icon? = null val job = underTest.networkTypeIcon.onEach { latest = it }.launchIn(this) - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) assertThat(latest).isEqualTo(initial) interactor.isDataConnected.value = false @@ -324,7 +333,7 @@ class MobileIconViewModelTest : SysuiTestCase() { THREE_G.dataType, ContentDescription.Resource(THREE_G.dataContentDescription) ) - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.setIsDataEnabled(true) var latest: Icon? = null val job = underTest.networkTypeIcon.onEach { latest = it }.launchIn(this) @@ -342,8 +351,8 @@ class MobileIconViewModelTest : SysuiTestCase() { @Test fun networkType_alwaysShow_shownEvenWhenDisabled() = testScope.runTest { - interactor.setIconGroup(THREE_G) - interactor.setIsDataEnabled(true) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) + interactor.setIsDataEnabled(false) interactor.alwaysShowDataRatIcon.value = true var latest: Icon? = null @@ -362,7 +371,7 @@ class MobileIconViewModelTest : SysuiTestCase() { @Test fun networkType_alwaysShow_shownEvenWhenDisconnected() = testScope.runTest { - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.isDataConnected.value = false interactor.alwaysShowDataRatIcon.value = true @@ -382,7 +391,7 @@ class MobileIconViewModelTest : SysuiTestCase() { @Test fun networkType_alwaysShow_shownEvenWhenFailedConnection() = testScope.runTest { - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.setIsFailedConnection(true) interactor.alwaysShowDataRatIcon.value = true @@ -400,9 +409,24 @@ class MobileIconViewModelTest : SysuiTestCase() { } @Test + fun networkType_alwaysShow_notShownWhenInvalidDataTypeIcon() = + testScope.runTest { + // The UNKNOWN icon group doesn't have a valid data type icon ID + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(UNKNOWN) + interactor.alwaysShowDataRatIcon.value = true + + var latest: Icon? = null + val job = underTest.networkTypeIcon.onEach { latest = it }.launchIn(this) + + assertThat(latest).isNull() + + job.cancel() + } + + @Test fun `network type - alwaysShow - shown when not default`() = testScope.runTest { - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.mobileIsDefault.value = false interactor.alwaysShowDataRatIcon.value = true @@ -422,7 +446,7 @@ class MobileIconViewModelTest : SysuiTestCase() { @Test fun `network type - not shown when not default`() = testScope.runTest { - interactor.setIconGroup(THREE_G) + interactor.networkTypeIconGroup.value = NetworkTypeIconModel.DefaultIcon(THREE_G) interactor.isDataConnected.value = true interactor.mobileIsDefault.value = false diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt index 87d4f5c618a7..661002d275b0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt @@ -33,6 +33,7 @@ import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlo import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl.Companion.DEFAULT_HIDDEN_ICONS_RESOURCE import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl.Companion.HIDDEN_ICONS_TUNABLE_KEY +import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl.Companion.getMainOrUnderlyingWifiInfo import com.android.systemui.tuner.TunerService import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor @@ -491,6 +492,111 @@ class ConnectivityRepositoryImplTest : SysuiTestCase() { } @Test + fun defaultConnections_nullUnderlyingInfo_noError() { + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(null) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + // No assert, just verify no error + } + + @Test + fun defaultConnections_underlyingInfoHasNullCapabilities_noError() { + val underlyingNetworkWithNull = mock<Network>() + whenever(connectivityManager.getNetworkCapabilities(underlyingNetworkWithNull)) + .thenReturn(null) + + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetworkWithNull)) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + // No assert, just verify no error + } + + // This test verifies our internal API for completeness, but we don't expect this case to ever + // happen in practice. + @Test + fun defaultConnections_cellular_underlyingCarrierMergedViaWifi_allDefault() = + testScope.runTest { + var latest: DefaultConnectionModel? = null + val job = underTest.defaultConnections.onEach { latest = it }.launchIn(this) + + // Underlying carrier merged network + val underlyingCarrierMergedNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val underlyingCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(carrierMergedInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingCarrierMergedNetwork)) + .thenReturn(underlyingCapabilities) + + // Main network with underlying network + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks) + .thenReturn(listOf(underlyingCarrierMergedNetwork)) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + + assertThat(latest!!.mobile.isDefault).isTrue() + assertThat(latest!!.carrierMerged.isDefault).isTrue() + assertThat(latest!!.wifi.isDefault).isTrue() + + job.cancel() + } + + /** Test for b/225902574. */ + @Test + fun defaultConnections_cellular_underlyingCarrierMergedViaMobileWithVcnTransport_allDefault() = + testScope.runTest { + var latest: DefaultConnectionModel? = null + val job = underTest.defaultConnections.onEach { latest = it }.launchIn(this) + + // Underlying carrier merged network + val underlyingCarrierMergedNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val underlyingCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(VcnTransportInfo(carrierMergedInfo)) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingCarrierMergedNetwork)) + .thenReturn(underlyingCapabilities) + + // Main network with underlying network + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks) + .thenReturn(listOf(underlyingCarrierMergedNetwork)) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + + assertThat(latest!!.mobile.isDefault).isTrue() + assertThat(latest!!.carrierMerged.isDefault).isTrue() + assertThat(latest!!.wifi.isDefault).isTrue() + + job.cancel() + } + + @Test fun defaultConnections_multipleTransports_multipleDefault() = testScope.runTest { var latest: DefaultConnectionModel? = null @@ -548,6 +654,279 @@ class ConnectivityRepositoryImplTest : SysuiTestCase() { job.cancel() } + @Test + fun getMainOrUnderlyingWifiInfo_wifi_hasInfo() { + val wifiInfo = mock<WifiInfo>() + val capabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(wifiInfo) + } + + val result = capabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + assertThat(result).isEqualTo(wifiInfo) + } + + @Test + fun getMainOrUnderlyingWifiInfo_vcnWithWifi_hasInfo() { + val wifiInfo = mock<WifiInfo>() + val vcnInfo = VcnTransportInfo(wifiInfo) + val capabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(vcnInfo) + } + + val result = capabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + assertThat(result).isEqualTo(wifiInfo) + } + + @Test + fun getMainOrUnderlyingWifiInfo_notCellularOrWifiTransport_noInfo() { + val capabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(false) + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(false) + whenever(it.transportInfo).thenReturn(mock<WifiInfo>()) + } + + val result = capabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + assertThat(result).isNull() + } + + @Test + fun getMainOrUnderlyingWifiInfo_cellular_underlyingWifi_hasInfo() { + val underlyingNetwork = mock<Network>() + val underlyingWifiInfo = mock<WifiInfo>() + val underlyingWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(underlyingWifiInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) + + // WHEN the main capabilities have an underlying wifi network + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + // THEN we fetch the underlying wifi info + assertThat(result).isEqualTo(underlyingWifiInfo) + } + + @Test + fun getMainOrUnderlyingWifiInfo_notCellular_underlyingWifi_noInfo() { + val underlyingNetwork = mock<Network>() + val underlyingWifiInfo = mock<WifiInfo>() + val underlyingWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(underlyingWifiInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) + + // WHEN the main capabilities have an underlying wifi network but is *not* CELLULAR + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_ETHERNET)).thenReturn(true) + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(false) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + // THEN we DON'T fetch the underlying wifi info + assertThat(result).isNull() + } + + @Test + fun getMainOrUnderlyingWifiInfo_cellular_underlyingVcnWithWifi_hasInfo() { + val wifiInfo = mock<WifiInfo>() + val underlyingNetwork = mock<Network>() + val underlyingVcnInfo = VcnTransportInfo(wifiInfo) + val underlyingWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(underlyingVcnInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) + + // WHEN the main capabilities have an underlying VCN network with wifi + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + // THEN we fetch the wifi info + assertThat(result).isEqualTo(wifiInfo) + } + + @Test + fun getMainOrUnderlyingWifiInfo_notCellular_underlyingVcnWithWifi_noInfo() { + val underlyingNetwork = mock<Network>() + val underlyingVcnInfo = VcnTransportInfo(mock<WifiInfo>()) + val underlyingWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(underlyingVcnInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) + + // WHEN the main capabilities have an underlying wifi network but it is *not* CELLULAR + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_ETHERNET)).thenReturn(true) + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(false) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + // THEN we DON'T fetch the underlying wifi info + assertThat(result).isNull() + } + + @Test + fun getMainOrUnderlyingWifiInfo_cellular_underlyingCellularWithCarrierMerged_hasInfo() { + // Underlying carrier merged network + val underlyingCarrierMergedNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val underlyingCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(VcnTransportInfo(carrierMergedInfo)) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingCarrierMergedNetwork)) + .thenReturn(underlyingCapabilities) + + // Main network with underlying network + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingCarrierMergedNetwork)) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + assertThat(result).isEqualTo(carrierMergedInfo) + assertThat(result!!.isCarrierMerged).isTrue() + } + + @Test + fun getMainOrUnderlyingWifiInfo_multipleUnderlying_usesFirstNonNull() { + // First underlying: Not wifi + val underlyingNotWifiNetwork = mock<Network>() + val underlyingNotWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(false) + whenever(it.transportInfo).thenReturn(null) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNotWifiNetwork)) + .thenReturn(underlyingNotWifiCapabilities) + + // Second underlying: wifi + val underlyingWifiNetwork1 = mock<Network>() + val underlyingWifiInfo1 = mock<WifiInfo>() + val underlyingWifiCapabilities1 = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(underlyingWifiInfo1) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingWifiNetwork1)) + .thenReturn(underlyingWifiCapabilities1) + + // Third underlying: also wifi + val underlyingWifiNetwork2 = mock<Network>() + val underlyingWifiInfo2 = mock<WifiInfo>() + val underlyingWifiCapabilities2 = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(underlyingWifiInfo2) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingWifiNetwork2)) + .thenReturn(underlyingWifiCapabilities2) + + // WHEN the main capabilities has multiple underlying networks + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks) + .thenReturn( + listOf( + underlyingNotWifiNetwork, + underlyingWifiNetwork1, + underlyingWifiNetwork2, + ) + ) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + // THEN the first wifi one is used + assertThat(result).isEqualTo(underlyingWifiInfo1) + } + + @Test + fun getMainOrUnderlyingWifiInfo_nestedUnderlying_doesNotLookAtNested() { + // WHEN there are two layers of underlying networks... + + // Nested network + val nestedUnderlyingNetwork = mock<Network>() + val nestedWifiInfo = mock<WifiInfo>() + val nestedCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(nestedWifiInfo) + } + whenever(connectivityManager.getNetworkCapabilities(nestedUnderlyingNetwork)) + .thenReturn(nestedCapabilities) + + // Underlying network containing the nested network + val underlyingNetwork = mock<Network>() + val underlyingCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(nestedUnderlyingNetwork)) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingCapabilities) + + // Main network containing the underlying network, which contains the nested network + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + val result = mainCapabilities.getMainOrUnderlyingWifiInfo(connectivityManager) + + // THEN only the first layer is checked, and the first layer has no wifi info + assertThat(result).isNull() + } + private fun createAndSetRepo() { underTest = ConnectivityRepositoryImpl( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt index f69e9a39909b..ddc6d484d93f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt @@ -400,7 +400,7 @@ class WifiRepositoryImplTest : SysuiTestCase() { } @Test - fun wifiNetwork_cellularAndWifiTransports_usesCellular_isTrue() = + fun isWifiDefault_cellularAndWifiTransports_usesCellular_isTrue() = runBlocking(IMMEDIATE) { val job = underTest.isWifiDefault.launchIn(this) @@ -437,6 +437,75 @@ class WifiRepositoryImplTest : SysuiTestCase() { } @Test + fun isWifiDefault_isCarrierMergedViaUnderlyingWifi_isTrue() = + runBlocking(IMMEDIATE) { + val job = underTest.isWifiDefault.launchIn(this) + + val underlyingNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + } + val underlyingWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(carrierMergedInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) + + // WHEN the main capabilities have an underlying carrier merged network via WIFI + // transport and WifiInfo + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + + // THEN the wifi network is carrier merged, so wifi is default + assertThat(underTest.isWifiDefault.value).isTrue() + + job.cancel() + } + + @Test + fun isWifiDefault_isCarrierMergedViaUnderlyingCellular_isTrue() = + runBlocking(IMMEDIATE) { + val job = underTest.isWifiDefault.launchIn(this) + + val underlyingCarrierMergedNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { whenever(this.isCarrierMerged).thenReturn(true) } + val underlyingCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(VcnTransportInfo(carrierMergedInfo)) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingCarrierMergedNetwork)) + .thenReturn(underlyingCapabilities) + + // WHEN the main capabilities have an underlying carrier merged network via CELLULAR + // transport and VcnTransportInfo + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks) + .thenReturn(listOf(underlyingCarrierMergedNetwork)) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + + // THEN the wifi network is carrier merged, so wifi is default + assertThat(underTest.isWifiDefault.value).isTrue() + + job.cancel() + } + + @Test fun isWifiDefault_wifiNetworkLost_isFalse() = runBlocking(IMMEDIATE) { val job = underTest.isWifiDefault.launchIn(this) @@ -511,6 +580,81 @@ class WifiRepositoryImplTest : SysuiTestCase() { } @Test + fun wifiNetwork_isCarrierMergedViaUnderlyingWifi_flowHasCarrierMerged() = + runBlocking(IMMEDIATE) { + var latest: WifiNetworkModel? = null + val job = underTest.wifiNetwork.onEach { latest = it }.launchIn(this) + + val underlyingNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { + whenever(this.isCarrierMerged).thenReturn(true) + whenever(this.isPrimary).thenReturn(true) + } + val underlyingWifiCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.transportInfo).thenReturn(carrierMergedInfo) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingNetwork)) + .thenReturn(underlyingWifiCapabilities) + + // WHEN the main capabilities have an underlying carrier merged network via WIFI + // transport and WifiInfo + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks).thenReturn(listOf(underlyingNetwork)) + } + + getNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + + // THEN the wifi network is carrier merged + assertThat(latest is WifiNetworkModel.CarrierMerged).isTrue() + + job.cancel() + } + + @Test + fun wifiNetwork_isCarrierMergedViaUnderlyingCellular_flowHasCarrierMerged() = + runBlocking(IMMEDIATE) { + var latest: WifiNetworkModel? = null + val job = underTest.wifiNetwork.onEach { latest = it }.launchIn(this) + + val underlyingCarrierMergedNetwork = mock<Network>() + val carrierMergedInfo = + mock<WifiInfo>().apply { + whenever(this.isCarrierMerged).thenReturn(true) + whenever(this.isPrimary).thenReturn(true) + } + val underlyingCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(VcnTransportInfo(carrierMergedInfo)) + } + whenever(connectivityManager.getNetworkCapabilities(underlyingCarrierMergedNetwork)) + .thenReturn(underlyingCapabilities) + + // WHEN the main capabilities have an underlying carrier merged network via CELLULAR + // transport and VcnTransportInfo + val mainCapabilities = + mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(it.transportInfo).thenReturn(null) + whenever(it.underlyingNetworks) + .thenReturn(listOf(underlyingCarrierMergedNetwork)) + } + + getNetworkCallback().onCapabilitiesChanged(NETWORK, mainCapabilities) + + // THEN the wifi network is carrier merged + assertThat(latest is WifiNetworkModel.CarrierMerged).isTrue() + + job.cancel() + } + + @Test fun wifiNetwork_carrierMergedButInvalidSubId_flowHasInvalid() = runBlocking(IMMEDIATE) { var latest: WifiNetworkModel? = null diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt index 39ea46a657f2..e2aef31b4f10 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt @@ -126,7 +126,7 @@ class TestUnfoldProgressListener : UnfoldTransitionProgressProvider.TransitionPr } fun assertLastProgress(progress: Float) { - waitForCondition { progress == progressHistory.last() } + waitForCondition { progress == progressHistory.lastOrNull() } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/service/ObservableServiceConnectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/service/ObservableServiceConnectionTest.java index f9bfafc13f35..766a5ce322bf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/service/ObservableServiceConnectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/service/ObservableServiceConnectionTest.java @@ -29,12 +29,15 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.UserInfo; import android.os.IBinder; +import android.os.UserHandle; import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.settings.FakeUserTracker; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -44,6 +47,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.List; import java.util.Objects; @SmallTest @@ -93,15 +97,22 @@ public class ObservableServiceConnectionTest extends SysuiTestCase { FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); + private FakeUserTracker mUserTracker; + + private static final int MAIN_USER_ID = 10; + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); + mUserTracker = new FakeUserTracker(); + // Set the main user as the current user. + mUserTracker.set(List.of(new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_MAIN)), 0); } @Test public void testConnect() { ObservableServiceConnection<Foo> connection = new ObservableServiceConnection<>(mContext, - mIntent, mExecutor, mTransformer); + mIntent, mUserTracker, mExecutor, mTransformer); // Register twice to ensure only one callback occurs. connection.addCallback(mCallback); connection.addCallback(mCallback); @@ -121,15 +132,16 @@ public class ObservableServiceConnectionTest extends SysuiTestCase { @Test public void testDisconnect() { ObservableServiceConnection<Foo> connection = new ObservableServiceConnection<>(mContext, - mIntent, mExecutor, mTransformer); + mIntent, mUserTracker, mExecutor, mTransformer); connection.addCallback(mCallback); connection.onServiceDisconnected(mComponentName); + mExecutor.runAllReady(); // Disconnects before binds should be ignored. verify(mCallback, never()).onDisconnected(eq(connection), anyInt()); - when(mContext.bindService(eq(mIntent), anyInt(), eq(mExecutor), eq(connection))) - .thenReturn(true); + when(mContext.bindServiceAsUser(eq(mIntent), eq(connection), anyInt(), + eq(UserHandle.of(MAIN_USER_ID)))).thenReturn(true); connection.bind(); connection.onServiceDisconnected(mComponentName); @@ -151,15 +163,16 @@ public class ObservableServiceConnectionTest extends SysuiTestCase { @Test public void testUnbind() { ObservableServiceConnection<Foo> connection = new ObservableServiceConnection<>(mContext, - mIntent, mExecutor, mTransformer); + mIntent, mUserTracker, mExecutor, mTransformer); connection.addCallback(mCallback); connection.onServiceDisconnected(mComponentName); + mExecutor.runAllReady(); // Disconnects before binds should be ignored. verify(mCallback, never()).onDisconnected(eq(connection), anyInt()); - when(mContext.bindService(eq(mIntent), anyInt(), eq(mExecutor), eq(connection))) - .thenReturn(true); + when(mContext.bindServiceAsUser(eq(mIntent), eq(connection), anyInt(), + eq(UserHandle.of(MAIN_USER_ID)))).thenReturn(true); connection.bind(); mExecutor.runAllReady(); @@ -175,10 +188,11 @@ public class ObservableServiceConnectionTest extends SysuiTestCase { @Test public void testBindServiceThrowsError() { ObservableServiceConnection<Foo> connection = new ObservableServiceConnection<>(mContext, - mIntent, mExecutor, mTransformer); + mIntent, mUserTracker, mExecutor, mTransformer); connection.addCallback(mCallback); - when(mContext.bindService(eq(mIntent), anyInt(), eq(mExecutor), eq(connection))) + when(mContext.bindServiceAsUser(eq(mIntent), eq(connection), anyInt(), + eq(UserHandle.of(MAIN_USER_ID)))) .thenThrow(new SecurityException()); // Verify that the exception was caught and that bind returns false, and we properly diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java index 28bdca97552d..e82456524012 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -85,6 +85,9 @@ import androidx.test.filters.SmallTest; import com.android.internal.colorextraction.ColorExtractor; import com.android.internal.logging.UiEventLogger; import com.android.internal.statusbar.IStatusBarService; +import com.android.launcher3.icons.BubbleBadgeIconFactory; +import com.android.launcher3.icons.BubbleIconFactory; +import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; import com.android.systemui.colorextraction.SysuiColorExtractor; @@ -127,11 +130,9 @@ import com.android.systemui.statusbar.policy.ZenModeController; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.WindowManagerShellWrapper; import com.android.wm.shell.bubbles.Bubble; -import com.android.wm.shell.bubbles.BubbleBadgeIconFactory; import com.android.wm.shell.bubbles.BubbleData; import com.android.wm.shell.bubbles.BubbleDataRepository; import com.android.wm.shell.bubbles.BubbleEntry; -import com.android.wm.shell.bubbles.BubbleIconFactory; import com.android.wm.shell.bubbles.BubbleLogger; import com.android.wm.shell.bubbles.BubbleStackView; import com.android.wm.shell.bubbles.BubbleViewInfoTask; @@ -1225,8 +1226,13 @@ public class BubblesTest extends SysuiTestCase { BubbleViewInfoTask.BubbleViewInfo info = BubbleViewInfoTask.BubbleViewInfo.populate(context, mBubbleController, mBubbleController.getStackView(), - new BubbleIconFactory(mContext), - new BubbleBadgeIconFactory(mContext), + new BubbleIconFactory(mContext, + mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size)), + new BubbleBadgeIconFactory(mContext, + mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size), + mContext.getResources().getColor(R.color.important_conversation), + mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.importance_ring_stroke_width)), bubble, true /* skipInflation */); verify(userContext, times(1)).getPackageManager(); diff --git a/packages/SystemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt b/packages/SystemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt index 380c1fcbf732..156d2fc2cb3a 100644 --- a/packages/SystemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt +++ b/packages/SystemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt @@ -25,14 +25,18 @@ import java.util.concurrent.Executor * It could be used when no activity context is available * TODO(b/232369816): use Jetpack WM library when non-activity contexts supported b/169740873 */ -class ScreenSizeFoldProvider(private val context: Context) : FoldProvider { +class ScreenSizeFoldProvider(context: Context) : FoldProvider { + private var isFolded: Boolean = false private var callbacks: MutableList<FoldCallback> = arrayListOf() - private var lastWidth: Int = 0 + + init { + onConfigurationChange(context.resources.configuration) + } override fun registerCallback(callback: FoldCallback, executor: Executor) { callbacks += callback - onConfigurationChange(context.resources.configuration) + callback.onFoldUpdated(isFolded) } override fun unregisterCallback(callback: FoldCallback) { @@ -40,16 +44,14 @@ class ScreenSizeFoldProvider(private val context: Context) : FoldProvider { } fun onConfigurationChange(newConfig: Configuration) { - if (lastWidth == newConfig.smallestScreenWidthDp) { + val newIsFolded = + newConfig.smallestScreenWidthDp < INNER_SCREEN_SMALLEST_SCREEN_WIDTH_THRESHOLD_DP + if (newIsFolded == isFolded) { return } - if (newConfig.smallestScreenWidthDp > INNER_SCREEN_SMALLEST_SCREEN_WIDTH_THRESHOLD_DP) { - callbacks.forEach { it.onFoldUpdated(false) } - } else { - callbacks.forEach { it.onFoldUpdated(true) } - } - lastWidth = newConfig.smallestScreenWidthDp + isFolded = newIsFolded + callbacks.forEach { it.onFoldUpdated(isFolded) } } } diff --git a/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt b/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt index a633a5e41882..46001a73e518 100644 --- a/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt +++ b/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt @@ -256,6 +256,12 @@ constructor( } } + override fun markScreenAsTurnedOn() { + if (!isFolded) { + isUnfoldHandled = true + } + } + override fun onScreenTurningOn() { isScreenOn = true updateHingeAngleProviderState() diff --git a/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt b/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt index f09b53dc8436..2ee2940fa2a6 100644 --- a/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt +++ b/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt @@ -35,5 +35,12 @@ interface ScreenStatusProvider : CallbackController<ScreenListener> { * Called when the screen is starting to be turned on. */ fun onScreenTurningOn() + + /** + * Called when the screen is already turned on but it happened before the creation + * of the unfold progress provider, so we won't play the actual animation but we treat + * the current state of the screen as 'turned on' + */ + fun markScreenAsTurnedOn() } } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 0e25a06b4727..baed181ebd43 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -201,7 +201,8 @@ public class AccessibilityWindowManager { private List<AccessibilityWindowInfo> mWindows; private boolean mTrackingWindows = false; private boolean mHasWatchOutsideTouchWindow; - private int mProxyDisplayAccessibilityFocusedWindow; + private int mProxyDisplayAccessibilityFocusedWindow = + AccessibilityWindowInfo.UNDEFINED_WINDOW_ID; private boolean mIsProxy; /** diff --git a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java index 2188b99a3d83..2f3e4c075a5d 100644 --- a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java +++ b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.app.UiAutomation; import android.content.ComponentName; import android.content.Context; +import android.os.Binder; import android.os.Handler; import android.os.IBinder; import android.os.IBinder.DeathRecipient; @@ -34,6 +35,7 @@ import android.view.Display; import android.view.accessibility.AccessibilityEvent; import com.android.internal.util.DumpUtils; +import com.android.server.utils.Slogf; import com.android.server.wm.WindowManagerInternal; import java.io.FileDescriptor; @@ -51,12 +53,8 @@ class UiAutomationManager { private UiAutomationService mUiAutomationService; - private AccessibilityServiceInfo mUiAutomationServiceInfo; - private AbstractAccessibilityServiceConnection.SystemSupport mSystemSupport; - private AccessibilityTrace mTrace; - private int mUiAutomationFlags; UiAutomationManager(Object lock) { @@ -97,9 +95,10 @@ class UiAutomationManager { WindowManagerInternal windowManagerInternal, SystemActionPerformer systemActionPerformer, AccessibilityWindowManager awm, int flags) { + accessibilityServiceInfo.setComponentName(COMPONENT_NAME); + Slogf.i(LOG_TAG, "Registering UiTestAutomationService (id=%s) when called by user %d", + accessibilityServiceInfo.getId(), Binder.getCallingUserHandle().getIdentifier()); synchronized (mLock) { - accessibilityServiceInfo.setComponentName(COMPONENT_NAME); - if (mUiAutomationService != null) { throw new IllegalStateException( "UiAutomationService " + mUiAutomationService.mServiceInterface @@ -116,7 +115,6 @@ class UiAutomationManager { mUiAutomationFlags = flags; mSystemSupport = systemSupport; - mTrace = trace; // Ignore registering UiAutomation if it is not allowed to use the accessibility // subsystem. if (!useAccessibility()) { @@ -126,7 +124,6 @@ class UiAutomationManager { mainHandler, mLock, securityPolicy, systemSupport, trace, windowManagerInternal, systemActionPerformer, awm); mUiAutomationServiceOwner = owner; - mUiAutomationServiceInfo = accessibilityServiceInfo; mUiAutomationService.mServiceInterface = serviceClient; try { mUiAutomationService.mServiceInterface.asBinder().linkToDeath(mUiAutomationService, diff --git a/services/art-profile b/services/art-profile index c2ef53cb3caa..95ed8e3486c1 100644 --- a/services/art-profile +++ b/services/art-profile @@ -2371,10 +2371,10 @@ HSPLcom/android/server/am/UserController;->unsafeConvertIncomingUser(I)I HSPLcom/android/server/am/UserController;->updateStartedUserArrayLU()V HSPLcom/android/server/am/UserState;-><init>(Landroid/os/UserHandle;)V HSPLcom/android/server/app/GameManagerService$LocalService;->getResolutionScalingFactor(Ljava/lang/String;I)F -HSPLcom/android/server/app/GameManagerService$UidObserver$$ExternalSyntheticLambda0;-><init>(Lcom/android/server/app/GameManagerService$UidObserver;I)V -HSPLcom/android/server/app/GameManagerService$UidObserver$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z -HSPLcom/android/server/app/GameManagerService$UidObserver;->disableGameMode(I)V+]Ljava/util/Set;Ljava/util/HashSet;]Landroid/os/PowerManagerInternal;Lcom/android/server/power/PowerManagerService$LocalService; -HSPLcom/android/server/app/GameManagerService$UidObserver;->onUidStateChanged(IIJI)V+]Lcom/android/server/app/GameManagerService$UidObserver;Lcom/android/server/app/GameManagerService$UidObserver;]Ljava/util/stream/Stream;Ljava/util/stream/ReferencePipeline$Head;]Landroid/content/Context;Landroid/app/ContextImpl;]Landroid/content/pm/PackageManager;Landroid/app/ApplicationPackageManager;]Landroid/os/PowerManagerInternal;Lcom/android/server/power/PowerManagerService$LocalService;]Ljava/util/Set;Ljava/util/HashSet; +HSPLcom/android/server/app/GameManagerService$MyUidObserver$$ExternalSyntheticLambda0;-><init>(Lcom/android/server/app/GameManagerService$MyUidObserver;I)V +HSPLcom/android/server/app/GameManagerService$MyUidObserver$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z +HSPLcom/android/server/app/GameManagerService$MyUidObserver;->disableGameMode(I)V+]Ljava/util/Set;Ljava/util/HashSet;]Landroid/os/PowerManagerInternal;Lcom/android/server/power/PowerManagerService$LocalService; +HSPLcom/android/server/app/GameManagerService$MyUidObserver;->onUidStateChanged(IIJI)V+]Lcom/android/server/app/GameManagerService$MyUidObserver;Lcom/android/server/app/GameManagerService$MyUidObserver;]Ljava/util/stream/Stream;Ljava/util/stream/ReferencePipeline$Head;]Landroid/content/Context;Landroid/app/ContextImpl;]Landroid/content/pm/PackageManager;Landroid/app/ApplicationPackageManager;]Landroid/os/PowerManagerInternal;Lcom/android/server/power/PowerManagerService$LocalService;]Ljava/util/Set;Ljava/util/HashSet; HSPLcom/android/server/app/GameManagerService;->-$$Nest$fgetmContext(Lcom/android/server/app/GameManagerService;)Landroid/content/Context; HSPLcom/android/server/app/GameManagerService;->-$$Nest$fgetmForegroundGameUids(Lcom/android/server/app/GameManagerService;)Ljava/util/Set; HSPLcom/android/server/app/GameManagerService;->-$$Nest$fgetmUidObserverLock(Lcom/android/server/app/GameManagerService;)Ljava/lang/Object; @@ -9213,7 +9213,7 @@ HSPLcom/android/server/power/hint/HintManagerService$AppHintSession;-><init>(Lco HPLcom/android/server/power/hint/HintManagerService$AppHintSession;->close()V HSPLcom/android/server/power/hint/HintManagerService$AppHintSession;->reportActualWorkDuration([J[J)V+]Lcom/android/server/power/hint/HintManagerService$NativeWrapper;Lcom/android/server/power/hint/HintManagerService$NativeWrapper;]Lcom/android/server/power/hint/HintManagerService$AppHintSession;Lcom/android/server/power/hint/HintManagerService$AppHintSession; HSPLcom/android/server/power/hint/HintManagerService$AppHintSession;->sendHint(I)V+]Lcom/android/server/power/hint/HintManagerService$NativeWrapper;Lcom/android/server/power/hint/HintManagerService$NativeWrapper;]Lcom/android/server/power/hint/HintManagerService$AppHintSession;Lcom/android/server/power/hint/HintManagerService$AppHintSession; -HSPLcom/android/server/power/hint/HintManagerService$AppHintSession;->updateHintAllowed()Z+]Lcom/android/server/power/hint/HintManagerService$UidObserver;Lcom/android/server/power/hint/HintManagerService$UidObserver;]Lcom/android/server/power/hint/HintManagerService$AppHintSession;Lcom/android/server/power/hint/HintManagerService$AppHintSession; +HSPLcom/android/server/power/hint/HintManagerService$AppHintSession;->updateHintAllowed()Z+]Lcom/android/server/power/hint/HintManagerService$MyUidObserver;Lcom/android/server/power/hint/HintManagerService$MyUidObserver;]Lcom/android/server/power/hint/HintManagerService$AppHintSession;Lcom/android/server/power/hint/HintManagerService$AppHintSession; HSPLcom/android/server/power/hint/HintManagerService$AppHintSession;->updateTargetWorkDuration(J)V HSPLcom/android/server/power/hint/HintManagerService$BinderService;-><init>(Lcom/android/server/power/hint/HintManagerService;)V HSPLcom/android/server/power/hint/HintManagerService$BinderService;->createHintSession(Landroid/os/IBinder;[IJ)Landroid/os/IHintSession; @@ -9224,13 +9224,13 @@ HSPLcom/android/server/power/hint/HintManagerService$NativeWrapper;->halGetHintS HSPLcom/android/server/power/hint/HintManagerService$NativeWrapper;->halInit()V HSPLcom/android/server/power/hint/HintManagerService$NativeWrapper;->halReportActualWorkDuration(J[J[J)V HSPLcom/android/server/power/hint/HintManagerService$NativeWrapper;->halSendHint(JI)V -HSPLcom/android/server/power/hint/HintManagerService$UidObserver$$ExternalSyntheticLambda1;-><init>(Lcom/android/server/power/hint/HintManagerService$UidObserver;II)V -HSPLcom/android/server/power/hint/HintManagerService$UidObserver$$ExternalSyntheticLambda1;->run()V -HSPLcom/android/server/power/hint/HintManagerService$UidObserver;->$r8$lambda$ej6eMAvAGZXPb5YUxpIPNazvUW4(Lcom/android/server/power/hint/HintManagerService$UidObserver;II)V -HSPLcom/android/server/power/hint/HintManagerService$UidObserver;-><init>(Lcom/android/server/power/hint/HintManagerService;)V -HSPLcom/android/server/power/hint/HintManagerService$UidObserver;->isUidForeground(I)Z+]Ljava/lang/Integer;Ljava/lang/Integer;]Landroid/util/SparseArray;Landroid/util/SparseArray; -HSPLcom/android/server/power/hint/HintManagerService$UidObserver;->lambda$onUidStateChanged$1(II)V+]Landroid/util/ArrayMap;Landroid/util/ArrayMap;]Landroid/util/SparseArray;Landroid/util/SparseArray;]Ljava/util/Collection;Landroid/util/MapCollections$ValuesCollection;]Landroid/util/ArraySet;Landroid/util/ArraySet;]Ljava/util/Iterator;Landroid/util/MapCollections$ArrayIterator; -HSPLcom/android/server/power/hint/HintManagerService$UidObserver;->onUidStateChanged(IIJI)V+]Landroid/os/Handler;Landroid/os/Handler; +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver$$ExternalSyntheticLambda1;-><init>(Lcom/android/server/power/hint/HintManagerService$MyUidObserver;II)V +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver$$ExternalSyntheticLambda1;->run()V +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver;->$r8$lambda$ej6eMAvAGZXPb5YUxpIPNazvUW4(Lcom/android/server/power/hint/HintManagerService$MyUidObserver;II)V +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver;-><init>(Lcom/android/server/power/hint/HintManagerService;)V +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver;->isUidForeground(I)Z+]Ljava/lang/Integer;Ljava/lang/Integer;]Landroid/util/SparseArray;Landroid/util/SparseArray; +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver;->lambda$onUidStateChanged$1(II)V+]Landroid/util/ArrayMap;Landroid/util/ArrayMap;]Landroid/util/SparseArray;Landroid/util/SparseArray;]Ljava/util/Collection;Landroid/util/MapCollections$ValuesCollection;]Landroid/util/ArraySet;Landroid/util/ArraySet;]Ljava/util/Iterator;Landroid/util/MapCollections$ArrayIterator; +HSPLcom/android/server/power/hint/HintManagerService$MyUidObserver;->onUidStateChanged(IIJI)V+]Landroid/os/Handler;Landroid/os/Handler; HSPLcom/android/server/power/hint/HintManagerService;->-$$Nest$fgetmActiveSessions(Lcom/android/server/power/hint/HintManagerService;)Landroid/util/ArrayMap; HSPLcom/android/server/power/hint/HintManagerService;->-$$Nest$fgetmLock(Lcom/android/server/power/hint/HintManagerService;)Ljava/lang/Object; HSPLcom/android/server/power/hint/HintManagerService;->-$$Nest$fgetmNativeWrapper(Lcom/android/server/power/hint/HintManagerService;)Lcom/android/server/power/hint/HintManagerService$NativeWrapper; @@ -10370,8 +10370,8 @@ HPLcom/android/server/vibrator/Vibration$DebugInfo;-><init>(Lcom/android/server/ HPLcom/android/server/vibrator/Vibration;-><init>(Landroid/os/IBinder;Lcom/android/server/vibrator/Vibration$CallerInfo;)V HPLcom/android/server/vibrator/VibrationEffectAdapters;->apply(Landroid/os/VibrationEffect;Ljava/util/List;Ljava/lang/Object;)Landroid/os/VibrationEffect;+]Ljava/util/List;Ljava/util/Arrays$ArrayList;]Lcom/android/server/vibrator/VibrationEffectAdapters$SegmentsAdapter;Lcom/android/server/vibrator/StepToRampAdapter;,Lcom/android/server/vibrator/RampDownAdapter;,Lcom/android/server/vibrator/RampToStepAdapter;,Lcom/android/server/vibrator/ClippingAmplitudeAndFrequencyAdapter;]Landroid/os/VibrationEffect$Composed;Landroid/os/VibrationEffect$Composed; HPLcom/android/server/vibrator/VibrationScaler;->scale(Landroid/os/VibrationEffect;I)Landroid/os/VibrationEffect; -HPLcom/android/server/vibrator/VibrationSettings$UidObserver;->isUidForeground(I)Z -HSPLcom/android/server/vibrator/VibrationSettings$UidObserver;->onUidStateChanged(IIJI)V+]Landroid/util/SparseArray;Landroid/util/SparseArray; +HPLcom/android/server/vibrator/VibrationSettings$MyUidObserver;->isUidForeground(I)Z +HSPLcom/android/server/vibrator/VibrationSettings$MyUidObserver;->onUidStateChanged(IIJI)V+]Landroid/util/SparseArray;Landroid/util/SparseArray; HPLcom/android/server/vibrator/VibrationSettings;->getCurrentIntensity(I)I HPLcom/android/server/vibrator/VibrationSettings;->shouldIgnoreVibration(Lcom/android/server/vibrator/Vibration$CallerInfo;)Lcom/android/server/vibrator/Vibration$Status; HPLcom/android/server/vibrator/VibrationStats$StatsInfo;-><init>(IIILcom/android/server/vibrator/Vibration$Status;Lcom/android/server/vibrator/VibrationStats;J)V @@ -13493,7 +13493,7 @@ Lcom/android/server/power/batterysaver/BatterySavingStats; Lcom/android/server/power/hint/HintManagerService$BinderService; Lcom/android/server/power/hint/HintManagerService$Injector; Lcom/android/server/power/hint/HintManagerService$NativeWrapper; -Lcom/android/server/power/hint/HintManagerService$UidObserver; +Lcom/android/server/power/hint/HintManagerService$MyUidObserver; Lcom/android/server/power/hint/HintManagerService; Lcom/android/server/power/stats/BatteryExternalStatsWorker$$ExternalSyntheticLambda0; Lcom/android/server/power/stats/BatteryExternalStatsWorker$$ExternalSyntheticLambda3; diff --git a/services/autofill/java/com/android/server/autofill/FieldClassificationEventLogger.java b/services/autofill/java/com/android/server/autofill/FieldClassificationEventLogger.java new file mode 100644 index 000000000000..ffb4632164a3 --- /dev/null +++ b/services/autofill/java/com/android/server/autofill/FieldClassificationEventLogger.java @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.autofill; + +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED; +import static com.android.server.autofill.Helper.sVerbose; + +import android.util.Slog; + +import com.android.internal.util.FrameworkStatsLog; + +import java.util.Optional; + +/** + * Helper class to log Field Classification stats. + */ +public final class FieldClassificationEventLogger { + private static final String TAG = "FieldClassificationEventLogger"; + private Optional<FieldClassificationEventInternal> mEventInternal; + + private FieldClassificationEventLogger() { + mEventInternal = Optional.empty(); + } + + /** + * A factory constructor to create FieldClassificationEventLogger. + */ + public static FieldClassificationEventLogger createLogger() { + return new FieldClassificationEventLogger(); + } + + /** + * Reset mEventInternal before logging for a new request. It shall be called for each + * FieldClassification request. + */ + public void startNewLogForRequest() { + if (!mEventInternal.isEmpty()) { + Slog.w(TAG, "FieldClassificationEventLogger is not empty before starting for a new " + + "request"); + } + mEventInternal = Optional.of(new FieldClassificationEventInternal()); + } + + /** + * Set latency as long as mEventInternal presents. + */ + public void maybeSetLatencyMillis(long timestamp) { + mEventInternal.ifPresent(event -> { + event.mLatencyClassificationRequestMillis = timestamp; + }); + } + + /** + * Log an AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED event. + */ + public void logAndEndEvent() { + if (!mEventInternal.isPresent()) { + Slog.w(TAG, "Shouldn't be logging AutofillFieldClassificationEventInternal again for " + + "same event"); + return; + } + FieldClassificationEventInternal event = mEventInternal.get(); + if (sVerbose) { + Slog.v(TAG, "Log AutofillFieldClassificationEventReported:" + + " mLatencyClassificationRequestMillis=" + + event.mLatencyClassificationRequestMillis); + } + FrameworkStatsLog.write( + AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED, + event.mLatencyClassificationRequestMillis); + mEventInternal = Optional.empty(); + } + + private static final class FieldClassificationEventInternal { + long mLatencyClassificationRequestMillis = -1; + + FieldClassificationEventInternal() { + } + } +} diff --git a/services/autofill/java/com/android/server/autofill/FillResponseEventLogger.java b/services/autofill/java/com/android/server/autofill/FillResponseEventLogger.java index 6b8246cd5bfb..8f2ab714c4af 100644 --- a/services/autofill/java/com/android/server/autofill/FillResponseEventLogger.java +++ b/services/autofill/java/com/android/server/autofill/FillResponseEventLogger.java @@ -17,16 +17,16 @@ package com.android.server.autofill; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED; -import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__UNKNOWN_AUTOFILL_DISPLAY_PRESENTATION_TYPE; -import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__MENU; -import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__INLINE; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__DIALOG; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__INLINE; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__MENU; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__DISPLAY_PRESENTATION_TYPE__UNKNOWN_AUTOFILL_DISPLAY_PRESENTATION_TYPE; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_RESULT__AUTHENTICATION_FAILURE; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_RESULT__AUTHENTICATION_RESULT_UNKNOWN; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_RESULT__AUTHENTICATION_SUCCESS; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_TYPE__AUTHENTICATION_TYPE_UNKNOWN; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_TYPE__DATASET_AUTHENTICATION; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_TYPE__FULL_AUTHENTICATION; -import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_RESULT__AUTHENTICATION_RESULT_UNKNOWN; -import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_RESULT__AUTHENTICATION_SUCCESS; -import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__AUTHENTICATION_RESULT__AUTHENTICATION_FAILURE; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__RESPONSE_STATUS__RESPONSE_STATUS_CANCELLED; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__RESPONSE_STATUS__RESPONSE_STATUS_FAILURE; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_FILL_RESPONSE_REPORTED__RESPONSE_STATUS__RESPONSE_STATUS_SESSION_DESTROYED; @@ -37,12 +37,7 @@ import static com.android.server.autofill.Helper.sVerbose; import android.annotation.IntDef; import android.annotation.Nullable; -import android.content.ComponentName; -import android.content.Context; -import android.content.pm.PackageManager; -import android.provider.Settings; import android.service.autofill.Dataset; -import android.text.TextUtils; import android.util.Slog; import android.view.autofill.AutofillId; @@ -154,6 +149,9 @@ public final class FillResponseEventLogger { // succeeded. public static final int AVAILABLE_COUNT_WHEN_FILL_REQUEST_FAILED_OR_TIMEOUT = -1; + // Log a magic number to indicate that the FillResponse contains a saveTriggerId. + public static final int HAVE_SAVE_TRIGGER_ID = 1; + private final int mSessionId; private Optional<FillResponseEventInternal> mEventInternal; diff --git a/services/autofill/java/com/android/server/autofill/HintsHelper.java b/services/autofill/java/com/android/server/autofill/HintsHelper.java new file mode 100644 index 000000000000..9b2660262955 --- /dev/null +++ b/services/autofill/java/com/android/server/autofill/HintsHelper.java @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.autofill; + +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_ADDRESS; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_DEBIT_CARD; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_EMAIL_ADDRESS; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC_CARD; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PAYMENT_CARD; +import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_USERNAME; + +import android.util.ArraySet; + +import java.util.Set; + +/** + * Helper class to manage autofill hints. + * Provides utility methods like converting SaveTypes to applicable HintsConstants. + */ +public class HintsHelper { + // Username fields + public static final String AUTOFILL_HINT_NEW_USERNAME = "newUsername"; + public static final String AUTOFILL_HINT_USERNAME = "username"; + + // Password fields + public static final String AUTOFILL_HINT_NEW_PASSWORD = "newPassword"; + public static final String AUTOFILL_HINT_PASSWORD = "password"; + + // Email hints + public static final String AUTOFILL_HINT_EMAIL_ADDRESS = "emailAddress"; + + // Phone number hints + public static final String AUTOFILL_HINT_PHONE_COUNTRY_CODE = "phoneCountryCode"; + public static final String AUTOFILL_HINT_PHONE = "phone"; + public static final String AUTOFILL_HINT_PHONE_NATIONAL = "phoneNational"; + public static final String AUTOFILL_HINT_PHONE_NUMBER = "phoneNumber"; + public static final String AUTOFILL_HINT_PHONE_NUMBER_DEVICE = "phoneNumberDevice"; + + // Credit card hints + public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = + "creditCardExpirationDate"; + public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = "creditCardExpirationDay"; + public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = + "creditCardExpirationMonth"; + public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR = + "creditCardExpirationYear"; + public static final String AUTOFILL_HINT_CREDIT_CARD_NUMBER = "creditCardNumber"; + public static final String AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE = "creditCardSecurityCode"; + + // Address hints + public static final String AUTOFILL_HINT_POSTAL_ADDRESS = "postalAddress"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_APT_NUMBER = "aptNumber"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_COUNTRY = "addressCountry"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_DEPENDENT_LOCALITY = + "dependentLocality"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_ADDRESS = "extendedAddress"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_POSTAL_CODE = + "extendedPostalCode"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_LOCALITY = "addressLocality"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_REGION = "addressRegion"; + public static final String AUTOFILL_HINT_POSTAL_ADDRESS_STREET_ADDRESS = "streetAddress"; + public static final String AUTOFILL_HINT_POSTAL_CODE = "postalCode"; + + private HintsHelper() {} + + /** + * Converts saveType to Autofill HintsConstants. + * @param saveType + * @return + */ + public static Set<String> getHintsForSaveType(int saveType) { + ArraySet<String> hintSet = new ArraySet<>(); + switch (saveType) { + case SAVE_DATA_TYPE_PASSWORD: + hintSet.add(AUTOFILL_HINT_NEW_USERNAME); + hintSet.add(AUTOFILL_HINT_USERNAME); + hintSet.add(AUTOFILL_HINT_NEW_PASSWORD); + hintSet.add(AUTOFILL_HINT_PASSWORD); + return hintSet; + case SAVE_DATA_TYPE_USERNAME: + hintSet.add(AUTOFILL_HINT_NEW_USERNAME); + hintSet.add(AUTOFILL_HINT_USERNAME); + return hintSet; + case SAVE_DATA_TYPE_EMAIL_ADDRESS: + hintSet.add(AUTOFILL_HINT_EMAIL_ADDRESS); + return hintSet; + case SAVE_DATA_TYPE_CREDIT_CARD: + case SAVE_DATA_TYPE_DEBIT_CARD: + case SAVE_DATA_TYPE_PAYMENT_CARD: + case SAVE_DATA_TYPE_GENERIC_CARD: + hintSet.add(AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE); + hintSet.add(AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY); + hintSet.add(AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH); + hintSet.add(AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR); + hintSet.add(AUTOFILL_HINT_CREDIT_CARD_NUMBER); + hintSet.add(AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE); + return hintSet; + case SAVE_DATA_TYPE_ADDRESS: + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_APT_NUMBER); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_COUNTRY); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_DEPENDENT_LOCALITY); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_ADDRESS); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_POSTAL_CODE); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_LOCALITY); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_REGION); + hintSet.add(AUTOFILL_HINT_POSTAL_ADDRESS_STREET_ADDRESS); + hintSet.add(AUTOFILL_HINT_POSTAL_CODE); + return hintSet; + default: + return hintSet; + } + } +} diff --git a/services/autofill/java/com/android/server/autofill/RemoteFieldClassificationService.java b/services/autofill/java/com/android/server/autofill/RemoteFieldClassificationService.java index 99a2291016e9..feae56e89784 100644 --- a/services/autofill/java/com/android/server/autofill/RemoteFieldClassificationService.java +++ b/services/autofill/java/com/android/server/autofill/RemoteFieldClassificationService.java @@ -30,6 +30,7 @@ import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.os.ICancellationSignal; import android.os.RemoteException; +import android.os.SystemClock; import android.service.assist.classification.FieldClassificationRequest; import android.service.assist.classification.FieldClassificationResponse; import android.service.assist.classification.FieldClassificationService; @@ -132,7 +133,7 @@ final class RemoteFieldClassificationService public void onFieldClassificationRequest(@NonNull FieldClassificationRequest request, FieldClassificationServiceCallbacks fieldClassificationServiceCallbacks) { - + final long startTime = SystemClock.elapsedRealtime(); if (sVerbose) { Slog.v(TAG, "onFieldClassificationRequest request:" + request); } @@ -144,6 +145,7 @@ final class RemoteFieldClassificationService new IFieldClassificationCallback.Stub() { @Override public void onCancellable(ICancellationSignal cancellation) { + logLatency(startTime); if (sDebug) { Log.d(TAG, "onCancellable"); } @@ -151,15 +153,15 @@ final class RemoteFieldClassificationService @Override public void onSuccess(FieldClassificationResponse response) { + logLatency(startTime); if (sDebug) { Log.d(TAG, "onSuccess Response: " + response); } - fieldClassificationServiceCallbacks - .onClassificationRequestSuccess(response); } @Override public void onFailure() { + logLatency(startTime); if (sDebug) { Log.d(TAG, "onFailure"); } @@ -174,4 +176,12 @@ final class RemoteFieldClassificationService public void cancel() throws RemoteException {} })); } + + private void logLatency(long startTime) { + final FieldClassificationEventLogger logger = FieldClassificationEventLogger.createLogger(); + logger.startNewLogForRequest(); + logger.maybeSetLatencyMillis( + SystemClock.elapsedRealtime() - startTime); + logger.logAndEndEvent(); + } } diff --git a/services/autofill/java/com/android/server/autofill/SaveEventLogger.java b/services/autofill/java/com/android/server/autofill/SaveEventLogger.java index 4b7d5bdf0002..e5435c2869fd 100644 --- a/services/autofill/java/com/android/server/autofill/SaveEventLogger.java +++ b/services/autofill/java/com/android/server/autofill/SaveEventLogger.java @@ -23,8 +23,10 @@ import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_RE import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_NONE; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_NO_SAVE_INFO; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_NO_VALUE_CHANGED; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_SESSION_DESTROYED; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_UNKNOWN; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_WITH_DELAY_SAVE_FLAG; +import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_WITH_DONT_SAVE_ON_FINISH_FLAG; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_SHOWN_REASON__SAVE_UI_SHOWN_REASON_OPTIONAL_ID_CHANGE; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_SHOWN_REASON__SAVE_UI_SHOWN_REASON_REQUIRED_ID_CHANGE; import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_SHOWN_REASON__SAVE_UI_SHOWN_REASON_TRIGGER_ID_SET; @@ -32,11 +34,6 @@ import static com.android.internal.util.FrameworkStatsLog.AUTOFILL_SAVE_EVENT_RE import static com.android.server.autofill.Helper.sVerbose; import android.annotation.IntDef; -import android.content.ComponentName; -import android.content.Context; -import android.content.pm.PackageManager; -import android.provider.Settings; -import android.text.TextUtils; import android.util.Slog; import com.android.internal.util.FrameworkStatsLog; @@ -74,10 +71,12 @@ public final class SaveEventLogger { NO_SAVE_REASON_NONE, NO_SAVE_REASON_NO_SAVE_INFO, NO_SAVE_REASON_WITH_DELAY_SAVE_FLAG, + NO_SAVE_REASON_WITH_DONT_SAVE_ON_FINISH_FLAG, NO_SAVE_REASON_HAS_EMPTY_REQUIRED, NO_SAVE_REASON_NO_VALUE_CHANGED, NO_SAVE_REASON_FIELD_VALIDATION_FAILED, - NO_SAVE_REASON_DATASET_MATCH + NO_SAVE_REASON_DATASET_MATCH, + NO_SAVE_REASON_SESSION_DESTROYED }) @Retention(RetentionPolicy.SOURCE) public @interface SaveUiNotShownReason { @@ -108,6 +107,10 @@ public final class SaveEventLogger { AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_FIELD_VALIDATION_FAILED; public static final int NO_SAVE_REASON_DATASET_MATCH = AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_DATASET_MATCH; + public static final int NO_SAVE_REASON_SESSION_DESTROYED = + AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_SESSION_DESTROYED; + public static final int NO_SAVE_REASON_WITH_DONT_SAVE_ON_FINISH_FLAG = + AUTOFILL_SAVE_EVENT_REPORTED__SAVE_UI_NOT_SHOWN_REASON__NO_SAVE_REASON_WITH_DONT_SAVE_ON_FINISH_FLAG; private final int mSessionId; private Optional<SaveEventInternal> mEventInternal; diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 46fc7628aae4..8d039fc02026 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -41,16 +41,15 @@ import static android.view.autofill.AutofillManager.FLAG_SMART_SUGGESTION_SYSTEM import static android.view.autofill.AutofillManager.getSmartSuggestionModeToString; import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; -import static com.android.server.autofill.FillRequestEventLogger.AUGMENTED_AUTOFILL_REQUEST_ID; import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_NORMAL_TRIGGER; import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_PRE_TRIGGER; import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_SERVED_FROM_CACHED_RESPONSE; import static com.android.server.autofill.FillResponseEventLogger.AVAILABLE_COUNT_WHEN_FILL_REQUEST_FAILED_OR_TIMEOUT; +import static com.android.server.autofill.FillResponseEventLogger.HAVE_SAVE_TRIGGER_ID; import static com.android.server.autofill.FillResponseEventLogger.RESPONSE_STATUS_FAILURE; +import static com.android.server.autofill.FillResponseEventLogger.RESPONSE_STATUS_SESSION_DESTROYED; import static com.android.server.autofill.FillResponseEventLogger.RESPONSE_STATUS_SUCCESS; -import static com.android.server.autofill.FillResponseEventLogger.RESPONSE_STATUS_FAILURE; import static com.android.server.autofill.FillResponseEventLogger.RESPONSE_STATUS_TIMEOUT; -import static com.android.server.autofill.FillResponseEventLogger.RESPONSE_STATUS_SESSION_DESTROYED; import static com.android.server.autofill.Helper.containsCharsInOrder; import static com.android.server.autofill.Helper.createSanitizers; import static com.android.server.autofill.Helper.getNumericValue; @@ -60,8 +59,22 @@ import static com.android.server.autofill.Helper.toArray; import static com.android.server.autofill.PresentationStatsEventLogger.NOT_SHOWN_REASON_NO_FOCUS; import static com.android.server.autofill.PresentationStatsEventLogger.NOT_SHOWN_REASON_REQUEST_FAILED; import static com.android.server.autofill.PresentationStatsEventLogger.NOT_SHOWN_REASON_REQUEST_TIMEOUT; +import static com.android.server.autofill.PresentationStatsEventLogger.NOT_SHOWN_REASON_SESSION_COMMITTED_PREMATURELY; import static com.android.server.autofill.PresentationStatsEventLogger.NOT_SHOWN_REASON_VIEW_CHANGED; import static com.android.server.autofill.PresentationStatsEventLogger.NOT_SHOWN_REASON_VIEW_FOCUS_CHANGED; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_DATASET_MATCH; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_FIELD_VALIDATION_FAILED; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_HAS_EMPTY_REQUIRED; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_NONE; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_NO_SAVE_INFO; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_NO_VALUE_CHANGED; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_SESSION_DESTROYED; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_WITH_DELAY_SAVE_FLAG; +import static com.android.server.autofill.SaveEventLogger.NO_SAVE_REASON_WITH_DONT_SAVE_ON_FINISH_FLAG; +import static com.android.server.autofill.SaveEventLogger.SAVE_UI_SHOWN_REASON_OPTIONAL_ID_CHANGE; +import static com.android.server.autofill.SaveEventLogger.SAVE_UI_SHOWN_REASON_REQUIRED_ID_CHANGE; +import static com.android.server.autofill.SaveEventLogger.SAVE_UI_SHOWN_REASON_TRIGGER_ID_SET; +import static com.android.server.autofill.SaveEventLogger.SAVE_UI_SHOWN_REASON_UNKNOWN; import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_RECEIVER_EXTRAS; import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_STRUCTURE; @@ -158,7 +171,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -457,6 +472,14 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState @GuardedBy("mLock") private FillResponseEventLogger mFillResponseEventLogger; + @NonNull + @GuardedBy("mLock") + private SaveEventLogger mSaveEventLogger; + + @NonNull + @GuardedBy("mLock") + private SessionCommittedEventLogger mSessionCommittedEventLogger; + /** * Fill dialog request would likely be sent slightly later. */ @@ -1327,6 +1350,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mPresentationStatsEventLogger = PresentationStatsEventLogger.forSessionId(sessionId); mFillRequestEventLogger = FillRequestEventLogger.forSessionId(sessionId); mFillResponseEventLogger = FillResponseEventLogger.forSessionId(sessionId); + mSessionCommittedEventLogger = SessionCommittedEventLogger.forSessionId(sessionId); + mSaveEventLogger = SaveEventLogger.forSessionId(sessionId); synchronized (mLock) { mSessionFlags = new SessionFlags(); mSessionFlags.mAugmentedAutofillOnly = forAugmentedAutofillOnly; @@ -1576,30 +1601,53 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState synchronized (mLock) { response = getEffectiveFillResponse(response); + if (isEmptyResponse(response)) { + // Treat it as a null response. + processNullResponseLocked(requestId, requestFlags); + } processResponseLocked(response, null, requestFlags); } } + private boolean isEmptyResponse(FillResponse response) { + if (response == null) return true; + SaveInfo saveInfo = response.getSaveInfo(); + synchronized (mLock) { + return ((response.getDatasets() == null || response.getDatasets().isEmpty()) + && response.getAuthentication() == null + && (saveInfo == null + || (ArrayUtils.isEmpty(saveInfo.getOptionalIds()) + && ArrayUtils.isEmpty(saveInfo.getRequiredIds()) + && ((saveInfo.getFlags() & SaveInfo.FLAG_DELAY_SAVE) == 0))) + && (ArrayUtils.isEmpty(response.getFieldClassificationIds()) + || (!mSessionFlags.mClientSuggestionsEnabled + && !mService.isFieldClassificationEnabledLocked()))); + } + } + private FillResponse getEffectiveFillResponse(FillResponse response) { // TODO(b/266379948): label dataset source - if (!mService.getMaster().isPccClassificationEnabled()) return response; + + DatasetComputationContainer autofillProviderContainer = new DatasetComputationContainer(); + computeDatasetsForProviderAndUpdateContainer(response, autofillProviderContainer); + + if (!mService.getMaster().isPccClassificationEnabled()) { + return createShallowCopy(response, autofillProviderContainer); + } synchronized (mLock) { if (mClassificationState.mState != ClassificationState.STATE_RESPONSE || mClassificationState.mLastFieldClassificationResponse == null) { - return response; + return createShallowCopy(response, autofillProviderContainer); } if (!mClassificationState.processResponse()) return response; } boolean preferAutofillProvider = mService.getMaster().preferProviderOverPcc(); boolean shouldUseFallback = mService.getMaster().shouldUsePccFallback(); if (preferAutofillProvider && !shouldUseFallback) { - return response; + return createShallowCopy(response, autofillProviderContainer); } - DatasetComputationContainer autofillProviderContainer = new DatasetComputationContainer(); DatasetComputationContainer detectionPccContainer = new DatasetComputationContainer(); - - computeDatasetsForProviderAndUpdateContainer(response, autofillProviderContainer); computeDatasetsForPccAndUpdateContainer(response, detectionPccContainer); DatasetComputationContainer resultContainer; @@ -1618,7 +1666,50 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } // Create FillResponse with effectiveDatasets, and all the rest value from the original // response. - return FillResponse.shallowCopy(response, new ArrayList<>(resultContainer.mDatasets)); + return createShallowCopy(response, resultContainer); + } + + private FillResponse createShallowCopy( + FillResponse response, DatasetComputationContainer container) { + return FillResponse.shallowCopy( + response, + new ArrayList<>(container.mDatasets), + getEligibleSaveInfo(response)); + } + + private SaveInfo getEligibleSaveInfo(FillResponse response) { + SaveInfo saveInfo = response.getSaveInfo(); + if (saveInfo == null || (!ArrayUtils.isEmpty(saveInfo.getOptionalIds()) + || !ArrayUtils.isEmpty(saveInfo.getRequiredIds()) + || (saveInfo.getFlags() & SaveInfo.FLAG_DELAY_SAVE) != 0)) { + return saveInfo; + } + synchronized (mLock) { + ArrayMap<String, Set<AutofillId>> hintsToAutofillIdMap = + mClassificationState.mHintsToAutofillIdMap; + if (hintsToAutofillIdMap == null || hintsToAutofillIdMap.isEmpty()) { + return saveInfo; + } + + ArraySet<AutofillId> ids = new ArraySet<>(); + int saveType = saveInfo.getType(); + if (saveType == SaveInfo.SAVE_DATA_TYPE_GENERIC) { + for (Set<AutofillId> autofillIds: hintsToAutofillIdMap.values()) { + ids.addAll(autofillIds); + } + } else { + Set<String> hints = HintsHelper.getHintsForSaveType(saveType); + for (Map.Entry<String, Set<AutofillId>> entry: hintsToAutofillIdMap.entrySet()) { + String hint = entry.getKey(); + if (hints.contains(hint)) { + ids.addAll(entry.getValue()); + } + } + } + AutofillId[] autofillIds = new AutofillId[ids.size()]; + ids.toArray(autofillIds); + return SaveInfo.copy(saveInfo, autofillIds); + } } /** @@ -1629,7 +1720,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState Set<AutofillId> mAutofillIds = new ArraySet<>(); // Set of datasets. Kept separately, to be able to be used directly for composing // FillResponse. - Set<Dataset> mDatasets = new ArraySet<>(); + Set<Dataset> mDatasets = new LinkedHashSet<>(); ArrayMap<AutofillId, Set<Dataset>> mAutofillIdToDatasetMap = new ArrayMap<>(); } @@ -1675,7 +1766,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState List<Dataset> datasets = response.getDatasets(); if (datasets == null) return; ArrayMap<AutofillId, Set<Dataset>> autofillIdToDatasetMap = new ArrayMap<>(); - Set<Dataset> eligibleDatasets = new ArraySet<>(); + Set<Dataset> eligibleDatasets = new LinkedHashSet<>(); Set<AutofillId> eligibleAutofillIds = new ArraySet<>(); for (Dataset dataset : response.getDatasets()) { if (dataset.getFieldIds() == null || dataset.getFieldIds().isEmpty()) continue; @@ -1697,6 +1788,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } } + // If the dataset doesn't have any non-null autofill id's, pass over. + if (newSize == 0) continue; + if (conversionRequired) { ArrayList<AutofillId> fieldIds = new ArrayList<>(newSize); ArrayList<AutofillValue> fieldValues = new ArrayList<>(newSize); @@ -1772,7 +1866,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState ArrayMap<AutofillId, Set<Dataset>> map = new ArrayMap<>(); - Set<Dataset> eligibleDatasets = new ArraySet<>(); + Set<Dataset> eligibleDatasets = new LinkedHashSet<>(); Set<AutofillId> eligibleAutofillIds = new ArraySet<>(); for (int i = 0; i < datasets.size(); i++) { @@ -1979,6 +2073,12 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState @Override public void onSaveRequestSuccess(@NonNull String servicePackageName, @Nullable IntentSender intentSender) { + // Log onSaveRequest result. + mSaveEventLogger.maybeSetIsSaved(true); + final long saveRequestFinishTimestamp = SystemClock.elapsedRealtime() - mLatencyBaseTime; + mSaveEventLogger.maybeSetLatencySaveFinishMillis(saveRequestFinishTimestamp); + mSaveEventLogger.logAndEndEvent(); + synchronized (mLock) { mSessionFlags.mShowingSaveUi = false; @@ -1991,6 +2091,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_DATA_SAVE_REQUEST, servicePackageName) .setType(intentSender == null ? MetricsEvent.TYPE_SUCCESS : MetricsEvent.TYPE_OPEN); mMetricsLogger.write(log); + + if (intentSender != null) { if (sDebug) Slog.d(TAG, "Starting intent sender on save()"); startIntentSenderAndFinishSession(intentSender); @@ -2005,6 +2107,12 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState public void onSaveRequestFailure(@Nullable CharSequence message, @NonNull String servicePackageName) { boolean showMessage = !TextUtils.isEmpty(message); + + // Log onSaveRequest result. + final long saveRequestFinishTimestamp = SystemClock.elapsedRealtime() - mLatencyBaseTime; + mSaveEventLogger.maybeSetLatencySaveFinishMillis(saveRequestFinishTimestamp); + mSaveEventLogger.logAndEndEvent(); + synchronized (mLock) { mSessionFlags.mShowingSaveUi = false; @@ -2030,6 +2138,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } mMetricsLogger.write(log); + if (showMessage) { getUiForShowing().showError(message, this); } @@ -2119,13 +2228,17 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState // AutoFillUiCallback @Override public void save() { + mSaveEventLogger.maybeSetSaveButtonClicked(true); synchronized (mLock) { if (mDestroyed) { Slog.w(TAG, "Call to Session#save() rejected - session: " + id + " destroyed"); + mSaveEventLogger.logAndEndEvent(); return; } } + final long saveRequestStartTimestamp = SystemClock.elapsedRealtime() - mLatencyBaseTime; + mSaveEventLogger.maybeSetLatencySaveRequestMillis(saveRequestStartTimestamp); mHandler.sendMessage(obtainMessage( AutofillManagerServiceImpl::handleSessionSave, mService, this)); @@ -2134,12 +2247,14 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState // AutoFillUiCallback @Override public void cancelSave() { + mSaveEventLogger.maybeSetDialogDismissed(true); synchronized (mLock) { mSessionFlags.mShowingSaveUi = false; if (mDestroyed) { Slog.w(TAG, "Call to Session#cancelSave() rejected - session: " + id + " destroyed"); + mSaveEventLogger.logAndEndEvent(); return; } } @@ -2962,6 +3077,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if (mDestroyed) { Slog.w(TAG, "Call to Session#showSaveLocked() rejected - session: " + id + " destroyed"); + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_SESSION_DESTROYED); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ false, Event.NO_SAVE_UI_REASON_NONE); } @@ -2981,6 +3098,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState */ if (saveInfo == null) { if (sVerbose) Slog.v(TAG, "showSaveLocked(" + this.id + "): no saveInfo from service"); + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_NO_SAVE_INFO); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ true, Event.NO_SAVE_UI_REASON_NO_SAVE_INFO); } @@ -2988,6 +3107,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if ((saveInfo.getFlags() & SaveInfo.FLAG_DELAY_SAVE) != 0) { // TODO(b/113281366): log metrics if (sDebug) Slog.v(TAG, "showSaveLocked(" + this.id + "): service asked to delay save"); + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_WITH_DELAY_SAVE_FLAG); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ false, Event.NO_SAVE_UI_REASON_WITH_DELAY_SAVE_FLAG); } @@ -3061,6 +3182,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState + "didn't change: " + value); } changed = false; + } else { + mSaveEventLogger.maybeSetIsNewField(true); } } else { isUpdate = true; @@ -3084,6 +3207,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState int saveDialogNotShowReason; if (!allRequiredAreNotEmpty) { saveDialogNotShowReason = Event.NO_SAVE_UI_REASON_HAS_EMPTY_REQUIRED; + + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_HAS_EMPTY_REQUIRED); + mSaveEventLogger.logAndEndEvent(); } else { // Must look up all optional ids in 2 scenarios: // - if no required id changed but an optional id did, it should trigger save / update @@ -3119,6 +3245,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } if (filledValue != null) { isUpdate = true; + } else { + mSaveEventLogger.maybeSetIsNewField(true); } atLeastOneChanged = true; } @@ -3137,6 +3265,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } if (!atLeastOneChanged) { saveDialogNotShowReason = Event.NO_SAVE_UI_REASON_NO_VALUE_CHANGED; + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_NO_VALUE_CHANGED); + mSaveEventLogger.logAndEndEvent(); } else { if (sDebug) { Slog.d(TAG, "at least one field changed, validate fields for save UI"); @@ -3155,6 +3285,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState Slog.e(TAG, "Not showing save UI because validation failed:", e); log.setType(MetricsEvent.TYPE_FAILURE); mMetricsLogger.write(log); + mSaveEventLogger.maybeSetSaveUiNotShownReason( + NO_SAVE_REASON_FIELD_VALIDATION_FAILED); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ true, Event.NO_SAVE_UI_REASON_FIELD_VALIDATION_FAILED); } @@ -3162,6 +3295,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mMetricsLogger.write(log); if (!isValid) { Slog.i(TAG, "not showing save UI because fields failed validation"); + mSaveEventLogger.maybeSetSaveUiNotShownReason( + NO_SAVE_REASON_FIELD_VALIDATION_FAILED); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ true, Event.NO_SAVE_UI_REASON_FIELD_VALIDATION_FAILED); } @@ -3202,6 +3338,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState Slog.d(TAG, "ignoring Save UI because all fields match contents of " + "dataset #" + i + ": " + dataset); } + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_DATASET_MATCH); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ true, Event.NO_SAVE_UI_REASON_DATASET_MATCH); } @@ -3223,14 +3361,18 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } if (serviceLabel == null || serviceIcon == null) { wtf(null, "showSaveLocked(): no service label or icon"); + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_NONE); + mSaveEventLogger.logAndEndEvent(); return new SaveResult(/* logSaveShown= */ false, /* removeSession= */ true, Event.NO_SAVE_UI_REASON_NONE); } - + final long saveUiDisplayStartTimestamp = SystemClock.elapsedRealtime(); getUiForShowing().showSaveUi(serviceLabel, serviceIcon, mService.getServicePackageName(), saveInfo, this, mComponentName, this, mPendingSaveUi, isUpdate, mCompatMode, response.getShowSaveDialogIcon()); + mSaveEventLogger.maybeSetLatencySaveUiDisplayMillis( + SystemClock.elapsedRealtime()- saveUiDisplayStartTimestamp); if (client != null) { try { client.setSaveUiState(id, true); @@ -3402,11 +3544,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if (mDestroyed) { Slog.w(TAG, "Call to Session#callSaveLocked() rejected - session: " + id + " destroyed"); + mSaveEventLogger.maybeSetIsSaved(false); + mSaveEventLogger.logAndEndEvent(); return; } if (mRemoteFillService == null) { wtf(null, "callSaveLocked() called without a remote service. " + "mForAugmentedAutofillOnly: %s", mSessionFlags.mAugmentedAutofillOnly); + mSaveEventLogger.maybeSetIsSaved(false); + mSaveEventLogger.logAndEndEvent(); return; } @@ -3414,6 +3560,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if (mContexts == null) { Slog.w(TAG, "callSaveLocked(): no contexts"); + mSaveEventLogger.maybeSetIsSaved(false); + mSaveEventLogger.logAndEndEvent(); return; } @@ -3830,6 +3978,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mPresentationStatsEventLogger.maybeSetRequestId(response.getRequestId()); mPresentationStatsEventLogger.maybeSetAvailableCount( response.getDatasets(), mCurrentViewId); + mFillResponseEventLogger.maybeSetAvailableCount( + response.getDatasets(), mCurrentViewId); } if (isSameViewEntered) { @@ -4000,6 +4150,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if (mDestroyed) { Slog.w(TAG, "Call to Session#onFillReady() rejected - session: " + id + " destroyed"); + mSaveEventLogger.maybeSetSaveUiNotShownReason(NO_SAVE_REASON_SESSION_DESTROYED); + mSaveEventLogger.logAndEndEvent(); + mPresentationStatsEventLogger.maybeSetNoPresentationEventReason( + NOT_SHOWN_REASON_SESSION_COMMITTED_PREMATURELY); + mPresentationStatsEventLogger.logAndEndEvent(); return; } } @@ -4031,7 +4186,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState synchronized (mLock) { // Time passed since Session was created - long suggestionSentRelativeTimestamp = + final long suggestionSentRelativeTimestamp = SystemClock.elapsedRealtime() - mLatencyBaseTime; mPresentationStatsEventLogger.maybeSetSuggestionSentTimestampMs( (int) (suggestionSentRelativeTimestamp)); @@ -4399,10 +4554,19 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState saveTriggerId = saveInfo.getTriggerId(); if (saveTriggerId != null) { writeLog(MetricsEvent.AUTOFILL_EXPLICIT_SAVE_TRIGGER_DEFINITION); + mSaveEventLogger.maybeSetSaveUiShownReason(SAVE_UI_SHOWN_REASON_TRIGGER_ID_SET); } flags = saveInfo.getFlags(); mSaveOnAllViewsInvisible = (flags & SaveInfo.FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE) != 0; + mFillResponseEventLogger.maybeSetSaveUiTriggerIds(HAVE_SAVE_TRIGGER_ID); + + // Start to log Save event. + mSaveEventLogger.maybeSetRequestId(response.getRequestId()); + mSaveEventLogger.maybeSetAppPackageUid(uid); + mSaveEventLogger.maybeSetSaveUiTriggerIds(HAVE_SAVE_TRIGGER_ID); + mSaveEventLogger.maybeSetFlag(flags); + // We only need to track views if we want to save once they become invisible. if (mSaveOnAllViewsInvisible) { if (trackedViews == null) { @@ -4410,18 +4574,28 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } if (saveInfo.getRequiredIds() != null) { Collections.addAll(trackedViews, saveInfo.getRequiredIds()); + mSaveEventLogger.maybeSetSaveUiShownReason( + SAVE_UI_SHOWN_REASON_REQUIRED_ID_CHANGE); } if (saveInfo.getOptionalIds() != null) { Collections.addAll(trackedViews, saveInfo.getOptionalIds()); + mSaveEventLogger.maybeSetSaveUiShownReason( + SAVE_UI_SHOWN_REASON_OPTIONAL_ID_CHANGE); } } if ((flags & SaveInfo.FLAG_DONT_SAVE_ON_FINISH) != 0) { + mSaveEventLogger.maybeSetSaveUiShownReason( + SAVE_UI_SHOWN_REASON_UNKNOWN); + mSaveEventLogger.maybeSetSaveUiNotShownReason( + NO_SAVE_REASON_WITH_DONT_SAVE_ON_FINISH_FLAG); saveOnFinish = false; } } else { flags = 0; + mSaveEventLogger.maybeSetSaveUiNotShownReason( + NO_SAVE_REASON_NO_SAVE_INFO); saveTriggerId = null; } @@ -4762,7 +4936,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState @GuardedBy("mLock") private void setViewStatesLocked(FillResponse response, int state, boolean clearResponse) { final List<Dataset> datasets = response.getDatasets(); - if (datasets != null) { + if (datasets != null && !datasets.isEmpty()) { for (int i = 0; i < datasets.size(); i++) { final Dataset dataset = datasets.get(i); if (dataset == null) { diff --git a/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java b/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java index 092eb4ea9014..d54aa7c101d7 100644 --- a/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java +++ b/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java @@ -301,25 +301,31 @@ public class CompanionTransportManager { int sdk = Build.VERSION.SDK_INT; String release = Build.VERSION.RELEASE; - if (Build.isDebuggable()) { - // Debug builds cannot pass attestation verification. Use hardcoded key instead. + + if (sdk < SECURE_CHANNEL_AVAILABLE_SDK || remoteSdk < SECURE_CHANNEL_AVAILABLE_SDK) { + // If either device is Android T or below, use raw channel + // TODO: depending on the release version, either + // 1) using a RawTransport for old T versions + // 2) or an Ukey2 handshaked transport for UKey2 backported T versions + Slog.d(TAG, "Secure channel is not supported. Using raw transport"); + transport = new RawTransport(transport.getAssociationId(), transport.getFd(), mContext); + } else if (Build.isDebuggable()) { + // If device is debug build, use hardcoded test key for authentication Slog.d(TAG, "Creating an unauthenticated secure channel"); final byte[] testKey = "CDM".getBytes(StandardCharsets.UTF_8); transport = new SecureTransport(transport.getAssociationId(), transport.getFd(), mContext, testKey, null); - } else if (remoteSdk == NON_ANDROID) { + } else if (sdk == NON_ANDROID || remoteSdk == NON_ANDROID) { + // If either device is not Android, then use app-specific pre-shared key // TODO: pass in a real preSharedKey + Slog.d(TAG, "Creating a PSK-authenticated secure channel"); transport = new SecureTransport(transport.getAssociationId(), transport.getFd(), mContext, new byte[0], null); - } else if (sdk >= SECURE_CHANNEL_AVAILABLE_SDK - && remoteSdk >= SECURE_CHANNEL_AVAILABLE_SDK) { - Slog.i(TAG, "Creating a secure channel"); + } else { + // If none of the above applies, then use secure channel with attestation verification + Slog.d(TAG, "Creating a secure channel"); transport = new SecureTransport(transport.getAssociationId(), transport.getFd(), mContext); - } else { - // TODO: depending on the release version, either - // 1) using a RawTransport for old T versions - // 2) or an Ukey2 handshaked transport for UKey2 backported T versions } addMessageListenersToTransport(transport); transport.start(); diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index 1363ef31c68d..ae88f24ab409 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -126,7 +126,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub private final VirtualDeviceManagerService mService; private final PendingTrampolineCallback mPendingTrampolineCallback; private final int mOwnerUid; - private final int mDeviceId; + private int mDeviceId; // Thou shall not hold the mVirtualDeviceLock over the mInputController calls. // Holding the lock can lead to lock inversion with GlobalWindowManagerLock. // 1. After display is created the window manager calls into VDM during construction @@ -348,6 +348,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @Override // Binder call public void launchPendingIntent(int displayId, PendingIntent pendingIntent, ResultReceiver resultReceiver) { + Objects.requireNonNull(pendingIntent); synchronized (mVirtualDeviceLock) { if (!mVirtualDisplays.contains(displayId)) { throw new SecurityException("Display ID " + displayId @@ -404,6 +405,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub super.close_enforcePermission(); // Remove about-to-be-closed virtual device from the service before butchering it. mService.removeVirtualDevice(mDeviceId); + mDeviceId = Context.DEVICE_ID_INVALID; VirtualDisplayWrapper[] virtualDisplaysToBeReleased; synchronized (mVirtualDeviceLock) { @@ -497,6 +499,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @EnforcePermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void createVirtualDpad(VirtualDpadConfig config, @NonNull IBinder deviceToken) { super.createVirtualDpad_enforcePermission(); + Objects.requireNonNull(config); synchronized (mVirtualDeviceLock) { if (!mVirtualDisplays.contains(config.getAssociatedDisplayId())) { throw new SecurityException( @@ -517,6 +520,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @EnforcePermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void createVirtualKeyboard(VirtualKeyboardConfig config, @NonNull IBinder deviceToken) { super.createVirtualKeyboard_enforcePermission(); + Objects.requireNonNull(config); synchronized (mVirtualDeviceLock) { if (!mVirtualDisplays.contains(config.getAssociatedDisplayId())) { throw new SecurityException( @@ -539,6 +543,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @EnforcePermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void createVirtualMouse(VirtualMouseConfig config, @NonNull IBinder deviceToken) { super.createVirtualMouse_enforcePermission(); + Objects.requireNonNull(config); synchronized (mVirtualDeviceLock) { if (!mVirtualDisplays.contains(config.getAssociatedDisplayId())) { throw new SecurityException( @@ -560,6 +565,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub public void createVirtualTouchscreen(VirtualTouchscreenConfig config, @NonNull IBinder deviceToken) { super.createVirtualTouchscreen_enforcePermission(); + Objects.requireNonNull(config); synchronized (mVirtualDeviceLock) { if (!mVirtualDisplays.contains(config.getAssociatedDisplayId())) { throw new SecurityException( @@ -590,6 +596,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub public void createVirtualNavigationTouchpad(VirtualNavigationTouchpadConfig config, @NonNull IBinder deviceToken) { super.createVirtualNavigationTouchpad_enforcePermission(); + Objects.requireNonNull(config); synchronized (mVirtualDeviceLock) { if (!mVirtualDisplays.contains(config.getAssociatedDisplayId())) { throw new SecurityException( diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java index 3b1983f55fb6..291c05877c17 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java @@ -66,7 +66,10 @@ import com.android.server.wm.ActivityTaskManagerInternal; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; @@ -86,6 +89,14 @@ public class VirtualDeviceManagerService extends SystemService { private static AtomicInteger sNextUniqueIndex = new AtomicInteger( Context.DEVICE_ID_DEFAULT + 1); + private final CompanionDeviceManager.OnAssociationsChangedListener mCdmAssociationListener = + new CompanionDeviceManager.OnAssociationsChangedListener() { + @Override + public void onAssociationsChanged(@NonNull List<AssociationInfo> associations) { + syncVirtualDevicesToCdmAssociations(associations); + } + }; + /** * Mapping from device IDs to virtual devices. */ @@ -204,11 +215,56 @@ public class VirtualDeviceManagerService extends SystemService { final long identity = Binder.clearCallingIdentity(); try { getContext().sendBroadcastAsUser(i, UserHandle.ALL); + + synchronized (mVirtualDeviceManagerLock) { + if (mVirtualDevices.size() == 0) { + unregisterCdmAssociationListener(); + } + } } finally { Binder.restoreCallingIdentity(identity); } } + private void syncVirtualDevicesToCdmAssociations(List<AssociationInfo> associations) { + Set<VirtualDeviceImpl> virtualDevicesToRemove = new HashSet<>(); + synchronized (mVirtualDeviceManagerLock) { + if (mVirtualDevices.size() == 0) { + return; + } + + Set<Integer> activeAssociationIds = new HashSet<>(associations.size()); + for (AssociationInfo association : associations) { + activeAssociationIds.add(association.getId()); + } + + for (int i = 0; i < mVirtualDevices.size(); i++) { + VirtualDeviceImpl virtualDevice = mVirtualDevices.valueAt(i); + if (!activeAssociationIds.contains(virtualDevice.getAssociationId())) { + virtualDevicesToRemove.add(virtualDevice); + } + } + } + + for (VirtualDeviceImpl virtualDevice : virtualDevicesToRemove) { + virtualDevice.close(); + } + + } + + private void registerCdmAssociationListener() { + final CompanionDeviceManager cdm = getContext().getSystemService( + CompanionDeviceManager.class); + cdm.addOnAssociationsChangedListener(getContext().getMainExecutor(), + mCdmAssociationListener); + } + + private void unregisterCdmAssociationListener() { + final CompanionDeviceManager cdm = getContext().getSystemService( + CompanionDeviceManager.class); + cdm.removeOnAssociationsChangedListener(mCdmAssociationListener); + } + class VirtualDeviceManagerImpl extends IVirtualDeviceManager.Stub { private final VirtualDeviceImpl.PendingTrampolineCallback mPendingTrampolineCallback = @@ -254,7 +310,20 @@ public class VirtualDeviceManagerService extends SystemService { if (associationInfo == null) { throw new IllegalArgumentException("No association with ID " + associationId); } + Objects.requireNonNull(params); + Objects.requireNonNull(activityListener); + Objects.requireNonNull(soundEffectListener); + synchronized (mVirtualDeviceManagerLock) { + if (mVirtualDevices.size() == 0) { + final long callindId = Binder.clearCallingIdentity(); + try { + registerCdmAssociationListener(); + } finally { + Binder.restoreCallingIdentity(callindId); + } + } + final UserHandle userHandle = getCallingUserHandle(); final CameraAccessController cameraAccessController = getCameraAccessController(userHandle); @@ -275,6 +344,7 @@ public class VirtualDeviceManagerService extends SystemService { public int createVirtualDisplay(VirtualDisplayConfig virtualDisplayConfig, IVirtualDisplayCallback callback, IVirtualDevice virtualDevice, String packageName) throws RemoteException { + Objects.requireNonNull(virtualDisplayConfig); final int callingUid = getCallingUid(); if (!PermissionUtils.validateCallingPackageName(getContext(), packageName)) { throw new SecurityException( diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java index c5eb25b9981e..3fd6fe8afba6 100644 --- a/services/core/java/com/android/server/PinnerService.java +++ b/services/core/java/com/android/server/PinnerService.java @@ -26,8 +26,8 @@ import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.IActivityManager; -import android.app.IUidObserver; import android.app.SearchManager; +import android.app.UidObserver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -360,35 +360,18 @@ public final class PinnerService extends SystemService { private void registerUidListener() { try { - mAm.registerUidObserver(new IUidObserver.Stub() { + mAm.registerUidObserver(new UidObserver() { @Override - public void onUidGone(int uid, boolean disabled) throws RemoteException { + public void onUidGone(int uid, boolean disabled) { mPinnerHandler.sendMessage(PooledLambda.obtainMessage( PinnerService::handleUidGone, PinnerService.this, uid)); } @Override - public void onUidActive(int uid) throws RemoteException { + public void onUidActive(int uid) { mPinnerHandler.sendMessage(PooledLambda.obtainMessage( PinnerService::handleUidActive, PinnerService.this, uid)); } - - @Override - public void onUidIdle(int uid, boolean disabled) throws RemoteException { - } - - @Override - public void onUidStateChanged(int uid, int procState, long procStateSeq, - int capability) throws RemoteException { - } - - @Override - public void onUidCachedChanged(int uid, boolean cached) throws RemoteException { - } - - @Override - public void onUidProcAdjChanged(int uid) throws RemoteException { - } }, UID_OBSERVER_GONE | UID_OBSERVER_ACTIVE, 0, null); } catch (RemoteException e) { Slog.e(TAG, "Failed to register uid observer", e); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 78cbf2bd80d8..7b618b11bd45 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -88,6 +88,7 @@ import static com.android.internal.messages.nano.SystemMessageProto.SystemMessag import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED; import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER; import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT; import static com.android.internal.util.FrameworkStatsLog.SERVICE_REQUEST_EVENT_REPORTED; import static com.android.internal.util.FrameworkStatsLog.SERVICE_REQUEST_EVENT_REPORTED__PACKAGE_STOPPED_STATE__PACKAGE_STATE_NORMAL; import static com.android.internal.util.FrameworkStatsLog.SERVICE_REQUEST_EVENT_REPORTED__PACKAGE_STOPPED_STATE__PACKAGE_STATE_STOPPED; @@ -3240,6 +3241,12 @@ public final class ActiveServices { return; } Slog.e(TAG_SERVICE, "Short FGS timed out: " + sr); + final long now = SystemClock.uptimeMillis(); + logFGSStateChangeLocked(sr, + FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT, + now > sr.mFgsEnterTime ? (int) (now - sr.mFgsEnterTime) : 0, + FGS_STOP_REASON_UNKNOWN, + FGS_TYPE_POLICY_CHECK_UNKNOWN); try { sr.app.getThread().scheduleTimeoutService(sr, sr.getShortFgsInfo().getStartId()); } catch (RemoteException e) { @@ -7897,7 +7904,8 @@ public final class ActiveServices { boolean allowWhileInUsePermissionInFgs; @PowerExemptionManager.ReasonCode int fgsStartReasonCode; if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER - || state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT) { + || state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT + || state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT) { allowWhileInUsePermissionInFgs = r.mAllowWhileInUsePermissionInFgsAtEntering; fgsStartReasonCode = r.mAllowStartForegroundAtEntering; } else { @@ -7931,9 +7939,9 @@ public final class ActiveServices { r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mClientUid : INVALID_UID, r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService : ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT, - 0, - null, - null); + 0 /* api_sate */, + null /* api_type */, + null /* api_timestamp */); int event = 0; if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER) { @@ -7942,7 +7950,9 @@ public final class ActiveServices { event = EventLogTags.AM_FOREGROUND_SERVICE_STOP; } else if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED) { event = EventLogTags.AM_FOREGROUND_SERVICE_DENIED; - } else { + } else if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT) { + event = EventLogTags.AM_FOREGROUND_SERVICE_TIMED_OUT; + }else { // Unknown event. return; } diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index 553706db34d8..ae5dbe11495a 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -151,6 +151,7 @@ final class ActivityManagerConstants extends ContentObserver { static final String KEY_USE_TIERED_CACHED_ADJ = "use_tiered_cached_adj"; static final String KEY_TIERED_CACHED_ADJ_DECAY_TIME = "tiered_cached_adj_decay_time"; + static final String KEY_USE_MODERN_TRIM = "use_modern_trim"; private static final int DEFAULT_MAX_CACHED_PROCESSES = 1024; private static final boolean DEFAULT_PRIORITIZE_ALARM_BROADCASTS = true; @@ -212,6 +213,8 @@ final class ActivityManagerConstants extends ContentObserver { private static final boolean DEFAULT_USE_TIERED_CACHED_ADJ = false; private static final long DEFAULT_TIERED_CACHED_ADJ_DECAY_TIME = 60 * 1000; + private static final boolean DEFAULT_USE_MODERN_TRIM = false; + /** * Same as {@link TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED} */ @@ -1052,6 +1055,9 @@ final class ActivityManagerConstants extends ContentObserver { /** @see #KEY_TIERED_CACHED_ADJ_DECAY_TIME */ public long TIERED_CACHED_ADJ_DECAY_TIME = DEFAULT_TIERED_CACHED_ADJ_DECAY_TIME; + /** @see #KEY_USE_MODERN_TRIM */ + public boolean USE_MODERN_TRIM = DEFAULT_USE_MODERN_TRIM; + private final OnPropertiesChangedListener mOnDeviceConfigChangedListener = new OnPropertiesChangedListener() { @Override @@ -1227,6 +1233,9 @@ final class ActivityManagerConstants extends ContentObserver { case KEY_TIERED_CACHED_ADJ_DECAY_TIME: updateUseTieredCachedAdj(); break; + case KEY_USE_MODERN_TRIM: + updateUseModernTrim(); + break; default: updateFGSPermissionEnforcementFlagsIfNecessary(name); break; @@ -1302,6 +1311,13 @@ final class ActivityManagerConstants extends ContentObserver { com.android.internal.R.integer.config_customizedMaxCachedProcesses); CUR_MAX_CACHED_PROCESSES = mCustomizedMaxCachedProcesses; CUR_MAX_EMPTY_PROCESSES = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES); + + final int rawMaxEmptyProcesses = computeEmptyProcessLimit( + Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES)); + CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses / 2; + CUR_TRIM_CACHED_PROCESSES = (Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES) + - rawMaxEmptyProcesses) / 3; + } public void start(ContentResolver resolver) { @@ -1867,12 +1883,11 @@ final class ActivityManagerConstants extends ContentObserver { } CUR_MAX_EMPTY_PROCESSES = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES); - // Note the trim levels do NOT depend on the override process limit, we want - // to consider the same level the point where we do trimming regardless of any - // additional enforced limit. - final int rawMaxEmptyProcesses = computeEmptyProcessLimit(MAX_CACHED_PROCESSES); - CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses/2; - CUR_TRIM_CACHED_PROCESSES = (MAX_CACHED_PROCESSES-rawMaxEmptyProcesses)/3; + final int rawMaxEmptyProcesses = computeEmptyProcessLimit( + Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES)); + CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses / 2; + CUR_TRIM_CACHED_PROCESSES = (Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES) + - rawMaxEmptyProcesses) / 3; } private void updateProactiveKillsEnabled() { @@ -1991,6 +2006,13 @@ final class ActivityManagerConstants extends ContentObserver { DEFAULT_TIERED_CACHED_ADJ_DECAY_TIME); } + private void updateUseModernTrim() { + USE_MODERN_TRIM = DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_USE_MODERN_TRIM, + DEFAULT_USE_MODERN_TRIM); + } + private void updateFGSPermissionEnforcementFlagsIfNecessary(@NonNull String name) { ForegroundServiceTypePolicy.getDefaultPolicy() .updatePermissionEnforcementFlagIfNecessary(name); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 0cd5577b4439..ef7d5ae43396 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13649,8 +13649,9 @@ public class ActivityManagerService extends IActivityManager.Stub || action.startsWith("android.intent.action.UID_") || action.startsWith("android.intent.action.EXTERNAL_")) { if (DEBUG_BROADCAST) { - Slog.wtf(TAG, "System internals registering for " + filter - + " with app priority; this will race with apps!", + Slog.wtf(TAG, + "System internals registering for " + filter.toLongString() + + " with app priority; this will race with apps!", new Throwable()); } diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index 6c6ac1eb3030..e080a80e1c37 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -59,12 +59,12 @@ import android.app.IActivityManager; import android.app.IActivityTaskManager; import android.app.IProcessObserver; import android.app.IStopUserCallback; -import android.app.IUidObserver; import android.app.IUserSwitchObserver; import android.app.KeyguardManager; import android.app.ProcessStateEnum; import android.app.ProfilerInfo; import android.app.RemoteServiceException.CrashedByAdbException; +import android.app.UidObserver; import android.app.UserSwitchObserver; import android.app.WaitResult; import android.app.usage.AppStandbyInfo; @@ -1095,7 +1095,7 @@ final class ActivityManagerShellCommand extends ShellCommand { synchronized (mInternal.mProcLock) { mInternal.mOomAdjuster.mCachedAppOptimizer.compactApp(app, CachedAppOptimizer.CompactProfile.FULL, - CachedAppOptimizer.CompactSource.APP, true); + CachedAppOptimizer.CompactSource.SHELL, true); } pw.println("Finished full compaction for " + app.mPid); } else if (isSomeCompact) { @@ -1103,7 +1103,7 @@ final class ActivityManagerShellCommand extends ShellCommand { synchronized (mInternal.mProcLock) { mInternal.mOomAdjuster.mCachedAppOptimizer.compactApp(app, CachedAppOptimizer.CompactProfile.SOME, - CachedAppOptimizer.CompactSource.APP, true); + CachedAppOptimizer.CompactSource.SHELL, true); } pw.println("Finished some compaction for " + app.mPid); } @@ -1858,7 +1858,7 @@ final class ActivityManagerShellCommand extends ShellCommand { return 0; } - static final class MyUidObserver extends IUidObserver.Stub + static final class MyUidObserver extends UidObserver implements ActivityManagerService.OomAdjObserver { final IActivityManager mInterface; final ActivityManagerService mInternal; @@ -1883,8 +1883,7 @@ final class ActivityManagerShellCommand extends ShellCommand { } @Override - public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) - throws RemoteException { + public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { synchronized (this) { final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { @@ -1903,7 +1902,7 @@ final class ActivityManagerShellCommand extends ShellCommand { } @Override - public void onUidGone(int uid, boolean disabled) throws RemoteException { + public void onUidGone(int uid, boolean disabled) { synchronized (this) { final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { @@ -1921,7 +1920,7 @@ final class ActivityManagerShellCommand extends ShellCommand { } @Override - public void onUidActive(int uid) throws RemoteException { + public void onUidActive(int uid) { synchronized (this) { final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { @@ -1935,7 +1934,7 @@ final class ActivityManagerShellCommand extends ShellCommand { } @Override - public void onUidIdle(int uid, boolean disabled) throws RemoteException { + public void onUidIdle(int uid, boolean disabled) { synchronized (this) { final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { @@ -1953,7 +1952,7 @@ final class ActivityManagerShellCommand extends ShellCommand { } @Override - public void onUidCachedChanged(int uid, boolean cached) throws RemoteException { + public void onUidCachedChanged(int uid, boolean cached) { synchronized (this) { final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { @@ -1967,10 +1966,6 @@ final class ActivityManagerShellCommand extends ShellCommand { } @Override - public void onUidProcAdjChanged(int uid) throws RemoteException { - } - - @Override public void onOomAdjMessage(String msg) { synchronized (this) { final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index 08c1de61d7fb..c343ec24412a 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -534,6 +534,8 @@ class AppErrors { } } + mService.mOomAdjuster.mCachedAppOptimizer.unfreezeProcess(initialPid, + CachedAppOptimizer.UNFREEZE_REASON_PROCESS_END); proc.scheduleCrashLocked(message, exceptionTypeId, extras); if (force) { // If the app is responsive, the scheduled crash will happen as expected diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java index ccd739006713..25ac956d328d 100644 --- a/services/core/java/com/android/server/am/AppProfiler.java +++ b/services/core/java/com/android/server/am/AppProfiler.java @@ -1005,6 +1005,37 @@ public class AppProfiler { mBgHandler.obtainMessage(BgHandler.MEMORY_PRESSURE_CHANGED, mLastMemoryLevel, memFactor) .sendToTarget(); } + + if (mService.mConstants.USE_MODERN_TRIM) { + // Modern trim is not sent based on lowmem state + // Dispatch UI_HIDDEN to processes that need it + mService.mProcessList.forEachLruProcessesLOSP(true, app -> { + final ProcessProfileRecord profile = app.mProfile; + final IApplicationThread thread; + final ProcessStateRecord state = app.mState; + if (state.hasProcStateChanged()) { + state.setProcStateChanged(false); + } + int procState = app.mState.getCurProcState(); + if (((procState >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND + && procState < ActivityManager.PROCESS_STATE_CACHED_ACTIVITY) + || app.mState.isSystemNoUi()) && app.mProfile.hasPendingUiClean()) { + // If this application is now in the background and it + // had done UI, then give it the special trim level to + // have it free UI resources. + if ((thread = app.getThread()) != null) { + try { + thread.scheduleTrimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN); + app.mProfile.setPendingUiClean(false); + } catch (RemoteException e) { + + } + } + } + }); + return false; + } + mLastMemoryLevel = memFactor; mLastNumProcesses = mService.mProcessList.getLruSizeLOSP(); boolean allChanged; diff --git a/services/core/java/com/android/server/am/AppRestrictionController.java b/services/core/java/com/android/server/am/AppRestrictionController.java index 6928bd307af0..88f6bc91d1ff 100644 --- a/services/core/java/com/android/server/am/AppRestrictionController.java +++ b/services/core/java/com/android/server/am/AppRestrictionController.java @@ -101,6 +101,7 @@ import android.app.IUidObserver; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; +import android.app.UidObserver; import android.app.role.OnRoleHoldersChangedListener; import android.app.role.RoleManager; import android.app.usage.AppStandbyInfo; @@ -136,6 +137,7 @@ import android.provider.DeviceConfig.OnPropertiesChangedListener; import android.provider.DeviceConfig.Properties; import android.provider.Settings; import android.telephony.TelephonyManager; +import android.telephony.TelephonyManager.CarrierPrivilegesCallback; import android.text.TextUtils; import android.util.ArraySet; import android.util.AtomicFile; @@ -311,10 +313,18 @@ public final class AppRestrictionController { private final Object mCarrierPrivilegedLock = new Object(); /** - * List of carrier-privileged apps that should be excluded from standby. + * List of carrier-privileged apps that should be excluded from standby, + * the key of this array here is the phone id. */ @GuardedBy("mCarrierPrivilegedLock") - private List<String> mCarrierPrivilegedApps; + private final SparseArray<Set<String>> mCarrierPrivilegedApps = new SparseArray<>(); + + /** + * Holding the callbacks to the carrier privileged app changes. + * + * it's lock free. + */ + private volatile ArrayList<PhoneCarrierPrivilegesCallback> mCarrierPrivilegesCallbacks; /** * Whether or not we've loaded the restriction settings from the persistent storage. @@ -357,19 +367,6 @@ public final class AppRestrictionController { onUidAdded(uid); } } - } - // fall through. - case Intent.ACTION_PACKAGE_CHANGED: { - final String pkgName = intent.getData().getSchemeSpecificPart(); - final String[] cmpList = intent.getStringArrayExtra( - Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST); - // If this is PACKAGE_ADDED (cmpList == null), or if it's a whole-package - // enable/disable event (cmpList is just the package name itself), drop - // our carrier privileged app & system-app caches and let them refresh - if (cmpList == null - || (cmpList.length == 1 && pkgName.equals(cmpList[0]))) { - clearCarrierPrivilegedApps(); - } } break; case Intent.ACTION_PACKAGE_FULLY_REMOVED: { final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); @@ -412,6 +409,10 @@ public final class AppRestrictionController { onUserRemoved(userId); } } break; + case TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED: { + unregisterCarrierPrivilegesCallbacks(); + registerCarrierPrivilegesCallbacks(); + } break; } } }; @@ -1439,7 +1440,7 @@ public final class AppRestrictionController { }; private final IUidObserver mUidObserver = - new IUidObserver.Stub() { + new UidObserver() { @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { @@ -1463,14 +1464,6 @@ public final class AppRestrictionController { public void onUidActive(int uid) { mBgHandler.obtainMessage(BgHandler.MSG_UID_ACTIVE, uid, 0).sendToTarget(); } - - @Override - public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override - public void onUidProcAdjChanged(int uid) { - } }; /** @@ -1508,6 +1501,7 @@ public final class AppRestrictionController { initRolesInInterest(); registerForUidObservers(); registerForSystemBroadcasts(); + registerCarrierPrivilegesCallbacks(); mNotificationHelper.onSystemReady(); mInjector.getAppStateTracker().addBackgroundRestrictedAppListener( mBackgroundRestrictionListener); @@ -2823,6 +2817,7 @@ public final class AppRestrictionController { final PackageManagerInternal pm = mInjector.getPackageManagerInternal(); final AppStandbyInternal appStandbyInternal = mInjector.getAppStandbyInternal(); final AppOpsManager appOpsManager = mInjector.getAppOpsManager(); + final ActivityManagerService activityManagerService = mInjector.getActivityManagerService(); final int userId = UserHandle.getUserId(uid); if (isSystemModule(pkg)) { return REASON_SYSTEM_MODULE; @@ -2836,7 +2831,7 @@ public final class AppRestrictionController { return REASON_DPO_PROTECTED_APP; } else if (appStandbyInternal.isActiveDeviceAdmin(pkg, userId)) { return REASON_ACTIVE_DEVICE_ADMIN; - } else if (mActivityManagerService.mConstants.mFlagSystemExemptPowerRestrictionsEnabled + } else if (activityManagerService.mConstants.mFlagSystemExemptPowerRestrictionsEnabled && appOpsManager.checkOpNoThrow( AppOpsManager.OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS, uid, pkg) == AppOpsManager.MODE_ALLOWED) { @@ -2879,32 +2874,61 @@ public final class AppRestrictionController { private boolean isCarrierApp(String packageName) { synchronized (mCarrierPrivilegedLock) { - if (mCarrierPrivilegedApps == null) { - fetchCarrierPrivilegedAppsCPL(); - } if (mCarrierPrivilegedApps != null) { - return mCarrierPrivilegedApps.contains(packageName); + for (int i = mCarrierPrivilegedApps.size() - 1; i >= 0; i--) { + if (mCarrierPrivilegedApps.valueAt(i).contains(packageName)) { + return true; + } + } } return false; } } - private void clearCarrierPrivilegedApps() { - if (DEBUG_BG_RESTRICTION_CONTROLLER) { - Slog.i(TAG, "Clearing carrier privileged apps list"); + private void registerCarrierPrivilegesCallbacks() { + final TelephonyManager telephonyManager = mInjector.getTelephonyManager(); + if (telephonyManager == null) { + return; } - synchronized (mCarrierPrivilegedLock) { - mCarrierPrivilegedApps = null; // Need to be refetched. + + final int numPhones = telephonyManager.getActiveModemCount(); + final ArrayList<PhoneCarrierPrivilegesCallback> callbacks = new ArrayList<>(); + for (int i = 0; i < numPhones; i++) { + final PhoneCarrierPrivilegesCallback callback = new PhoneCarrierPrivilegesCallback(i); + callbacks.add(callback); + telephonyManager.registerCarrierPrivilegesCallback(i, mBgExecutor, callback); } + mCarrierPrivilegesCallbacks = callbacks; } - @GuardedBy("mCarrierPrivilegedLock") - private void fetchCarrierPrivilegedAppsCPL() { + private void unregisterCarrierPrivilegesCallbacks() { final TelephonyManager telephonyManager = mInjector.getTelephonyManager(); - mCarrierPrivilegedApps = - telephonyManager.getCarrierPrivilegedPackagesForAllActiveSubscriptions(); - if (DEBUG_BG_RESTRICTION_CONTROLLER) { - Slog.d(TAG, "apps with carrier privilege " + mCarrierPrivilegedApps); + if (telephonyManager == null) { + return; + } + final ArrayList<PhoneCarrierPrivilegesCallback> callbacks = mCarrierPrivilegesCallbacks; + if (callbacks != null) { + for (int i = callbacks.size() - 1; i >= 0; i--) { + telephonyManager.unregisterCarrierPrivilegesCallback(callbacks.get(i)); + } + mCarrierPrivilegesCallbacks = null; + } + } + + private class PhoneCarrierPrivilegesCallback implements CarrierPrivilegesCallback { + private final int mPhoneId; + + PhoneCarrierPrivilegesCallback(int phoneId) { + mPhoneId = phoneId; + } + + @Override + public void onCarrierPrivilegesChanged(@NonNull Set<String> privilegedPackageNames, + @NonNull Set<Integer> privilegedUids) { + synchronized (mCarrierPrivilegedLock) { + mCarrierPrivilegedApps.put(mPhoneId, + Collections.unmodifiableSet(privilegedPackageNames)); + } } } @@ -3272,7 +3296,6 @@ public final class AppRestrictionController { private void registerForSystemBroadcasts() { final IntentFilter packageFilter = new IntentFilter(); packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED); - packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED); packageFilter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); packageFilter.addDataScheme("package"); mContext.registerReceiverForAllUsers(mBroadcastReceiver, packageFilter, null, mBgHandler); @@ -3285,6 +3308,9 @@ public final class AppRestrictionController { bootFilter.addAction(Intent.ACTION_LOCKED_BOOT_COMPLETED); mContext.registerReceiverAsUser(mBootReceiver, UserHandle.SYSTEM, bootFilter, null, mBgHandler); + final IntentFilter telFilter = new IntentFilter( + TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED); + mContext.registerReceiverForAllUsers(mBroadcastReceiver, telFilter, null, mBgHandler); } private void unregisterForSystemBroadcasts() { diff --git a/services/core/java/com/android/server/am/BroadcastProcessQueue.java b/services/core/java/com/android/server/am/BroadcastProcessQueue.java index 48ab96cee562..bfc8251d97bb 100644 --- a/services/core/java/com/android/server/am/BroadcastProcessQueue.java +++ b/services/core/java/com/android/server/am/BroadcastProcessQueue.java @@ -188,7 +188,7 @@ class BroadcastProcessQueue { private @Reason int mRunnableAtReason = REASON_EMPTY; private boolean mRunnableAtInvalidated; - private boolean mProcessCached; + private boolean mUidCached; private boolean mProcessInstrumented; private boolean mProcessPersistent; @@ -382,14 +382,14 @@ class BroadcastProcessQueue { /** * Update the actively running "warm" process for this process. */ - public void setProcess(@Nullable ProcessRecord app) { + public void setProcessAndUidCached(@Nullable ProcessRecord app, boolean uidCached) { this.app = app; if (app != null) { - setProcessCached(app.isCached()); + setUidCached(uidCached); setProcessInstrumented(app.getActiveInstrumentation() != null); setProcessPersistent(app.isPersistent()); } else { - setProcessCached(false); + setUidCached(uidCached); setProcessInstrumented(false); setProcessPersistent(false); } @@ -403,10 +403,9 @@ class BroadcastProcessQueue { * Update if this process is in the "cached" state, typically signaling that * broadcast dispatch should be paused or delayed. */ - @VisibleForTesting - void setProcessCached(boolean cached) { - if (mProcessCached != cached) { - mProcessCached = cached; + private void setUidCached(boolean uidCached) { + if (mUidCached != uidCached) { + mUidCached = uidCached; invalidateRunnableAt(); } } @@ -416,7 +415,7 @@ class BroadcastProcessQueue { * signaling that broadcast dispatch should bypass all pauses or delays, to * avoid holding up test suites. */ - public void setProcessInstrumented(boolean instrumented) { + private void setProcessInstrumented(boolean instrumented) { if (mProcessInstrumented != instrumented) { mProcessInstrumented = instrumented; invalidateRunnableAt(); @@ -427,7 +426,7 @@ class BroadcastProcessQueue { * Update if this process is in the "persistent" state, which signals broadcast dispatch should * bypass all pauses or delays to prevent the system from becoming out of sync with itself. */ - public void setProcessPersistent(boolean persistent) { + private void setProcessPersistent(boolean persistent) { if (mProcessPersistent != persistent) { mProcessPersistent = persistent; invalidateRunnableAt(); @@ -442,17 +441,17 @@ class BroadcastProcessQueue { } public int getPreferredSchedulingGroupLocked() { - if (mCountForeground > mCountForegroundDeferred) { + if (!isActive()) { + return ProcessList.SCHED_GROUP_UNDEFINED; + } else if (mCountForeground > mCountForegroundDeferred) { // We have a foreground broadcast somewhere down the queue, so // boost priority until we drain them all return ProcessList.SCHED_GROUP_DEFAULT; } else if ((mActive != null) && mActive.isForeground()) { // We have a foreground broadcast right now, so boost priority return ProcessList.SCHED_GROUP_DEFAULT; - } else if (!isIdle()) { - return ProcessList.SCHED_GROUP_BACKGROUND; } else { - return ProcessList.SCHED_GROUP_UNDEFINED; + return ProcessList.SCHED_GROUP_BACKGROUND; } } @@ -986,7 +985,7 @@ class BroadcastProcessQueue { } else if (mProcessPersistent) { mRunnableAt = runnableAt; mRunnableAtReason = REASON_PERSISTENT; - } else if (mProcessCached) { + } else if (mUidCached) { if (r.deferUntilActive) { // All enqueued broadcasts are deferrable, defer if (mCountDeferred == mCountEnqueued) { @@ -1051,13 +1050,13 @@ class BroadcastProcessQueue { * Check overall health, confirming things are in a reasonable state and * that we're not wedged. */ - public void checkHealthLocked() { - checkHealthLocked(mPending); - checkHealthLocked(mPendingUrgent); - checkHealthLocked(mPendingOffload); + public void assertHealthLocked() { + assertHealthLocked(mPending); + assertHealthLocked(mPendingUrgent); + assertHealthLocked(mPendingOffload); } - private void checkHealthLocked(@NonNull ArrayDeque<SomeArgs> queue) { + private void assertHealthLocked(@NonNull ArrayDeque<SomeArgs> queue) { if (queue.isEmpty()) return; final Iterator<SomeArgs> it = queue.descendingIterator(); @@ -1195,7 +1194,7 @@ class BroadcastProcessQueue { @NeverCompile private void dumpProcessState(@NonNull IndentingPrintWriter pw) { final StringBuilder sb = new StringBuilder(); - if (mProcessCached) { + if (mUidCached) { sb.append("CACHED"); } if (mProcessInstrumented) { diff --git a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java index 40ae6e211235..a4bdf61e628f 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java @@ -72,6 +72,7 @@ import android.util.MathUtils; import android.util.Pair; import android.util.Slog; import android.util.SparseArray; +import android.util.SparseBooleanArray; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; @@ -209,6 +210,16 @@ class BroadcastQueueModernImpl extends BroadcastQueue { private final AtomicReference<ArraySet<BroadcastRecord>> mReplacedBroadcastsCache = new AtomicReference<>(); + /** + * Map from UID to its last known "cached" state. + * <p> + * We manually maintain this data structure since the lifecycle of + * {@link ProcessRecord} and {@link BroadcastProcessQueue} can be + * mismatched. + */ + @GuardedBy("mService") + private final SparseBooleanArray mUidCached = new SparseBooleanArray(); + private final BroadcastConstants mConstants; private final BroadcastConstants mFgConstants; private final BroadcastConstants mBgConstants; @@ -235,21 +246,15 @@ class BroadcastQueueModernImpl extends BroadcastQueue { private final Handler.Callback mLocalCallback = (msg) -> { switch (msg.what) { case MSG_UPDATE_RUNNING_LIST: { - synchronized (mService) { - updateRunningListLocked(); - } + updateRunningList(); return true; } case MSG_DELIVERY_TIMEOUT_SOFT: { - synchronized (mService) { - deliveryTimeoutSoftLocked((BroadcastProcessQueue) msg.obj, msg.arg1); - } + deliveryTimeoutSoft((BroadcastProcessQueue) msg.obj, msg.arg1); return true; } case MSG_DELIVERY_TIMEOUT_HARD: { - synchronized (mService) { - deliveryTimeoutHardLocked((BroadcastProcessQueue) msg.obj); - } + deliveryTimeoutHard((BroadcastProcessQueue) msg.obj); return true; } case MSG_BG_ACTIVITY_START_TIMEOUT: { @@ -263,9 +268,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { return true; } case MSG_CHECK_HEALTH: { - synchronized (mService) { - checkHealthLocked(); - } + checkHealth(); return true; } } @@ -354,6 +357,12 @@ class BroadcastQueueModernImpl extends BroadcastQueue { } } + private void updateRunningList() { + synchronized (mService) { + updateRunningListLocked(); + } + } + /** * Consider updating the list of "running" queues. * <p> @@ -485,7 +494,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { // relevant per-process queue final BroadcastProcessQueue queue = getProcessQueue(app); if (queue != null) { - queue.setProcess(app); + setQueueProcess(queue, app); } boolean didSomething = false; @@ -526,7 +535,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { // relevant per-process queue final BroadcastProcessQueue queue = getProcessQueue(app); if (queue != null) { - queue.setProcess(null); + setQueueProcess(queue, null); } if ((mRunningColdStart != null) && (mRunningColdStart == queue)) { @@ -954,6 +963,13 @@ class BroadcastQueueModernImpl extends BroadcastQueue { r.resultTo = null; } + private void deliveryTimeoutSoft(@NonNull BroadcastProcessQueue queue, + int softTimeoutMillis) { + synchronized (mService) { + deliveryTimeoutSoftLocked(queue, softTimeoutMillis); + } + } + private void deliveryTimeoutSoftLocked(@NonNull BroadcastProcessQueue queue, int softTimeoutMillis) { if (queue.app != null) { @@ -970,6 +986,12 @@ class BroadcastQueueModernImpl extends BroadcastQueue { } } + private void deliveryTimeoutHard(@NonNull BroadcastProcessQueue queue) { + synchronized (mService) { + deliveryTimeoutHardLocked(queue); + } + } + private void deliveryTimeoutHardLocked(@NonNull BroadcastProcessQueue queue) { finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_TIMEOUT, "deliveryTimeoutHardLocked"); @@ -1332,11 +1354,17 @@ class BroadcastQueueModernImpl extends BroadcastQueue { @Override public void onUidCachedChanged(int uid, boolean cached) { synchronized (mService) { + if (cached) { + mUidCached.put(uid, true); + } else { + mUidCached.delete(uid); + } + BroadcastProcessQueue leaf = mProcessQueues.get(uid); while (leaf != null) { // Update internal state by refreshing values previously // read from any known running process - leaf.setProcess(leaf.app); + setQueueProcess(leaf, leaf.app); updateQueueDeferred(leaf); updateRunnableList(leaf); leaf = leaf.processNameNext; @@ -1441,68 +1469,88 @@ class BroadcastQueueModernImpl extends BroadcastQueue { // TODO: implement } + private void checkHealth() { + synchronized (mService) { + checkHealthLocked(); + } + } + + private void checkHealthLocked() { + try { + assertHealthLocked(); + + // If no health issues found above, check again in the future + mLocalHandler.sendEmptyMessageDelayed(MSG_CHECK_HEALTH, + DateUtils.MINUTE_IN_MILLIS); + + } catch (Exception e) { + // Throw up a message to indicate that something went wrong, and + // dump current state for later inspection + Slog.wtf(TAG, e); + dumpToDropBoxLocked(e.toString()); + } + } + /** * Check overall health, confirming things are in a reasonable state and * that we're not wedged. If we determine we're in an unhealthy state, dump * current state once and stop future health checks to avoid spamming. */ @VisibleForTesting - void checkHealthLocked() { - try { - // Verify all runnable queues are sorted - BroadcastProcessQueue prev = null; - BroadcastProcessQueue next = mRunnableHead; - while (next != null) { - checkState(next.runnableAtPrev == prev, "runnableAtPrev"); - checkState(next.isRunnable(), "isRunnable " + next); - if (prev != null) { - checkState(next.getRunnableAt() >= prev.getRunnableAt(), - "getRunnableAt " + next + " vs " + prev); - } - prev = next; - next = next.runnableAtNext; + void assertHealthLocked() { + // Verify all runnable queues are sorted + BroadcastProcessQueue prev = null; + BroadcastProcessQueue next = mRunnableHead; + while (next != null) { + checkState(next.runnableAtPrev == prev, "runnableAtPrev"); + checkState(next.isRunnable(), "isRunnable " + next); + if (prev != null) { + checkState(next.getRunnableAt() >= prev.getRunnableAt(), + "getRunnableAt " + next + " vs " + prev); } + prev = next; + next = next.runnableAtNext; + } - // Verify all running queues are active - for (BroadcastProcessQueue queue : mRunning) { - if (queue != null) { - checkState(queue.isActive(), "isActive " + queue); - } + // Verify all running queues are active + for (BroadcastProcessQueue queue : mRunning) { + if (queue != null) { + checkState(queue.isActive(), "isActive " + queue); } + } - // Verify that pending cold start hasn't been orphaned - if (mRunningColdStart != null) { - checkState(getRunningIndexOf(mRunningColdStart) >= 0, - "isOrphaned " + mRunningColdStart); - } + // Verify that pending cold start hasn't been orphaned + if (mRunningColdStart != null) { + checkState(getRunningIndexOf(mRunningColdStart) >= 0, + "isOrphaned " + mRunningColdStart); + } - // Verify health of all known process queues - for (int i = 0; i < mProcessQueues.size(); i++) { - BroadcastProcessQueue leaf = mProcessQueues.valueAt(i); - while (leaf != null) { - leaf.checkHealthLocked(); - leaf = leaf.processNameNext; - } + // Verify health of all known process queues + for (int i = 0; i < mProcessQueues.size(); i++) { + BroadcastProcessQueue leaf = mProcessQueues.valueAt(i); + while (leaf != null) { + leaf.assertHealthLocked(); + leaf = leaf.processNameNext; } - - // If no health issues found above, check again in the future - mLocalHandler.sendEmptyMessageDelayed(MSG_CHECK_HEALTH, DateUtils.MINUTE_IN_MILLIS); - - } catch (Exception e) { - // Throw up a message to indicate that something went wrong, and - // dump current state for later inspection - Slog.wtf(TAG, e); - dumpToDropBoxLocked(e.toString()); } } private void updateWarmProcess(@NonNull BroadcastProcessQueue queue) { if (!queue.isProcessWarm()) { - queue.setProcess(mService.getProcessRecordLocked(queue.processName, queue.uid)); + setQueueProcess(queue, mService.getProcessRecordLocked(queue.processName, queue.uid)); } } /** + * Update the {@link ProcessRecord} associated with the given + * {@link BroadcastProcessQueue}. + */ + private void setQueueProcess(@NonNull BroadcastProcessQueue queue, + @Nullable ProcessRecord app) { + queue.setProcessAndUidCached(app, mUidCached.get(queue.uid, false)); + } + + /** * Inform other parts of OS that the given broadcast queue has started * running, typically for internal bookkeeping. */ @@ -1692,7 +1740,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { } BroadcastProcessQueue created = new BroadcastProcessQueue(mConstants, processName, uid); - created.setProcess(mService.getProcessRecordLocked(processName, uid)); + setQueueProcess(created, mService.getProcessRecordLocked(processName, uid)); if (leaf == null) { mProcessQueues.put(uid, created); @@ -1815,12 +1863,18 @@ class BroadcastQueueModernImpl extends BroadcastQueue { ipw.decreaseIndent(); ipw.println(); - ipw.println(" Broadcasts with ignored delivery group policies:"); + ipw.println("Broadcasts with ignored delivery group policies:"); ipw.increaseIndent(); mService.dumpDeliveryGroupPolicyIgnoredActions(ipw); ipw.decreaseIndent(); ipw.println(); + ipw.println("Cached UIDs:"); + ipw.increaseIndent(); + ipw.println(mUidCached.toString()); + ipw.decreaseIndent(); + ipw.println(); + if (dumpConstants) { mConstants.dump(ipw); } diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 192a2ba1df2a..568997bb2667 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -18,6 +18,7 @@ package com.android.server.am; import static android.app.ActivityManager.UidFrozenStateChangedCallback.UID_FROZEN_STATE_FROZEN; import static android.app.ActivityManager.UidFrozenStateChangedCallback.UID_FROZEN_STATE_UNFROZEN; +import static android.content.ComponentCallbacks2.TRIM_MEMORY_BACKGROUND; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_COMPACTION; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_FREEZER; @@ -27,12 +28,14 @@ import android.annotation.IntDef; import android.app.ActivityManager; import android.app.ActivityThread; import android.app.ApplicationExitInfo; +import android.app.IApplicationThread; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.os.Message; import android.os.PowerManagerInternal; import android.os.Process; +import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; import android.provider.DeviceConfig; @@ -175,6 +178,7 @@ public final class CachedAppOptimizer { private static final String ATRACE_FREEZER_TRACK = "Freezer"; private static final int FREEZE_BINDER_TIMEOUT_MS = 100; + private static final int FREEZE_DEADLOCK_TIMEOUT_MS = 1000; @VisibleForTesting static final boolean ENABLE_FILE_COMPACT = false; @@ -226,8 +230,8 @@ public final class CachedAppOptimizer { FULL // File+anon compaction } - // This indicates the process OOM memory state that initiated the compaction request - public enum CompactSource { APP, PERSISTENT, BFGS } + // This indicates who initiated the compaction request + public enum CompactSource { APP, SHELL } public enum CancelCompactReason { SCREEN_ON, // screen was turned on which cancels all compactions. @@ -241,6 +245,7 @@ public final class CachedAppOptimizer { static final int REPORT_UNFREEZE_MSG = 4; static final int COMPACT_NATIVE_MSG = 5; static final int UID_FROZEN_STATE_CHANGED_MSG = 6; + static final int DEADLOCK_WATCHDOG_MSG = 7; // When free swap falls below this percentage threshold any full (file + anon) // compactions will be downgraded to file only compactions to reduce pressure @@ -373,10 +378,6 @@ public final class CachedAppOptimizer { @GuardedBy("mPhenotypeFlagLock") @VisibleForTesting volatile long mCompactThrottleFullFull = DEFAULT_COMPACT_THROTTLE_4; @GuardedBy("mPhenotypeFlagLock") - @VisibleForTesting volatile long mCompactThrottleBFGS = DEFAULT_COMPACT_THROTTLE_5; - @GuardedBy("mPhenotypeFlagLock") - @VisibleForTesting volatile long mCompactThrottlePersistent = DEFAULT_COMPACT_THROTTLE_6; - @GuardedBy("mPhenotypeFlagLock") @VisibleForTesting volatile long mCompactThrottleMinOomAdj = DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ; @GuardedBy("mPhenotypeFlagLock") @@ -635,8 +636,6 @@ public final class CachedAppOptimizer { pw.println(" " + KEY_COMPACT_THROTTLE_2 + "=" + mCompactThrottleSomeFull); pw.println(" " + KEY_COMPACT_THROTTLE_3 + "=" + mCompactThrottleFullSome); pw.println(" " + KEY_COMPACT_THROTTLE_4 + "=" + mCompactThrottleFullFull); - pw.println(" " + KEY_COMPACT_THROTTLE_5 + "=" + mCompactThrottleBFGS); - pw.println(" " + KEY_COMPACT_THROTTLE_6 + "=" + mCompactThrottlePersistent); pw.println(" " + KEY_COMPACT_THROTTLE_MIN_OOM_ADJ + "=" + mCompactThrottleMinOomAdj); pw.println(" " + KEY_COMPACT_THROTTLE_MAX_OOM_ADJ + "=" + mCompactThrottleMaxOomAdj); pw.println(" " + KEY_COMPACT_STATSD_SAMPLE_RATE + "=" + mCompactStatsdSampleRate); @@ -728,32 +727,6 @@ public final class CachedAppOptimizer { } } - // This method returns true only if requirements are met. Note, that requirements are different - // from throttles applied at the time a compaction is trying to be executed in the sense that - // these are not subject to change dependent on time or memory as throttles usually do. - @GuardedBy("mProcLock") - boolean meetsCompactionRequirements(ProcessRecord proc) { - if (mAm.mInternal.isPendingTopUid(proc.uid)) { - // In case the OOM Adjust has not yet been propagated we see if this is - // pending on becoming top app in which case we should not compact. - if (DEBUG_COMPACTION) { - Slog.d(TAG_AM, "Skip compaction since UID is active for " + proc.processName); - } - return false; - } - - if (proc.mState.hasForegroundActivities()) { - if (DEBUG_COMPACTION) { - Slog.e(TAG_AM, - "Skip compaction as process " + proc.processName - + " has foreground activities"); - } - return false; - } - - return true; - } - @GuardedBy("mProcLock") boolean compactApp( ProcessRecord app, CompactProfile compactProfile, CompactSource source, boolean force) { @@ -777,7 +750,7 @@ public final class CachedAppOptimizer { return false; } - if (!app.mOptRecord.hasPendingCompact() && (meetsCompactionRequirements(app) || force)) { + if (!app.mOptRecord.hasPendingCompact()) { final String processName = (app.processName != null ? app.processName : ""); if (DEBUG_COMPACTION) { Slog.d(TAG_AM, @@ -795,8 +768,7 @@ public final class CachedAppOptimizer { if (DEBUG_COMPACTION) { Slog.d(TAG_AM, " compactApp Skipped for " + app.processName + " pendingCompact= " - + app.mOptRecord.hasPendingCompact() + " meetsCompactionRequirements=" - + meetsCompactionRequirements(app) + ". Requested compact profile: " + + app.mOptRecord.hasPendingCompact() + ". Requested compact profile: " + app.mOptRecord.getReqCompactProfile().name() + ". Compact source " + app.mOptRecord.getReqCompactSource().name()); } @@ -831,18 +803,6 @@ public final class CachedAppOptimizer { return stats; } - @GuardedBy("mProcLock") - boolean shouldCompactPersistent(ProcessRecord app, long now) { - return (app.mOptRecord.getLastCompactTime() == 0 - || (now - app.mOptRecord.getLastCompactTime()) > mCompactThrottlePersistent); - } - - @GuardedBy("mProcLock") - boolean shouldCompactBFGS(ProcessRecord app, long now) { - return (app.mOptRecord.getLastCompactTime() == 0 - || (now - app.mOptRecord.getLastCompactTime()) > mCompactThrottleBFGS); - } - void compactAllSystem() { if (useCompaction()) { if (DEBUG_COMPACTION) { @@ -1130,8 +1090,6 @@ public final class CachedAppOptimizer { mCompactThrottleSomeFull = Integer.parseInt(throttleSomeFullFlag); mCompactThrottleFullSome = Integer.parseInt(throttleFullSomeFlag); mCompactThrottleFullFull = Integer.parseInt(throttleFullFullFlag); - mCompactThrottleBFGS = Integer.parseInt(throttleBFGSFlag); - mCompactThrottlePersistent = Integer.parseInt(throttlePersistentFlag); mCompactThrottleMinOomAdj = Long.parseLong(throttleMinOomAdjFlag); mCompactThrottleMaxOomAdj = Long.parseLong(throttleMaxOomAdjFlag); } catch (NumberFormatException e) { @@ -1144,8 +1102,6 @@ public final class CachedAppOptimizer { mCompactThrottleSomeFull = DEFAULT_COMPACT_THROTTLE_2; mCompactThrottleFullSome = DEFAULT_COMPACT_THROTTLE_3; mCompactThrottleFullFull = DEFAULT_COMPACT_THROTTLE_4; - mCompactThrottleBFGS = DEFAULT_COMPACT_THROTTLE_5; - mCompactThrottlePersistent = DEFAULT_COMPACT_THROTTLE_6; mCompactThrottleMinOomAdj = DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ; mCompactThrottleMaxOomAdj = DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ; } @@ -1280,6 +1236,17 @@ public final class CachedAppOptimizer { return; } + if (mAm.mConstants.USE_MODERN_TRIM + && app.mState.getSetAdj() >= ProcessList.CACHED_APP_MIN_ADJ) { + final IApplicationThread thread = app.getThread(); + if (thread != null) { + try { + thread.scheduleTrimMemory(TRIM_MEMORY_BACKGROUND); + } catch (RemoteException e) { + // do nothing + } + } + } mFreezeHandler.sendMessageDelayed( mFreezeHandler.obtainMessage( SET_FROZEN_PROCESS_MSG, DO_FREEZE, 0, app), @@ -1497,23 +1464,23 @@ public final class CachedAppOptimizer { @GuardedBy({"mService", "mProcLock"}) void onOomAdjustChanged(int oldAdj, int newAdj, ProcessRecord app) { - // Cancel any currently executing compactions - // if the process moved out of cached state - if (newAdj < oldAdj && newAdj < ProcessList.CACHED_APP_MIN_ADJ) { - cancelCompactionForProcess(app, CancelCompactReason.OOM_IMPROVEMENT); + if (useCompaction()) { + // Cancel any currently executing compactions + // if the process moved out of cached state + if (newAdj < oldAdj && newAdj < ProcessList.CACHED_APP_MIN_ADJ) { + cancelCompactionForProcess(app, CancelCompactReason.OOM_IMPROVEMENT); + } } + } - if (oldAdj <= ProcessList.PERCEPTIBLE_APP_ADJ - && (newAdj == ProcessList.PREVIOUS_APP_ADJ || newAdj == ProcessList.HOME_APP_ADJ)) { - if (ENABLE_FILE_COMPACT) { - // Perform a minor compaction when a perceptible app becomes the prev/home app - compactApp(app, CompactProfile.SOME, CompactSource.APP, false); + /** + * Callback received after a process has been frozen. + */ + void onProcessFrozen(ProcessRecord frozenProc) { + if (useCompaction()) { + synchronized (mProcLock) { + compactApp(frozenProc, CompactProfile.FULL, CompactSource.APP, false); } - } else if (oldAdj < ProcessList.CACHED_APP_MIN_ADJ - && newAdj >= ProcessList.CACHED_APP_MIN_ADJ - && newAdj <= ProcessList.CACHED_APP_MAX_ADJ) { - // Perform a major compaction when any app enters cached - compactApp(app, CompactProfile.FULL, CompactSource.APP, false); } } @@ -1687,26 +1654,6 @@ public final class CachedAppOptimizer { return true; } } - } else if (source == CompactSource.PERSISTENT) { - if (start - lastCompactTime < mCompactThrottlePersistent) { - if (DEBUG_COMPACTION) { - Slog.d(TAG_AM, - "Skipping persistent compaction for " + name - + ": too soon. throttle=" + mCompactThrottlePersistent - + " last=" + (start - lastCompactTime) + "ms ago"); - } - return true; - } - } else if (source == CompactSource.BFGS) { - if (start - lastCompactTime < mCompactThrottleBFGS) { - if (DEBUG_COMPACTION) { - Slog.d(TAG_AM, - "Skipping bfgs compaction for " + name - + ": too soon. throttle=" + mCompactThrottleBFGS - + " last=" + (start - lastCompactTime) + "ms ago"); - } - return true; - } } } @@ -2002,26 +1949,15 @@ public final class CachedAppOptimizer { public void handleMessage(Message msg) { switch (msg.what) { case SET_FROZEN_PROCESS_MSG: - { ProcessRecord proc = (ProcessRecord) msg.obj; - int pid = proc.getPid(); - final String name = proc.processName; synchronized (mAm) { freezeProcess(proc); } - try { - // post-check to prevent deadlock - mProcLocksReader.handleBlockingFileLocks(this); - } catch (Exception e) { - Slog.e(TAG_AM, "Unable to check file locks for " - + name + "(" + pid + "): " + e); - synchronized (mAm) { - synchronized (mProcLock) { - unfreezeAppLSP(proc, UNFREEZE_REASON_FILE_LOCK_CHECK_FAILURE); - } - } + if (proc.mOptRecord.isFrozen()) { + onProcessFrozen(proc); + removeMessages(DEADLOCK_WATCHDOG_MSG); + sendEmptyMessageDelayed(DEADLOCK_WATCHDOG_MSG, FREEZE_DEADLOCK_TIMEOUT_MS); } - } break; case REPORT_UNFREEZE_MSG: int pid = msg.arg1; @@ -2033,8 +1969,18 @@ public final class CachedAppOptimizer { reportUnfreeze(pid, frozenDuration, processName, reason); break; case UID_FROZEN_STATE_CHANGED_MSG: - ProcessRecord proc = (ProcessRecord) msg.obj; - reportOneUidFrozenStateChanged(proc.uid, true); + reportOneUidFrozenStateChanged(((ProcessRecord) msg.obj).uid, true); + break; + case DEADLOCK_WATCHDOG_MSG: + try { + // post-check to prevent deadlock + if (DEBUG_FREEZER) { + Slog.d(TAG_AM, "Freezer deadlock watchdog"); + } + mProcLocksReader.handleBlockingFileLocks(this); + } catch (IOException e) { + Slog.w(TAG_AM, "Unable to check file locks"); + } break; default: return; @@ -2050,6 +1996,10 @@ public final class CachedAppOptimizer { freezeAppAsyncLSP(proc); } + /** + * Freeze a process. + * @param proc process to be frozen + */ @GuardedBy({"mAm"}) private void freezeProcess(final ProcessRecord proc) { int pid = proc.getPid(); // Unlocked intentionally @@ -2083,6 +2033,10 @@ public final class CachedAppOptimizer { if (pid == 0 || opt.isFrozen()) { // Already frozen or not a real process, either one being // launched or one being killed + if (DEBUG_FREEZER) { + Slog.d(TAG_AM, "Skipping freeze for process " + pid + + " " + name + ". Already frozen or not a real process"); + } return; } diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags index 81b242155bac..9e9db6aff699 100644 --- a/services/core/java/com/android/server/am/EventLogTags.logtags +++ b/services/core/java/com/android/server/am/EventLogTags.logtags @@ -121,10 +121,11 @@ option java_package com.android.server.am # Similarly, tags below are used by UserManagerService 30091 um_user_visibility_changed (userId|1|5),(visible|1) -# Foreground service start/stop events. +# Foreground service start/stop/denied/timed_out events. 30100 am_foreground_service_start (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) 30101 am_foreground_service_denied (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) 30102 am_foreground_service_stop (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) +30103 am_foreground_service_timed_out (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) # Intent Sender redirect for UserHandle.USER_CURRENT 30110 am_intent_sender_redirect_user (userId|1|5) diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index a86c02d4b826..a98571b68067 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -2937,30 +2937,8 @@ public class OomAdjuster { int changes = 0; - // don't compact during bootup - if (mCachedAppOptimizer.useCompaction() && mService.mBooted) { - // Cached and prev/home compaction - // reminder: here, setAdj is previous state, curAdj is upcoming state - if (state.getCurAdj() != state.getSetAdj()) { - mCachedAppOptimizer.onOomAdjustChanged(state.getSetAdj(), state.getCurAdj(), app); - } else if (mService.mWakefulness.get() != PowerManagerInternal.WAKEFULNESS_AWAKE) { - // See if we can compact persistent and bfgs services now that screen is off - if (state.getSetAdj() < FOREGROUND_APP_ADJ - && !state.isRunningRemoteAnimation() - // Because these can fire independent of oom_adj/procstate changes, we need - // to throttle the actual dispatch of these requests in addition to the - // processing of the requests. As a result, there is throttling both here - // and in CachedAppOptimizer. - && mCachedAppOptimizer.shouldCompactPersistent(app, now)) { - mCachedAppOptimizer.compactApp(app, CachedAppOptimizer.CompactProfile.FULL, - CachedAppOptimizer.CompactSource.PERSISTENT, false); - } else if (state.getCurProcState() - == ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE - && mCachedAppOptimizer.shouldCompactBFGS(app, now)) { - mCachedAppOptimizer.compactApp(app, CachedAppOptimizer.CompactProfile.FULL, - CachedAppOptimizer.CompactSource.BFGS, false); - } - } + if (state.getCurAdj() != state.getSetAdj()) { + mCachedAppOptimizer.onOomAdjustChanged(state.getSetAdj(), state.getCurAdj(), app); } if (state.getCurAdj() != state.getSetAdj()) { diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index b26a1705b309..b1322ef510d5 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -70,7 +70,7 @@ import android.app.ApplicationExitInfo.Reason; import android.app.ApplicationExitInfo.SubReason; import android.app.IApplicationThread; import android.app.IProcessObserver; -import android.app.IUidObserver; +import android.app.UidObserver; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; import android.content.BroadcastReceiver; @@ -5281,7 +5281,7 @@ public final class ProcessList { return new Pair<>(numForegroundServices, procs); } - private final class ImperceptibleKillRunner extends IUidObserver.Stub { + private final class ImperceptibleKillRunner extends UidObserver { private static final String EXTRA_PID = "pid"; private static final String EXTRA_UID = "uid"; private static final String EXTRA_TIMESTAMP = "timestamp"; @@ -5537,24 +5537,8 @@ public final class ProcessList { } @Override - public void onUidActive(int uid) { - } - - @Override - public void onUidIdle(int uid, boolean disabled) { - } - - @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { mHandler.obtainMessage(H.MSG_UID_STATE_CHANGED, uid, procState).sendToTarget(); } - - @Override - public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override - public void onUidProcAdjChanged(int uid) { - } }; } diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index e651e23a5318..afae623cd217 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -16,10 +16,13 @@ package com.android.server.am; +import static com.android.internal.util.Preconditions.checkArgument; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.am.ActivityManagerService.MY_PID; +import static java.util.Objects.requireNonNull; + import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; @@ -63,7 +66,6 @@ import com.android.server.wm.WindowProcessListener; import java.io.PrintWriter; import java.util.Arrays; import java.util.List; -import java.util.Objects; /** * Full information about a particular process that @@ -1350,16 +1352,19 @@ class ProcessRecord implements WindowProcessListener { * {@param originatingToken} if you have one such originating token, this is useful for tracing * back the grant in the case of the notification token. */ - void addOrUpdateBackgroundStartPrivileges(Binder entity, - BackgroundStartPrivileges backgroundStartPrivileges) { - Objects.requireNonNull(entity); + void addOrUpdateBackgroundStartPrivileges(@NonNull Binder entity, + @NonNull BackgroundStartPrivileges backgroundStartPrivileges) { + requireNonNull(entity, "entity"); + requireNonNull(backgroundStartPrivileges, "backgroundStartPrivileges"); + checkArgument(backgroundStartPrivileges.allowsAny(), + "backgroundStartPrivileges does not allow anything"); mWindowProcessController.addOrUpdateBackgroundStartPrivileges(entity, backgroundStartPrivileges); setBackgroundStartPrivileges(entity, backgroundStartPrivileges); } - void removeBackgroundStartPrivileges(Binder entity) { - Objects.requireNonNull(entity); + void removeBackgroundStartPrivileges(@NonNull Binder entity) { + requireNonNull(entity, "entity"); mWindowProcessController.removeBackgroundStartPrivileges(entity); setBackgroundStartPrivileges(entity, null); } diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index 18ef66febe89..edf0dbd65ef2 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -850,10 +850,11 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN mAppForAllowingBgActivityStartsByStart = mBackgroundStartPrivilegesByStartMerged.allowsAny() ? proc : null; - if (mBackgroundStartPrivilegesByStartMerged.allowsAny() - || mIsAllowedBgActivityStartsByBinding) { + BackgroundStartPrivileges backgroundStartPrivileges = + getBackgroundStartPrivilegesWithExclusiveToken(); + if (backgroundStartPrivileges.allowsAny()) { proc.addOrUpdateBackgroundStartPrivileges(this, - getBackgroundStartPrivilegesWithExclusiveToken()); + backgroundStartPrivileges); } else { proc.removeBackgroundStartPrivileges(this); } diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 60a7f9371837..22e2c9fd889b 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -83,6 +83,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_CAMERA_NATIVE, DeviceConfig.NAMESPACE_CONFIGURATION, DeviceConfig.NAMESPACE_CONNECTIVITY, + DeviceConfig.NAMESPACE_EDGETPU_NATIVE, DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT, DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS, DeviceConfig.NAMESPACE_LMKD_NATIVE, diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java index 893c8b5d2698..d369af608d31 100644 --- a/services/core/java/com/android/server/app/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -40,8 +40,8 @@ import android.app.GameModeInfo; import android.app.GameState; import android.app.IGameManagerService; import android.app.IGameModeListener; -import android.app.IUidObserver; import android.app.StatsManager; +import android.app.UidObserver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -169,7 +169,7 @@ public final class GameManagerService extends IGameManagerService.Stub { private final Object mUidObserverLock = new Object(); @VisibleForTesting @Nullable - final UidObserver mUidObserver; + final MyUidObserver mUidObserver; @GuardedBy("mUidObserverLock") private final Set<Integer> mForegroundGameUids = new HashSet<>(); @@ -209,7 +209,7 @@ public final class GameManagerService extends IGameManagerService.Stub { } else { mGameServiceController = null; } - mUidObserver = new UidObserver(); + mUidObserver = new MyUidObserver(); try { ActivityManager.getService().registerUidObserver(mUidObserver, ActivityManager.UID_OBSERVER_PROCSTATE | ActivityManager.UID_OBSERVER_GONE, @@ -2143,10 +2143,7 @@ public final class GameManagerService extends IGameManagerService.Stub { */ private static native void nativeSetOverrideFrameRate(int uid, float frameRate); - final class UidObserver extends IUidObserver.Stub { - @Override - public void onUidIdle(int uid, boolean disabled) {} - + final class MyUidObserver extends UidObserver { @Override public void onUidGone(int uid, boolean disabled) { synchronized (mUidObserverLock) { @@ -2155,9 +2152,6 @@ public final class GameManagerService extends IGameManagerService.Stub { } @Override - public void onUidActive(int uid) {} - - @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { synchronized (mUidObserverLock) { if (ActivityManager.isProcStateBackground(procState)) { @@ -2197,11 +2191,5 @@ public final class GameManagerService extends IGameManagerService.Stub { mPowerManagerInternal.setPowerMode(Mode.GAME, false); } } - - @Override - public void onUidCachedChanged(int uid, boolean cached) {} - - @Override - public void onUidProcAdjChanged(int uid) {} } } diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index d43687be6128..ac55f28a8ab0 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -51,6 +51,7 @@ import android.app.AppOpsManager; import android.app.BroadcastOptions; import android.app.IUidObserver; import android.app.NotificationManager; +import android.app.UidObserver; import android.app.role.OnRoleHoldersChangedListener; import android.app.role.RoleManager; import android.bluetooth.BluetoothAdapter; @@ -959,29 +960,16 @@ public class AudioService extends IAudioService.Stub } } - final private IUidObserver mUidObserver = new IUidObserver.Stub() { - @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, - int capability) { - } - + final private IUidObserver mUidObserver = new UidObserver() { @Override public void onUidGone(int uid, boolean disabled) { // Once the uid is no longer running, no need to keep trying to disable its audio. disableAudioForUid(false, uid); } - @Override public void onUidActive(int uid) throws RemoteException { - } - - @Override public void onUidIdle(int uid, boolean disabled) { - } - @Override public void onUidCachedChanged(int uid, boolean cached) { disableAudioForUid(cached, uid); } - @Override public void onUidProcAdjChanged(int uid) { - } - private void disableAudioForUid(boolean disable, int uid) { queueMsgUnderWakeLock(mAudioHandler, MSG_DISABLE_AUDIO_FOR_UID, disable ? 1 : 0 /* arg1 */, uid /* arg2 */, @@ -7545,6 +7533,7 @@ public class AudioService extends IAudioService.Stub DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.add(AudioSystem.DEVICE_OUT_WIRED_HEADPHONE); DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.add(AudioSystem.DEVICE_OUT_LINE); DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.addAll(AudioSystem.DEVICE_OUT_ALL_A2DP_SET); + DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.addAll(AudioSystem.DEVICE_OUT_ALL_BLE_SET); DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.addAll(AudioSystem.DEVICE_OUT_ALL_USB_SET); DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.add(AudioSystem.DEVICE_OUT_HDMI); } diff --git a/services/core/java/com/android/server/biometrics/BiometricSensor.java b/services/core/java/com/android/server/biometrics/BiometricSensor.java index 937e3f8f8668..bac44809883f 100644 --- a/services/core/java/com/android/server/biometrics/BiometricSensor.java +++ b/services/core/java/com/android/server/biometrics/BiometricSensor.java @@ -22,14 +22,20 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.content.Context; import android.hardware.biometrics.BiometricConstants; +import android.hardware.biometrics.ComponentInfoInternal; import android.hardware.biometrics.IBiometricAuthenticator; import android.hardware.biometrics.IBiometricSensorReceiver; +import android.hardware.biometrics.SensorPropertiesInternal; import android.os.IBinder; import android.os.RemoteException; +import android.text.TextUtils; +import android.util.IndentingPrintWriter; import android.util.Slog; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Collections; +import java.util.List; /** * Wraps IBiometricAuthenticator implementation and stores information about the authenticator, @@ -67,6 +73,7 @@ public abstract class BiometricSensor { public final int id; public final @Authenticators.Types int oemStrength; // strength as configured by the OEM public final int modality; + @NonNull public final List<ComponentInfoInternal> componentInfo; public final IBiometricAuthenticator impl; private @Authenticators.Types int mUpdatedStrength; // updated by BiometricStrengthController @@ -86,15 +93,16 @@ public abstract class BiometricSensor { */ abstract boolean confirmationSupported(); - BiometricSensor(@NonNull Context context, int id, int modality, - @Authenticators.Types int strength, IBiometricAuthenticator impl) { + BiometricSensor(@NonNull Context context, int modality, @NonNull SensorPropertiesInternal props, + IBiometricAuthenticator impl) { this.mContext = context; - this.id = id; + this.id = props.sensorId; this.modality = modality; - this.oemStrength = strength; + this.oemStrength = Utils.propertyStrengthToAuthenticatorStrength(props.sensorStrength); + this.componentInfo = Collections.unmodifiableList(props.componentInfo); this.impl = impl; - mUpdatedStrength = strength; + mUpdatedStrength = oemStrength; goToStateUnknown(); } @@ -178,8 +186,25 @@ public abstract class BiometricSensor { return "ID(" + id + ")" + ", oemStrength: " + oemStrength + ", updatedStrength: " + mUpdatedStrength - + ", modality " + modality + + ", modality: " + modality + ", state: " + mSensorState + ", cookie: " + mCookie; } + + protected void dump(@NonNull IndentingPrintWriter pw) { + pw.println(TextUtils.formatSimple("ID: %d", id)); + pw.increaseIndent(); + pw.println(TextUtils.formatSimple("oemStrength: %d", oemStrength)); + pw.println(TextUtils.formatSimple("updatedStrength: %d", mUpdatedStrength)); + pw.println(TextUtils.formatSimple("modality: %d", modality)); + pw.println("componentInfo:"); + for (ComponentInfoInternal info : componentInfo) { + pw.increaseIndent(); + info.dump(pw); + pw.decreaseIndent(); + } + pw.println(TextUtils.formatSimple("state: %d", mSensorState)); + pw.println(TextUtils.formatSimple("cookie: %d", mCookie)); + pw.decreaseIndent(); + } } diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java index ffa5d2055e92..f44d14bfa12c 100644 --- a/services/core/java/com/android/server/biometrics/BiometricService.java +++ b/services/core/java/com/android/server/biometrics/BiometricService.java @@ -62,6 +62,7 @@ import android.provider.Settings; import android.security.KeyStore; import android.text.TextUtils; import android.util.ArraySet; +import android.util.IndentingPrintWriter; import android.util.Pair; import android.util.Slog; import android.util.proto.ProtoOutputStream; @@ -638,13 +639,16 @@ public class BiometricService extends SystemService { @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL) @Override - public synchronized void registerAuthenticator(int id, int modality, - @Authenticators.Types int strength, + public synchronized void registerAuthenticator(int modality, + @NonNull SensorPropertiesInternal props, @NonNull IBiometricAuthenticator authenticator) { super.registerAuthenticator_enforcePermission(); - Slog.d(TAG, "Registering ID: " + id + @Authenticators.Types final int strength = + Utils.propertyStrengthToAuthenticatorStrength(props.sensorStrength); + + Slog.d(TAG, "Registering ID: " + props.sensorId + " Modality: " + modality + " Strength: " + strength); @@ -665,12 +669,12 @@ public class BiometricService extends SystemService { } for (BiometricSensor sensor : mSensors) { - if (sensor.id == id) { + if (sensor.id == props.sensorId) { throw new IllegalStateException("Cannot register duplicate authenticator"); } } - mSensors.add(new BiometricSensor(getContext(), id, modality, strength, authenticator) { + mSensors.add(new BiometricSensor(getContext(), modality, props, authenticator) { @Override boolean confirmationAlwaysRequired(int userId) { return mSettingObserver.getConfirmationAlwaysRequired(modality, userId); @@ -1360,13 +1364,17 @@ public class BiometricService extends SystemService { return null; } - private void dumpInternal(PrintWriter pw) { + private void dumpInternal(PrintWriter printWriter) { + IndentingPrintWriter pw = new IndentingPrintWriter(printWriter); + pw.println("Legacy Settings: " + mSettingObserver.mUseLegacyFaceOnlySettings); pw.println(); pw.println("Sensors:"); for (BiometricSensor sensor : mSensors) { - pw.println(" " + sensor); + pw.increaseIndent(); + sensor.dump(pw); + pw.decreaseIndent(); } pw.println(); pw.println("CurrentSession: " + mAuthSession); diff --git a/services/core/java/com/android/server/biometrics/log/BiometricContext.java b/services/core/java/com/android/server/biometrics/log/BiometricContext.java index 79ce6b48e2e7..3dcea19b6077 100644 --- a/services/core/java/com/android/server/biometrics/log/BiometricContext.java +++ b/services/core/java/com/android/server/biometrics/log/BiometricContext.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.hardware.biometrics.AuthenticateOptions; +import android.hardware.biometrics.IBiometricContextListener; import android.hardware.biometrics.common.OperationContext; import android.view.Surface; @@ -65,6 +66,7 @@ public interface BiometricContext { * Current fold state from * {@link android.hardware.biometrics.IBiometricContextListener.FoldState}. */ + @IBiometricContextListener.FoldState int getFoldState(); /** Current device display rotation. */ diff --git a/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java b/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java index dea8030fe6f8..21ade1bbbc4a 100644 --- a/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java +++ b/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java @@ -84,8 +84,6 @@ public final class BiometricContextProvider implements BiometricContext { private final AuthSessionCoordinator mAuthSessionCoordinator; private final WindowManager mWindowManager; @Nullable private final Handler mHandler; - private boolean mIsAod = false; - private boolean mIsAwake = false; private int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED; private int mFoldState = IBiometricContextListener.FoldState.UNKNOWN; @@ -117,16 +115,6 @@ public final class BiometricContextProvider implements BiometricContext { try { service.setBiometicContextListener(new IBiometricContextListener.Stub() { @Override - public void onDozeChanged(boolean isAod, boolean isAwake) { - final boolean changed = (mIsAod != isAod) || (mIsAwake != isAwake); - if (changed) { - mIsAod = isAod; - mIsAwake = isAwake; - notifyChanged(); - } - } - - @Override public void onFoldChanged(int foldState) { mFoldState = foldState; // no need to notify, not sent to HAL @@ -185,12 +173,18 @@ public final class BiometricContextProvider implements BiometricContext { @Override public boolean isAod() { - return mIsAod; + return mDisplayState == AuthenticateOptions.DISPLAY_STATE_AOD; } @Override public boolean isAwake() { - return mIsAwake; + switch (mDisplayState) { + case AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN: + case AuthenticateOptions.DISPLAY_STATE_SCREENSAVER: + case AuthenticateOptions.DISPLAY_STATE_UNKNOWN: + return true; + } + return false; } @Override @@ -252,7 +246,7 @@ public final class BiometricContextProvider implements BiometricContext { public String toString() { return "[keyguard session: " + getKeyguardEntrySessionInfo() + ", " + "bp session: " + getBiometricPromptSessionInfo() + ", " - + "isAod: " + isAod() + ", " + + "displayState: " + getDisplayState() + ", " + "isAwake: " + isAwake() + ", " + "isDisplayOn: " + isDisplayOn() + ", " + "dock: " + getDockedState() + ", " diff --git a/services/core/java/com/android/server/biometrics/log/OperationContextExt.java b/services/core/java/com/android/server/biometrics/log/OperationContextExt.java index 293433990cbd..d1de80b4761d 100644 --- a/services/core/java/com/android/server/biometrics/log/OperationContextExt.java +++ b/services/core/java/com/android/server/biometrics/log/OperationContextExt.java @@ -19,8 +19,10 @@ package com.android.server.biometrics.log; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Intent; +import android.hardware.biometrics.AuthenticateOptions; import android.hardware.biometrics.IBiometricContextListener; import android.hardware.biometrics.common.AuthenticateReason; +import android.hardware.biometrics.common.DisplayState; import android.hardware.biometrics.common.OperationContext; import android.hardware.biometrics.common.OperationReason; import android.hardware.biometrics.common.WakeReason; @@ -204,11 +206,17 @@ public class OperationContextExt { return mIsDisplayOn; } - /** {@link OperationContext#isAod}. */ + /** @deprecated prefer {@link #getDisplayState()} to {@link OperationContext#isAod}. */ public boolean isAod() { return mAidlContext.isAod; } + /** {@link OperationContext#displayState}. */ + @DisplayState + public int getDisplayState() { + return mAidlContext.displayState; + } + /** {@link OperationContext#isCrypto}. */ public boolean isCrypto() { return mAidlContext.isCrypto; @@ -233,6 +241,7 @@ public class OperationContextExt { /** Update this object with the latest values from the given context. */ OperationContextExt update(@NonNull BiometricContext biometricContext) { mAidlContext.isAod = biometricContext.isAod(); + mAidlContext.displayState = toAidlDisplayState(biometricContext.getDisplayState()); setFirstSessionId(biometricContext); mIsDisplayOn = biometricContext.isDisplayOn(); @@ -243,6 +252,21 @@ public class OperationContextExt { return this; } + @DisplayState + private static int toAidlDisplayState(@AuthenticateOptions.DisplayState int state) { + switch (state) { + case AuthenticateOptions.DISPLAY_STATE_AOD: + return DisplayState.AOD; + case AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN: + return DisplayState.LOCKSCREEN; + case AuthenticateOptions.DISPLAY_STATE_NO_UI: + return DisplayState.NO_UI; + case AuthenticateOptions.DISPLAY_STATE_SCREENSAVER: + return DisplayState.SCREENSAVER; + } + return DisplayState.UNKNOWN; + } + private void setFirstSessionId(@NonNull BiometricContext biometricContext) { mSessionInfo = biometricContext.getKeyguardEntrySessionInfo(); if (mSessionInfo != null) { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceServiceRegistry.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceServiceRegistry.java index 0f0a81d24473..d43045b4450f 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceServiceRegistry.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceServiceRegistry.java @@ -20,7 +20,6 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.IBiometricService; import android.hardware.face.FaceSensorPropertiesInternal; import android.hardware.face.IFaceAuthenticatorsRegisteredCallback; @@ -28,7 +27,6 @@ import android.hardware.face.IFaceService; import android.os.RemoteException; import android.util.Slog; -import com.android.server.biometrics.Utils; import com.android.server.biometrics.sensors.BiometricServiceRegistry; import java.util.List; @@ -53,10 +51,8 @@ public class FaceServiceRegistry extends BiometricServiceRegistry<ServiceProvide @Override protected void registerService(@NonNull IBiometricService service, @NonNull FaceSensorPropertiesInternal props) { - @BiometricManager.Authenticators.Types final int strength = - Utils.propertyStrengthToAuthenticatorStrength(props.sensorStrength); try { - service.registerAuthenticator(props.sensorId, TYPE_FACE, strength, + service.registerAuthenticator(TYPE_FACE, props, new FaceAuthenticator(mService, props.sensorId)); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when registering sensorId: " + props.sensorId); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java index 84e2fb4a5966..7ae31b2a114d 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java @@ -40,6 +40,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.server.biometrics.Utils; import com.android.server.biometrics.log.BiometricContext; import com.android.server.biometrics.log.BiometricLogger; +import com.android.server.biometrics.log.OperationContextExt; import com.android.server.biometrics.sensors.AuthSessionCoordinator; import com.android.server.biometrics.sensors.AuthenticationClient; import com.android.server.biometrics.sensors.BiometricNotificationUtils; @@ -165,8 +166,17 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut final AidlSession session = getFreshDaemon(); if (session.hasContextMethods()) { - return session.getSession().authenticateWithContext( - mOperationId, getOperationContext().toAidlContext(getOptions())); + final OperationContextExt opContext = getOperationContext(); + final ICancellationSignal cancel = session.getSession().authenticateWithContext( + mOperationId, opContext.toAidlContext(getOptions())); + getBiometricContext().subscribe(opContext, ctx -> { + try { + session.getSession().onContextChanged(ctx); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to notify context changed", e); + } + }); + return cancel; } else { return session.getSession().authenticate(mOperationId); } @@ -174,6 +184,8 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut @Override protected void stopHalOperation() { + unsubscribeBiometricContext(); + if (mCancellationSignal != null) { try { mCancellationSignal.cancel(); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java index fa23ccd482fb..9dc1782cea6f 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java @@ -31,6 +31,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.server.biometrics.BiometricsProto; import com.android.server.biometrics.log.BiometricContext; import com.android.server.biometrics.log.BiometricLogger; +import com.android.server.biometrics.log.OperationContextExt; import com.android.server.biometrics.sensors.AcquisitionClient; import com.android.server.biometrics.sensors.ClientMonitorCallback; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; @@ -86,6 +87,8 @@ public class FaceDetectClient extends AcquisitionClient<AidlSession> implements @Override protected void stopHalOperation() { + unsubscribeBiometricContext(); + if (mCancellationSignal != null) { try { mCancellationSignal.cancel(); @@ -119,8 +122,17 @@ public class FaceDetectClient extends AcquisitionClient<AidlSession> implements final AidlSession session = getFreshDaemon(); if (session.hasContextMethods()) { - return session.getSession().detectInteractionWithContext( - getOperationContext().toAidlContext(mOptions)); + final OperationContextExt opContext = getOperationContext(); + final ICancellationSignal cancel = session.getSession().detectInteractionWithContext( + opContext.toAidlContext(mOptions)); + getBiometricContext().subscribe(opContext, ctx -> { + try { + session.getSession().onContextChanged(ctx); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to notify context changed", e); + } + }); + return cancel; } else { return session.getSession().detectInteraction(); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java index 792b52e7d658..722c9afbeaf8 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java @@ -39,6 +39,7 @@ import com.android.server.biometrics.HardwareAuthTokenUtils; import com.android.server.biometrics.Utils; import com.android.server.biometrics.log.BiometricContext; import com.android.server.biometrics.log.BiometricLogger; +import com.android.server.biometrics.log.OperationContextExt; import com.android.server.biometrics.sensors.BaseClientMonitor; import com.android.server.biometrics.sensors.BiometricNotificationUtils; import com.android.server.biometrics.sensors.BiometricUtils; @@ -198,9 +199,18 @@ public class FaceEnrollClient extends EnrollClient<AidlSession> { HardwareAuthTokenUtils.toHardwareAuthToken(mHardwareAuthToken); if (session.hasContextMethods()) { - return session.getSession().enrollWithContext( + final OperationContextExt opContext = getOperationContext(); + final ICancellationSignal cancel = session.getSession().enrollWithContext( hat, EnrollmentType.DEFAULT, features, mHwPreviewHandle, - getOperationContext().toAidlContext()); + opContext.toAidlContext()); + getBiometricContext().subscribe(opContext, ctx -> { + try { + session.getSession().onContextChanged(ctx); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to notify context changed", e); + } + }); + return cancel; } else { return session.getSession().enroll(hat, EnrollmentType.DEFAULT, features, mHwPreviewHandle); @@ -209,6 +219,8 @@ public class FaceEnrollClient extends EnrollClient<AidlSession> { @Override protected void stopHalOperation() { + unsubscribeBiometricContext(); + if (mCancellationSignal != null) { try { mCancellationSignal.cancel(); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistry.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistry.java index 33810b764f23..6d210eac542b 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistry.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistry.java @@ -20,7 +20,6 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRIN import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.IBiometricService; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback; @@ -28,7 +27,6 @@ import android.hardware.fingerprint.IFingerprintService; import android.os.RemoteException; import android.util.Slog; -import com.android.server.biometrics.Utils; import com.android.server.biometrics.sensors.BiometricServiceRegistry; import java.util.List; @@ -53,10 +51,8 @@ public class FingerprintServiceRegistry extends BiometricServiceRegistry<Service @Override protected void registerService(@NonNull IBiometricService service, @NonNull FingerprintSensorPropertiesInternal props) { - @BiometricManager.Authenticators.Types final int strength = - Utils.propertyStrengthToAuthenticatorStrength(props.sensorStrength); try { - service.registerAuthenticator(props.sensorId, TYPE_FINGERPRINT, strength, + service.registerAuthenticator(TYPE_FINGERPRINT, props, new FingerprintAuthenticator(mService, props.sensorId)); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when registering sensorId: " + props.sensorId); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index 435e81d688bd..2bfc2391b948 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -262,6 +262,14 @@ class FingerprintAuthenticationClient final AidlSession session = getFreshDaemon(); final OperationContextExt opContext = getOperationContext(); + final ICancellationSignal cancel; + if (session.hasContextMethods()) { + cancel = session.getSession().authenticateWithContext( + mOperationId, opContext.toAidlContext(getOptions())); + } else { + cancel = session.getSession().authenticate(mOperationId); + } + getBiometricContext().subscribe(opContext, ctx -> { if (session.hasContextMethods()) { try { @@ -283,12 +291,7 @@ class FingerprintAuthenticationClient mALSProbeCallback.getProbe().enable(); } - if (session.hasContextMethods()) { - return session.getSession().authenticateWithContext( - mOperationId, opContext.toAidlContext(getOptions())); - } else { - return session.getSession().authenticate(mOperationId); - } + return cancel; } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java index 16d16fc95c5b..46f62d38b03e 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java @@ -31,6 +31,7 @@ import android.util.Slog; import com.android.server.biometrics.BiometricsProto; import com.android.server.biometrics.log.BiometricContext; import com.android.server.biometrics.log.BiometricLogger; +import com.android.server.biometrics.log.OperationContextExt; import com.android.server.biometrics.sensors.AcquisitionClient; import com.android.server.biometrics.sensors.ClientMonitorCallback; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; @@ -79,12 +80,15 @@ class FingerprintDetectClient extends AcquisitionClient<AidlSession> implements @Override protected void stopHalOperation() { mSensorOverlays.hide(getSensorId()); - - try { - mCancellationSignal.cancel(); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception", e); - mCallback.onClientFinished(this, false /* success */); + unsubscribeBiometricContext(); + + if (mCancellationSignal != null) { + try { + mCancellationSignal.cancel(); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception", e); + mCallback.onClientFinished(this, false /* success */); + } } } @@ -106,8 +110,17 @@ class FingerprintDetectClient extends AcquisitionClient<AidlSession> implements final AidlSession session = getFreshDaemon(); if (session.hasContextMethods()) { - return session.getSession().detectInteractionWithContext( - getOperationContext().toAidlContext(mOptions)); + final OperationContextExt opContext = getOperationContext(); + final ICancellationSignal cancel = session.getSession().detectInteractionWithContext( + opContext.toAidlContext(mOptions)); + getBiometricContext().subscribe(opContext, ctx -> { + try { + session.getSession().onContextChanged(ctx); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to notify context changed", e); + } + }); + return cancel; } else { return session.getSession().detectInteraction(); } diff --git a/services/core/java/com/android/server/biometrics/sensors/iris/IrisService.java b/services/core/java/com/android/server/biometrics/sensors/iris/IrisService.java index 35ea36c5d56f..f27761fd644c 100644 --- a/services/core/java/com/android/server/biometrics/sensors/iris/IrisService.java +++ b/services/core/java/com/android/server/biometrics/sensors/iris/IrisService.java @@ -16,12 +16,10 @@ package com.android.server.biometrics.sensors.iris; -import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_IRIS; import android.annotation.NonNull; import android.content.Context; -import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.IBiometricService; import android.hardware.biometrics.SensorPropertiesInternal; import android.hardware.iris.IIrisService; @@ -33,7 +31,6 @@ import android.util.Slog; import com.android.server.ServiceThread; import com.android.server.SystemService; -import com.android.server.biometrics.Utils; import java.util.List; @@ -75,17 +72,12 @@ public class IrisService extends SystemService { ServiceManager.getService(Context.BIOMETRIC_SERVICE)); for (SensorPropertiesInternal hidlSensor : hidlSensors) { - final int sensorId = hidlSensor.sensorId; - final @BiometricManager.Authenticators.Types int strength = - Utils.propertyStrengthToAuthenticatorStrength( - hidlSensor.sensorStrength); - final IrisAuthenticator authenticator = new IrisAuthenticator(mServiceWrapper, - sensorId); try { - biometricService.registerAuthenticator(sensorId, TYPE_IRIS, strength, - authenticator); + biometricService.registerAuthenticator(TYPE_IRIS, hidlSensor, + new IrisAuthenticator(mServiceWrapper, hidlSensor.sensorId)); } catch (RemoteException e) { - Slog.e(TAG, "Remote exception when registering sensorId: " + sensorId); + Slog.e(TAG, "Remote exception when registering sensorId: " + + hidlSensor.sensorId); } } }); diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index af5609a68952..299f86550efd 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -75,10 +75,11 @@ public class AutomaticBrightnessController { private static final int MSG_UPDATE_AMBIENT_LUX = 1; private static final int MSG_BRIGHTNESS_ADJUSTMENT_SAMPLE = 2; - private static final int MSG_INVALIDATE_SHORT_TERM_MODEL = 3; + private static final int MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL = 3; private static final int MSG_UPDATE_FOREGROUND_APP = 4; private static final int MSG_UPDATE_FOREGROUND_APP_SYNC = 5; private static final int MSG_RUN_UPDATE = 6; + private static final int MSG_INVALIDATE_PAUSED_SHORT_TERM_MODEL = 7; // Callbacks for requesting updates to the display's power state private final Callbacks mCallbacks; @@ -216,12 +217,11 @@ public class AutomaticBrightnessController { private float mBrightnessAdjustmentSampleOldLux; private float mBrightnessAdjustmentSampleOldBrightness; - // When the short term model is invalidated, we don't necessarily reset it (i.e. clear the - // user's adjustment) immediately, but wait for a drastic enough change in the ambient light. - // The anchor determines what were the light levels when the user has set their preference, and - // we use a relative threshold to determine when to revert to the OEM curve. - private boolean mShortTermModelValid; - private float mShortTermModelAnchor; + // The short term models, current and previous. Eg, we might use the "paused" one to save out + // the interactive short term model when switching to idle screen brightness mode, and + // vice-versa. + private final ShortTermModel mShortTermModel; + private final ShortTermModel mPausedShortTermModel; // Controls High Brightness Mode. private HighBrightnessModeController mHbmController; @@ -309,8 +309,8 @@ public class AutomaticBrightnessController { mAmbientBrightnessThresholdsIdle = ambientBrightnessThresholdsIdle; mScreenBrightnessThresholds = screenBrightnessThresholds; mScreenBrightnessThresholdsIdle = screenBrightnessThresholdsIdle; - mShortTermModelValid = true; - mShortTermModelAnchor = -1; + mShortTermModel = new ShortTermModel(); + mPausedShortTermModel = new ShortTermModel(); mHandler = new AutomaticBrightnessHandler(looper); mAmbientLightRingBuffer = new AmbientLightRingBuffer(mNormalLightSensorRate, mAmbientLightHorizonLong, mClock); @@ -492,10 +492,10 @@ public class AutomaticBrightnessController { Slog.d(TAG, "Display policy transitioning from " + oldPolicy + " to " + policy); } if (!isInteractivePolicy(policy) && isInteractivePolicy(oldPolicy) && !isInIdleMode()) { - mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_SHORT_TERM_MODEL, + mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL, mCurrentBrightnessMapper.getShortTermModelTimeout()); } else if (isInteractivePolicy(policy) && !isInteractivePolicy(oldPolicy)) { - mHandler.removeMessages(MSG_INVALIDATE_SHORT_TERM_MODEL); + mHandler.removeMessages(MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL); } return true; } @@ -516,25 +516,13 @@ public class AutomaticBrightnessController { private boolean setScreenBrightnessByUser(float lux, float brightness) { mCurrentBrightnessMapper.addUserDataPoint(lux, brightness); - mShortTermModelValid = true; - mShortTermModelAnchor = lux; - if (mLoggingEnabled) { - Slog.d(TAG, "ShortTermModel: anchor=" + mShortTermModelAnchor); - } + mShortTermModel.setUserBrightness(lux, brightness); return true; } public void resetShortTermModel() { mCurrentBrightnessMapper.clearUserDataPoints(); - mShortTermModelValid = true; - mShortTermModelAnchor = -1; - } - - private void invalidateShortTermModel() { - if (mLoggingEnabled) { - Slog.d(TAG, "ShortTermModel: invalidate user data"); - } - mShortTermModelValid = false; + mShortTermModel.reset(); } public boolean setBrightnessConfiguration(BrightnessConfiguration configuration, @@ -595,8 +583,12 @@ public class AutomaticBrightnessController { pw.println(" mShortTermModelTimeout(idle)=" + mIdleModeBrightnessMapper.getShortTermModelTimeout()); } - pw.println(" mShortTermModelAnchor=" + mShortTermModelAnchor); - pw.println(" mShortTermModelValid=" + mShortTermModelValid); + pw.println(" mShortTermModel="); + mShortTermModel.dump(pw); + pw.println(" mPausedShortTermModel="); + mPausedShortTermModel.dump(pw); + + pw.println(); pw.println(" mBrightnessAdjustmentSamplePending=" + mBrightnessAdjustmentSamplePending); pw.println(" mBrightnessAdjustmentSampleOldLux=" + mBrightnessAdjustmentSampleOldLux); pw.println(" mBrightnessAdjustmentSampleOldBrightness=" @@ -740,15 +732,9 @@ public class AutomaticBrightnessController { } mHbmController.onAmbientLuxChange(mAmbientLux); + // If the short term model was invalidated and the change is drastic enough, reset it. - if (!mShortTermModelValid && mShortTermModelAnchor != -1) { - if (mCurrentBrightnessMapper.shouldResetShortTermModel( - mAmbientLux, mShortTermModelAnchor)) { - resetShortTermModel(); - } else { - mShortTermModelValid = true; - } - } + mShortTermModel.maybeReset(mAmbientLux); } private float calculateAmbientLux(long now, long horizon) { @@ -1118,8 +1104,29 @@ public class AutomaticBrightnessController { return; } Slog.i(TAG, "Switching to Idle Screen Brightness Mode"); + // Stash short term model + ShortTermModel tempShortTermModel = new ShortTermModel(); + tempShortTermModel.set(mCurrentBrightnessMapper.getUserLux(), + mCurrentBrightnessMapper.getUserBrightness(), /* valid= */ true); + + // Send delayed timeout + mHandler.sendEmptyMessageAtTime(MSG_INVALIDATE_PAUSED_SHORT_TERM_MODEL, + mClock.uptimeMillis() + + mCurrentBrightnessMapper.getShortTermModelTimeout()); + + Slog.i(TAG, "mPreviousShortTermModel" + mPausedShortTermModel); + // new brightness mapper mCurrentBrightnessMapper = mIdleModeBrightnessMapper; - resetShortTermModel(); + + // if previous stm has been invalidated, and lux has drastically changed, just use + // the new, reset stm. + // if previous stm is still valid then revalidate it + if (mPausedShortTermModel != null && !mPausedShortTermModel.maybeReset(mAmbientLux)) { + setScreenBrightnessByUser(mPausedShortTermModel.mAnchor, + mPausedShortTermModel.mBrightness); + } + mPausedShortTermModel.copyFrom(tempShortTermModel); + update(); } @@ -1128,8 +1135,28 @@ public class AutomaticBrightnessController { return; } Slog.i(TAG, "Switching to Interactive Screen Brightness Mode"); + ShortTermModel tempShortTermModel = new ShortTermModel(); + tempShortTermModel.set(mCurrentBrightnessMapper.getUserLux(), + mCurrentBrightnessMapper.getUserBrightness(), /* valid= */ true); + mHandler.removeMessages(MSG_INVALIDATE_PAUSED_SHORT_TERM_MODEL); + // Send delayed timeout + mHandler.sendEmptyMessageAtTime(MSG_INVALIDATE_PAUSED_SHORT_TERM_MODEL, + mClock.uptimeMillis() + + mCurrentBrightnessMapper.getShortTermModelTimeout()); + Slog.i(TAG, "mPreviousShortTermModel" + mPausedShortTermModel.toString()); + + // restore interactive mapper. mCurrentBrightnessMapper = mInteractiveModeBrightnessMapper; - resetShortTermModel(); + + // if previous stm has been invalidated, and lux has drastically changed, just use + // the new, reset stm. + // if previous stm is still valid then revalidate it + if (!mPausedShortTermModel.maybeReset(mAmbientLux)) { + setScreenBrightnessByUser(mPausedShortTermModel.mAnchor, + mPausedShortTermModel.mBrightness); + } + mPausedShortTermModel.copyFrom(tempShortTermModel); + update(); } @@ -1164,6 +1191,77 @@ public class AutomaticBrightnessController { } } + private class ShortTermModel { + // When the short term model is invalidated, we don't necessarily reset it (i.e. clear the + // user's adjustment) immediately, but wait for a drastic enough change in the ambient + // light. + // The anchor determines what were the light levels when the user has set their preference, + // and we use a relative threshold to determine when to revert to the OEM curve. + private float mAnchor = -1f; + private float mBrightness; + private boolean mIsValid = true; + + private void reset() { + mAnchor = -1f; + mBrightness = -1f; + mIsValid = true; + } + + private void invalidate() { + mIsValid = false; + if (mLoggingEnabled) { + Slog.d(TAG, "ShortTermModel: invalidate user data"); + } + } + + private void setUserBrightness(float lux, float brightness) { + mAnchor = lux; + mBrightness = brightness; + mIsValid = true; + if (mLoggingEnabled) { + Slog.d(TAG, "ShortTermModel: anchor=" + mAnchor); + } + } + + private boolean maybeReset(float currentLux) { + // If the short term model was invalidated and the change is drastic enough, reset it. + // Otherwise, we revalidate it. + if (!mIsValid && mAnchor != -1) { + if (mCurrentBrightnessMapper != null + && mCurrentBrightnessMapper.shouldResetShortTermModel( + currentLux, mAnchor)) { + resetShortTermModel(); + } else { + mIsValid = true; + } + return mIsValid; + } + return false; + } + + private void set(float anchor, float brightness, boolean valid) { + mAnchor = anchor; + mBrightness = brightness; + mIsValid = valid; + } + private void copyFrom(ShortTermModel from) { + mAnchor = from.mAnchor; + mBrightness = from.mBrightness; + mIsValid = from.mIsValid; + } + + public String toString() { + return " mAnchor: " + mAnchor + + "\n mBrightness: " + mBrightness + + "\n mIsValid: " + mIsValid; + } + + void dump(PrintWriter pw) { + pw.println(this); + } + + } + private final class AutomaticBrightnessHandler extends Handler { public AutomaticBrightnessHandler(Looper looper) { super(looper, null, true /*async*/); @@ -1184,8 +1282,8 @@ public class AutomaticBrightnessController { collectBrightnessAdjustmentSample(); break; - case MSG_INVALIDATE_SHORT_TERM_MODEL: - invalidateShortTermModel(); + case MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL: + mShortTermModel.invalidate(); break; case MSG_UPDATE_FOREGROUND_APP: @@ -1195,6 +1293,10 @@ public class AutomaticBrightnessController { case MSG_UPDATE_FOREGROUND_APP_SYNC: updateForegroundAppSync(); break; + + case MSG_INVALIDATE_PAUSED_SHORT_TERM_MODEL: + mPausedShortTermModel.invalidate(); + break; } } } diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index d0471837d79b..3456e3e262de 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -363,13 +363,17 @@ public abstract class BrightnessMappingStrategy { public abstract void recalculateSplines(boolean applyAdjustment, float[] adjustment); /** - * Returns the timeout for the short term model + * Returns the timeout, in milliseconds for the short term model * * Timeout after which we remove the effects any user interactions might've had on the * brightness mapping. This timeout doesn't start until we transition to a non-interactive * display policy so that we don't reset while users are using their devices, but also so that * we don't erroneously keep the short-term model if the device is dozing but the * display is fully on. + * + * This timeout is also used when the device switches from interactive screen brightness mode + * to idle screen brightness mode, to preserve the user's preference when they resume usage of + * the device, within the specified timeframe. */ public abstract long getShortTermModelTimeout(); diff --git a/services/core/java/com/android/server/display/BrightnessThrottler.java b/services/core/java/com/android/server/display/BrightnessThrottler.java index eccee52f37aa..cfdcd636904b 100644 --- a/services/core/java/com/android/server/display/BrightnessThrottler.java +++ b/services/core/java/com/android/server/display/BrightnessThrottler.java @@ -16,7 +16,10 @@ package com.android.server.display; +import static com.android.server.display.DisplayDeviceConfig.DEFAULT_ID; + import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.hardware.display.BrightnessInfo; import android.hardware.display.DisplayManager; @@ -33,8 +36,8 @@ import android.provider.DeviceConfigInterface; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.display.DisplayDeviceConfig.BrightnessThrottlingData; -import com.android.server.display.DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel; +import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData; +import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel; import java.io.PrintWriter; import java.util.ArrayList; @@ -63,49 +66,69 @@ class BrightnessThrottler { private final DeviceConfigInterface mDeviceConfig; private int mThrottlingStatus; - private BrightnessThrottlingData mThrottlingData; - private BrightnessThrottlingData mDdcThrottlingData; + + // Maps the throttling ID to the data. Sourced from DisplayDeviceConfig. + @NonNull + private HashMap<String, ThermalBrightnessThrottlingData> mDdcThermalThrottlingDataMap; + + // Current throttling data being used. + // Null if we do not support throttling. + @Nullable + private ThermalBrightnessThrottlingData mThermalThrottlingData; + private float mBrightnessCap = PowerManager.BRIGHTNESS_MAX; private @BrightnessInfo.BrightnessMaxReason int mBrightnessMaxReason = BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE; private String mUniqueDisplayId; // The most recent string that has been set from DeviceConfig - private String mBrightnessThrottlingDataString; + private String mThermalBrightnessThrottlingDataString; + + // The brightness throttling configuration that should be used. + private String mThermalBrightnessThrottlingDataId; // This is a collection of brightness throttling data that has been written as overrides from // the DeviceConfig. This will always take priority over the display device config data. - private HashMap<String, BrightnessThrottlingData> mBrightnessThrottlingDataOverride = - new HashMap<>(1); - - BrightnessThrottler(Handler handler, BrightnessThrottlingData throttlingData, - Runnable throttlingChangeCallback, String uniqueDisplayId) { - this(new Injector(), handler, handler, throttlingData, throttlingChangeCallback, - uniqueDisplayId); + // We need to store the data for every display device, so we do not need to update this each + // time the underlying display device changes. + // This map is indexed by uniqueDisplayId, to provide maps for throttlingId -> throttlingData. + // HashMap< uniqueDisplayId, HashMap< throttlingDataId, ThermalBrightnessThrottlingData >> + private final HashMap<String, HashMap<String, ThermalBrightnessThrottlingData>> + mThermalBrightnessThrottlingDataOverride = new HashMap<>(1); + + BrightnessThrottler(Handler handler, Runnable throttlingChangeCallback, String uniqueDisplayId, + String throttlingDataId, + @NonNull HashMap<String, ThermalBrightnessThrottlingData> + thermalBrightnessThrottlingDataMap) { + this(new Injector(), handler, handler, throttlingChangeCallback, + uniqueDisplayId, throttlingDataId, thermalBrightnessThrottlingDataMap); } @VisibleForTesting BrightnessThrottler(Injector injector, Handler handler, Handler deviceConfigHandler, - BrightnessThrottlingData throttlingData, Runnable throttlingChangeCallback, - String uniqueDisplayId) { + Runnable throttlingChangeCallback, String uniqueDisplayId, String throttlingDataId, + @NonNull HashMap<String, ThermalBrightnessThrottlingData> + thermalBrightnessThrottlingDataMap) { mInjector = injector; mHandler = handler; mDeviceConfigHandler = deviceConfigHandler; - mThrottlingData = throttlingData; - mDdcThrottlingData = throttlingData; + mDdcThermalThrottlingDataMap = thermalBrightnessThrottlingDataMap; mThrottlingChangeCallback = throttlingChangeCallback; mSkinThermalStatusObserver = new SkinThermalStatusObserver(mInjector, mHandler); mUniqueDisplayId = uniqueDisplayId; mDeviceConfig = injector.getDeviceConfig(); mDeviceConfigListener = new DeviceConfigListener(); - - resetThrottlingData(mThrottlingData, mUniqueDisplayId); + mThermalBrightnessThrottlingDataId = throttlingDataId; + mDdcThermalThrottlingDataMap = thermalBrightnessThrottlingDataMap; + loadThermalBrightnessThrottlingDataFromDeviceConfig(); + loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig(mDdcThermalThrottlingDataMap, + mThermalBrightnessThrottlingDataId, mUniqueDisplayId); } boolean deviceSupportsThrottling() { - return mThrottlingData != null; + return mThermalThrottlingData != null; } float getBrightnessCap() { @@ -133,23 +156,14 @@ class BrightnessThrottler { mThrottlingStatus = THROTTLING_INVALID; } - private void resetThrottlingData() { - resetThrottlingData(mDdcThrottlingData, mUniqueDisplayId); - } - - void resetThrottlingData(BrightnessThrottlingData throttlingData, String displayId) { - stop(); - - mUniqueDisplayId = displayId; - mDdcThrottlingData = throttlingData; - mDeviceConfigListener.startListening(); - reloadBrightnessThrottlingDataOverride(); - mThrottlingData = mBrightnessThrottlingDataOverride.getOrDefault(mUniqueDisplayId, - throttlingData); - - if (deviceSupportsThrottling()) { - mSkinThermalStatusObserver.startObserving(); - } + void loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( + HashMap<String, ThermalBrightnessThrottlingData> ddcThrottlingDataMap, + String brightnessThrottlingDataId, + String uniqueDisplayId) { + mDdcThermalThrottlingDataMap = ddcThrottlingDataMap; + mThermalBrightnessThrottlingDataId = brightnessThrottlingDataId; + mUniqueDisplayId = uniqueDisplayId; + resetThermalThrottlingData(); } private float verifyAndConstrainBrightnessCap(float brightness) { @@ -171,11 +185,11 @@ class BrightnessThrottler { private void thermalStatusChanged(@Temperature.ThrottlingStatus int newStatus) { if (mThrottlingStatus != newStatus) { mThrottlingStatus = newStatus; - updateThrottling(); + updateThermalThrottling(); } } - private void updateThrottling() { + private void updateThermalThrottling() { if (!deviceSupportsThrottling()) { return; } @@ -183,9 +197,9 @@ class BrightnessThrottler { float brightnessCap = PowerManager.BRIGHTNESS_MAX; int brightnessMaxReason = BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE; - if (mThrottlingStatus != THROTTLING_INVALID) { + if (mThrottlingStatus != THROTTLING_INVALID && mThermalThrottlingData != null) { // Throttling levels are sorted by increasing severity - for (ThrottlingLevel level : mThrottlingData.throttlingLevels) { + for (ThrottlingLevel level : mThermalThrottlingData.throttlingLevels) { if (level.thermalStatus <= mThrottlingStatus) { brightnessCap = level.brightness; brightnessMaxReason = BrightnessInfo.BRIGHTNESS_MAX_REASON_THERMAL; @@ -218,27 +232,40 @@ class BrightnessThrottler { private void dumpLocal(PrintWriter pw) { pw.println("BrightnessThrottler:"); - pw.println(" mThrottlingData=" + mThrottlingData); - pw.println(" mDdcThrottlingData=" + mDdcThrottlingData); + pw.println(" mThermalBrightnessThrottlingDataId=" + mThermalBrightnessThrottlingDataId); + pw.println(" mThermalThrottlingData=" + mThermalThrottlingData); pw.println(" mUniqueDisplayId=" + mUniqueDisplayId); pw.println(" mThrottlingStatus=" + mThrottlingStatus); pw.println(" mBrightnessCap=" + mBrightnessCap); pw.println(" mBrightnessMaxReason=" + BrightnessInfo.briMaxReasonToString(mBrightnessMaxReason)); - pw.println(" mBrightnessThrottlingDataOverride=" + mBrightnessThrottlingDataOverride); - pw.println(" mBrightnessThrottlingDataString=" + mBrightnessThrottlingDataString); + pw.println(" mDdcThermalThrottlingDataMap=" + mDdcThermalThrottlingDataMap); + pw.println(" mThermalBrightnessThrottlingDataOverride=" + + mThermalBrightnessThrottlingDataOverride); + pw.println(" mThermalBrightnessThrottlingDataString=" + + mThermalBrightnessThrottlingDataString); mSkinThermalStatusObserver.dump(pw); } - private String getBrightnessThrottlingDataString() { + private String getThermalBrightnessThrottlingDataString() { return mDeviceConfig.getString(DeviceConfig.NAMESPACE_DISPLAY_MANAGER, DisplayManager.DeviceConfig.KEY_BRIGHTNESS_THROTTLING_DATA, /* defaultValue= */ null); } - private boolean parseAndSaveData(@NonNull String strArray, - @NonNull HashMap<String, BrightnessThrottlingData> tempBrightnessThrottlingData) { + // The brightness throttling data id may or may not be specified in the string that is passed + // in, if there is none specified, we assume it is for the default case. Each string passed in + // here must be for one display and one throttling id. + // 123,1,critical,0.8 + // 456,2,moderate,0.9,critical,0.7 + // 456,2,moderate,0.9,critical,0.7,default + // 456,2,moderate,0.9,critical,0.7,id_2 + // displayId, number, <state, val> * number + // displayId, <number, <state, val> * number>, throttlingId + private boolean parseAndAddData(@NonNull String strArray, + @NonNull HashMap<String, HashMap<String, ThermalBrightnessThrottlingData>> + displayIdToThrottlingIdToBtd) { boolean validConfig = true; String[] items = strArray.split(","); int i = 0; @@ -254,61 +281,110 @@ class BrightnessThrottler { for (int j = 0; j < noOfThrottlingPoints; j++) { String severity = items[i++]; int status = parseThermalStatus(severity); - float brightnessPoint = parseBrightness(items[i++]); - throttlingLevels.add(new ThrottlingLevel(status, brightnessPoint)); } - BrightnessThrottlingData toSave = - DisplayDeviceConfig.BrightnessThrottlingData.create(throttlingLevels); - tempBrightnessThrottlingData.put(uniqueDisplayId, toSave); + + String throttlingDataId = (i < items.length) ? items[i++] : DEFAULT_ID; + ThermalBrightnessThrottlingData throttlingLevelsData = + DisplayDeviceConfig.ThermalBrightnessThrottlingData.create(throttlingLevels); + + // Add throttlingLevelsData to inner map where necessary. + HashMap<String, ThermalBrightnessThrottlingData> throttlingMapForDisplay = + displayIdToThrottlingIdToBtd.get(uniqueDisplayId); + if (throttlingMapForDisplay == null) { + throttlingMapForDisplay = new HashMap<>(); + throttlingMapForDisplay.put(throttlingDataId, throttlingLevelsData); + displayIdToThrottlingIdToBtd.put(uniqueDisplayId, throttlingMapForDisplay); + } else if (throttlingMapForDisplay.containsKey(throttlingDataId)) { + Slog.e(TAG, "Throttling data for display " + uniqueDisplayId + + "contains duplicate throttling ids: '" + throttlingDataId + "'"); + return false; + } else { + throttlingMapForDisplay.put(throttlingDataId, throttlingLevelsData); + } } catch (NumberFormatException | IndexOutOfBoundsException | UnknownThermalStatusException e) { - validConfig = false; Slog.e(TAG, "Throttling data is invalid array: '" + strArray + "'", e); + validConfig = false; } if (i != items.length) { validConfig = false; } - return validConfig; } - public void reloadBrightnessThrottlingDataOverride() { - HashMap<String, BrightnessThrottlingData> tempBrightnessThrottlingData = + private void loadThermalBrightnessThrottlingDataFromDeviceConfig() { + HashMap<String, HashMap<String, ThermalBrightnessThrottlingData>> tempThrottlingData = new HashMap<>(1); - mBrightnessThrottlingDataString = getBrightnessThrottlingDataString(); + mThermalBrightnessThrottlingDataString = getThermalBrightnessThrottlingDataString(); boolean validConfig = true; - mBrightnessThrottlingDataOverride.clear(); - if (mBrightnessThrottlingDataString != null) { - String[] throttlingDataSplits = mBrightnessThrottlingDataString.split(";"); + mThermalBrightnessThrottlingDataOverride.clear(); + if (mThermalBrightnessThrottlingDataString != null) { + String[] throttlingDataSplits = mThermalBrightnessThrottlingDataString.split(";"); for (String s : throttlingDataSplits) { - if (!parseAndSaveData(s, tempBrightnessThrottlingData)) { + if (!parseAndAddData(s, tempThrottlingData)) { validConfig = false; break; } } if (validConfig) { - mBrightnessThrottlingDataOverride.putAll(tempBrightnessThrottlingData); - tempBrightnessThrottlingData.clear(); + mThermalBrightnessThrottlingDataOverride.putAll(tempThrottlingData); + tempThrottlingData.clear(); } } else { - Slog.w(TAG, "DeviceConfig BrightnessThrottlingData is null"); + Slog.w(TAG, "DeviceConfig ThermalBrightnessThrottlingData is null"); } } + private void resetThermalThrottlingData() { + stop(); + + mDeviceConfigListener.startListening(); + + // Get throttling data for this id, if it exists + mThermalThrottlingData = getConfigFromId(mThermalBrightnessThrottlingDataId); + + // Fallback to default id otherwise. + if (!DEFAULT_ID.equals(mThermalBrightnessThrottlingDataId) + && mThermalThrottlingData == null) { + mThermalThrottlingData = getConfigFromId(DEFAULT_ID); + Slog.d(TAG, "Falling back to default throttling Id"); + } + + if (deviceSupportsThrottling()) { + mSkinThermalStatusObserver.startObserving(); + } + } + + private ThermalBrightnessThrottlingData getConfigFromId(String id) { + ThermalBrightnessThrottlingData returnValue; + + // Fallback pattern for fetching correct throttling data for this display and id. + // 1) throttling data from device config for this throttling data id + returnValue = mThermalBrightnessThrottlingDataOverride.get(mUniqueDisplayId) == null + ? null + : mThermalBrightnessThrottlingDataOverride.get(mUniqueDisplayId).get(id); + // 2) throttling data from ddc for this throttling data id + returnValue = returnValue == null + ? mDdcThermalThrottlingDataMap.get(id) + : returnValue; + + return returnValue; + } + /** * Listens to config data change and updates the brightness throttling data using * DisplayManager#KEY_BRIGHTNESS_THROTTLING_DATA. * The format should be a string similar to: "local:4619827677550801152,2,moderate,0.5,severe, * 0.379518072;local:4619827677550801151,1,moderate,0.75" * In this order: - * <displayId>,<no of throttling levels>,[<severity as string>,<brightness cap>] - * Where the latter part is repeated for each throttling level, and the entirety is repeated - * for each display, separated by a semicolon. + * <displayId>,<no of throttling levels>,[<severity as string>,<brightness cap>][,throttlingId]? + * Where [<severity as string>,<brightness cap>] is repeated for each throttling level, and the + * entirety is repeated for each display & throttling data id, separated by a semicolon. */ public class DeviceConfigListener implements DeviceConfig.OnPropertiesChangedListener { public Executor mExecutor = new HandlerExecutor(mDeviceConfigHandler); @@ -320,8 +396,8 @@ class BrightnessThrottler { @Override public void onPropertiesChanged(DeviceConfig.Properties properties) { - reloadBrightnessThrottlingDataOverride(); - resetThrottlingData(); + loadThermalBrightnessThrottlingDataFromDeviceConfig(); + resetThermalThrottlingData(); } } diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index f4b3f1ab7b11..a021174e3031 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -143,17 +143,17 @@ import javax.xml.datatype.DatatypeConfigurationException; * <brightness>0.01</brightness> * </brightnessThrottlingPoint> * </brightnessThrottlingMap> - * <concurrentDisplaysBrightnessThrottlingMap> - * <brightnessThrottlingPoint> - * <thermalStatus>severe</thermalStatus> - * <brightness>0.07</brightness> - * </brightnessThrottlingPoint> - * <brightnessThrottlingPoint> - * <thermalStatus>critical</thermalStatus> - * <brightness>0.005</brightness> - * </brightnessThrottlingPoint> - * </concurrentDisplaysBrightnessThrottlingMap> - * <refreshRateThrottlingMap> + * <brightnessThrottlingMap id="id_2"> // optional attribute, leave blank for default + * <brightnessThrottlingPoint> + * <thermalStatus>moderate</thermalStatus> + * <brightness>0.2</brightness> + * </brightnessThrottlingPoint> + * <brightnessThrottlingPoint> + * <thermalStatus>severe</thermalStatus> + * <brightness>0.1</brightness> + * </brightnessThrottlingPoint> + * </brightnessThrottlingMap> + <refreshRateThrottlingMap> * <refreshRateThrottlingPoint> * <thermalStatus>critical</thermalStatus> * <refreshRateRange> @@ -687,8 +687,8 @@ public class DisplayDeviceConfig { private int[] mHighDisplayBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS; private int[] mHighAmbientBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS; - private final Map<String, BrightnessThrottlingData> mBrightnessThrottlingDataMap = - new HashMap<>(); + private final HashMap<String, ThermalBrightnessThrottlingData> + mThermalBrightnessThrottlingDataMapByThrottlingId = new HashMap<>(); private final Map<String, SparseArray<SurfaceControl.RefreshRateRange>> mRefreshRateThrottlingMap = new HashMap<>(); @@ -1346,11 +1346,11 @@ public class DisplayDeviceConfig { } /** - * @param id The ID of the throttling data - * @return brightness throttling configuration data for the display. + * @return brightness throttling configuration data for this display, for each throttling id. */ - public BrightnessThrottlingData getBrightnessThrottlingData(String id) { - return BrightnessThrottlingData.create(mBrightnessThrottlingDataMap.get(id)); + public HashMap<String, ThermalBrightnessThrottlingData> + getThermalBrightnessThrottlingDataMapByThrottlingId() { + return mThermalBrightnessThrottlingDataMapByThrottlingId; } /** @@ -1358,7 +1358,7 @@ public class DisplayDeviceConfig { * @return refresh rate throttling configuration */ @Nullable - public SparseArray<SurfaceControl.RefreshRateRange> getRefreshRateThrottlingData( + public SparseArray<SurfaceControl.RefreshRateRange> getThermalRefreshRateThrottlingData( @Nullable String id) { String key = id == null ? DEFAULT_ID : id; return mRefreshRateThrottlingMap.get(key); @@ -1525,7 +1525,8 @@ public class DisplayDeviceConfig { + ", isHbmEnabled=" + mIsHighBrightnessModeEnabled + ", mHbmData=" + mHbmData + ", mSdrToHdrRatioSpline=" + mSdrToHdrRatioSpline - + ", mBrightnessThrottlingData=" + mBrightnessThrottlingDataMap + + ", mThermalBrightnessThrottlingDataMapByThrottlingId=" + + mThermalBrightnessThrottlingDataMapByThrottlingId + "\n" + ", mBrightnessRampFastDecrease=" + mBrightnessRampFastDecrease + ", mBrightnessRampFastIncrease=" + mBrightnessRampFastIncrease @@ -1886,11 +1887,11 @@ public class DisplayDeviceConfig { Slog.i(TAG, "No thermal throttling config found"); return; } - loadBrightnessThrottlingMaps(throttlingConfig); - loadRefreshRateThermalThrottlingMap(throttlingConfig); + loadThermalBrightnessThrottlingMaps(throttlingConfig); + loadThermalRefreshRateThrottlingMap(throttlingConfig); } - private void loadBrightnessThrottlingMaps(ThermalThrottling throttlingConfig) { + private void loadThermalBrightnessThrottlingMaps(ThermalThrottling throttlingConfig) { final List<BrightnessThrottlingMap> maps = throttlingConfig.getBrightnessThrottlingMap(); if (maps == null || maps.isEmpty()) { Slog.i(TAG, "No brightness throttling map found"); @@ -1900,7 +1901,7 @@ public class DisplayDeviceConfig { for (BrightnessThrottlingMap map : maps) { final List<BrightnessThrottlingPoint> points = map.getBrightnessThrottlingPoint(); // At least 1 point is guaranteed by the display device config schema - List<BrightnessThrottlingData.ThrottlingLevel> throttlingLevels = + List<ThermalBrightnessThrottlingData.ThrottlingLevel> throttlingLevels = new ArrayList<>(points.size()); boolean badConfig = false; @@ -1911,24 +1912,24 @@ public class DisplayDeviceConfig { break; } - throttlingLevels.add(new BrightnessThrottlingData.ThrottlingLevel( + throttlingLevels.add(new ThermalBrightnessThrottlingData.ThrottlingLevel( convertThermalStatus(status), point.getBrightness().floatValue())); } if (!badConfig) { String id = map.getId() == null ? DEFAULT_ID : map.getId(); - if (mBrightnessThrottlingDataMap.containsKey(id)) { + if (mThermalBrightnessThrottlingDataMapByThrottlingId.containsKey(id)) { throw new RuntimeException("Brightness throttling data with ID " + id + " already exists"); } - mBrightnessThrottlingDataMap.put(id, - BrightnessThrottlingData.create(throttlingLevels)); + mThermalBrightnessThrottlingDataMapByThrottlingId.put(id, + ThermalBrightnessThrottlingData.create(throttlingLevels)); } } } - private void loadRefreshRateThermalThrottlingMap(ThermalThrottling throttlingConfig) { + private void loadThermalRefreshRateThrottlingMap(ThermalThrottling throttlingConfig) { List<RefreshRateThrottlingMap> maps = throttlingConfig.getRefreshRateThrottlingMap(); if (maps == null || maps.isEmpty()) { Slog.w(TAG, "RefreshRateThrottling: map not found"); @@ -1971,8 +1972,8 @@ public class DisplayDeviceConfig { )); } if (refreshRates.size() == 0) { - Slog.w(TAG, "RefreshRateThrottling: no valid throttling points fond for map, mapId=" - + id); + Slog.w(TAG, "RefreshRateThrottling: no valid throttling points found for map, " + + "mapId=" + id); continue; } mRefreshRateThrottlingMap.put(id, refreshRates); @@ -3038,7 +3039,7 @@ public class DisplayDeviceConfig { /** * Container for brightness throttling data. */ - public static class BrightnessThrottlingData { + public static class ThermalBrightnessThrottlingData { public List<ThrottlingLevel> throttlingLevels; static class ThrottlingLevel { @@ -3077,9 +3078,10 @@ public class DisplayDeviceConfig { /** - * Creates multiple teperature based throttling levels of brightness + * Creates multiple temperature based throttling levels of brightness */ - public static BrightnessThrottlingData create(List<ThrottlingLevel> throttlingLevels) { + public static ThermalBrightnessThrottlingData create( + List<ThrottlingLevel> throttlingLevels) { if (throttlingLevels == null || throttlingLevels.size() == 0) { Slog.e(TAG, "BrightnessThrottlingData received null or empty throttling levels"); return null; @@ -3117,21 +3119,12 @@ public class DisplayDeviceConfig { } } - return new BrightnessThrottlingData(throttlingLevels); + return new ThermalBrightnessThrottlingData(throttlingLevels); } - static public BrightnessThrottlingData create(BrightnessThrottlingData other) { - if (other == null) { - return null; - } - - return BrightnessThrottlingData.create(other.throttlingLevels); - } - - @Override public String toString() { - return "BrightnessThrottlingData{" + return "ThermalBrightnessThrottlingData{" + "throttlingLevels:" + throttlingLevels + "} "; } @@ -3142,12 +3135,12 @@ public class DisplayDeviceConfig { return true; } - if (!(obj instanceof BrightnessThrottlingData)) { + if (!(obj instanceof ThermalBrightnessThrottlingData)) { return false; } - BrightnessThrottlingData otherBrightnessThrottlingData = (BrightnessThrottlingData) obj; - return throttlingLevels.equals(otherBrightnessThrottlingData.throttlingLevels); + ThermalBrightnessThrottlingData otherData = (ThermalBrightnessThrottlingData) obj; + return throttlingLevels.equals(otherData.throttlingLevels); } @Override @@ -3156,7 +3149,7 @@ public class DisplayDeviceConfig { } @VisibleForTesting - BrightnessThrottlingData(List<ThrottlingLevel> inLevels) { + ThermalBrightnessThrottlingData(List<ThrottlingLevel> inLevels) { throttlingLevels = new ArrayList<>(inLevels.size()); for (ThrottlingLevel level : inLevels) { throttlingLevels.add(new ThrottlingLevel(level.thermalStatus, level.brightness)); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index c3a4c2e389ac..85b403496645 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1418,19 +1418,32 @@ public final class DisplayManagerService extends SystemService { flags |= VIRTUAL_DISPLAY_FLAG_DEVICE_DISPLAY_GROUP; } - if (projection != null) { - final long firstToken = Binder.clearCallingIdentity(); - try { + // Check if the host app is attempting to reuse the token or capture again on the same + // MediaProjection instance. Don't start recording if so; MediaProjectionManagerService + // decides how to respond based on the target SDK. + boolean waitForPermissionConsent = false; + final long firstToken = Binder.clearCallingIdentity(); + try { + if (projection != null) { if (!getProjectionService().isCurrentProjection(projection)) { throw new SecurityException("Cannot create VirtualDisplay with " + "non-current MediaProjection"); } + if (!projection.isValid()) { + // Just log; MediaProjectionManagerService throws an exception. + Slog.w(TAG, "Reusing token: create virtual display for app reusing token"); + // If the exception wasn't thrown, we continue and re-show the permission dialog + getProjectionService().requestConsentForInvalidProjection(projection); + // Declare that mirroring shouldn't begin until user reviews the permission + // dialog. + waitForPermissionConsent = true; + } flags = projection.applyVirtualDisplayFlags(flags); - } catch (RemoteException e) { - throw new SecurityException("unable to validate media projection or flags"); - } finally { - Binder.restoreCallingIdentity(firstToken); } + } catch (RemoteException e) { + throw new SecurityException("Unable to validate media projection or flags", e); + } finally { + Binder.restoreCallingIdentity(firstToken); } if (callingUid != Process.SYSTEM_UID @@ -1548,22 +1561,28 @@ public final class DisplayManagerService extends SystemService { // Only attempt to set content recording session if there are details to set and a // VirtualDisplay has been successfully constructed. session.setVirtualDisplayId(displayId); + // Don't start mirroring until user re-grants consent. + session.setWaitingToRecord(waitForPermissionConsent); // We set the content recording session here on the server side instead of using // a second AIDL call in MediaProjection. By ensuring that a virtual display has // been constructed before calling setContentRecordingSession, we avoid a race // condition between the DisplayManagerService & WindowManagerService which could // lead to the MediaProjection being pre-emptively torn down. - if (!mWindowManagerInternal.setContentRecordingSession(session)) { - // Unable to start mirroring, so tear down projection & release VirtualDisplay. - try { - getProjectionService().stopActiveProjection(); - } catch (RemoteException e) { - Slog.e(TAG, "Unable to tell MediaProjectionManagerService to stop the " - + "active projection", e); + try { + if (!getProjectionService().setContentRecordingSession(session, projection)) { + // Unable to start mirroring, so release VirtualDisplay. Projection service + // handles stopping the projection. + releaseVirtualDisplayInternal(callback.asBinder()); + return Display.INVALID_DISPLAY; + } else if (projection != null) { + // Indicate that this projection has been used to record, and can't be used + // again. + projection.notifyVirtualDisplayCreated(displayId); } - releaseVirtualDisplayInternal(callback.asBinder()); - return Display.INVALID_DISPLAY; + } catch (RemoteException e) { + Slog.e(TAG, "Unable to tell MediaProjectionManagerService to set the " + + "content recording session", e); } } diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index f5859eed34f1..5e3990ac7167 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -505,7 +505,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private DisplayDeviceConfig mDisplayDeviceConfig; - // Identifiers for suspend blocker acuisition requests + // Identifiers for suspend blocker acquisition requests private final String mSuspendBlockerIdUnfinishedBusiness; private final String mSuspendBlockerIdOnStateChanged; private final String mSuspendBlockerIdProxPositive; @@ -515,7 +515,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private boolean mIsEnabled; private boolean mIsInTransition; - private String mBrightnessThrottlingDataId; + // The id of the thermal brightness throttling policy that should be used. + private String mThermalBrightnessThrottlingDataId; // DPCs following the brightness of this DPC. This is used in concurrent displays mode - there // is one lead display, the additional displays follow the brightness value of the lead display. @@ -555,7 +556,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mHandler = new DisplayControllerHandler(handler.getLooper()); mLastBrightnessEvent = new BrightnessEvent(mDisplayId); mTempBrightnessEvent = new BrightnessEvent(mDisplayId); - mBrightnessThrottlingDataId = logicalDisplay.getBrightnessThrottlingDataIdLocked(); + mThermalBrightnessThrottlingDataId = + logicalDisplay.getThermalBrightnessThrottlingDataIdLocked(); if (mDisplayId == Display.DEFAULT_DISPLAY) { mBatteryStats = BatteryStatsService.getService(); @@ -890,8 +892,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call final DisplayDeviceInfo info = device.getDisplayDeviceInfoLocked(); final boolean isEnabled = mLogicalDisplay.isEnabledLocked(); final boolean isInTransition = mLogicalDisplay.isInTransitionLocked(); - final String brightnessThrottlingDataId = - mLogicalDisplay.getBrightnessThrottlingDataIdLocked(); + final String thermalBrightnessThrottlingDataId = + mLogicalDisplay.getThermalBrightnessThrottlingDataIdLocked(); mHandler.postAtTime(() -> { boolean changed = false; if (mDisplayDevice != device) { @@ -900,19 +902,21 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mUniqueDisplayId = uniqueId; mDisplayStatsId = mUniqueDisplayId.hashCode(); mDisplayDeviceConfig = config; - mBrightnessThrottlingDataId = brightnessThrottlingDataId; + mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId; loadFromDisplayDeviceConfig(token, info, hbmMetadata); loadNitBasedBrightnessSetting(); /// Since the underlying display-device changed, we really don't know the - // last command that was sent to change it's state. Lets assume it is unknown so + // last command that was sent to change it's state. Let's assume it is unknown so // that we trigger a change immediately. mPowerState.resetScreenState(); - } else if (!mBrightnessThrottlingDataId.equals(brightnessThrottlingDataId)) { + } else if ( + !mThermalBrightnessThrottlingDataId.equals(thermalBrightnessThrottlingDataId)) { changed = true; - mBrightnessThrottlingDataId = brightnessThrottlingDataId; - mBrightnessThrottler.resetThrottlingData( - config.getBrightnessThrottlingData(mBrightnessThrottlingDataId), + mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId; + mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( + config.getThermalBrightnessThrottlingDataMapByThrottlingId(), + mThermalBrightnessThrottlingDataId, mUniqueDisplayId); } if (mIsEnabled != isEnabled || mIsInTransition != isInTransition) { @@ -981,9 +985,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call sdrBrightness, maxDesiredHdrSdrRatio); } }); - mBrightnessThrottler.resetThrottlingData( - mDisplayDeviceConfig.getBrightnessThrottlingData(mBrightnessThrottlingDataId), - mUniqueDisplayId); + mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( + mDisplayDeviceConfig.getThermalBrightnessThrottlingDataMapByThrottlingId(), + mThermalBrightnessThrottlingDataId, mUniqueDisplayId); } private void sendUpdatePowerState() { @@ -2116,11 +2120,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked(); final DisplayDeviceConfig ddConfig = device.getDisplayDeviceConfig(); return new BrightnessThrottler(mHandler, - ddConfig.getBrightnessThrottlingData(mBrightnessThrottlingDataId), () -> { sendUpdatePowerState(); postBrightnessChangeRunnable(); - }, mUniqueDisplayId); + }, mUniqueDisplayId, mLogicalDisplay.getThermalBrightnessThrottlingDataIdLocked(), + ddConfig.getThermalBrightnessThrottlingDataMapByThrottlingId()); } private void blockScreenOn() { diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index 5306ac0e57b9..23e606c028ac 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -400,7 +400,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal private boolean mIsEnabled; private boolean mIsInTransition; - private String mBrightnessThrottlingDataId; + // The id of the thermal brightness throttling policy that should be used. + private String mThermalBrightnessThrottlingDataId; // DPCs following the brightness of this DPC. This is used in concurrent displays mode - there // is one lead display, the additional displays follow the brightness value of the lead display. @@ -438,7 +439,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal mDisplayStateController = new DisplayStateController(mDisplayPowerProximityStateController); mAutomaticBrightnessStrategy = new AutomaticBrightnessStrategy(context, mDisplayId); mTag = "DisplayPowerController2[" + mDisplayId + "]"; - mBrightnessThrottlingDataId = logicalDisplay.getBrightnessThrottlingDataIdLocked(); + mThermalBrightnessThrottlingDataId = + logicalDisplay.getThermalBrightnessThrottlingDataIdLocked(); mDisplayDevice = mLogicalDisplay.getPrimaryDisplayDeviceLocked(); mUniqueDisplayId = logicalDisplay.getPrimaryDisplayDeviceLocked().getUniqueId(); @@ -706,8 +708,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal final DisplayDeviceInfo info = device.getDisplayDeviceInfoLocked(); final boolean isEnabled = mLogicalDisplay.isEnabledLocked(); final boolean isInTransition = mLogicalDisplay.isInTransitionLocked(); - final String brightnessThrottlingDataId = - mLogicalDisplay.getBrightnessThrottlingDataIdLocked(); + final String thermalBrightnessThrottlingDataId = + mLogicalDisplay.getThermalBrightnessThrottlingDataIdLocked(); mHandler.postAtTime(() -> { boolean changed = false; @@ -717,19 +719,21 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal mUniqueDisplayId = uniqueId; mDisplayStatsId = mUniqueDisplayId.hashCode(); mDisplayDeviceConfig = config; - mBrightnessThrottlingDataId = brightnessThrottlingDataId; + mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId; loadFromDisplayDeviceConfig(token, info, hbmMetadata); mDisplayPowerProximityStateController.notifyDisplayDeviceChanged(config); // Since the underlying display-device changed, we really don't know the - // last command that was sent to change it's state. Lets assume it is unknown so + // last command that was sent to change it's state. Let's assume it is unknown so // that we trigger a change immediately. mPowerState.resetScreenState(); - } else if (!mBrightnessThrottlingDataId.equals(brightnessThrottlingDataId)) { + } else if ( + !mThermalBrightnessThrottlingDataId.equals(thermalBrightnessThrottlingDataId)) { changed = true; - mBrightnessThrottlingDataId = brightnessThrottlingDataId; - mBrightnessThrottler.resetThrottlingData( - config.getBrightnessThrottlingData(mBrightnessThrottlingDataId), + mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId; + mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( + config.getThermalBrightnessThrottlingDataMapByThrottlingId(), + mThermalBrightnessThrottlingDataId, mUniqueDisplayId); } if (mIsEnabled != isEnabled || mIsInTransition != isInTransition) { @@ -795,9 +799,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal sdrBrightness, maxDesiredHdrSdrRatio); } }); - mBrightnessThrottler.resetThrottlingData( - mDisplayDeviceConfig.getBrightnessThrottlingData(mBrightnessThrottlingDataId), - mUniqueDisplayId); + mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( + mDisplayDeviceConfig.getThermalBrightnessThrottlingDataMapByThrottlingId(), + mThermalBrightnessThrottlingDataId, mUniqueDisplayId); } private void sendUpdatePowerState() { @@ -1206,14 +1210,15 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal // actual state instead of the desired one. animateScreenStateChange(state, mDisplayStateController.shouldPerformScreenOffTransition()); state = mPowerState.getScreenState(); + final boolean userSetBrightnessChanged = mDisplayBrightnessController + .updateUserSetScreenBrightness(); DisplayBrightnessState displayBrightnessState = mDisplayBrightnessController .updateBrightness(mPowerRequest, state); float brightnessState = displayBrightnessState.getBrightness(); float rawBrightnessState = displayBrightnessState.getBrightness(); mBrightnessReasonTemp.set(displayBrightnessState.getBrightnessReason()); - final boolean userSetBrightnessChanged = mDisplayBrightnessController - .updateUserSetScreenBrightness(); + // Take note if the short term model was already active before applying the current // request changes. final boolean wasShortTermModelActive = @@ -1756,11 +1761,11 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked(); final DisplayDeviceConfig ddConfig = device.getDisplayDeviceConfig(); return new BrightnessThrottler(mHandler, - ddConfig.getBrightnessThrottlingData(mBrightnessThrottlingDataId), () -> { sendUpdatePowerState(); postBrightnessChangeRunnable(); - }, mUniqueDisplayId); + }, mUniqueDisplayId, mLogicalDisplay.getThermalBrightnessThrottlingDataIdLocked(), + ddConfig.getThermalBrightnessThrottlingDataMapByThrottlingId()); } private void blockScreenOn() { diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java index dee4cdea65fe..dab00d8070d4 100644 --- a/services/core/java/com/android/server/display/LogicalDisplay.java +++ b/services/core/java/com/android/server/display/LogicalDisplay.java @@ -175,11 +175,11 @@ final class LogicalDisplay { private boolean mDirty = false; /** - * The ID of the brightness throttling data that should be used. This can change e.g. in - * concurrent displays mode in which a stricter brightness throttling policy might need to be - * used. + * The ID of the thermal brightness throttling data that should be used. This can change e.g. + * in concurrent displays mode in which a stricter brightness throttling policy might need to + * be used. */ - private String mBrightnessThrottlingDataId; + private String mThermalBrightnessThrottlingDataId; public LogicalDisplay(int displayId, int layerStack, DisplayDevice primaryDisplayDevice) { mDisplayId = displayId; @@ -189,7 +189,7 @@ final class LogicalDisplay { mTempFrameRateOverride = new SparseArray<>(); mIsEnabled = true; mIsInTransition = false; - mBrightnessThrottlingDataId = DisplayDeviceConfig.DEFAULT_ID; + mThermalBrightnessThrottlingDataId = DisplayDeviceConfig.DEFAULT_ID; } public void setDevicePositionLocked(int position) { @@ -349,7 +349,7 @@ final class LogicalDisplay { * * @param refreshRanges new refreshRateThermalThrottling ranges limited by layout or default */ - public void updateRefreshRateThermalThrottling( + public void updateThermalRefreshRateThrottling( @Nullable SparseArray<SurfaceControl.RefreshRateRange> refreshRanges) { if (refreshRanges == null) { refreshRanges = new SparseArray<>(); @@ -872,16 +872,16 @@ final class LogicalDisplay { /** * @return The ID of the brightness throttling data that this display should use. */ - public String getBrightnessThrottlingDataIdLocked() { - return mBrightnessThrottlingDataId; + public String getThermalBrightnessThrottlingDataIdLocked() { + return mThermalBrightnessThrottlingDataId; } /** * @param brightnessThrottlingDataId The ID of the brightness throttling data that this * display should use. */ - public void setBrightnessThrottlingDataIdLocked(String brightnessThrottlingDataId) { - mBrightnessThrottlingDataId = + public void setThermalBrightnessThrottlingDataIdLocked(String brightnessThrottlingDataId) { + mThermalBrightnessThrottlingDataId = brightnessThrottlingDataId; } @@ -950,7 +950,7 @@ final class LogicalDisplay { pw.println("mFrameRateOverrides=" + Arrays.toString(mFrameRateOverrides)); pw.println("mPendingFrameRateOverrideUids=" + mPendingFrameRateOverrideUids); pw.println("mDisplayGroupName=" + mDisplayGroupName); - pw.println("mBrightnessThrottlingDataId=" + mBrightnessThrottlingDataId); + pw.println("mThermalBrightnessThrottlingDataId=" + mThermalBrightnessThrottlingDataId); pw.println("mLeadDisplayId=" + mLeadDisplayId); } diff --git a/services/core/java/com/android/server/display/LogicalDisplayMapper.java b/services/core/java/com/android/server/display/LogicalDisplayMapper.java index 424eedc876ec..254441c2aa13 100644 --- a/services/core/java/com/android/server/display/LogicalDisplayMapper.java +++ b/services/core/java/com/android/server/display/LogicalDisplayMapper.java @@ -1022,17 +1022,17 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { newDisplay.updateLayoutLimitedRefreshRateLocked( config.getRefreshRange(displayLayout.getRefreshRateZoneId()) ); - newDisplay.updateRefreshRateThermalThrottling( - config.getRefreshRateThrottlingData( + newDisplay.updateThermalRefreshRateThrottling( + config.getThermalRefreshRateThrottlingData( displayLayout.getRefreshRateThermalThrottlingMapId() ) ); setEnabledLocked(newDisplay, displayLayout.isEnabled()); - newDisplay.setBrightnessThrottlingDataIdLocked( - displayLayout.getBrightnessThrottlingMapId() == null + newDisplay.setThermalBrightnessThrottlingDataIdLocked( + displayLayout.getThermalBrightnessThrottlingMapId() == null ? DisplayDeviceConfig.DEFAULT_ID - : displayLayout.getBrightnessThrottlingMapId()); + : displayLayout.getThermalBrightnessThrottlingMapId()); newDisplay.setDisplayGroupNameLocked(displayLayout.getDisplayGroupName()); } diff --git a/services/core/java/com/android/server/display/layout/Layout.java b/services/core/java/com/android/server/display/layout/Layout.java index f86ee249408c..b55d7d5d9d3c 100644 --- a/services/core/java/com/android/server/display/layout/Layout.java +++ b/services/core/java/com/android/server/display/layout/Layout.java @@ -234,11 +234,11 @@ public class Layout { // {@link DeviceStateToLayoutMap.POSITION_UNKNOWN} is unspecified. private final int mPosition; - // The ID of the brightness throttling map that should be used. This can change e.g. in - // concurrent displays mode in which a stricter brightness throttling policy might need to - // be used. + // The ID of the thermal brightness throttling map that should be used. This can change + // e.g. in concurrent displays mode in which a stricter brightness throttling policy might + // need to be used. @Nullable - private final String mBrightnessThrottlingMapId; + private final String mThermalBrightnessThrottlingMapId; // The ID of the lead display that this display will follow in a layout. -1 means no lead. private final int mLeadDisplayId; @@ -248,7 +248,7 @@ public class Layout { private final String mRefreshRateZoneId; @Nullable - private final String mRefreshRateThermalThrottlingMapId; + private final String mThermalRefreshRateThrottlingMapId; private Display(@NonNull DisplayAddress address, int logicalDisplayId, boolean isEnabled, @NonNull String displayGroupName, String brightnessThrottlingMapId, int position, @@ -259,9 +259,9 @@ public class Layout { mIsEnabled = isEnabled; mDisplayGroupName = displayGroupName; mPosition = position; - mBrightnessThrottlingMapId = brightnessThrottlingMapId; + mThermalBrightnessThrottlingMapId = brightnessThrottlingMapId; mRefreshRateZoneId = refreshRateZoneId; - mRefreshRateThermalThrottlingMapId = refreshRateThermalThrottlingMapId; + mThermalRefreshRateThrottlingMapId = refreshRateThermalThrottlingMapId; mLeadDisplayId = leadDisplayId; } @@ -273,10 +273,10 @@ public class Layout { + ", displayGroupName: " + mDisplayGroupName + ", addr: " + mAddress + ((mPosition == POSITION_UNKNOWN) ? "" : ", position: " + mPosition) - + ", brightnessThrottlingMapId: " + mBrightnessThrottlingMapId + + ", mThermalBrightnessThrottlingMapId: " + mThermalBrightnessThrottlingMapId + ", mRefreshRateZoneId: " + mRefreshRateZoneId + ", mLeadDisplayId: " + mLeadDisplayId - + ", mRefreshRateThermalThrottlingMapId: " + mRefreshRateThermalThrottlingMapId + + ", mThermalRefreshRateThrottlingMapId: " + mThermalRefreshRateThrottlingMapId + "}"; } @@ -293,12 +293,12 @@ public class Layout { && otherDisplay.mLogicalDisplayId == this.mLogicalDisplayId && this.mDisplayGroupName.equals(otherDisplay.mDisplayGroupName) && this.mAddress.equals(otherDisplay.mAddress) - && Objects.equals(mBrightnessThrottlingMapId, - otherDisplay.mBrightnessThrottlingMapId) + && Objects.equals(mThermalBrightnessThrottlingMapId, + otherDisplay.mThermalBrightnessThrottlingMapId) && Objects.equals(otherDisplay.mRefreshRateZoneId, this.mRefreshRateZoneId) && this.mLeadDisplayId == otherDisplay.mLeadDisplayId - && Objects.equals(mRefreshRateThermalThrottlingMapId, - otherDisplay.mRefreshRateThermalThrottlingMapId); + && Objects.equals(mThermalRefreshRateThrottlingMapId, + otherDisplay.mThermalRefreshRateThrottlingMapId); } @Override @@ -309,10 +309,10 @@ public class Layout { result = 31 * result + mLogicalDisplayId; result = 31 * result + mDisplayGroupName.hashCode(); result = 31 * result + mAddress.hashCode(); - result = 31 * result + mBrightnessThrottlingMapId.hashCode(); + result = 31 * result + mThermalBrightnessThrottlingMapId.hashCode(); result = 31 * result + Objects.hashCode(mRefreshRateZoneId); result = 31 * result + mLeadDisplayId; - result = 31 * result + Objects.hashCode(mRefreshRateThermalThrottlingMapId); + result = 31 * result + Objects.hashCode(mThermalRefreshRateThrottlingMapId); return result; } @@ -338,10 +338,12 @@ public class Layout { } /** - * @return The ID of the brightness throttling map that this display should use. + * Gets the id of the thermal brightness throttling map that should be used. + * @return The ID of the thermal brightness throttling map that this display should use, + * null if unspecified, will fall back to default. */ - public String getBrightnessThrottlingMapId() { - return mBrightnessThrottlingMapId; + public String getThermalBrightnessThrottlingMapId() { + return mThermalBrightnessThrottlingMapId; } /** @@ -359,7 +361,7 @@ public class Layout { } public String getRefreshRateThermalThrottlingMapId() { - return mRefreshRateThermalThrottlingMapId; + return mThermalRefreshRateThrottlingMapId; } } } diff --git a/services/core/java/com/android/server/display/mode/SkinThermalStatusObserver.java b/services/core/java/com/android/server/display/mode/SkinThermalStatusObserver.java index f93d9ee55d30..c04735d8f7e2 100644 --- a/services/core/java/com/android/server/display/mode/SkinThermalStatusObserver.java +++ b/services/core/java/com/android/server/display/mode/SkinThermalStatusObserver.java @@ -102,7 +102,7 @@ final class SkinThermalStatusObserver extends IThermalEventListener.Stub impleme //region DisplayManager.DisplayListener @Override public void onDisplayAdded(int displayId) { - updateRefreshRateThermalThrottling(displayId); + updateThermalRefreshRateThrottling(displayId); if (mLoggingEnabled) { Slog.d(TAG, "Display added:" + displayId); } @@ -122,7 +122,7 @@ final class SkinThermalStatusObserver extends IThermalEventListener.Stub impleme @Override public void onDisplayChanged(int displayId) { - updateRefreshRateThermalThrottling(displayId); + updateThermalRefreshRateThrottling(displayId); if (mLoggingEnabled) { Slog.d(TAG, "Display changed:" + displayId); } @@ -150,7 +150,7 @@ final class SkinThermalStatusObserver extends IThermalEventListener.Stub impleme } } - private void updateRefreshRateThermalThrottling(int displayId) { + private void updateThermalRefreshRateThrottling(int displayId) { DisplayInfo displayInfo = new DisplayInfo(); mInjector.getDisplayInfo(displayId, displayInfo); SparseArray<SurfaceControl.RefreshRateRange> throttlingMap = diff --git a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java index bb1a445b52e9..effef47e21d6 100644 --- a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java +++ b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java @@ -37,6 +37,7 @@ import android.view.InputChannel; import android.view.InputEvent; import android.view.InputEventReceiver; import android.view.MotionEvent; +import android.view.PointerIcon; import android.view.SurfaceControl; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -273,6 +274,9 @@ final class HandwritingModeController { } mHandwritingSurface.startIntercepting(imePid, imeUid); + // Unset the pointer icon for the stylus in case the app had set it. + InputManagerGlobal.getInstance().setPointerIconType(PointerIcon.TYPE_NOT_SPECIFIED); + return new HandwritingSession(mCurrentRequestId, mHandwritingSurface.getInputChannel(), mHandwritingBuffer); } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java b/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java index c212e8e3c82c..44ae454e7ef2 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java @@ -19,7 +19,6 @@ package com.android.server.inputmethod; import static com.android.server.inputmethod.InputMethodManagerService.DEBUG; import static com.android.server.inputmethod.InputMethodUtils.NOT_A_SUBTYPE_ID; -import android.annotation.Nullable; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -66,8 +65,8 @@ final class InputMethodMenuController { private boolean mShowImeWithHardKeyboard; @GuardedBy("ImfLock.class") - @Nullable - private InputMethodDialogWindowContext mDialogWindowContext; + private final InputMethodDialogWindowContext mDialogWindowContext = + new InputMethodDialogWindowContext(); InputMethodMenuController(InputMethodManagerService service) { mService = service; @@ -125,13 +124,11 @@ final class InputMethodMenuController { } } - if (mDialogWindowContext == null) { - mDialogWindowContext = new InputMethodDialogWindowContext(); - } final Context dialogWindowContext = mDialogWindowContext.get(displayId); mDialogBuilder = new AlertDialog.Builder(dialogWindowContext); mDialogBuilder.setOnCancelListener(dialog -> hideInputMethodMenu()); + // TODO(b/277061090): refactor UI components should not be created while holding a lock. final Context dialogContext = mDialogBuilder.getContext(); final TypedArray a = dialogContext.obtainStyledAttributes(null, com.android.internal.R.styleable.DialogPreference, @@ -199,10 +196,11 @@ final class InputMethodMenuController { attrs.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS; attrs.setTitle("Select input method"); w.setAttributes(attrs); + // TODO(b/277062834) decouple/remove dependency on IMMS mService.updateSystemUiLocked(); mService.sendOnNavButtonFlagsChangedLocked(); - mSwitchingDialog.show(); } + mSwitchingDialog.show(); } private boolean isScreenLocked() { @@ -276,6 +274,7 @@ final class InputMethodMenuController { private final int mTextViewResourceId; private final List<ImeSubtypeListItem> mItemsList; public int mCheckedItem; + private ImeSubtypeListAdapter(Context context, int textViewResourceId, List<ImeSubtypeListItem> itemsList, int checkedItem) { super(context, textViewResourceId, itemsList); diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 0da94ff6aa0f..ee4a6fea8ad4 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1516,11 +1516,6 @@ public class LockSettingsService extends ILockSettings.Stub { && !getSeparateProfileChallengeEnabledInternal(userId); } - private boolean isProfileWithSeparatedLock(int userId) { - return isCredentialSharableWithParent(userId) - && getSeparateProfileChallengeEnabledInternal(userId); - } - /** * Send credentials for user {@code userId} to {@link RecoverableKeyStoreManager} during an * unlock operation. @@ -2784,9 +2779,19 @@ public class LockSettingsService extends ILockSettings.Stub { activateEscrowTokens(sp, userId); - if (isProfileWithSeparatedLock(userId)) { - setDeviceUnlockedForUser(userId); + if (isCredentialSharableWithParent(userId)) { + if (getSeparateProfileChallengeEnabledInternal(userId)) { + setDeviceUnlockedForUser(userId); + } else { + // Here only clear StrongAuthFlags for a profile that has a unified challenge. + // StrongAuth for a profile with a separate challenge is handled differently and + // is cleared after the user successfully confirms the separate challenge to enter + // the profile. StrongAuth for the full user (e.g. userId 0) is also handled + // separately by Keyguard. + mStrongAuth.reportUnlock(userId); + } } + mStrongAuth.reportSuccessfulStrongAuthUnlock(userId); onSyntheticPasswordUnlocked(userId, sp); diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java index 48acc7c2ba8d..f0e8ede5987d 100644 --- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java +++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java @@ -19,6 +19,7 @@ package com.android.server.media.projection; import static android.Manifest.permission.MANAGE_MEDIA_PROJECTION; import static android.app.ActivityManagerInternal.MEDIA_PROJECTION_TOKEN_EVENT_CREATED; import static android.app.ActivityManagerInternal.MEDIA_PROJECTION_TOKEN_EVENT_DESTROYED; +import static android.view.Display.INVALID_DISPLAY; import android.Manifest; import android.annotation.NonNull; @@ -26,10 +27,14 @@ import android.annotation.Nullable; import android.app.ActivityManagerInternal; import android.app.AppOpsManager; import android.app.IProcessObserver; +import android.app.compat.CompatChanges; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledSince; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.ApplicationInfoFlags; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ServiceInfo; import android.hardware.display.DisplayManager; @@ -46,11 +51,13 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; +import android.os.SystemClock; import android.os.UserHandle; import android.util.ArrayMap; import android.util.Slog; import android.view.ContentRecordingSession; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import com.android.internal.util.DumpUtils; import com.android.server.LocalServices; @@ -60,6 +67,7 @@ import com.android.server.wm.WindowManagerInternal; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.time.Duration; import java.util.Map; /** @@ -75,14 +83,29 @@ public final class MediaProjectionManagerService extends SystemService private static final boolean REQUIRE_FG_SERVICE_FOR_PROJECTION = true; private static final String TAG = "MediaProjectionManagerService"; + /** + * Determines how to respond to an app re-using a consent token; either failing or allowing the + * user to re-grant consent. + * + * <p>Enabled after version 33 (Android T), so applies to target SDK of 34+ (Android U+). + * @hide + */ + @VisibleForTesting + @ChangeId + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + static final long MEDIA_PROJECTION_PREVENTS_REUSING_CONSENT = 266201607L; // buganizer id + private final Object mLock = new Object(); // Protects the list of media projections private final Map<IBinder, IBinder.DeathRecipient> mDeathEaters; private final CallbackDelegate mCallbackDelegate; private final Context mContext; + private final Injector mInjector; + private final Clock mClock; private final AppOpsManager mAppOps; private final ActivityManagerInternal mActivityManagerInternal; private final PackageManager mPackageManager; + private final WindowManagerInternal mWmInternal; private final MediaRouter mMediaRouter; private final MediaRouterCallback mMediaRouterCallback; @@ -92,18 +115,53 @@ public final class MediaProjectionManagerService extends SystemService private MediaProjection mProjectionGrant; public MediaProjectionManagerService(Context context) { + this(context, new Injector()); + } + + @VisibleForTesting MediaProjectionManagerService(Context context, Injector injector) { super(context); mContext = context; + mInjector = injector; + mClock = injector.createClock(); mDeathEaters = new ArrayMap<IBinder, IBinder.DeathRecipient>(); mCallbackDelegate = new CallbackDelegate(); mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE); mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); mPackageManager = mContext.getPackageManager(); + mWmInternal = LocalServices.getService(WindowManagerInternal.class); mMediaRouter = (MediaRouter) mContext.getSystemService(Context.MEDIA_ROUTER_SERVICE); mMediaRouterCallback = new MediaRouterCallback(); Watchdog.getInstance().addMonitor(this); } + /** Functional interface for providing time. */ + @VisibleForTesting + interface Clock { + /** + * Returns current time in milliseconds since boot, not counting time spent in deep sleep. + */ + long uptimeMillis(); + } + + @VisibleForTesting + static class Injector { + + /** + * Returns whether we should prevent the calling app from re-using the user's consent, or + * allow the user to re-grant access to the same consent token. + */ + boolean shouldMediaProjectionPreventReusingConsent(MediaProjection projection) { + // TODO(b/269273190): query feature flag directly instead of injecting. + return CompatChanges.isChangeEnabled(MEDIA_PROJECTION_PREVENTS_REUSING_CONSENT, + projection.packageName, UserHandle.getUserHandleForUid(projection.uid)); + } + + Clock createClock() { + return SystemClock::uptimeMillis; + } + } + + @Override public void onStart() { publishBinderService(Context.MEDIA_PROJECTION_SERVICE, new BinderService(), @@ -232,7 +290,31 @@ public final class MediaProjectionManagerService extends SystemService mCallbackDelegate.dispatchStop(projection); } - private boolean isCurrentProjection(IBinder token) { + /** + * Returns {@code true} when updating the current mirroring session on WM succeeded, and + * {@code false} otherwise. + */ + @VisibleForTesting + boolean setContentRecordingSession(@Nullable ContentRecordingSession incomingSession) { + synchronized (mLock) { + if (!mWmInternal.setContentRecordingSession( + incomingSession)) { + // Unable to start mirroring, so tear down this projection. + if (mProjectionGrant != null) { + mProjectionGrant.stop(); + } + return false; + } + return true; + } + } + + /** + * Returns {@code true} when the given token matches the token of the current projection + * instance. Returns {@code false} otherwise. + */ + @VisibleForTesting + boolean isCurrentProjection(IBinder token) { synchronized (mLock) { if (mProjectionToken != null) { return mProjectionToken.equals(token); @@ -241,7 +323,52 @@ public final class MediaProjectionManagerService extends SystemService } } - private MediaProjectionInfo getActiveProjectionInfo() { + + /** + * Reshows the permisison dialog for the user to review consent they've already granted in + * the given projection instance. + * + * <p>Preconditions: + * <ul> + * <li>{@link IMediaProjection#isValid} returned false, rather than throwing an exception</li> + * <li>Given projection instance is the current projection instance.</li> + * <ul> + * + * <p>Returns immediately but waits to start recording until user has reviewed their consent. + */ + @VisibleForTesting + void requestConsentForInvalidProjection(IMediaProjection projection) { + synchronized (mLock) { + Slog.v(TAG, "Reusing token: Reshow dialog for due to invalid projection."); + // TODO(b/274790702): Trigger the permission dialog again in SysUI. + } + } + + // TODO(b/261563516): Remove internal method and test aidl directly, here and elsewhere. + @VisibleForTesting + MediaProjection createProjectionInternal(int uid, String packageName, int type, + boolean isPermanentGrant, UserHandle callingUser, + boolean packageAttemptedReusingGrantedConsent) { + MediaProjection projection; + ApplicationInfo ai; + try { + ai = mPackageManager.getApplicationInfoAsUser(packageName, ApplicationInfoFlags.of(0), + callingUser); + } catch (NameNotFoundException e) { + throw new IllegalArgumentException("No package matching :" + packageName); + } + + projection = new MediaProjection(type, uid, packageName, ai.targetSdkVersion, + ai.isPrivilegedApp()); + if (isPermanentGrant) { + mAppOps.setMode(AppOpsManager.OP_PROJECT_MEDIA, + projection.uid, projection.packageName, AppOpsManager.MODE_ALLOWED); + } + return projection; + } + + @VisibleForTesting + MediaProjectionInfo getActiveProjectionInfo() { synchronized (mLock) { if (mProjectionGrant == null) { return null; @@ -291,22 +418,12 @@ public final class MediaProjectionManagerService extends SystemService if (packageName == null || packageName.isEmpty()) { throw new IllegalArgumentException("package name must not be empty"); } - final ApplicationInfo ai; - try { - ai = mPackageManager.getApplicationInfo(packageName, 0); - } catch (NameNotFoundException e) { - throw new IllegalArgumentException("No package matching :" + packageName); - } - MediaProjection projection; + final UserHandle callingUser = Binder.getCallingUserHandle(); final long callingToken = Binder.clearCallingIdentity(); try { - projection = new MediaProjection(type, uid, packageName, ai.targetSdkVersion, - ai.isPrivilegedApp()); - if (isPermanentGrant) { - mAppOps.setMode(AppOpsManager.OP_PROJECT_MEDIA, - projection.uid, projection.packageName, AppOpsManager.MODE_ALLOWED); - } + projection = createProjectionInternal(uid, packageName, type, isPermanentGrant, + callingUser, false); } finally { Binder.restoreCallingIdentity(callingToken); } @@ -426,33 +543,49 @@ public final class MediaProjectionManagerService extends SystemService } } - /** - * Updates the current content mirroring session. - */ @Override - public void setContentRecordingSession(@Nullable ContentRecordingSession incomingSession, + public boolean setContentRecordingSession(@Nullable ContentRecordingSession incomingSession, @NonNull IMediaProjection projection) { + if (mContext.checkCallingOrSelfPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION to set session " + + "details."); + } + if (!isCurrentProjection(projection)) { + throw new SecurityException("Unable to set ContentRecordingSession on " + + "non-current MediaProjection"); + } final long origId = Binder.clearCallingIdentity(); try { - synchronized (mLock) { - if (!isCurrentProjection(projection)) { - throw new SecurityException("Unable to set ContentRecordingSession on " - + "non-current MediaProjection"); - } - if (!LocalServices.getService( - WindowManagerInternal.class).setContentRecordingSession( - incomingSession)) { - // Unable to start mirroring, so tear down this projection. - if (mProjectionGrant != null) { - mProjectionGrant.stop(); - } - } - } + return MediaProjectionManagerService.this.setContentRecordingSession( + incomingSession); } finally { Binder.restoreCallingIdentity(origId); } } + @Override + public void requestConsentForInvalidProjection(IMediaProjection projection) { + if (mContext.checkCallingOrSelfPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION to check if the given" + + "projection is valid."); + } + if (!isCurrentProjection(projection)) { + Slog.v(TAG, "Reusing token: Won't request consent again for a token that " + + "isn't current"); + return; + } + + // Remove calling app identity before performing any privileged operations. + final long token = Binder.clearCallingIdentity(); + try { + MediaProjectionManagerService.this.requestConsentForInvalidProjection(projection); + } finally { + Binder.restoreCallingIdentity(token); + } + } + @Override // Binder call public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; @@ -471,7 +604,14 @@ public final class MediaProjectionManagerService extends SystemService } } - private final class MediaProjection extends IMediaProjection.Stub { + @VisibleForTesting + final class MediaProjection extends IMediaProjection.Stub { + // Host app has 5 minutes to begin using the token before it is invalid. + // Some apps show a dialog for the user to interact with (selecting recording resolution) + // before starting capture, but after requesting consent. + final long mDefaultTimeoutMs = Duration.ofMinutes(5).toMillis(); + // The creation timestamp in milliseconds, measured by {@link SystemClock#uptimeMillis}. + private final long mCreateTimeMs; public final int uid; public final String packageName; public final UserHandle userHandle; @@ -485,6 +625,15 @@ public final class MediaProjectionManagerService extends SystemService private boolean mRestoreSystemAlertWindow; private IBinder mLaunchCookie = null; + // Values for tracking token validity. + // Timeout value to compare creation time against. + private long mTimeoutMs = mDefaultTimeoutMs; + // Count of number of times IMediaProjection#start is invoked. + private int mCountStarts = 0; + // Set if MediaProjection#createVirtualDisplay has been invoked previously (it + // should only be called once). + private int mVirtualDisplayId = INVALID_DISPLAY; + MediaProjection(int type, int uid, String packageName, int targetSdkVersion, boolean isPrivileged) { mType = type; @@ -493,6 +642,7 @@ public final class MediaProjectionManagerService extends SystemService userHandle = new UserHandle(UserHandle.getUserId(uid)); mTargetSdkVersion = targetSdkVersion; mIsPrivileged = isPrivileged; + mCreateTimeMs = mClock.uptimeMillis(); // TODO(b/267740338): Add unit test. mActivityManagerInternal.notifyMediaProjectionEvent(uid, asBinder(), MEDIA_PROJECTION_TOKEN_EVENT_CREATED); @@ -554,6 +704,9 @@ public final class MediaProjectionManagerService extends SystemService if (isCurrentProjection(asBinder())) { Slog.w(TAG, "UID " + Binder.getCallingUid() + " attempted to start already started MediaProjection"); + // It is possible the app didn't explicitly invoke stop before trying to start + // again; ensure this start is counted in case they are re-using this token. + mCountStarts++; return; } @@ -612,6 +765,8 @@ public final class MediaProjectionManagerService extends SystemService } } startProjectionLocked(this); + // Mark this token as used when the app gets the MediaProjection instance. + mCountStarts++; } } @@ -689,6 +844,51 @@ public final class MediaProjectionManagerService extends SystemService return mLaunchCookie; } + @Override + public boolean isValid() { + if (mContext.checkCallingOrSelfPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION to check if this" + + "projection is valid."); + } + synchronized (mLock) { + final long curMs = mClock.uptimeMillis(); + final boolean hasTimedOut = curMs - mCreateTimeMs > mTimeoutMs; + final boolean virtualDisplayCreated = mVirtualDisplayId != INVALID_DISPLAY; + final boolean isValid = + !hasTimedOut && (mCountStarts <= 1) && !virtualDisplayCreated; + if (isValid) { + return true; + } + + // Can safely use mProjectionGrant since we know this is the current projection. + if (mInjector.shouldMediaProjectionPreventReusingConsent(mProjectionGrant)) { + Slog.v(TAG, "Reusing token: Throw exception due to invalid projection."); + // Tear down projection here; necessary to ensure (among other reasons) that + // stop is dispatched to client and cast icon disappears from status bar. + mProjectionGrant.stop(); + throw new IllegalStateException("Don't re-use the resultData to retrieve " + + "the same projection instance, and don't use a token that has " + + "timed out. Don't take multiple captures by invoking " + + "MediaProjection#createVirtualDisplay multiple times on the " + + "same instance."); + } + return false; + } + } + + @Override + public void notifyVirtualDisplayCreated(int displayId) { + if (mContext.checkCallingOrSelfPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION to notify virtual " + + "display created."); + } + synchronized (mLock) { + mVirtualDisplayId = displayId; + } + } + public MediaProjectionInfo getProjectionInfo() { return new MediaProjectionInfo(packageName, userHandle); } @@ -804,7 +1004,7 @@ public final class MediaProjectionManagerService extends SystemService return; } synchronized (mLock) { - // TODO(b/249827847) Currently the service assumes there is only one projection + // TODO(b/249827847): Currently the service assumes there is only one projection // at once - need to find the callback for the given projection, when there are // multiple sessions. for (IMediaProjectionCallback callback : mClientCallbacks.values()) { @@ -832,7 +1032,7 @@ public final class MediaProjectionManagerService extends SystemService return; } synchronized (mLock) { - // TODO(b/249827847) Currently the service assumes there is only one projection + // TODO(b/249827847): Currently the service assumes there is only one projection // at once - need to find the callback for the given projection, when there are // multiple sessions. for (IMediaProjectionCallback callback : mClientCallbacks.values()) { diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 4c36b910e77b..a3d89e73c2e0 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -153,6 +153,7 @@ import android.app.IUidObserver; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; +import android.app.UidObserver; import android.app.usage.NetworkStats; import android.app.usage.NetworkStatsManager; import android.app.usage.UsageStatsManagerInternal; @@ -1117,7 +1118,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } } - final private IUidObserver mUidObserver = new IUidObserver.Stub() { + final private IUidObserver mUidObserver = new UidObserver() { @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, @ProcessCapability int capability) { synchronized (mUidStateCallbackInfos) { @@ -1139,18 +1140,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { @Override public void onUidGone(int uid, boolean disabled) { mUidEventHandler.obtainMessage(UID_MSG_GONE, uid, 0).sendToTarget(); } - - @Override public void onUidActive(int uid) { - } - - @Override public void onUidIdle(int uid, boolean disabled) { - } - - @Override public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override public void onUidProcAdjChanged(int uid) { - } }; private static final class UidStateCallbackInfo { diff --git a/services/core/java/com/android/server/notification/BubbleExtractor.java b/services/core/java/com/android/server/notification/BubbleExtractor.java index d3dea0d96812..b8900d7acee5 100644 --- a/services/core/java/com/android/server/notification/BubbleExtractor.java +++ b/services/core/java/com/android/server/notification/BubbleExtractor.java @@ -16,7 +16,6 @@ package com.android.server.notification; import static android.app.Notification.FLAG_BUBBLE; -import static android.app.Notification.FLAG_FOREGROUND_SERVICE; import static android.app.NotificationChannel.ALLOW_BUBBLE_OFF; import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL; import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE; @@ -81,7 +80,7 @@ public class BubbleExtractor implements NotificationSignalExtractor { && !mActivityManager.isLowRamDevice() && record.isConversation() && record.getShortcutInfo() != null - && (record.getNotification().flags & FLAG_FOREGROUND_SERVICE) == 0; + && !record.getNotification().isFgsOrUij(); boolean userEnabledBubbles = mConfig.bubblesEnabled(record.getUser()); int appPreference = diff --git a/services/core/java/com/android/server/notification/NotificationComparator.java b/services/core/java/com/android/server/notification/NotificationComparator.java index 6f0903cf8685..446c4f7e335a 100644 --- a/services/core/java/com/android/server/notification/NotificationComparator.java +++ b/services/core/java/com/android/server/notification/NotificationComparator.java @@ -165,7 +165,7 @@ public class NotificationComparator if (isCallStyle(record)) { return true; } - if (!isOngoing(record)) { + if (!record.getNotification().isFgsOrUij()) { return false; } return isCallCategory(record) || isMediaNotification(record); @@ -199,11 +199,6 @@ public class NotificationComparator return false; } - private boolean isOngoing(NotificationRecord record) { - final int ongoingFlags = Notification.FLAG_FOREGROUND_SERVICE; - return (record.getNotification().flags & ongoingFlags) != 0; - } - private boolean isMediaNotification(NotificationRecord record) { return record.getNotification().isMediaNotification(); } diff --git a/services/core/java/com/android/server/notification/NotificationManagerInternal.java b/services/core/java/com/android/server/notification/NotificationManagerInternal.java index bc3885605a6c..919fc712c409 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerInternal.java +++ b/services/core/java/com/android/server/notification/NotificationManagerInternal.java @@ -35,6 +35,8 @@ public interface NotificationManagerInternal { void removeForegroundServiceFlagFromNotification(String pkg, int notificationId, int userId); + void removeUserInitiatedJobFlagFromNotification(String pkg, int notificationId, int userId); + void onConversationRemoved(String pkg, int uid, Set<String> shortcuts); /** Get the number of notification channels for a given package */ diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 2d806d374b70..6d27fe058423 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -21,6 +21,7 @@ import static android.app.ActivityManagerInternal.ServiceNotificationPolicy.NOT_ import static android.app.AppOpsManager.MODE_ALLOWED; import static android.app.Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; import static android.app.Notification.FLAG_AUTOGROUP_SUMMARY; +import static android.app.Notification.FLAG_AUTO_CANCEL; import static android.app.Notification.FLAG_BUBBLE; import static android.app.Notification.FLAG_FOREGROUND_SERVICE; import static android.app.Notification.FLAG_FSI_REQUESTED_BUT_DENIED; @@ -29,6 +30,7 @@ import static android.app.Notification.FLAG_NO_CLEAR; import static android.app.Notification.FLAG_NO_DISMISS; import static android.app.Notification.FLAG_ONGOING_EVENT; import static android.app.Notification.FLAG_ONLY_ALERT_ONCE; +import static android.app.Notification.FLAG_USER_INITIATED_JOB; import static android.app.NotificationChannel.CONVERSATION_CHANNEL_ID_FORMAT; import static android.app.NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED; import static android.app.NotificationManager.ACTION_AUTOMATIC_ZEN_RULE_STATUS_CHANGED; @@ -163,6 +165,7 @@ import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.app.PendingIntent; import android.app.RemoteServiceException.BadForegroundServiceNotificationException; +import android.app.RemoteServiceException.BadUserInitiatedJobNotificationException; import android.app.StatsManager; import android.app.StatusBarManager; import android.app.UriGrantsManager; @@ -304,6 +307,7 @@ import com.android.server.IoThread; import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.UiThread; +import com.android.server.job.JobSchedulerInternal; import com.android.server.lights.LightsManager; import com.android.server.lights.LogicalLight; import com.android.server.notification.ManagedServices.ManagedServiceInfo; @@ -1156,8 +1160,8 @@ public class NotificationManagerService extends SystemService { StatusBarNotification sbn = r.getSbn(); cancelNotification(callingUid, callingPid, sbn.getPackageName(), sbn.getTag(), sbn.getId(), Notification.FLAG_AUTO_CANCEL, - FLAG_FOREGROUND_SERVICE | FLAG_BUBBLE, false, r.getUserId(), - REASON_CLICK, nv.rank, nv.count, null); + FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB | FLAG_BUBBLE, + false, r.getUserId(), REASON_CLICK, nv.rank, nv.count, null); nv.recycle(); reportUserInteraction(r); mAssistants.notifyAssistantNotificationClicked(r); @@ -1265,21 +1269,26 @@ public class NotificationManagerService extends SystemService { public void onNotificationError(int callingUid, int callingPid, String pkg, String tag, int id, int uid, int initialPid, String message, int userId) { final boolean fgService; + final boolean uiJob; synchronized (mNotificationLock) { NotificationRecord r = findNotificationLocked(pkg, tag, id, userId); fgService = r != null && (r.getNotification().flags & FLAG_FOREGROUND_SERVICE) != 0; + uiJob = r != null && (r.getNotification().flags & FLAG_USER_INITIATED_JOB) != 0; } cancelNotification(callingUid, callingPid, pkg, tag, id, 0, 0, false, userId, REASON_ERROR, null); - if (fgService) { - // Still crash for foreground services, preventing the not-crash behaviour abused - // by apps to give us a garbage notification and silently start a fg service. + if (fgService || uiJob) { + // Still crash for foreground services or user-initiated jobs, preventing the + // not-crash behaviour abused by apps to give us a garbage notification and + // silently start a fg service or user-initiated job. + final int exceptionTypeId = fgService + ? BadForegroundServiceNotificationException.TYPE_ID + : BadUserInitiatedJobNotificationException.TYPE_ID; Binder.withCleanCallingIdentity( () -> mAm.crashApplicationWithType(uid, initialPid, pkg, -1, "Bad notification(tag=" + tag + ", id=" + id + ") posted from package " + pkg + ", crashing app(uid=" + uid + ", pid=" + initialPid + "): " - + message, true /* force */, - BadForegroundServiceNotificationException.TYPE_ID)); + + message, true /* force */, exceptionTypeId)); } } @@ -1689,8 +1698,8 @@ public class NotificationManagerService extends SystemService { cancelNotification(record.getSbn().getUid(), record.getSbn().getInitialPid(), record.getSbn().getPackageName(), record.getSbn().getTag(), record.getSbn().getId(), 0, - FLAG_FOREGROUND_SERVICE, true, record.getUserId(), - REASON_TIMEOUT, null); + FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB, + true, record.getUserId(), REASON_TIMEOUT, null); } } } @@ -3296,8 +3305,8 @@ public class NotificationManagerService extends SystemService { @Nullable ITransientNotification callback, int duration, boolean isUiContext, int displayId, @Nullable ITransientNotificationCallback textCallback) { if (DBG) { - Slog.i(TAG, "enqueueToast pkg=" + pkg + " token=" + token - + " duration=" + duration + " displayId=" + displayId); + Slog.i(TAG, "enqueueToast pkg=" + pkg + " token=" + token + " duration=" + duration + + " isUiContext=" + isUiContext + " displayId=" + displayId); } if (pkg == null || (text == null && callback == null) @@ -3308,15 +3317,6 @@ public class NotificationManagerService extends SystemService { } final int callingUid = Binder.getCallingUid(); - checkCallerIsSameApp(pkg); - final boolean isSystemToast = isCallerSystemOrPhone() - || PackageManagerService.PLATFORM_PACKAGE_NAME.equals(pkg); - boolean isAppRenderedToast = (callback != null); - if (!checkCanEnqueueToast(pkg, callingUid, displayId, isAppRenderedToast, - isSystemToast)) { - return; - } - if (!isUiContext && displayId == Display.DEFAULT_DISPLAY && mUm.isVisibleBackgroundUsersSupported()) { // When the caller is a visible background user using a non-UI context (like the @@ -3333,6 +3333,15 @@ public class NotificationManagerService extends SystemService { } } + checkCallerIsSameApp(pkg); + final boolean isSystemToast = isCallerSystemOrPhone() + || PackageManagerService.PLATFORM_PACKAGE_NAME.equals(pkg); + boolean isAppRenderedToast = (callback != null); + if (!checkCanEnqueueToast(pkg, callingUid, displayId, isAppRenderedToast, + isSystemToast)) { + return; + } + synchronized (mToastQueue) { int callingPid = Binder.getCallingPid(); final long callingId = Binder.clearCallingIdentity(); @@ -3519,10 +3528,10 @@ public class NotificationManagerService extends SystemService { userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, true, false, "cancelAllNotifications", pkg); - // Don't allow the app to cancel active FGS notifications + // Don't allow the app to cancel active FGS or UIJ notifications cancelAllNotificationsInt(Binder.getCallingUid(), Binder.getCallingPid(), - pkg, null, 0, FLAG_FOREGROUND_SERVICE, true, userId, - REASON_APP_CANCEL_ALL, null); + pkg, null, 0, FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB, + true, userId, REASON_APP_CANCEL_ALL, null); } @Override @@ -3964,6 +3973,21 @@ public class NotificationManagerService extends SystemService { } } + // Throws a security exception if the given channel has a notification associated + // with an active user-initiated job. + private void enforceDeletingChannelHasNoUserInitiatedJob(String pkg, int userId, + String channelId) { + final JobSchedulerInternal js = LocalServices.getService(JobSchedulerInternal.class); + if (js != null && js.isNotificationChannelAssociatedWithAnyUserInitiatedJobs( + channelId, userId, pkg)) { + Slog.w(TAG, "Package u" + userId + "/" + pkg + + " may not delete notification channel '" + + channelId + "' with user-initiated job"); + throw new SecurityException("Not allowed to delete channel " + channelId + + " with a user-initiated job"); + } + } + @Override public void deleteNotificationChannel(String pkg, String channelId) { checkCallerIsSystemOrSameApp(pkg); @@ -3973,6 +3997,7 @@ public class NotificationManagerService extends SystemService { throw new IllegalArgumentException("Cannot delete default channel"); } enforceDeletingChannelHasNoFgService(pkg, callingUser, channelId); + enforceDeletingChannelHasNoUserInitiatedJob(pkg, callingUser, channelId); cancelAllNotificationsInt(MY_UID, MY_PID, pkg, channelId, 0, 0, true, callingUser, REASON_CHANNEL_REMOVED, null); boolean previouslyExisted = mPreferencesHelper.deleteNotificationChannel( @@ -4017,8 +4042,9 @@ public class NotificationManagerService extends SystemService { final int userId = UserHandle.getUserId(callingUid); List<NotificationChannel> groupChannels = groupToDelete.getChannels(); for (int i = 0; i < groupChannels.size(); i++) { - enforceDeletingChannelHasNoFgService(pkg, userId, - groupChannels.get(i).getId()); + final String channelId = groupChannels.get(i).getId(); + enforceDeletingChannelHasNoFgService(pkg, userId, channelId); + enforceDeletingChannelHasNoUserInitiatedJob(pkg, userId, channelId); } List<NotificationChannel> deletedChannels = mPreferencesHelper.deleteNotificationChannelGroup(pkg, callingUid, groupId); @@ -6360,61 +6386,73 @@ public class NotificationManagerService extends SystemService { checkCallerIsSystem(); mHandler.post(() -> { synchronized (mNotificationLock) { - int count = getNotificationCount(pkg, userId); - boolean removeFgsNotification = false; - if (count > MAX_PACKAGE_NOTIFICATIONS) { - mUsageStats.registerOverCountQuota(pkg); - removeFgsNotification = true; - } - if (removeFgsNotification) { - NotificationRecord r = findNotificationLocked(pkg, null, notificationId, - userId); - if (r != null) { - if (DBG) { - Slog.d(TAG, "Remove FGS flag not allow. Cancel FGS notification"); - } - removeFromNotificationListsLocked(r); - cancelNotificationLocked(r, false, REASON_APP_CANCEL, true, - null, SystemClock.elapsedRealtime()); - } - } else { - // strip flag from all enqueued notifications. listeners will be informed - // in post runnable. - List<NotificationRecord> enqueued = findNotificationsByListLocked( - mEnqueuedNotifications, pkg, null, notificationId, userId); - for (int i = 0; i < enqueued.size(); i++) { - removeForegroundServiceFlagLocked(enqueued.get(i)); - } - - // if posted notification exists, strip its flag and tell listeners - NotificationRecord r = findNotificationByListLocked( - mNotificationList, pkg, null, notificationId, userId); - if (r != null) { - removeForegroundServiceFlagLocked(r); - mRankingHelper.sort(mNotificationList); - mListeners.notifyPostedLocked(r, r); - } - } + removeFlagFromNotificationLocked(pkg, notificationId, userId, + FLAG_FOREGROUND_SERVICE); } }); } @Override - public void onConversationRemoved(String pkg, int uid, Set<String> shortcuts) { - onConversationRemovedInternal(pkg, uid, shortcuts); + public void removeUserInitiatedJobFlagFromNotification(String pkg, int notificationId, + int userId) { + checkCallerIsSystem(); + mHandler.post(() -> { + synchronized (mNotificationLock) { + removeFlagFromNotificationLocked(pkg, notificationId, userId, + FLAG_USER_INITIATED_JOB); + } + }); } @GuardedBy("mNotificationLock") - private void removeForegroundServiceFlagLocked(NotificationRecord r) { - if (r == null) { - return; + private void removeFlagFromNotificationLocked(String pkg, int notificationId, int userId, + int flag) { + int count = getNotificationCount(pkg, userId); + boolean removeFlagFromNotification = false; + if (count > MAX_PACKAGE_NOTIFICATIONS) { + mUsageStats.registerOverCountQuota(pkg); + removeFlagFromNotification = true; + } + if (removeFlagFromNotification) { + NotificationRecord r = findNotificationLocked(pkg, null, notificationId, userId); + if (r != null) { + if (DBG) { + final String type = (flag == FLAG_FOREGROUND_SERVICE) ? "FGS" : "UIJ"; + Slog.d(TAG, "Remove " + type + " flag not allow. " + + "Cancel " + type + " notification"); + } + removeFromNotificationListsLocked(r); + cancelNotificationLocked(r, false, REASON_APP_CANCEL, true, + null, SystemClock.elapsedRealtime()); + } + } else { + List<NotificationRecord> enqueued = findNotificationsByListLocked( + mEnqueuedNotifications, pkg, null, notificationId, userId); + for (int i = 0; i < enqueued.size(); i++) { + final NotificationRecord r = enqueued.get(i); + if (r != null) { + // strip flag from all enqueued notifications. listeners will be informed + // in post runnable. + StatusBarNotification sbn = r.getSbn(); + sbn.getNotification().flags = (r.mOriginalFlags & ~flag); + } + } + + NotificationRecord r = findNotificationByListLocked( + mNotificationList, pkg, null, notificationId, userId); + if (r != null) { + // if posted notification exists, strip its flag and tell listeners + StatusBarNotification sbn = r.getSbn(); + sbn.getNotification().flags = (r.mOriginalFlags & ~flag); + mRankingHelper.sort(mNotificationList); + mListeners.notifyPostedLocked(r, r); + } } - StatusBarNotification sbn = r.getSbn(); - // NoMan adds flags FLAG_ONGOING_EVENT when it sees - // FLAG_FOREGROUND_SERVICE. Hence it's not enough to remove - // FLAG_FOREGROUND_SERVICE, we have to revert to the flags we received - // initially *and* force remove FLAG_FOREGROUND_SERVICE. - sbn.getNotification().flags = (r.mOriginalFlags & ~FLAG_FOREGROUND_SERVICE); + } + + @Override + public void onConversationRemoved(String pkg, int uid, Set<String> shortcuts) { + onConversationRemovedInternal(pkg, uid, shortcuts); } @Override @@ -6490,10 +6528,10 @@ public class NotificationManagerService extends SystemService { } } - // Don't allow client applications to cancel foreground service notifs or autobundled - // summaries. + // Don't allow client applications to cancel foreground service notifs, user-initiated job + // notifs or autobundled summaries. final int mustNotHaveFlags = isCallingUidSystem() ? 0 : - (FLAG_FOREGROUND_SERVICE | FLAG_AUTOGROUP_SUMMARY); + (FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB | FLAG_AUTOGROUP_SUMMARY); cancelNotification(uid, callingPid, pkg, tag, id, 0, mustNotHaveFlags, false, userId, REASON_APP_CANCEL, null); } @@ -6547,9 +6585,16 @@ public class NotificationManagerService extends SystemService { final ServiceNotificationPolicy policy = mAmi.applyForegroundServiceNotification( notification, tag, id, pkg, userId); + boolean stripUijFlag = true; + final JobSchedulerInternal js = LocalServices.getService(JobSchedulerInternal.class); + if (js != null) { + stripUijFlag = !js.isNotificationAssociatedWithAnyUserInitiatedJobs(id, userId, pkg); + } + // Fix the notification as best we can. try { - fixNotification(notification, pkg, tag, id, userId, notificationUid, policy); + fixNotification(notification, pkg, tag, id, userId, notificationUid, + policy, stripUijFlag); } catch (Exception e) { if (notification.isForegroundService()) { throw new SecurityException("Invalid FGS notification", e); @@ -6558,7 +6603,6 @@ public class NotificationManagerService extends SystemService { return; } - if (policy == ServiceNotificationPolicy.UPDATE_ONLY) { // Proceed if the notification is already showing/known, otherwise ignore // because the service lifecycle logic has retained responsibility for its @@ -6617,31 +6661,25 @@ public class NotificationManagerService extends SystemService { boolean isImportanceFixed = mPermissionHelper.isPermissionFixed(pkg, userId); r.setImportanceFixed(isImportanceFixed); - if ((notification.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) { - final boolean fgServiceShown = channel.isFgServiceShown(); + if (notification.isFgsOrUij()) { if (((channel.getUserLockedFields() & NotificationChannel.USER_LOCKED_IMPORTANCE) == 0 - || !fgServiceShown) + || !channel.isUserVisibleTaskShown()) && (r.getImportance() == IMPORTANCE_MIN || r.getImportance() == IMPORTANCE_NONE)) { - // Increase the importance of foreground service notifications unless the user had - // an opinion otherwise (and the channel hasn't yet shown a fg service). - if (TextUtils.isEmpty(channelId) - || NotificationChannel.DEFAULT_CHANNEL_ID.equals(channelId)) { - r.setSystemImportance(IMPORTANCE_LOW); - } else { - channel.setImportance(IMPORTANCE_LOW); - r.setSystemImportance(IMPORTANCE_LOW); - if (!fgServiceShown) { - channel.unlockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); - channel.setFgServiceShown(true); - } - mPreferencesHelper.updateNotificationChannel( - pkg, notificationUid, channel, false); - r.updateNotificationChannel(channel); - } - } else if (!fgServiceShown && !TextUtils.isEmpty(channelId) + // Increase the importance of fgs/uij notifications unless the user had + // an opinion otherwise (and the channel hasn't yet shown a fgs/uij). + channel.setImportance(IMPORTANCE_LOW); + r.setSystemImportance(IMPORTANCE_LOW); + if (!channel.isUserVisibleTaskShown()) { + channel.unlockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); + channel.setUserVisibleTaskShown(true); + } + mPreferencesHelper.updateNotificationChannel( + pkg, notificationUid, channel, false); + r.updateNotificationChannel(channel); + } else if (!channel.isUserVisibleTaskShown() && !TextUtils.isEmpty(channelId) && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(channelId)) { - channel.setFgServiceShown(true); + channel.setUserVisibleTaskShown(true); r.updateNotificationChannel(channel); } } @@ -6734,7 +6772,8 @@ public class NotificationManagerService extends SystemService { @VisibleForTesting protected void fixNotification(Notification notification, String pkg, String tag, int id, - @UserIdInt int userId, int notificationUid, ServiceNotificationPolicy fgsPolicy) + @UserIdInt int userId, int notificationUid, + ServiceNotificationPolicy fgsPolicy, boolean stripUijFlag) throws NameNotFoundException, RemoteException { final ApplicationInfo ai = mPackageManagerClient.getApplicationInfoAsUser( pkg, PackageManager.MATCH_DEBUG_TRIAGED_MISSING, @@ -6744,6 +6783,14 @@ public class NotificationManagerService extends SystemService { if (notification.isForegroundService() && fgsPolicy == NOT_FOREGROUND_SERVICE) { notification.flags &= ~FLAG_FOREGROUND_SERVICE; } + if (notification.isUserInitiatedJob() && stripUijFlag) { + notification.flags &= ~FLAG_USER_INITIATED_JOB; + } + + // Remove FLAG_AUTO_CANCEL from notifications that are associated with a FGS or UIJ. + if (notification.isFgsOrUij()) { + notification.flags &= ~FLAG_AUTO_CANCEL; + } // Only notifications that can be non-dismissible can have the flag FLAG_NO_DISMISS if (mFlagResolver.isEnabled(ALLOW_DISMISS_ONGOING)) { @@ -7088,8 +7135,8 @@ public class NotificationManagerService extends SystemService { } } - // limit the number of non-fgs outstanding notificationrecords an app can have - if (!n.isForegroundService()) { + // limit the number of non-fgs/uij outstanding notificationrecords an app can have + if (!n.isFgsOrUij()) { int count = getNotificationCount(pkg, userId, id, tag); if (count >= MAX_PACKAGE_NOTIFICATIONS) { mUsageStats.registerOverCountQuota(pkg); @@ -7449,7 +7496,8 @@ public class NotificationManagerService extends SystemService { return false; } } else if (mReason == REASON_APP_CANCEL) { - if ((flags & FLAG_FOREGROUND_SERVICE) != 0) { + if ((flags & FLAG_FOREGROUND_SERVICE) != 0 + || (flags & FLAG_USER_INITIATED_JOB) != 0) { return false; } } @@ -8002,7 +8050,7 @@ public class NotificationManagerService extends SystemService { } FlagChecker childrenFlagChecker = (flags) -> { - if ((flags & FLAG_FOREGROUND_SERVICE) != 0) { + if ((flags & FLAG_FOREGROUND_SERVICE) != 0 || (flags & FLAG_USER_INITIATED_JOB) != 0) { return false; } return true; diff --git a/services/core/java/com/android/server/notification/NotificationUsageStats.java b/services/core/java/com/android/server/notification/NotificationUsageStats.java index 9e91875bfd86..ffe33a832ce4 100644 --- a/services/core/java/com/android/server/notification/NotificationUsageStats.java +++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java @@ -383,6 +383,7 @@ public class NotificationUsageStats { public int numWithBigText; public int numWithBigPicture; public int numForegroundService; + public int numUserInitiatedJob; public int numOngoing; public int numAutoCancel; public int numWithLargeIcon; @@ -433,6 +434,10 @@ public class NotificationUsageStats { numForegroundService++; } + if ((n.flags & Notification.FLAG_USER_INITIATED_JOB) != 0) { + numUserInitiatedJob++; + } + if ((n.flags & Notification.FLAG_ONGOING_EVENT) != 0) { numOngoing++; } @@ -516,6 +521,7 @@ public class NotificationUsageStats { maybeCount("note_big_text", (numWithBigText - previous.numWithBigText)); maybeCount("note_big_pic", (numWithBigPicture - previous.numWithBigPicture)); maybeCount("note_fg", (numForegroundService - previous.numForegroundService)); + maybeCount("note_uij", (numUserInitiatedJob - previous.numUserInitiatedJob)); maybeCount("note_ongoing", (numOngoing - previous.numOngoing)); maybeCount("note_auto", (numAutoCancel - previous.numAutoCancel)); maybeCount("note_large_icon", (numWithLargeIcon - previous.numWithLargeIcon)); @@ -550,6 +556,7 @@ public class NotificationUsageStats { previous.numWithBigText = numWithBigText; previous.numWithBigPicture = numWithBigPicture; previous.numForegroundService = numForegroundService; + previous.numUserInitiatedJob = numUserInitiatedJob; previous.numOngoing = numOngoing; previous.numAutoCancel = numAutoCancel; previous.numWithLargeIcon = numWithLargeIcon; @@ -645,6 +652,8 @@ public class NotificationUsageStats { output.append(indentPlusTwo); output.append("numForegroundService=").append(numForegroundService).append("\n"); output.append(indentPlusTwo); + output.append("numUserInitiatedJob=").append(numUserInitiatedJob).append("\n"); + output.append(indentPlusTwo); output.append("numOngoing=").append(numOngoing).append("\n"); output.append(indentPlusTwo); output.append("numAutoCancel=").append(numAutoCancel).append("\n"); @@ -701,6 +710,7 @@ public class NotificationUsageStats { maybePut(dump, "numWithBigText", numWithBigText); maybePut(dump, "numWithBigPicture", numWithBigPicture); maybePut(dump, "numForegroundService", numForegroundService); + maybePut(dump, "numUserInitiatedJob", numUserInitiatedJob); maybePut(dump, "numOngoing", numOngoing); maybePut(dump, "numAutoCancel", numAutoCancel); maybePut(dump, "numWithLargeIcon", numWithLargeIcon); diff --git a/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java b/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java index cae7079c75e0..82b585d7ad01 100644 --- a/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java +++ b/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java @@ -65,7 +65,7 @@ public class DynamicCodeLoggingService extends JobService { private static final String AVC_PREFIX = "type=" + AUDIT_AVC + " "; private static final Pattern EXECUTE_NATIVE_AUDIT_PATTERN = - Pattern.compile(".*\\bavc: granted \\{ execute(?:_no_trans|) \\} .*" + Pattern.compile(".*\\bavc: +granted +\\{ execute(?:_no_trans|) \\} .*" + "\\bpath=(?:\"([^\" ]*)\"|([0-9A-F]+)) .*" + "\\bscontext=u:r:untrusted_app(?:_25|_27)?:.*" + "\\btcontext=u:object_r:app_data_file:.*" diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 84bee50b77b0..402fb30437b0 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -16,6 +16,7 @@ package com.android.server.pm; +import static android.Manifest.permission.READ_FRAME_BUFFER; import static android.app.ActivityOptions.KEY_SPLASH_SCREEN_THEME; import static android.app.ComponentOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED; import static android.app.ComponentOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; @@ -25,6 +26,8 @@ import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION; +import static android.content.PermissionChecker.PERMISSION_GRANTED; +import static android.content.PermissionChecker.checkCallingOrSelfPermissionForPreflight; import static android.content.pm.LauncherApps.FLAG_CACHE_BUBBLE_SHORTCUTS; import static android.content.pm.LauncherApps.FLAG_CACHE_NOTIFICATION_SHORTCUTS; import static android.content.pm.LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS; @@ -32,6 +35,7 @@ import static android.content.pm.LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS; import android.annotation.AppIdInt; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.ActivityManagerInternal; @@ -90,6 +94,7 @@ import android.util.ArrayMap; import android.util.Log; import android.util.Pair; import android.util.Slog; +import android.window.IDumpCallback; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; @@ -104,6 +109,15 @@ import com.android.server.SystemService; import com.android.server.pm.pkg.AndroidPackage; import com.android.server.wm.ActivityTaskManagerInternal; +import java.io.FileDescriptor; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.nio.file.attribute.PosixFilePermission; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -111,6 +125,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.concurrent.ExecutionException; /** @@ -118,6 +133,15 @@ import java.util.concurrent.ExecutionException; * managed profiles. */ public class LauncherAppsService extends SystemService { + private static final String WM_TRACE_DIR = "/data/misc/wmtrace/"; + private static final String VC_FILE_SUFFIX = ".vc"; + + private static final Set<PosixFilePermission> WM_TRACE_FILE_PERMISSIONS = Set.of( + PosixFilePermission.OWNER_WRITE, + PosixFilePermission.GROUP_READ, + PosixFilePermission.OTHERS_READ, + PosixFilePermission.OWNER_READ + ); private final LauncherAppsImpl mLauncherAppsImpl; @@ -191,6 +215,8 @@ public class LauncherAppsService extends SystemService { final LauncherAppsServiceInternal mInternal; + private RemoteCallbackList<IDumpCallback> mDumpCallbacks = new RemoteCallbackList<>(); + public LauncherAppsImpl(Context context) { mContext = context; mIPM = AppGlobals.getPackageManager(); @@ -1431,6 +1457,66 @@ public class LauncherAppsService extends SystemService { getActivityOptionsForLauncher(opts), user.getIdentifier()); } + + /** + * Using a pipe, outputs view capture data to the wmtrace dir + */ + protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + super.dump(fd, pw, args); + + // Before the wmtrace directory is picked up by dumpstate service, some processes need + // to write their data to that location. They can do that via these dumpCallbacks. + int i = mDumpCallbacks.beginBroadcast(); + while (i > 0) { + i--; + dumpDataToWmTrace((String) mDumpCallbacks.getBroadcastCookie(i) + "_" + i, + mDumpCallbacks.getBroadcastItem(i)); + } + mDumpCallbacks.finishBroadcast(); + } + + private void dumpDataToWmTrace(String name, IDumpCallback cb) { + ParcelFileDescriptor[] pipe; + try { + pipe = ParcelFileDescriptor.createPipe(); + cb.onDump(pipe[1]); + } catch (IOException | RemoteException e) { + Log.d(TAG, "failed to pipe view capture data", e); + return; + } + + Path path = Paths.get(WM_TRACE_DIR + Paths.get(name + VC_FILE_SUFFIX).getFileName()); + try (InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(pipe[0])) { + Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING); + Files.setPosixFilePermissions(path, WM_TRACE_FILE_PERMISSIONS); + } catch (IOException e) { + Log.d(TAG, "failed to write data to file in wmtrace dir", e); + } + } + + @RequiresPermission(READ_FRAME_BUFFER) + @Override + public void registerDumpCallback(IDumpCallback cb) { + int status = checkCallingOrSelfPermissionForPreflight(mContext, READ_FRAME_BUFFER); + if (PERMISSION_GRANTED == status) { + String name = mContext.getPackageManager().getNameForUid(Binder.getCallingUid()); + mDumpCallbacks.register(cb, name); + } else { + Log.w(TAG, "caller lacks permissions to registerDumpCallback"); + } + } + + @RequiresPermission(READ_FRAME_BUFFER) + @Override + public void unRegisterDumpCallback(IDumpCallback cb) { + int status = checkCallingOrSelfPermissionForPreflight(mContext, READ_FRAME_BUFFER); + if (PERMISSION_GRANTED == status) { + mDumpCallbacks.unregister(cb); + } else { + Log.w(TAG, "caller lacks permissions to unRegisterDumpCallback"); + } + } + /** Checks if user is a profile of or same as listeningUser. * and the user is enabled. */ private boolean isEnabledProfileOf(UserHandle listeningUser, UserHandle user, diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 69e92e075b51..f358ce796fcf 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -677,7 +677,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements ? params.installerPackageName : installerPackageName; if (PackageManagerServiceUtils.isRootOrShell(callingUid) - || PackageInstallerSession.isSystemDataLoaderInstallation(params)) { + || PackageInstallerSession.isSystemDataLoaderInstallation(params) + || PackageManagerServiceUtils.isAdoptedShell(callingUid, mContext)) { params.installFlags |= PackageManager.INSTALL_FROM_ADB; // adb installs can override the installingPackageName, but not the // initiatingPackageName diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index ea6383e14969..006d7c82398a 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -745,6 +745,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { @GuardedBy("mLock") private int mValidatedTargetSdk = INVALID_TARGET_SDK_VERSION; + @GuardedBy("mLock") + private boolean mAllowsUpdateOwnership = true; + private static final FileFilter sAddedApkFilter = new FileFilter() { @Override public boolean accept(File file) { @@ -866,13 +869,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { private static final int USER_ACTION_NOT_NEEDED = 0; private static final int USER_ACTION_REQUIRED = 1; - private static final int USER_ACTION_PENDING_APK_PARSING = 2; private static final int USER_ACTION_REQUIRED_UPDATE_OWNER_REMINDER = 3; @IntDef({ USER_ACTION_NOT_NEEDED, USER_ACTION_REQUIRED, - USER_ACTION_PENDING_APK_PARSING, USER_ACTION_REQUIRED_UPDATE_OWNER_REMINDER, }) @interface UserActionRequirement {} @@ -963,11 +964,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { && !isApexSession() && !isUpdateOwner && !isInstallerShell + && mAllowsUpdateOwnership // We don't enforce the update ownership for the managed user and profile. && !isFromManagedUserOrProfile) { return USER_ACTION_REQUIRED_UPDATE_OWNER_REMINDER; } - if (isPermissionGranted) { return USER_ACTION_NOT_NEEDED; } @@ -982,7 +983,20 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { && isUpdateWithoutUserActionPermissionGranted && ((isUpdateOwnershipEnforcementEnabled ? isUpdateOwner : isInstallerOfRecord) || isSelfUpdate)) { - return USER_ACTION_PENDING_APK_PARSING; + if (!isApexSession()) { + if (!isTargetSdkConditionSatisfied(this)) { + return USER_ACTION_REQUIRED; + } + + if (!mSilentUpdatePolicy.isSilentUpdateAllowed( + getInstallerPackageName(), getPackageName())) { + // Fall back to the non-silent update if a repeated installation is invoked + // within the throttle time. + return USER_ACTION_REQUIRED; + } + mSilentUpdatePolicy.track(getInstallerPackageName(), getPackageName()); + return USER_ACTION_NOT_NEEDED; + } } return USER_ACTION_REQUIRED; @@ -1442,7 +1456,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { @NonNull IOnChecksumsReadyListener onChecksumsReadyListener) { assertCallerIsOwnerRootOrVerifier(); final File file = new File(stageDir, name); - final String installerPackageName = getInstallSource().mInitiatingPackageName; + final String installerPackageName = PackageManagerServiceUtils.isInstalledByAdb( + getInstallSource().mInitiatingPackageName) + ? getInstallSource().mInstallerPackageName + : getInstallSource().mInitiatingPackageName; try { mPm.requestFileChecksums(file, installerPackageName, optional, required, trustedInstallers, onChecksumsReadyListener); @@ -2363,26 +2380,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { session.sendPendingUserActionIntent(target); return true; } - - if (!session.isApexSession() && userActionRequirement == USER_ACTION_PENDING_APK_PARSING) { - if (!isTargetSdkConditionSatisfied(session)) { - session.sendPendingUserActionIntent(target); - return true; - } - - if (session.params.requireUserAction == SessionParams.USER_ACTION_NOT_REQUIRED) { - if (!session.mSilentUpdatePolicy.isSilentUpdateAllowed( - session.getInstallerPackageName(), session.getPackageName())) { - // Fall back to the non-silent update if a repeated installation is invoked - // within the throttle time. - session.sendPendingUserActionIntent(target); - return true; - } - session.mSilentUpdatePolicy.track(session.getInstallerPackageName(), - session.getPackageName()); - } - } - return false; } @@ -3393,6 +3390,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { // {@link PackageLite#getTargetSdk()} mValidatedTargetSdk = packageLite.getTargetSdk(); + mAllowsUpdateOwnership = packageLite.isAllowUpdateOwnership(); + return packageLite; } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 6b213b78f11c..e4e3a9d0b7d3 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -7273,7 +7273,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final long token = Binder.clearCallingIdentity(); try { return DeviceConfig.getBoolean(NAMESPACE_PACKAGE_MANAGER_SERVICE, - PROPERTY_IS_UPDATE_OWNERSHIP_ENFORCEMENT_AVAILABLE, false /* defaultValue */); + PROPERTY_IS_UPDATE_OWNERSHIP_ENFORCEMENT_AVAILABLE, true /* defaultValue */); } finally { Binder.restoreCallingIdentity(token); } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index 42538f33c5f8..db997d8d1d79 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -36,6 +36,7 @@ import static com.android.server.pm.PackageManagerService.SHELL_PACKAGE_NAME; import static com.android.server.pm.PackageManagerService.STUB_SUFFIX; import static com.android.server.pm.PackageManagerService.TAG; +import android.Manifest; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -1389,6 +1390,14 @@ public class PackageManagerServiceUtils { } /** + * Check if a UID is non-system UID adopted shell permission. + */ + public static boolean isAdoptedShell(int uid, Context context) { + return uid != Process.SYSTEM_UID && context.checkCallingOrSelfPermission( + Manifest.permission.USE_SYSTEM_DATA_LOADERS) == PackageManager.PERMISSION_GRANTED; + } + + /** * Check if a UID is system UID or shell's UID. */ public static boolean isRootOrShell(int uid) { diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index cc60802967b0..89f46fed4862 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -692,7 +692,7 @@ class PackageManagerShellCommand extends ShellCommand { null /* usesSplitNames */, null /* configForSplit */, null /* splitApkPaths */, null /* splitRevisionCodes */, apkLite.getTargetSdkVersion(), null /* requiredSplitTypes */, - null /* splitTypes */); + null /* splitTypes */, apkLite.isAllowUpdateOwnership()); sessionSize += InstallLocationUtils.calculateInstalledSize(pkgLite, params.sessionParams.abiOverride, fd.getFileDescriptor()); } catch (IOException e) { diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 50f88d3c3a2d..b669ba238880 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -27,6 +27,7 @@ import android.app.ActivityManagerInternal; import android.app.AppGlobals; import android.app.IUidObserver; import android.app.IUriGrantsManager; +import android.app.UidObserver; import android.app.UriGrantsManager; import android.app.role.OnRoleHoldersChangedListener; import android.app.role.RoleManager; @@ -590,7 +591,7 @@ public class ShortcutService extends IShortcutService.Stub { } } - final private IUidObserver mUidObserver = new IUidObserver.Stub() { + final private IUidObserver mUidObserver = new UidObserver() { @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { injectPostToHandler(() -> handleOnUidStateChanged(uid, procState)); @@ -601,20 +602,6 @@ public class ShortcutService extends IShortcutService.Stub { injectPostToHandler(() -> handleOnUidStateChanged(uid, ActivityManager.PROCESS_STATE_NONEXISTENT)); } - - @Override - public void onUidActive(int uid) { - } - - @Override - public void onUidIdle(int uid, boolean disabled) { - } - - @Override public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override public void onUidProcAdjChanged(int uid) { - } }; void handleOnUidStateChanged(int uid, int procState) { diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index ab9d1cfc2eec..73be5490e0e1 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -2592,7 +2592,7 @@ public class UserManagerService extends IUserManager.Stub { } } if (scheduleWriteUser) { - scheduleWriteUser(userData); + scheduleWriteUser(userId); } } @@ -2902,7 +2902,7 @@ public class UserManagerService extends IUserManager.Stub { != newBaseRestrictions); if (mBaseUserRestrictions.updateRestrictions(userId, newBaseRestrictions)) { - scheduleWriteUser(getUserDataNoChecks(userId)); + scheduleWriteUser(userId); } } @@ -2978,7 +2978,7 @@ public class UserManagerService extends IUserManager.Stub { @GuardedBy("mRestrictionsLock") private void applyUserRestrictionsLR(@UserIdInt int userId) { updateUserRestrictionsInternalLR(null, userId); - scheduleWriteUser(getUserDataNoChecks(userId)); + scheduleWriteUser(userId); } @GuardedBy("mRestrictionsLock") @@ -4129,14 +4129,14 @@ public class UserManagerService extends IUserManager.Stub { } } - private void scheduleWriteUser(UserData userData) { + private void scheduleWriteUser(@UserIdInt int userId) { if (DBG) { debug("scheduleWriteUser"); } // No need to wrap it within a lock -- worst case, we'll just post the same message // twice. - if (!mHandler.hasMessages(WRITE_USER_MSG, userData)) { - Message msg = mHandler.obtainMessage(WRITE_USER_MSG, userData); + if (!mHandler.hasMessages(WRITE_USER_MSG, userId)) { + Message msg = mHandler.obtainMessage(WRITE_USER_MSG, userId); mHandler.sendMessageDelayed(msg, WRITE_USER_DELAY); } } @@ -4152,7 +4152,7 @@ public class UserManagerService extends IUserManager.Stub { // Something went wrong, schedule full rewrite. UserData userData = getUserDataNoChecks(userId); if (userData != null) { - scheduleWriteUser(userData); + scheduleWriteUser(userId); } }); } @@ -6363,7 +6363,7 @@ public class UserManagerService extends IUserManager.Stub { userData.info.lastLoggedInTime = now; } userData.info.lastLoggedInFingerprint = PackagePartitions.FINGERPRINT; - scheduleWriteUser(userData); + scheduleWriteUser(userId); } /** @@ -6533,7 +6533,7 @@ public class UserManagerService extends IUserManager.Stub { private void setLastEnteredForegroundTimeToNow(@NonNull UserData userData) { userData.mLastEnteredForegroundTimeMillis = System.currentTimeMillis(); - scheduleWriteUser(userData); + scheduleWriteUser(userData.info.id); } @Override @@ -6832,7 +6832,7 @@ public class UserManagerService extends IUserManager.Stub { case WRITE_USER_MSG: removeMessages(WRITE_USER_MSG, msg.obj); synchronized (mPackagesLock) { - int userId = ((UserData) msg.obj).info.id; + int userId = (int) msg.obj; UserData userData = getUserDataNoChecks(userId); if (userData != null) { writeUserLP(userData); diff --git a/services/core/java/com/android/server/pm/UserTypeFactory.java b/services/core/java/com/android/server/pm/UserTypeFactory.java index b7a2b86b1bcd..a814ca46fa5e 100644 --- a/services/core/java/com/android/server/pm/UserTypeFactory.java +++ b/services/core/java/com/android/server/pm/UserTypeFactory.java @@ -136,6 +136,7 @@ public final class UserTypeFactory { com.android.internal.R.color.system_neutral2_900) .setDefaultRestrictions(null) .setDefaultCrossProfileIntentFilters(getDefaultCloneCrossProfileIntentFilter()) + .setDefaultSecureSettings(getDefaultNonManagedProfileSecureSettings()) .setDefaultUserProperties(new UserProperties.Builder() .setStartWithParent(true) .setShowInLauncher(UserProperties.SHOW_IN_LAUNCHER_WITH_PARENT) @@ -216,7 +217,8 @@ public final class UserTypeFactory { com.android.internal.R.color.profile_badge_1_dark, com.android.internal.R.color.profile_badge_2_dark, com.android.internal.R.color.profile_badge_3_dark) - .setDefaultRestrictions(restrictions); + .setDefaultRestrictions(restrictions) + .setDefaultSecureSettings(getDefaultNonManagedProfileSecureSettings()); } /** @@ -337,6 +339,15 @@ public final class UserTypeFactory { return DefaultCrossProfileIntentFiltersUtils.getDefaultCloneProfileFilters(); } + /** Gets a default bundle, keyed by Settings.Secure String names, for non-managed profiles. */ + private static Bundle getDefaultNonManagedProfileSecureSettings() { + final Bundle settings = new Bundle(); + // Non-managed profiles go through neither SetupWizard nor DPC flows, so we automatically + // mark them as setup. + settings.putString(android.provider.Settings.Secure.USER_SETUP_COMPLETE, "1"); + return settings; + } + /** * Reads the given xml parser to obtain device user-type customization, and updates the given * map of {@link UserTypeDetails.Builder}s accordingly. diff --git a/services/core/java/com/android/server/pm/VerifyingSession.java b/services/core/java/com/android/server/pm/VerifyingSession.java index c9ebeaee88ce..5015985dd747 100644 --- a/services/core/java/com/android/server/pm/VerifyingSession.java +++ b/services/core/java/com/android/server/pm/VerifyingSession.java @@ -361,7 +361,8 @@ final class VerifyingSession { } final int verifierUserId = verifierUser.getIdentifier(); - List<String> requiredVerifierPackages = Arrays.asList(mPm.mRequiredVerifierPackages); + List<String> requiredVerifierPackages = new ArrayList<>( + Arrays.asList(mPm.mRequiredVerifierPackages)); boolean requiredVerifierPackagesOverridden = false; // Allow verifier override for ADB installations which could already be unverified using diff --git a/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java b/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java index 8641b41104e6..3296c1f284af 100644 --- a/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java +++ b/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java @@ -22,6 +22,7 @@ import android.app.ActivityManagerInternal; import android.app.AlarmManager; import android.app.IActivityManager; import android.app.IUidObserver; +import android.app.UidObserver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -168,7 +169,7 @@ public class OneTimePermissionUserManager { private final Object mInnerLock = new Object(); private final Object mToken = new Object(); - private final IUidObserver.Stub mObserver = new IUidObserver.Stub() { + private final IUidObserver mObserver = new UidObserver() { @Override public void onUidGone(int uid, boolean disabled) { if (uid == mUid) { @@ -188,15 +189,6 @@ public class OneTimePermissionUserManager { } } } - - public void onUidActive(int uid) { - } - public void onUidIdle(int uid, boolean disabled) { - } - public void onUidProcAdjChanged(int uid) { - } - public void onUidCachedChanged(int uid, boolean cached) { - } }; private PackageInactivityListener(int uid, @NonNull String packageName, long timeout, diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java index a9a1d5e9102c..1a91d252c431 100644 --- a/services/core/java/com/android/server/power/hint/HintManagerService.java +++ b/services/core/java/com/android/server/power/hint/HintManagerService.java @@ -19,8 +19,8 @@ package com.android.server.power.hint; import android.annotation.NonNull; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.IUidObserver; import android.app.StatsManager; +import android.app.UidObserver; import android.content.Context; import android.os.Binder; import android.os.IBinder; @@ -48,7 +48,6 @@ import com.android.server.utils.Slogf; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -70,7 +69,7 @@ public final class HintManagerService extends SystemService { /** Lock to protect HAL handles and listen list. */ private final Object mLock = new Object(); - @VisibleForTesting final UidObserver mUidObserver; + @VisibleForTesting final MyUidObserver mUidObserver; private final NativeWrapper mNativeWrapper; @@ -95,7 +94,7 @@ public final class HintManagerService extends SystemService { mNativeWrapper = injector.createNativeWrapper(); mNativeWrapper.halInit(); mHintSessionPreferredRate = mNativeWrapper.halGetHintSessionPreferredRate(); - mUidObserver = new UidObserver(); + mUidObserver = new MyUidObserver(); mAmInternal = Objects.requireNonNull( LocalServices.getService(ActivityManagerInternal.class)); } @@ -247,7 +246,7 @@ public final class HintManagerService extends SystemService { } @VisibleForTesting - final class UidObserver extends IUidObserver.Stub { + final class MyUidObserver extends UidObserver { private final SparseArray<Integer> mProcStatesCache = new SparseArray<>(); public boolean isUidForeground(int uid) { @@ -277,14 +276,6 @@ public final class HintManagerService extends SystemService { }); } - @Override - public void onUidActive(int uid) { - } - - @Override - public void onUidIdle(int uid, boolean disabled) { - } - /** * The IUidObserver callback is called from the system_server, so it'll be a direct function * call from ActivityManagerService. Do not do heavy logic here. @@ -306,14 +297,6 @@ public final class HintManagerService extends SystemService { } }); } - - @Override - public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override - public void onUidProcAdjChanged(int uid) { - } } @VisibleForTesting @@ -324,16 +307,7 @@ public final class HintManagerService extends SystemService { private boolean checkTidValid(int uid, int tgid, int [] tids) { // Make sure all tids belongs to the same UID (including isolated UID), // tids can belong to different application processes. - List<Integer> eligiblePids = null; - // To avoid deadlock, do not call into AMS if the call is from system. - if (uid != Process.SYSTEM_UID) { - eligiblePids = mAmInternal.getIsolatedProcesses(uid); - } - if (eligiblePids == null) { - eligiblePids = new ArrayList<>(); - } - eligiblePids.add(tgid); - + List<Integer> isolatedPids = null; for (int threadId : tids) { final String[] procStatusKeys = new String[] { "Uid:", @@ -345,7 +319,21 @@ public final class HintManagerService extends SystemService { int pidOfThreadId = (int) output[1]; // use PID check for isolated processes, use UID check for non-isolated processes. - if (eligiblePids.contains(pidOfThreadId) || uidOfThreadId == uid) { + if (pidOfThreadId == tgid || uidOfThreadId == uid) { + continue; + } + // Only call into AM if the tid is either isolated or invalid + if (isolatedPids == null) { + // To avoid deadlock, do not call into AMS if the call is from system. + if (uid == Process.SYSTEM_UID) { + return false; + } + isolatedPids = mAmInternal.getIsolatedProcesses(uid); + if (isolatedPids == null) { + return false; + } + } + if (isolatedPids.contains(pidOfThreadId)) { continue; } return false; diff --git a/services/core/java/com/android/server/security/rkp/RemoteProvisioningRegistration.java b/services/core/java/com/android/server/security/rkp/RemoteProvisioningRegistration.java index 2d3ede02a6a4..f586126196dd 100644 --- a/services/core/java/com/android/server/security/rkp/RemoteProvisioningRegistration.java +++ b/services/core/java/com/android/server/security/rkp/RemoteProvisioningRegistration.java @@ -70,12 +70,14 @@ final class RemoteProvisioningRegistration extends IRegistration.Stub { Log.i(TAG, "Operation cancelled for client " + mCallback.hashCode()); wrapCallback(mCallback::onCancel); } else if (e instanceof RkpProxyException) { - Log.e(TAG, "RKP error fetching key for client " + mCallback.hashCode(), e); + Log.e(TAG, "RKP error fetching key for client " + mCallback.hashCode() + ": " + + e.getMessage()); RkpProxyException rkpException = (RkpProxyException) e; wrapCallback(() -> mCallback.onError(toGetKeyError(rkpException), e.getMessage())); } else { - Log.e(TAG, "Error fetching key for client " + mCallback.hashCode(), e); + Log.e(TAG, "Unknown error fetching key for client " + mCallback.hashCode() + ": " + + e.getMessage()); wrapCallback(() -> mCallback.onError(IGetKeyCallback.ErrorCode.ERROR_UNKNOWN, e.getMessage())); } diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index b2f48d9e3d8c..433d8076d1f8 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -154,7 +154,6 @@ import android.security.metrics.Keystore2AtomWithOverflow; import android.security.metrics.KeystoreAtom; import android.security.metrics.KeystoreAtomPayload; import android.security.metrics.RkpErrorStats; -import android.security.metrics.RkpPoolStats; import android.security.metrics.StorageStats; import android.stats.storage.StorageEnums; import android.telephony.ModemActivityInfo; @@ -730,7 +729,6 @@ public class StatsPullAtomService extends SystemService { return pullInstalledIncrementalPackagesLocked(atomTag, data); } case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS: - case FrameworkStatsLog.RKP_POOL_STATS: case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO: case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO: @@ -938,7 +936,6 @@ public class StatsPullAtomService extends SystemService { registerSettingsStats(); registerInstalledIncrementalPackages(); registerKeystoreStorageStats(); - registerRkpPoolStats(); registerKeystoreKeyCreationWithGeneralInfo(); registerKeystoreKeyCreationWithAuthInfo(); registerKeystoreKeyCreationWithPurposeModesInfo(); @@ -4258,14 +4255,6 @@ public class StatsPullAtomService extends SystemService { mStatsCallbackImpl); } - private void registerRkpPoolStats() { - mStatsManager.setPullAtomCallback( - FrameworkStatsLog.RKP_POOL_STATS, - null, // use default PullAtomMetadata values, - DIRECT_EXECUTOR, - mStatsCallbackImpl); - } - private void registerKeystoreKeyCreationWithGeneralInfo() { mStatsManager.setPullAtomCallback( FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO, @@ -4373,19 +4362,6 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - int parseRkpPoolStats(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { - for (KeystoreAtom atomWrapper : atoms) { - if (atomWrapper.payload.getTag() != KeystoreAtomPayload.rkpPoolStats) { - return StatsManager.PULL_SKIP; - } - RkpPoolStats atom = atomWrapper.payload.getRkpPoolStats(); - pulledData.add(FrameworkStatsLog.buildStatsEvent( - FrameworkStatsLog.RKP_POOL_STATS, atom.security_level, atom.expiring, - atom.unassigned, atom.attested, atom.total)); - } - return StatsManager.PULL_SUCCESS; - } - int parseKeystoreKeyCreationWithGeneralInfo(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { for (KeystoreAtom atomWrapper : atoms) { if (atomWrapper.payload.getTag() @@ -4518,8 +4494,6 @@ public class StatsPullAtomService extends SystemService { switch (atomTag) { case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS: return parseKeystoreStorageStats(atoms, pulledData); - case FrameworkStatsLog.RKP_POOL_STATS: - return parseRkpPoolStats(atoms, pulledData); case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO: return parseKeystoreKeyCreationWithGeneralInfo(atoms, pulledData); case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java index 8a7d607c1e60..1ab7f362808a 100644 --- a/services/core/java/com/android/server/vibrator/VibrationSettings.java +++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java @@ -30,7 +30,7 @@ import static android.os.VibrationAttributes.USAGE_UNKNOWN; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.IUidObserver; +import android.app.UidObserver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -157,7 +157,7 @@ final class VibrationSettings { @VisibleForTesting final SettingsContentObserver mSettingObserver; @VisibleForTesting - final UidObserver mUidObserver; + final MyUidObserver mUidObserver; @VisibleForTesting final SettingsBroadcastReceiver mSettingChangeReceiver; final VirtualDeviceListener mVirtualDeviceListener; @@ -195,7 +195,7 @@ final class VibrationSettings { mContext = context; mVibrationConfig = config; mSettingObserver = new SettingsContentObserver(handler); - mUidObserver = new UidObserver(); + mUidObserver = new MyUidObserver(); mSettingChangeReceiver = new SettingsBroadcastReceiver(); mVirtualDeviceListener = new VirtualDeviceListener(); @@ -726,7 +726,7 @@ final class VibrationSettings { /** Implementation of {@link ContentObserver} to be registered to a setting {@link Uri}. */ @VisibleForTesting - final class UidObserver extends IUidObserver.Stub { + final class MyUidObserver extends UidObserver { private final SparseArray<Integer> mProcStatesCache = new SparseArray<>(); public boolean isUidForeground(int uid) { @@ -740,25 +740,9 @@ final class VibrationSettings { } @Override - public void onUidActive(int uid) { - } - - @Override - public void onUidIdle(int uid, boolean disabled) { - } - - @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { mProcStatesCache.put(uid, procState); } - - @Override - public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override - public void onUidProcAdjChanged(int uid) { - } } /** diff --git a/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java b/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java index 799d14944650..53861c854a1b 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java @@ -29,6 +29,7 @@ import static com.android.server.wallpaper.WallpaperUtils.makeWallpaperIdLocked; import android.annotation.Nullable; import android.app.WallpaperColors; +import android.app.WallpaperManager; import android.app.WallpaperManager.SetWallpaperFlags; import android.app.backup.WallpaperBackupHelper; import android.content.ComponentName; @@ -75,17 +76,17 @@ class WallpaperDataParser { private final WallpaperCropper mWallpaperCropper; private final Context mContext; - // Temporary feature flag. TODO(b/197814683) remove - private final boolean mEnableSeparateLockScreenEngine; + private final boolean mIsLockscreenLiveWallpaperEnabled; WallpaperDataParser(Context context, WallpaperDisplayHelper wallpaperDisplayHelper, - WallpaperCropper wallpaperCropper, boolean enableSeparateLockScreenEngine) { + WallpaperCropper wallpaperCropper) { mContext = context; mWallpaperDisplayHelper = wallpaperDisplayHelper; mWallpaperCropper = wallpaperCropper; mImageWallpaper = ComponentName.unflattenFromString( context.getResources().getString(R.string.image_wallpaper_component)); - mEnableSeparateLockScreenEngine = enableSeparateLockScreenEngine; + mIsLockscreenLiveWallpaperEnabled = context.getSystemService(WallpaperManager.class) + .isLockscreenLiveWallpaperEnabled(); } private JournaledFile makeJournaledFile(int userId) { @@ -135,8 +136,9 @@ class WallpaperDataParser { * If null, a new object will be created. * @param lockWallpaper the lock wallpaper object to reuse to do the modifications. * If null, a new object will be created. - * @param which The wallpaper(s) to load. If {@link #mEnableSeparateLockScreenEngine} is false, - * this flag has no effect and both wallpapers will always be loaded. + * @param which The wallpaper(s) to load. Only has effect if + * {@link WallpaperManager#isLockscreenLiveWallpaperEnabled} is true, + * otherwise both wallpaper will always be loaded. * @return a {@link WallpaperLoadingResult} object containing the wallpaper data. * This object will contain the {@code wallpaper} and * {@code lockWallpaper} provided as parameters, if they are not null. @@ -148,11 +150,13 @@ class WallpaperDataParser { File file = journal.chooseForRead(); boolean migrateFromOld = wallpaper == null; - boolean loadSystem = !mEnableSeparateLockScreenEngine || (which & FLAG_SYSTEM) != 0; - boolean loadLock = !mEnableSeparateLockScreenEngine || (which & FLAG_LOCK) != 0; + + boolean separateLockscreenEngine = mIsLockscreenLiveWallpaperEnabled; + boolean loadSystem = !separateLockscreenEngine || (which & FLAG_SYSTEM) != 0; + boolean loadLock = !separateLockscreenEngine || (which & FLAG_LOCK) != 0; // don't reuse the wallpaper objects in the new version - if (mEnableSeparateLockScreenEngine) { + if (separateLockscreenEngine) { wallpaper = null; lockWallpaper = null; } @@ -184,7 +188,8 @@ class WallpaperDataParser { if (type == XmlPullParser.START_TAG) { String tag = parser.getName(); if (("wp".equals(tag) && loadSystem) - || ("kwp".equals(tag) && mEnableSeparateLockScreenEngine && loadLock)) { + || ("kwp".equals(tag) && mIsLockscreenLiveWallpaperEnabled + && loadLock)) { if ("kwp".equals(tag) && lockWallpaper == null) { lockWallpaper = new WallpaperData(userId, FLAG_LOCK); @@ -213,7 +218,7 @@ class WallpaperDataParser { Slog.v(TAG, "mNextWallpaperComponent:" + wallpaper.nextWallpaperComponent); } - } else if ("kwp".equals(tag) && !mEnableSeparateLockScreenEngine) { + } else if ("kwp".equals(tag) && !mIsLockscreenLiveWallpaperEnabled) { // keyguard-specific wallpaper for this user (legacy code) if (lockWallpaper == null) { lockWallpaper = new WallpaperData(userId, FLAG_LOCK); diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 93f039d2f5b4..b1b0c559aad4 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -88,6 +88,7 @@ import android.os.ResultReceiver; import android.os.SELinux; import android.os.ShellCallback; import android.os.SystemClock; +import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; @@ -179,8 +180,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub private final Object mLock = new Object(); /** True to enable a second engine for lock screen wallpaper when different from system wp. */ - @VisibleForTesting - final boolean mEnableSeparateLockScreenEngine; + private final boolean mIsLockscreenLiveWallpaperEnabled; /** Tracks wallpaper being migrated from system+lock to lock when setting static wp. */ WallpaperDestinationChangeHandler mPendingMigrationViaStatic; @@ -230,7 +230,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } // Handles static wallpaper changes generated by WallpaperObserver events when - // mEnableSeparateLockScreenEngine is true. + // enableSeparateLockScreenEngine() is true. private void updateWallpapers(int event, String path) { // System and system+lock changes happen on the system wallpaper input file; // lock-only changes happen on the dedicated lock wallpaper input file @@ -381,7 +381,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } // Handles static wallpaper changes generated by WallpaperObserver events when - // mEnableSeparateLockScreenEngine is false. + // enableSeparateLockScreenEngine() is false. // TODO(b/266818039) Remove this method private void updateWallpapersLegacy(int event, String path) { final boolean moved = (event == MOVED_TO); @@ -498,7 +498,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub return; } - if (mEnableSeparateLockScreenEngine) { + if (mIsLockscreenLiveWallpaperEnabled) { updateWallpapers(event, path); } else { updateWallpapersLegacy(event, path); @@ -1600,15 +1600,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub mActivityManager = mContext.getSystemService(ActivityManager.class); mMonitor = new MyPackageMonitor(); mColorsChangedListeners = new SparseArray<>(); - - mEnableSeparateLockScreenEngine = mContext.getResources().getBoolean( - R.bool.config_independentLockscreenLiveWallpaper); mWallpaperDataParser = new WallpaperDataParser(mContext, mWallpaperDisplayHelper, - mWallpaperCropper, mEnableSeparateLockScreenEngine); - if (DEBUG) { - Slog.v(TAG, "Separate lock screen engine enabled: " + mEnableSeparateLockScreenEngine); - } + mWallpaperCropper); + mIsLockscreenLiveWallpaperEnabled = + SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false); LocalServices.addService(WallpaperManagerInternal.class, new LocalService()); } @@ -2794,7 +2790,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub Os.rename(sysWP.wallpaperFile.getAbsolutePath(), lockWP.wallpaperFile.getAbsolutePath()); Os.rename(sysWP.cropFile.getAbsolutePath(), lockWP.cropFile.getAbsolutePath()); mLockWallpaperMap.put(userId, lockWP); - if (mEnableSeparateLockScreenEngine) { + if (mIsLockscreenLiveWallpaperEnabled) { SELinux.restorecon(lockWP.wallpaperFile); mLastLockWallpaper = lockWP; } @@ -2858,7 +2854,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub @VisibleForTesting void setWallpaperComponent(ComponentName name, @SetWallpaperFlags int which, int userId) { - if (mEnableSeparateLockScreenEngine) { + if (mIsLockscreenLiveWallpaperEnabled) { setWallpaperComponentInternal(name, which, userId); } else { setWallpaperComponentInternalLegacy(name, which, userId); @@ -3192,7 +3188,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub Slog.w(TAG, msg); return false; } - if (mEnableSeparateLockScreenEngine) { + if (mIsLockscreenLiveWallpaperEnabled) { maybeDetachLastWallpapers(wallpaper); } else if (wallpaper.userId == mCurrentUserId && mLastWallpaper != null && !wallpaper.equals(mFallbackWallpaper)) { @@ -3201,7 +3197,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub wallpaper.wallpaperComponent = componentName; wallpaper.connection = newConn; newConn.mReply = reply; - if (mEnableSeparateLockScreenEngine) { + if (mIsLockscreenLiveWallpaperEnabled) { updateCurrentWallpapers(wallpaper); } else if (wallpaper.userId == mCurrentUserId && !wallpaper.equals( mFallbackWallpaper)) { @@ -3221,8 +3217,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub return true; } - // Updates tracking of the currently bound wallpapers. Assumes mEnableSeparateLockScreenEngine - // is true. + // Updates tracking of the currently bound wallpapers. + // Assumes isLockscreenLiveWallpaperEnabled is true. private void updateCurrentWallpapers(WallpaperData newWallpaper) { if (newWallpaper.userId != mCurrentUserId || newWallpaper.equals(mFallbackWallpaper)) { return; @@ -3237,7 +3233,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } // Detaches previously bound wallpapers if no longer in use. Assumes - // mEnableSeparateLockScreenEngine is true. + // isLockscreenLiveWallpaperEnabled is true. private void maybeDetachLastWallpapers(WallpaperData newWallpaper) { if (newWallpaper.userId != mCurrentUserId || newWallpaper.equals(mFallbackWallpaper)) { return; @@ -3389,6 +3385,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub return (wallpaper != null) ? wallpaper.allowBackup : false; } + @Override + public boolean isLockscreenLiveWallpaperEnabled() { + return mIsLockscreenLiveWallpaperEnabled; + } + private void onDisplayReadyInternal(int displayId) { synchronized (mLock) { if (mLastWallpaper == null) { @@ -3476,8 +3477,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub WallpaperDataParser.WallpaperLoadingResult result = mWallpaperDataParser.loadSettingsLocked( userId, keepDimensionHints, wallpaperData, lockWallpaperData, which); - boolean updateSystem = !mEnableSeparateLockScreenEngine || (which & FLAG_SYSTEM) != 0; - boolean updateLock = !mEnableSeparateLockScreenEngine || (which & FLAG_LOCK) != 0; + boolean updateSystem = !mIsLockscreenLiveWallpaperEnabled || (which & FLAG_SYSTEM) != 0; + boolean updateLock = !mIsLockscreenLiveWallpaperEnabled || (which & FLAG_LOCK) != 0; if (updateSystem) mWallpaperMap.put(userId, result.getSystemWallpaperData()); if (updateLock) { diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 5f56923e2f53..b5fde9e7593b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4068,7 +4068,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } void finishRelaunching() { - mLetterboxUiController.setRelauchingAfterRequestedOrientationChanged(false); + mLetterboxUiController.setRelaunchingAfterRequestedOrientationChanged(false); mTaskSupervisor.getActivityMetricsLogger().notifyActivityRelaunched(this); if (mPendingRelaunchCount > 0) { @@ -7917,6 +7917,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mAtmService.getTaskChangeNotificationController().notifyActivityRequestedOrientationChanged( task.mTaskId, requestedOrientation); + + mDisplayContent.getDisplayRotation().onSetRequestedOrientation(); } /* @@ -9500,7 +9502,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mRelaunchReason = RELAUNCH_REASON_NONE; } if (isRequestedOrientationChanged) { - mLetterboxUiController.setRelauchingAfterRequestedOrientationChanged(true); + mLetterboxUiController.setRelaunchingAfterRequestedOrientationChanged(true); } if (mState == PAUSING) { // A little annoying: we are waiting for this activity to finish pausing. Let's not diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index d4f151f5c66d..38f13ec15987 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1606,6 +1606,8 @@ class ActivityStarter { transitionController.requestStartTransition(newTransition, mTargetTask == null ? started.getTask() : mTargetTask, remoteTransition, null /* displayChange */); + } else if (result == START_SUCCESS && mStartActivity.isState(RESUMED)) { + // Do nothing if the activity is started and is resumed directly. } else if (isStarted) { // Make the collecting transition wait until this request is ready. transitionController.setReady(started, false); diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index 92ceedb0da0b..a49ecce8324c 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java @@ -228,7 +228,7 @@ class BLASTSyncEngine { if (mReady == ready) { return; } - ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "SyncGroup %d: Set ready", mSyncId); + ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "SyncGroup %d: Set ready %b", mSyncId, ready); mReady = ready; if (!ready) return; mWm.mWindowPlacerLocked.requestTraversal(); diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index 587e7204f993..be80b010962b 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -585,14 +585,14 @@ class BackNavigationController { * The closing target should only exist in close list, but the opening target can be either in * open or close list. */ - void onTransactionReady(Transition transition) { + void onTransactionReady(Transition transition, ArrayList<Transition.ChangeInfo> targets) { if (!isMonitoringTransition()) { return; } - final ArraySet<WindowContainer> targets = transition.mParticipants; for (int i = targets.size() - 1; i >= 0; --i) { - final WindowContainer wc = targets.valueAt(i); - if (wc.asActivityRecord() == null && wc.asTask() == null) { + final WindowContainer wc = targets.get(i).mContainer; + if (wc.asActivityRecord() == null && wc.asTask() == null + && wc.asTaskFragment() == null) { continue; } // WC can be visible due to setLaunchBehind @@ -605,6 +605,9 @@ class BackNavigationController { final boolean matchAnimationTargets = isWaitBackTransition() && (transition.mType == TRANSIT_CLOSE || transition.mType == TRANSIT_TO_BACK) && mAnimationHandler.containsBackAnimationTargets(mTmpOpenApps, mTmpCloseApps); + ProtoLog.d(WM_DEBUG_BACK_PREVIEW, + "onTransactionReady, opening: %s, closing: %s, animating: %s, match: %b", + mTmpOpenApps, mTmpCloseApps, mAnimationHandler, matchAnimationTargets); if (!matchAnimationTargets) { mNavigationMonitor.onTransitionReadyWhileNavigate(mTmpOpenApps, mTmpCloseApps); } else { @@ -829,10 +832,16 @@ class BackNavigationController { if (!mComposed) { return false; } + + // WC must be ActivityRecord in legacy transition, but it also can be Task or + // TaskFragment when using Shell transition. + // Open target: Can be Task or ActivityRecord or TaskFragment + // Close target: Limit to the top activity for now, to reduce the chance of misjudgment. final WindowContainer target = open ? mOpenAdaptor.mTarget : mCloseAdaptor.mTarget; if (mSwitchType == TASK_SWITCH) { return wc == target - || (wc.asTask() != null && wc.hasChild(target)); + || (wc.asTask() != null && wc.hasChild(target)) + || (wc.asActivityRecord() != null && target.hasChild(wc)); } else if (mSwitchType == ACTIVITY_SWITCH) { return wc == target || (wc.asTaskFragment() != null && wc.hasChild(target)); } diff --git a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java index 6773bcd6fac8..e447049a7362 100644 --- a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java +++ b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java @@ -487,7 +487,7 @@ public class BackgroundActivityStartController { // The verdict changed from allow (resultIfPiSenderAllowsBal) to block, PI sender // default change is on (otherwise we would have fallen into if above) and we'd // allow if it were off - Slog.wtf(TAG, "Without BAL hardening this activity start would NOT be allowed!" + Slog.wtf(TAG, "Without BAL hardening this activity start would be allowed!" + stateDumpLog); } } diff --git a/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java b/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java index 002c32ef32f6..e88cfbf6986e 100644 --- a/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java +++ b/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java @@ -254,11 +254,12 @@ class BackgroundLaunchProcessController { * * If {@code entity} is already added, this method will update its {@code originatingToken}. */ - void addOrUpdateAllowBackgroundStartPrivileges( - Binder entity, BackgroundStartPrivileges backgroundStartPrivileges) { + void addOrUpdateAllowBackgroundStartPrivileges(@NonNull Binder entity, + @NonNull BackgroundStartPrivileges backgroundStartPrivileges) { requireNonNull(entity, "entity"); requireNonNull(backgroundStartPrivileges, "backgroundStartPrivileges"); - checkArgument(backgroundStartPrivileges.allowsAny()); + checkArgument(backgroundStartPrivileges.allowsAny(), + "backgroundStartPrivileges does not allow anything"); synchronized (this) { if (mBackgroundStartPrivileges == null) { mBackgroundStartPrivileges = new ArrayMap<>(); @@ -271,7 +272,7 @@ class BackgroundLaunchProcessController { * Removes token {@code entity} that allowed background activity starts added via {@link * #addOrUpdateAllowBackgroundStartPrivileges(Binder, BackgroundStartPrivileges)}. */ - void removeAllowBackgroundStartPrivileges(Binder entity) { + void removeAllowBackgroundStartPrivileges(@NonNull Binder entity) { requireNonNull(entity, "entity"); synchronized (this) { if (mBackgroundStartPrivileges != null) { diff --git a/services/core/java/com/android/server/wm/ContentRecorder.java b/services/core/java/com/android/server/wm/ContentRecorder.java index f1c5f91146ab..b808a55d2952 100644 --- a/services/core/java/com/android/server/wm/ContentRecorder.java +++ b/services/core/java/com/android/server/wm/ContentRecorder.java @@ -296,6 +296,9 @@ final class ContentRecorder implements WindowContainerListener { + "state %d", mDisplayContent.getDisplayId(), mDisplayContent.getDisplayInfo().state); + // TODO(b/274790702): Do not start recording if waiting for consent - for now, + // go ahead. + // Create a mirrored hierarchy for the SurfaceControl of the DisplayArea to capture. mRecordedSurface = SurfaceControl.mirrorSurface( mRecordedWindowContainer.getSurfaceControl()); diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java index 13a1cb6daf38..c6db8a7acb6f 100644 --- a/services/core/java/com/android/server/wm/Dimmer.java +++ b/services/core/java/com/android/server/wm/Dimmer.java @@ -126,6 +126,9 @@ class Dimmer { boolean isVisible; SurfaceAnimator mSurfaceAnimator; + // TODO(b/64816140): Remove after confirming dimmer layer always matches its container. + final Rect mDimBounds = new Rect(); + /** * Determines whether the dim layer should animate before destroying. */ @@ -260,11 +263,16 @@ class Dimmer { * {@link WindowContainer#prepareSurfaces}. After calling this, the container should * chain {@link WindowContainer#prepareSurfaces} down to it's children to give them * a chance to request dims to continue. + * @return Non-null dim bounds if the dimmer is showing. */ - void resetDimStates() { - if (mDimState != null && !mDimState.mDontReset) { + Rect resetDimStates() { + if (mDimState == null) { + return null; + } + if (!mDimState.mDontReset) { mDimState.mDimming = false; } + return mDimState.mDimBounds; } void dontAnimateExit() { @@ -275,13 +283,13 @@ class Dimmer { /** * Call after invoking {@link WindowContainer#prepareSurfaces} on children as - * described in {@link #resetDimStates}. + * described in {@link #resetDimStates}. The dim bounds returned by {@link #resetDimStates} + * should be set before calling this method. * * @param t A transaction in which to update the dims. - * @param bounds The bounds at which to dim. * @return true if any Dims were updated. */ - boolean updateDims(SurfaceControl.Transaction t, Rect bounds) { + boolean updateDims(SurfaceControl.Transaction t) { if (mDimState == null) { return false; } @@ -297,6 +305,7 @@ class Dimmer { mDimState = null; return false; } else { + final Rect bounds = mDimState.mDimBounds; // TODO: Once we use geometry from hierarchy this falls away. t.setPosition(mDimState.mDimLayer, bounds.left, bounds.top); t.setWindowCrop(mDimState.mDimLayer, bounds.width(), bounds.height()); diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java index c2ddb4158846..26f56a2e5c0b 100644 --- a/services/core/java/com/android/server/wm/DisplayArea.java +++ b/services/core/java/com/android/server/wm/DisplayArea.java @@ -148,7 +148,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @ScreenOrientation int getOrientation(int candidate) { final int orientation = super.getOrientation(candidate); - if (getIgnoreOrientationRequest(orientation)) { + if (shouldIgnoreOrientationRequest(orientation)) { // In all the other case, mLastOrientationSource will be reassigned to a new value mLastOrientationSource = null; return SCREEN_ORIENTATION_UNSET; @@ -158,7 +158,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @Override boolean handlesOrientationChangeFromDescendant(@ScreenOrientation int orientation) { - return !getIgnoreOrientationRequest(orientation) + return !shouldIgnoreOrientationRequest(orientation) && super.handlesOrientationChangeFromDescendant(orientation); } @@ -169,7 +169,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { final int orientation = requestingContainer != null ? requestingContainer.getOverrideOrientation() : SCREEN_ORIENTATION_UNSET; - return !getIgnoreOrientationRequest(orientation) + return !shouldIgnoreOrientationRequest(orientation) && super.onDescendantOrientationChanged(requestingContainer); } @@ -236,8 +236,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { /** * @return {@value true} if we need to ignore the orientation in input. */ - // TODO(b/262366204): Rename getIgnoreOrientationRequest to shouldIgnoreOrientationRequest - boolean getIgnoreOrientationRequest(@ScreenOrientation int orientation) { + boolean shouldIgnoreOrientationRequest(@ScreenOrientation int orientation) { // We always respect orientation request for ActivityInfo.SCREEN_ORIENTATION_LOCKED // ActivityInfo.SCREEN_ORIENTATION_NOSENSOR. // Main use case why this is important is Camera apps that rely on those @@ -768,7 +767,6 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { */ static class Dimmable extends DisplayArea<DisplayArea> { private final Dimmer mDimmer = new Dimmer(this); - private final Rect mTmpDimBoundsRect = new Rect(); Dimmable(WindowManagerService wms, Type type, String name, int featureId) { super(wms, type, name, featureId); @@ -781,11 +779,13 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @Override void prepareSurfaces() { - mDimmer.resetDimStates(); + final Rect dimBounds = mDimmer.resetDimStates(); super.prepareSurfaces(); - // Bounds need to be relative, as the dim layer is a child. - getBounds(mTmpDimBoundsRect); - mTmpDimBoundsRect.offsetTo(0 /* newLeft */, 0 /* newTop */); + if (dimBounds != null) { + // Bounds need to be relative, as the dim layer is a child. + getBounds(dimBounds); + dimBounds.offsetTo(0 /* newLeft */, 0 /* newTop */); + } // If SystemUI is dragging for recents, we want to reset the dim state so any dim layer // on the display level fades out. @@ -793,8 +793,10 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { mDimmer.resetDimStates(); } - if (mDimmer.updateDims(getSyncTransaction(), mTmpDimBoundsRect)) { - scheduleAnimation(); + if (dimBounds != null) { + if (mDimmer.updateDims(getSyncTransaction())) { + scheduleAnimation(); + } } } } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 89cb13a40f8d..bec58b848478 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1648,7 +1648,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @Override boolean handlesOrientationChangeFromDescendant(@ScreenOrientation int orientation) { - return !getIgnoreOrientationRequest(orientation) + return !shouldIgnoreOrientationRequest(orientation) && !getDisplayRotation().isFixedToUserRotation(); } @@ -1752,7 +1752,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } final int activityOrientation = r.getOverrideOrientation(); if (!WindowManagerService.ENABLE_FIXED_ROTATION_TRANSFORM - || getIgnoreOrientationRequest(activityOrientation)) { + || shouldIgnoreOrientationRequest(activityOrientation)) { return ROTATION_UNDEFINED; } if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) { @@ -2921,6 +2921,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp /* includeRotationSettings */ false); mDisplaySwitchTransitionLauncher.requestDisplaySwitchTransitionIfNeeded(mDisplayId, mInitialDisplayWidth, mInitialDisplayHeight, newWidth, newHeight); + mDisplayRotation.physicalDisplayChanged(); } // If there is an override set for base values - use it, otherwise use new values. @@ -3291,7 +3292,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mTransitionController.unregisterLegacyListener(mFixedRotationTransitionListener); handleAnimatingStoppedAndTransition(); mWmService.stopFreezingDisplayLocked(); - mDisplayRotation.removeDefaultDisplayRotationChangedCallback(); mDeviceStateController.unregisterDeviceStateCallback(mDeviceStateConsumer); super.removeImmediately(); if (DEBUG_DISPLAY) Slog.v(TAG_WM, "Removing display=" + this); @@ -3305,6 +3305,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mWindowingLayer.release(); mInputMonitor.onDisplayRemoved(); mWmService.mDisplayNotificationController.dispatchDisplayRemoved(this); + mDisplayRotation.onDisplayRemoved(); mWmService.mAccessibilityController.onDisplayRemoved(mDisplayId); mRootWindowContainer.mTaskSupervisor .getKeyguardController().onDisplayRemoved(mDisplayId); @@ -5148,7 +5149,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @ScreenOrientation int getOrientation(@ScreenOrientation int candidate) { // IME does not participate in orientation. - return getIgnoreOrientationRequest(candidate) ? SCREEN_ORIENTATION_UNSET : candidate; + return shouldIgnoreOrientationRequest(candidate) ? SCREEN_ORIENTATION_UNSET : candidate; } @Override diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index d31fe23bf2be..6ed20257f829 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1122,7 +1122,6 @@ public class DisplayPolicy { inOutFrame.set(windowContainer.getBounds()); break; case SOURCE_FRAME: - inOutFrame.inset(win.mGivenContentInsets); extendByCutout = (lp.privateFlags & PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT) != 0; break; diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index 6af1c7c9d656..c8fde6b5b355 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -51,8 +51,13 @@ import android.content.pm.ActivityInfo.ScreenOrientation; import android.content.pm.PackageManager; import android.content.res.Resources; import android.database.ContentObserver; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; +import android.hardware.SensorManager; import android.hardware.power.Boost; import android.os.Handler; +import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; @@ -92,6 +97,8 @@ public class DisplayRotation { // config changes and unexpected jumps while folding the device to closed state. private static final int FOLDING_RECOMPUTE_CONFIG_DELAY_MS = 800; + private static final int ROTATION_UNDEFINED = -1; + private static class RotationAnimationPair { @AnimRes int mEnter; @@ -184,6 +191,12 @@ public class DisplayRotation { */ private int mShowRotationSuggestions; + /** + * The most recent {@link Surface.Rotation} choice shown to the user for confirmation, or + * {@link #ROTATION_UNDEFINED} + */ + private int mRotationChoiceShownToUserForConfirmation = ROTATION_UNDEFINED; + private static final int ALLOW_ALL_ROTATIONS_UNDEFINED = -1; private static final int ALLOW_ALL_ROTATIONS_DISABLED = 0; private static final int ALLOW_ALL_ROTATIONS_ENABLED = 1; @@ -889,6 +902,7 @@ public class DisplayRotation { @VisibleForTesting void setUserRotation(int userRotationMode, int userRotation) { + mRotationChoiceShownToUserForConfirmation = ROTATION_UNDEFINED; if (isDefaultDisplay) { // We'll be notified via settings listener, so we don't need to update internal values. final ContentResolver res = mContext.getContentResolver(); @@ -1085,6 +1099,10 @@ public class DisplayRotation { return false; } + if (mFoldController != null && mFoldController.shouldDisableRotationSensor()) { + return false; + } + if (mSupportAutoRotation) { if (mCurrentAppOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR || mCurrentAppOrientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR @@ -1183,6 +1201,9 @@ public class DisplayRotation { int sensorRotation = mOrientationListener != null ? mOrientationListener.getProposedRotation() // may be -1 : -1; + if (mFoldController != null && mFoldController.shouldIgnoreSensorRotation()) { + sensorRotation = -1; + } if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()) { sensorRotation = RotationUtils.reverseRotationDirectionAroundZAxis(sensorRotation); } @@ -1425,6 +1446,11 @@ public class DisplayRotation { return false; } + // Do not show rotation choice when fold controller blocks rotation sensor + if (mFoldController != null && mFoldController.shouldIgnoreSensorRotation()) { + return false; + } + // Don't show rotation choice if we are in tabletop or book modes. if (isTabletopAutoRotateOverrideEnabled()) return false; @@ -1527,6 +1553,13 @@ public class DisplayRotation { } } + void onDisplayRemoved() { + removeDefaultDisplayRotationChangedCallback(); + if (mFoldController != null) { + mFoldController.onDisplayRemoved(); + } + } + /** Return whether the rotation settings has changed. */ private boolean updateSettings() { final ContentResolver resolver = mContext.getContentResolver(); @@ -1589,6 +1622,17 @@ public class DisplayRotation { } } + /** + * Called from {@link ActivityRecord#setRequestedOrientation(int)} + */ + void onSetRequestedOrientation() { + if (mCompatPolicyForImmersiveApps == null + || mRotationChoiceShownToUserForConfirmation == ROTATION_UNDEFINED) { + return; + } + mOrientationListener.onProposedRotationChanged(mRotationChoiceShownToUserForConfirmation); + } + void dump(String prefix, PrintWriter pw) { pw.println(prefix + "DisplayRotation"); pw.println(prefix + " mCurrentAppOrientation=" @@ -1622,6 +1666,22 @@ public class DisplayRotation { pw.println(prefix + " mLidOpenRotation=" + Surface.rotationToString(mLidOpenRotation)); pw.println(prefix + " mFixedToUserRotation=" + isFixedToUserRotation()); + if (mFoldController != null) { + pw.println(prefix + "FoldController"); + pw.println(prefix + " mPauseAutorotationDuringUnfolding=" + + mFoldController.mPauseAutorotationDuringUnfolding); + pw.println(prefix + " mShouldDisableRotationSensor=" + + mFoldController.mShouldDisableRotationSensor); + pw.println(prefix + " mShouldIgnoreSensorRotation=" + + mFoldController.mShouldIgnoreSensorRotation); + pw.println(prefix + " mLastDisplaySwitchTime=" + + mFoldController.mLastDisplaySwitchTime); + pw.println(prefix + " mLastHingeAngleEventTime=" + + mFoldController.mLastHingeAngleEventTime); + pw.println(prefix + " mDeviceState=" + + mFoldController.mDeviceState); + } + if (!mRotationHistory.mRecords.isEmpty()) { pw.println(); pw.println(prefix + " RotationHistory"); @@ -1663,13 +1723,37 @@ public class DisplayRotation { } } - private class FoldController { + /** + * Called by the DisplayContent when the physical display changes + */ + void physicalDisplayChanged() { + if (mFoldController != null) { + mFoldController.onPhysicalDisplayChanged(); + } + } + + @VisibleForTesting + long uptimeMillis() { + return SystemClock.uptimeMillis(); + } + + class FoldController { + private final boolean mPauseAutorotationDuringUnfolding; @Surface.Rotation private int mHalfFoldSavedRotation = -1; // No saved rotation private DeviceStateController.DeviceState mDeviceState = DeviceStateController.DeviceState.UNKNOWN; + private long mLastHingeAngleEventTime = 0; + private long mLastDisplaySwitchTime = 0; + private boolean mShouldIgnoreSensorRotation; + private boolean mShouldDisableRotationSensor; private boolean mInHalfFoldTransition = false; + private int mDisplaySwitchRotationBlockTimeMs; + private int mHingeAngleRotationBlockTimeMs; + private int mMaxHingeAngle; private final boolean mIsDisplayAlwaysSeparatingHinge; + private SensorManager mSensorManager; + private SensorEventListener mHingeAngleSensorEventListener; private final Set<Integer> mTabletopRotations; private final Runnable mActivityBoundsUpdateCallback; @@ -1726,6 +1810,48 @@ public class DisplayRotation { } } }; + + mPauseAutorotationDuringUnfolding = mContext.getResources().getBoolean( + R.bool.config_windowManagerPauseRotationWhenUnfolding); + + if (mPauseAutorotationDuringUnfolding) { + mDisplaySwitchRotationBlockTimeMs = mContext.getResources().getInteger( + R.integer.config_pauseRotationWhenUnfolding_displaySwitchTimeout); + mHingeAngleRotationBlockTimeMs = mContext.getResources().getInteger( + R.integer.config_pauseRotationWhenUnfolding_hingeEventTimeout); + mMaxHingeAngle = mContext.getResources().getInteger( + R.integer.config_pauseRotationWhenUnfolding_maxHingeAngle); + registerSensorManager(); + } + } + + private void registerSensorManager() { + mSensorManager = mContext.getSystemService(SensorManager.class); + if (mSensorManager != null) { + final Sensor hingeAngleSensor = mSensorManager + .getDefaultSensor(Sensor.TYPE_HINGE_ANGLE); + + if (hingeAngleSensor != null) { + mHingeAngleSensorEventListener = new SensorEventListener() { + @Override + public void onSensorChanged(SensorEvent event) { + onHingeAngleChanged(event.values[0]); + } + + @Override + public void onAccuracyChanged(Sensor sensor, int accuracy) { + } + }; + mSensorManager.registerListener(mHingeAngleSensorEventListener, + hingeAngleSensor, SensorManager.SENSOR_DELAY_FASTEST, getHandler()); + } + } + } + + void onDisplayRemoved() { + if (mSensorManager != null && mHingeAngleSensorEventListener != null) { + mSensorManager.unregisterListener(mHingeAngleSensorEventListener); + } } boolean isDeviceInPosture(DeviceStateController.DeviceState state, boolean isTabletop) { @@ -1755,6 +1881,7 @@ public class DisplayRotation { boolean shouldRevertOverriddenRotation() { // When transitioning to open. return mDeviceState == DeviceStateController.DeviceState.OPEN + && !mShouldIgnoreSensorRotation // Ignore if the hinge angle still moving && mInHalfFoldTransition && mHalfFoldSavedRotation != -1 // Ignore if we've already reverted. && mUserRotationMode @@ -1801,6 +1928,80 @@ public class DisplayRotation { UiThread.getHandler().postDelayed(mActivityBoundsUpdateCallback, FOLDING_RECOMPUTE_CONFIG_DELAY_MS); } + + boolean shouldIgnoreSensorRotation() { + return mShouldIgnoreSensorRotation; + } + + boolean shouldDisableRotationSensor() { + return mShouldDisableRotationSensor; + } + + private void updateSensorRotationBlockIfNeeded() { + final long currentTime = uptimeMillis(); + final boolean newShouldIgnoreRotation = + currentTime - mLastDisplaySwitchTime < mDisplaySwitchRotationBlockTimeMs + || currentTime - mLastHingeAngleEventTime < mHingeAngleRotationBlockTimeMs; + + if (newShouldIgnoreRotation != mShouldIgnoreSensorRotation) { + mShouldIgnoreSensorRotation = newShouldIgnoreRotation; + + // Resuming the autorotation + if (!mShouldIgnoreSensorRotation) { + if (mShouldDisableRotationSensor) { + // Sensor was disabled, let's re-enable it + mShouldDisableRotationSensor = false; + updateOrientationListenerLw(); + } else { + // Sensor was not disabled, let's update the rotation in case if we received + // some rotation sensor updates when autorotate was disabled + updateRotationAndSendNewConfigIfChanged(); + } + } + } + } + + void onPhysicalDisplayChanged() { + if (!mPauseAutorotationDuringUnfolding) return; + + mLastDisplaySwitchTime = uptimeMillis(); + + final boolean isUnfolding = + mDeviceState == DeviceStateController.DeviceState.OPEN + || mDeviceState == DeviceStateController.DeviceState.HALF_FOLDED; + + if (isUnfolding) { + // Temporary disable rotation sensor updates when unfolding + mShouldDisableRotationSensor = true; + updateOrientationListenerLw(); + } + + updateSensorRotationBlockIfNeeded(); + getHandler().postDelayed(() -> { + synchronized (mLock) { + updateSensorRotationBlockIfNeeded(); + }; + }, mDisplaySwitchRotationBlockTimeMs); + } + + void onHingeAngleChanged(float hingeAngle) { + if (hingeAngle < mMaxHingeAngle) { + mLastHingeAngleEventTime = uptimeMillis(); + + updateSensorRotationBlockIfNeeded(); + + getHandler().postDelayed(() -> { + synchronized (mLock) { + updateSensorRotationBlockIfNeeded(); + }; + }, mHingeAngleRotationBlockTimeMs); + } + } + } + + @VisibleForTesting + Handler getHandler() { + return mService.mH; } private class OrientationListener extends WindowOrientationListener implements Runnable { @@ -1831,9 +2032,11 @@ public class DisplayRotation { mService.mPowerManagerInternal.setPowerBoost(Boost.INTERACTION, 0); dispatchProposedRotation(rotation); if (isRotationChoiceAllowed(rotation)) { + mRotationChoiceShownToUserForConfirmation = rotation; final boolean isValid = isValidRotationChoice(rotation); sendProposedRotationChangeToStatusBarInternal(rotation, isValid); } else { + mRotationChoiceShownToUserForConfirmation = ROTATION_UNDEFINED; mService.updateRotation(false /* alwaysSendConfiguration */, false /* forceRelayout */); } diff --git a/services/core/java/com/android/server/wm/EmbeddedWindowController.java b/services/core/java/com/android/server/wm/EmbeddedWindowController.java index d65f464590c1..44d67687e260 100644 --- a/services/core/java/com/android/server/wm/EmbeddedWindowController.java +++ b/services/core/java/com/android/server/wm/EmbeddedWindowController.java @@ -292,7 +292,9 @@ class EmbeddedWindowController { private void handleTap(boolean grantFocus) { if (mInputChannel != null) { if (mHostWindowState != null) { - mWmService.grantEmbeddedWindowFocus(mSession, mHostWindowState.mClient, + // Use null session since this is being granted by system server and doesn't + // require the host session to be passed in + mWmService.grantEmbeddedWindowFocus(null, mHostWindowState.mClient, mFocusGrantToken, grantFocus); if (grantFocus) { // If granting focus to the embedded when tapped, we need to ensure the host diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java index 3b23f9717175..3e03b9983a5d 100644 --- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java @@ -218,8 +218,6 @@ class InsetsSourceProvider { if (mFrameProvider != null) { mFrameProvider.accept(mWindowContainer.getDisplayContent().mDisplayFrames, mWindowContainer, mSourceFrame); - } else { - mSourceFrame.inset(win.mGivenContentInsets); } updateSourceFrameForServerVisibility(); diff --git a/services/core/java/com/android/server/wm/LaunchParamsPersister.java b/services/core/java/com/android/server/wm/LaunchParamsPersister.java index bb50372ba019..bf511adf0bf9 100644 --- a/services/core/java/com/android/server/wm/LaunchParamsPersister.java +++ b/services/core/java/com/android/server/wm/LaunchParamsPersister.java @@ -263,8 +263,8 @@ class LaunchParamsPersister { boolean changed = !Objects.equals(params.mDisplayUniqueId, info.uniqueId); params.mDisplayUniqueId = info.uniqueId; - changed |= params.mWindowingMode != task.getTaskDisplayArea().getWindowingMode(); - params.mWindowingMode = task.getTaskDisplayArea().getWindowingMode(); + changed |= params.mWindowingMode != task.getWindowingMode(); + params.mWindowingMode = task.getWindowingMode(); if (task.mLastNonFullscreenBounds != null) { changed |= !Objects.equals(params.mBounds, task.mLastNonFullscreenBounds); diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index a1e6cd78776c..ff1deaf415b3 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -50,6 +50,7 @@ import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_V import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE; import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE; import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS; +import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED; import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION; import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__LETTERBOX_POSITION__BOTTOM; @@ -126,7 +127,8 @@ import java.util.function.Predicate; final class LetterboxUiController { private static final Predicate<ActivityRecord> FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE = - activityRecord -> activityRecord.fillsParent() && !activityRecord.isFinishing(); + activityRecord -> activityRecord.fillsParent() && !activityRecord.isFinishing() + && activityRecord.nowVisible; private static final String TAG = TAG_WITH_CLASS_NAME ? "LetterboxUiController" : TAG_ATM; @@ -234,9 +236,14 @@ final class LetterboxUiController { private final Boolean mBooleanPropertyIgnoreRequestedOrientation; @Nullable + private final Boolean mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected; + + @Nullable private final Boolean mBooleanPropertyFakeFocus; - private boolean mIsRelauchingAfterRequestedOrientationChanged; + private boolean mIsRelaunchingAfterRequestedOrientationChanged; + + private boolean mLastShouldShowLetterboxUi; private boolean mDoubleTapEvent; @@ -252,6 +259,10 @@ final class LetterboxUiController { readComponentProperty(packageManager, mActivityRecord.packageName, mLetterboxConfiguration::isPolicyForIgnoringRequestedOrientationEnabled, PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION); + mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected = + readComponentProperty(packageManager, mActivityRecord.packageName, + mLetterboxConfiguration::isPolicyForIgnoringRequestedOrientationEnabled, + PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED); mBooleanPropertyFakeFocus = readComponentProperty(packageManager, mActivityRecord.packageName, mLetterboxConfiguration::isCompatFakeFocusEnabled, @@ -386,7 +397,7 @@ final class LetterboxUiController { ::isPolicyForIgnoringRequestedOrientationEnabled, mIsOverrideEnableCompatIgnoreRequestedOrientationEnabled, mBooleanPropertyIgnoreRequestedOrientation)) { - if (mIsRelauchingAfterRequestedOrientationChanged) { + if (mIsRelaunchingAfterRequestedOrientationChanged) { Slog.w(TAG, "Ignoring orientation update to " + screenOrientationToString(requestedOrientation) + " due to relaunching after setRequestedOrientation for " @@ -421,6 +432,8 @@ final class LetterboxUiController { * * <p>This treatment is enabled when the following conditions are met: * <ul> + * <li>Flag gating the treatment is enabled + * <li>Opt-out component property isn't enabled * <li>Per-app override is enabled * <li>App has requested orientation more than 2 times within 1-second * timer and activity is not letterboxed for fixed orientation @@ -428,7 +441,11 @@ final class LetterboxUiController { */ @VisibleForTesting boolean shouldIgnoreOrientationRequestLoop() { - if (!mIsOverrideEnableCompatIgnoreOrientationRequestWhenLoopDetectedEnabled) { + if (!shouldEnableWithOptInOverrideAndOptOutProperty( + /* gatingCondition */ mLetterboxConfiguration + ::isPolicyForIgnoringRequestedOrientationEnabled, + mIsOverrideEnableCompatIgnoreOrientationRequestWhenLoopDetectedEnabled, + mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected)) { return false; } @@ -475,8 +492,8 @@ final class LetterboxUiController { * Sets whether an activity is relaunching after the app has called {@link * android.app.Activity#setRequestedOrientation}. */ - void setRelauchingAfterRequestedOrientationChanged(boolean isRelaunching) { - mIsRelauchingAfterRequestedOrientationChanged = isRelaunching; + void setRelaunchingAfterRequestedOrientationChanged(boolean isRelaunching) { + mIsRelaunchingAfterRequestedOrientationChanged = isRelaunching; } /** @@ -1153,12 +1170,28 @@ final class LetterboxUiController { @VisibleForTesting boolean shouldShowLetterboxUi(WindowState mainWindow) { - return (mActivityRecord.isInLetterboxAnimation() || isSurfaceVisible(mainWindow)) + if (mIsRelaunchingAfterRequestedOrientationChanged || !isSurfaceReadyToShow(mainWindow)) { + return mLastShouldShowLetterboxUi; + } + + final boolean shouldShowLetterboxUi = + (mActivityRecord.isInLetterboxAnimation() || isSurfaceVisible(mainWindow)) && mainWindow.areAppWindowBoundsLetterboxed() // Check for FLAG_SHOW_WALLPAPER explicitly instead of using // WindowContainer#showWallpaper because the later will return true when this // activity is using blurred wallpaper for letterbox background. && (mainWindow.getAttrs().flags & FLAG_SHOW_WALLPAPER) == 0; + + mLastShouldShowLetterboxUi = shouldShowLetterboxUi; + + return shouldShowLetterboxUi; + } + + @VisibleForTesting + boolean isSurfaceReadyToShow(WindowState mainWindow) { + return mainWindow.isDrawn() // Regular case + // Waiting for relayoutWindow to call preserveSurface + || mainWindow.isDragResizeChanged(); } @VisibleForTesting @@ -1296,6 +1329,10 @@ final class LetterboxUiController { return null; } + boolean getIsRelaunchingAfterRequestedOrientationChanged() { + return mIsRelaunchingAfterRequestedOrientationChanged; + } + private void adjustBoundsForTaskbar(final WindowState mainWindow, final Rect bounds) { // Rounded corners should be displayed above the taskbar. When taskbar is hidden, // an insets frame is equal to a navigation bar which shouldn't affect position of @@ -1560,11 +1597,10 @@ final class LetterboxUiController { inheritConfiguration(firstOpaqueActivityBeneath); mLetterboxConfigListener = WindowContainer.overrideConfigurationPropagation( mActivityRecord, firstOpaqueActivityBeneath, - (opaqueConfig, transparentConfig) -> { - final Configuration mutatedConfiguration = - fromOriginalTranslucentConfig(transparentConfig); + (opaqueConfig, transparentOverrideConfig) -> { + resetTranslucentOverrideConfig(transparentOverrideConfig); final Rect parentBounds = parent.getWindowConfiguration().getBounds(); - final Rect bounds = mutatedConfiguration.windowConfiguration.getBounds(); + final Rect bounds = transparentOverrideConfig.windowConfiguration.getBounds(); final Rect letterboxBounds = opaqueConfig.windowConfiguration.getBounds(); // We cannot use letterboxBounds directly here because the position relies on // letterboxing. Using letterboxBounds directly, would produce a double offset. @@ -1573,9 +1609,9 @@ final class LetterboxUiController { parentBounds.top + letterboxBounds.height()); // We need to initialize appBounds to avoid NPE. The actual value will // be set ahead when resolving the Configuration for the activity. - mutatedConfiguration.windowConfiguration.setAppBounds(new Rect()); + transparentOverrideConfig.windowConfiguration.setAppBounds(new Rect()); inheritConfiguration(firstOpaqueActivityBeneath); - return mutatedConfiguration; + return transparentOverrideConfig; }); } @@ -1654,20 +1690,16 @@ final class LetterboxUiController { true /* traverseTopToBottom */)); } - // When overriding translucent activities configuration we need to keep some of the - // original properties - private Configuration fromOriginalTranslucentConfig(Configuration translucentConfig) { - final Configuration configuration = new Configuration(translucentConfig); + /** Resets the screen size related fields so they can be resolved by requested bounds later. */ + private static void resetTranslucentOverrideConfig(Configuration config) { // The values for the following properties will be defined during the configuration // resolution in {@link ActivityRecord#resolveOverrideConfiguration} using the // properties inherited from the first not finishing opaque activity beneath. - configuration.orientation = ORIENTATION_UNDEFINED; - configuration.screenWidthDp = configuration.compatScreenWidthDp = SCREEN_WIDTH_DP_UNDEFINED; - configuration.screenHeightDp = - configuration.compatScreenHeightDp = SCREEN_HEIGHT_DP_UNDEFINED; - configuration.smallestScreenWidthDp = - configuration.compatSmallestScreenWidthDp = SMALLEST_SCREEN_WIDTH_DP_UNDEFINED; - return configuration; + config.orientation = ORIENTATION_UNDEFINED; + config.screenWidthDp = config.compatScreenWidthDp = SCREEN_WIDTH_DP_UNDEFINED; + config.screenHeightDp = config.compatScreenHeightDp = SCREEN_HEIGHT_DP_UNDEFINED; + config.smallestScreenWidthDp = config.compatSmallestScreenWidthDp = + SMALLEST_SCREEN_WIDTH_DP_UNDEFINED; } private void inheritConfiguration(ActivityRecord firstOpaque) { diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index b38666522754..f8f0211e108f 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -338,7 +338,8 @@ class RecentTasks { synchronized (mService.mGlobalLock) { final Task focusedStack = mService.getTopDisplayFocusedRootTask(); final Task topTask = focusedStack != null ? focusedStack.getTopMostTask() : null; - resetFreezeTaskListReordering(topTask); + final Task reorderToEndTask = topTask != null && topTask.hasChild() ? topTask : null; + resetFreezeTaskListReordering(reorderToEndTask); } } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index b5725aed4a7c..73f4b5beea50 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -481,8 +481,6 @@ class Task extends TaskFragment { // to layout without loading all the task snapshots final PersistedTaskSnapshotData mLastTaskSnapshotData; - private final Rect mTmpDimBoundsRect = new Rect(); - /** @see #setCanAffectSystemUiFlags */ private boolean mCanAffectSystemUiFlags = true; @@ -3254,22 +3252,24 @@ class Task extends TaskFragment { @Override void prepareSurfaces() { - mDimmer.resetDimStates(); + final Rect dimBounds = mDimmer.resetDimStates(); super.prepareSurfaces(); - getDimBounds(mTmpDimBoundsRect); - // Bounds need to be relative, as the dim layer is a child. - if (inFreeformWindowingMode()) { - getBounds(mTmpRect); - mTmpDimBoundsRect.offsetTo(mTmpDimBoundsRect.left - mTmpRect.left, - mTmpDimBoundsRect.top - mTmpRect.top); - } else { - mTmpDimBoundsRect.offsetTo(0, 0); + if (dimBounds != null) { + getDimBounds(dimBounds); + + // Bounds need to be relative, as the dim layer is a child. + if (inFreeformWindowingMode()) { + getBounds(mTmpRect); + dimBounds.offsetTo(dimBounds.left - mTmpRect.left, dimBounds.top - mTmpRect.top); + } else { + dimBounds.offsetTo(0, 0); + } } final SurfaceControl.Transaction t = getSyncTransaction(); - if (mDimmer.updateDims(t, mTmpDimBoundsRect)) { + if (dimBounds != null && mDimmer.updateDims(t)) { scheduleAnimation(); } diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 76759ba53f5a..b0a879e96dcf 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -1883,7 +1883,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { // Only allow to specify orientation if this TDA is the last focused one on this logical // display that can request orientation request. return mDisplayContent.getOrientationRequestingTaskDisplayArea() == this - && !getIgnoreOrientationRequest(orientation); + && !shouldIgnoreOrientationRequest(orientation); } void clearPreferredTopFocusableRootTask() { diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index 612fc4be70db..1d232fe99e3c 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -2923,14 +2923,15 @@ class TaskFragment extends WindowContainer<WindowContainer> { return; } - mDimmer.resetDimStates(); + final Rect dimBounds = mDimmer.resetDimStates(); super.prepareSurfaces(); - // Bounds need to be relative, as the dim layer is a child. - final Rect dimBounds = getBounds(); - dimBounds.offsetTo(0 /* newLeft */, 0 /* newTop */); - if (mDimmer.updateDims(getSyncTransaction(), dimBounds)) { - scheduleAnimation(); + if (dimBounds != null) { + // Bounds need to be relative, as the dim layer is a child. + dimBounds.offsetTo(0 /* newLeft */, 0 /* newTop */); + if (mDimmer.updateDims(getSyncTransaction())) { + scheduleAnimation(); + } } } diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 17bf3de03c67..e209ef97fd7b 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -33,8 +33,6 @@ import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_FLAG_IS_RECENTS; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_LOCKED; -import static android.view.WindowManager.TRANSIT_KEYGUARD_OCCLUDE; -import static android.view.WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_BACK; import static android.view.WindowManager.TRANSIT_TO_FRONT; @@ -167,6 +165,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { private SurfaceControl.Transaction mStartTransaction = null; private SurfaceControl.Transaction mFinishTransaction = null; + /** Used for failsafe clean-up to prevent leaks due to misbehaving player impls. */ + private SurfaceControl.Transaction mCleanupTransaction = null; + /** * Contains change infos for both participants and all remote-animatable ancestors. The * ancestors can be the promotion candidates so their start-states need to be captured. @@ -798,6 +799,24 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } /** + * Build a transaction that cleans-up transition-only surfaces (transition root and snapshots). + * This will ALWAYS be applied on transition finish just in-case + */ + private static void buildCleanupTransaction(SurfaceControl.Transaction t, TransitionInfo info) { + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + final TransitionInfo.Change c = info.getChanges().get(i); + if (c.getSnapshot() != null) { + t.reparent(c.getSnapshot(), null); + } + } + for (int i = info.getRootCount() - 1; i >= 0; --i) { + final SurfaceControl leash = info.getRoot(i).getLeash(); + if (leash == null) continue; + t.reparent(leash, null); + } + } + + /** * Set whether this transition can start a pip-enter transition when finished. This is usually * true, but gets set to false when recents decides that it wants to finish its animation but * not actually finish its animation (yeah...). @@ -874,6 +893,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { if (mStartTransaction != null) mStartTransaction.close(); if (mFinishTransaction != null) mFinishTransaction.close(); mStartTransaction = mFinishTransaction = null; + if (mCleanupTransaction != null) { + mCleanupTransaction.apply(); + mCleanupTransaction = null; + } if (mState < STATE_PLAYING) { throw new IllegalStateException("Can't finish a non-playing transition " + mSyncId); } @@ -1187,13 +1210,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { if (primaryDisplay.isKeyguardLocked()) { mFlags |= TRANSIT_FLAG_KEYGUARD_LOCKED; } - // Check whether the participants were animated from back navigation. - mController.mAtm.mBackNavigationController.onTransactionReady(this); - collectOrderChanges(); // Resolve the animating targets from the participants. mTargets = calculateTargets(mParticipants, mChanges); + // Check whether the participants were animated from back navigation. + mController.mAtm.mBackNavigationController.onTransactionReady(this, mTargets); final TransitionInfo info = calculateTransitionInfo(mType, mFlags, mTargets, transaction); info.setDebugId(mSyncId); @@ -1297,6 +1319,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } } buildFinishTransaction(mFinishTransaction, info); + mCleanupTransaction = mController.mAtm.mWindowManager.mTransactionFactory.get(); + buildCleanupTransaction(mCleanupTransaction, info); if (mController.getTransitionPlayer() != null && mIsPlayerEnabled) { mController.dispatchLegacyAppTransitionStarting(info, mStatusBarTransitionDelay); try { @@ -1396,6 +1420,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { ci.mSnapshot.release(); } } + if (mCleanupTransaction != null) { + mCleanupTransaction.apply(); + mCleanupTransaction = null; + } } /** The transition is ready to play. Make the start transaction show the surfaces. */ diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 0b9ceeaf5d4e..7ceac4fe7f16 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -46,6 +46,7 @@ import android.os.Debug; import android.os.IBinder; import android.os.RemoteException; import android.os.SystemClock; +import android.os.SystemProperties; import android.util.ArraySet; import android.util.MathUtils; import android.util.Slog; @@ -56,7 +57,6 @@ import android.view.WindowManager; import android.view.animation.Animation; import android.window.ScreenCapture; -import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.protolog.ProtoLogImpl; import com.android.internal.protolog.common.ProtoLog; @@ -122,7 +122,7 @@ class WallpaperController { private boolean mShouldOffsetWallpaperCenter; - final boolean mEnableSeparateLockScreenEngine; + final boolean mIsLockscreenLiveWallpaperEnabled; private final ToBooleanFunction<WindowState> mFindWallpaperTargetFunction = w -> { if ((w.mAttrs.type == TYPE_WALLPAPER)) { @@ -259,8 +259,8 @@ class WallpaperController { mShouldOffsetWallpaperCenter = resources.getBoolean( com.android.internal.R.bool.config_offsetWallpaperToCenterOfLargestDisplay); - mEnableSeparateLockScreenEngine = - resources.getBoolean(R.bool.config_independentLockscreenLiveWallpaper); + mIsLockscreenLiveWallpaperEnabled = + SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false); } void resetLargestDisplay(Display display) { diff --git a/services/core/java/com/android/server/wm/WallpaperWindowToken.java b/services/core/java/com/android/server/wm/WallpaperWindowToken.java index 17ab551b5c1e..6c38c6fb7ac4 100644 --- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java +++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java @@ -76,7 +76,7 @@ class WallpaperWindowToken extends WindowToken { return; } mShowWhenLocked = showWhenLocked; - if (mDisplayContent.mWallpaperController.mEnableSeparateLockScreenEngine) { + if (mDisplayContent.mWallpaperController.mIsLockscreenLiveWallpaperEnabled) { // Move the window token to the front (private) or back (showWhenLocked). This is // possible // because the DisplayArea underneath TaskDisplayArea only contains TYPE_WALLPAPER diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 41176410a789..cf6efd28acb7 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -4047,7 +4047,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< final Configuration mergedConfiguration = configurationMerger != null ? configurationMerger.merge(mergedOverrideConfig, - receiver.getConfiguration()) + receiver.getRequestedOverrideConfiguration()) : supplier.getConfiguration(); receiver.onRequestedOverrideConfigurationChanged(mergedConfiguration); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index dde87b1c35e8..cd4d6e4f1600 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -9315,7 +9315,14 @@ public class WindowManagerService extends IWindowManager.Stub throw new SecurityException("Requires READ_FRAME_BUFFER permission"); } - ScreenCapture.captureLayers(getCaptureArgs(displayId, captureArgs), listener); + ScreenCapture.LayerCaptureArgs layerCaptureArgs = getCaptureArgs(displayId, captureArgs); + ScreenCapture.captureLayers(layerCaptureArgs, listener); + + if (Binder.getCallingUid() != SYSTEM_UID) { + // Release the SurfaceControl objects only if the caller is not in system server as no + // parcelling occurs in this case. + layerCaptureArgs.release(); + } } @VisibleForTesting diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index c34aa2b336cd..85c601fe0a5c 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -45,6 +45,8 @@ import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_N import static com.android.server.wm.BackgroundActivityStartController.BAL_BLOCK; import static com.android.server.wm.WindowManagerService.MY_PID; +import static java.util.Objects.requireNonNull; + import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; @@ -559,14 +561,19 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio * @see BackgroundLaunchProcessController#addOrUpdateAllowBackgroundStartPrivileges(Binder, * BackgroundStartPrivileges) */ - public void addOrUpdateBackgroundStartPrivileges(Binder entity, - BackgroundStartPrivileges backgroundStartPrivileges) { + public void addOrUpdateBackgroundStartPrivileges(@NonNull Binder entity, + @NonNull BackgroundStartPrivileges backgroundStartPrivileges) { + requireNonNull(entity, "entity"); + requireNonNull(backgroundStartPrivileges, "backgroundStartPrivileges"); + checkArgument(backgroundStartPrivileges.allowsAny(), + "backgroundStartPrivileges does not allow anything"); mBgLaunchController.addOrUpdateAllowBackgroundStartPrivileges(entity, backgroundStartPrivileges); } /** @see BackgroundLaunchProcessController#removeAllowBackgroundStartPrivileges(Binder) */ - public void removeBackgroundStartPrivileges(Binder entity) { + public void removeBackgroundStartPrivileges(@NonNull Binder entity) { + requireNonNull(entity, "entity"); mBgLaunchController.removeAllowBackgroundStartPrivileges(entity); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 680f6052f36a..6e3924baadf3 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -428,8 +428,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP boolean mGivenInsetsPending; /** - * These are the content insets that were given during layout for - * this window, to be applied to windows behind it. + * These are the content insets that were given during layout for this window, to be applied to + * windows behind it. + * This is only applied to IME windows when corresponding process in DisplayPolicy executed. */ final Rect mGivenContentInsets = new Rect(); @@ -5176,13 +5177,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override void prepareSurfaces() { mIsDimming = false; - applyDims(); - updateSurfacePositionNonOrganized(); - // Send information to SurfaceFlinger about the priority of the current window. - updateFrameRateSelectionPriorityIfNeeded(); - updateScaleIfNeeded(); - - mWinAnimator.prepareSurfaceLocked(getSyncTransaction()); + if (mHasSurface) { + applyDims(); + updateSurfacePositionNonOrganized(); + // Send information to SurfaceFlinger about the priority of the current window. + updateFrameRateSelectionPriorityIfNeeded(); + updateScaleIfNeeded(); + mWinAnimator.prepareSurfaceLocked(getSyncTransaction()); + } super.prepareSurfaces(); } @@ -5229,8 +5231,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (surfaceInsetsChanged) { mLastSurfaceInsets.set(mAttrs.surfaceInsets); } - if (surfaceSizeChanged && mWinAnimator.getShown() && !canPlayMoveAnimation() - && okToDisplay() && mSyncState == SYNC_STATE_NONE) { + final boolean surfaceResizedWithoutMoveAnimation = surfaceSizeChanged + && mWinAnimator.getShown() && !canPlayMoveAnimation() && okToDisplay() + && mSyncState == SYNC_STATE_NONE; + final ActivityRecord activityRecord = getActivityRecord(); + // If this window belongs to an activity that is relaunching due to an orientation + // change then delay the position update until it has redrawn to avoid any flickers. + final boolean isLetterboxedAndRelaunching = activityRecord != null + && activityRecord.areBoundsLetterboxed() + && activityRecord.mLetterboxUiController + .getIsRelaunchingAfterRequestedOrientationChanged(); + if (surfaceResizedWithoutMoveAnimation || isLetterboxedAndRelaunching) { applyWithNextDraw(mSetSurfacePositionConsumer); } else { mSetSurfacePositionConsumer.accept(t); diff --git a/services/credentials/java/com/android/server/credentials/ClearRequestSession.java b/services/credentials/java/com/android/server/credentials/ClearRequestSession.java index dce7b87c0328..5c77aa22ece8 100644 --- a/services/credentials/java/com/android/server/credentials/ClearRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/ClearRequestSession.java @@ -30,6 +30,7 @@ import android.service.credentials.CallingAppInfo; import android.util.Log; import java.util.ArrayList; +import java.util.Set; /** * Central session for a single clearCredentialState request. This class listens to the @@ -40,12 +41,15 @@ public final class ClearRequestSession extends RequestSession<ClearCredentialSta implements ProviderSession.ProviderInternalCallback<Void> { private static final String TAG = "GetRequestSession"; - public ClearRequestSession(Context context, int userId, int callingUid, + public ClearRequestSession(Context context, RequestSession.SessionLifetime sessionCallback, + Object lock, int userId, int callingUid, IClearCredentialStateCallback callback, ClearCredentialStateRequest request, - CallingAppInfo callingAppInfo, CancellationSignal cancellationSignal, + CallingAppInfo callingAppInfo, Set<ComponentName> enabledProviders, + CancellationSignal cancellationSignal, long startedTimestamp) { - super(context, userId, callingUid, request, callback, RequestInfo.TYPE_UNDEFINED, - callingAppInfo, cancellationSignal, startedTimestamp); + super(context, sessionCallback, lock, userId, callingUid, request, callback, + RequestInfo.TYPE_UNDEFINED, + callingAppInfo, enabledProviders, cancellationSignal, startedTimestamp); } /** diff --git a/services/credentials/java/com/android/server/credentials/CreateRequestSession.java b/services/credentials/java/com/android/server/credentials/CreateRequestSession.java index 98dc8ab8aa9c..02aaf867fa7b 100644 --- a/services/credentials/java/com/android/server/credentials/CreateRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/CreateRequestSession.java @@ -38,6 +38,7 @@ import android.util.Log; import com.android.server.credentials.metrics.ProviderStatusForMetrics; import java.util.ArrayList; +import java.util.Set; /** * Central session for a single {@link CredentialManager#createCredential} request. @@ -49,14 +50,17 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR implements ProviderSession.ProviderInternalCallback<CreateCredentialResponse> { private static final String TAG = "CreateRequestSession"; - CreateRequestSession(@NonNull Context context, int userId, int callingUid, + CreateRequestSession(@NonNull Context context, RequestSession.SessionLifetime sessionCallback, + Object lock, int userId, int callingUid, CreateCredentialRequest request, ICreateCredentialCallback callback, CallingAppInfo callingAppInfo, + Set<ComponentName> enabledProviders, CancellationSignal cancellationSignal, long startedTimestamp) { - super(context, userId, callingUid, request, callback, RequestInfo.TYPE_CREATE, - callingAppInfo, cancellationSignal, startedTimestamp); + super(context, sessionCallback, lock, userId, callingUid, request, callback, + RequestInfo.TYPE_CREATE, + callingAppInfo, enabledProviders, cancellationSignal, startedTimestamp); } /** @@ -83,6 +87,7 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR @Override protected void launchUiWithProviderData(ArrayList<ProviderData> providerDataList) { mRequestSessionMetric.collectUiCallStartTime(System.nanoTime()); + mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.USER_INTERACTION); try { mClientCallback.onPendingIntent(mCredentialManagerUi.createPendingIntent( RequestInfo.newCreateRequestInfo( @@ -93,6 +98,7 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR providerDataList)); } catch (RemoteException e) { mRequestSessionMetric.collectUiReturnedFinalPhase(/*uiReturned=*/ false); + mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.TERMINATED); respondToClientWithErrorAndFinish( CreateCredentialException.TYPE_UNKNOWN, "Unable to invoke selector"); diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java index de06d440fa9d..06b96eb46ac1 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java @@ -33,7 +33,6 @@ import android.content.pm.PackageManager; import android.credentials.ClearCredentialStateRequest; import android.credentials.CreateCredentialException; import android.credentials.CreateCredentialRequest; -import android.credentials.CredentialManager; import android.credentials.CredentialOption; import android.credentials.CredentialProviderInfo; import android.credentials.GetCredentialException; @@ -50,6 +49,7 @@ import android.credentials.UnregisterCredentialDescriptionRequest; import android.credentials.ui.IntentFactory; import android.os.Binder; import android.os.CancellationSignal; +import android.os.IBinder; import android.os.ICancellationSignal; import android.os.RemoteException; import android.os.UserHandle; @@ -70,9 +70,11 @@ import com.android.server.infra.AbstractMasterSystemService; import com.android.server.infra.SecureSettingsServiceNameResolver; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -94,6 +96,8 @@ public final class CredentialManagerService private static final String PERMISSION_DENIED_ERROR = "permission_denied"; private static final String PERMISSION_DENIED_WRITE_SECURE_SETTINGS_ERROR = "Caller is missing WRITE_SECURE_SETTINGS permission"; + private static final String DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER = + "enable_credential_manager"; private final Context mContext; @@ -102,6 +106,13 @@ public final class CredentialManagerService private final SparseArray<List<CredentialManagerServiceImpl>> mSystemServicesCacheList = new SparseArray<>(); + /** Cache of all ongoing request sessions per user id. */ + @GuardedBy("mLock") + private final SparseArray<Map<IBinder, RequestSession>> mRequestSessions = + new SparseArray<>(); + + private final SessionManager mSessionManager = new SessionManager(); + public CredentialManagerService(@NonNull Context context) { super( context, @@ -331,7 +342,7 @@ public final class CredentialManagerService @NonNull private Set<Pair<CredentialOption, CredentialDescriptionRegistry.FilterResult>> - getFilteredResultFromRegistry(List<CredentialOption> options) { + getFilteredResultFromRegistry(List<CredentialOption> options) { // Session for active/provisioned credential descriptions; CredentialDescriptionRegistry registry = CredentialDescriptionRegistry.forUser(UserHandle.getCallingUserId()); @@ -389,14 +400,6 @@ public final class CredentialManagerService return providerSessions; } - private List<CredentialProviderInfo> getServicesForCredentialDescription(int userId) { - return CredentialProviderInfoFactory.getCredentialProviderServices( - mContext, - userId, - CredentialManager.PROVIDER_FILTER_ALL_PROVIDERS, - new HashSet<>()); - } - @Override @GuardedBy("CredentialDescriptionRegistry.sLock") public void onUserStopped(@NonNull TargetUser user) { @@ -448,13 +451,17 @@ public final class CredentialManagerService final GetRequestSession session = new GetRequestSession( getContext(), + mSessionManager, + mLock, userId, callingUid, callback, request, constructCallingAppInfo(callingPackage, userId, request.getOrigin()), + getEnabledProviders(), CancellationSignal.fromTransport(cancelTransport), timestampBegan); + addSessionLocked(userId, session); List<ProviderSession> providerSessions = prepareProviderSessions(request, session); @@ -499,11 +506,14 @@ public final class CredentialManagerService final PrepareGetRequestSession session = new PrepareGetRequestSession( getContext(), + mSessionManager, + mLock, userId, callingUid, getCredentialCallback, request, constructCallingAppInfo(callingPackage, userId, request.getOrigin()), + getEnabledProviders(), CancellationSignal.fromTransport(cancelTransport), timestampBegan, prepareGetCredentialCallback); @@ -515,8 +525,8 @@ public final class CredentialManagerService // TODO: fix prepareGetCredentialCallback.onResponse( new PrepareGetCredentialResponseInternal( - false, null, - false, false, null)); + false, null, + false, false, null)); } catch (RemoteException e) { Log.i( TAG, @@ -540,10 +550,10 @@ public final class CredentialManagerService List<CredentialOption> optionsThatRequireActiveCredentials = request.getCredentialOptions().stream() .filter(credentialOption -> credentialOption - .getCredentialRetrievalData() - .getStringArrayList( - CredentialOption - .SUPPORTED_ELEMENT_KEYS) != null) + .getCredentialRetrievalData() + .getStringArrayList( + CredentialOption + .SUPPORTED_ELEMENT_KEYS) != null) .toList(); List<CredentialOption> optionsThatDoNotRequireActiveCredentials = @@ -614,13 +624,17 @@ public final class CredentialManagerService final CreateRequestSession session = new CreateRequestSession( getContext(), + mSessionManager, + mLock, userId, callingUid, request, callback, constructCallingAppInfo(callingPackage, userId, request.getOrigin()), + getEnabledProviders(), CancellationSignal.fromTransport(cancelTransport), timestampBegan); + addSessionLocked(userId, session); processCreateCredential(request, callback, session); return cancelTransport; @@ -775,6 +789,19 @@ public final class CredentialManagerService mContext, userId, providerFilter, getEnabledProviders()); } + @Override + public boolean isServiceEnabled() { + final long origId = Binder.clearCallingIdentity(); + try { + return DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_CREDENTIAL, + DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER, + true); + } finally { + Binder.restoreCallingIdentity(origId); + } + } + @SuppressWarnings("GuardedBy") // ErrorProne requires service.mLock which is the same // this.mLock private Set<ComponentName> getEnabledProviders() { @@ -815,13 +842,17 @@ public final class CredentialManagerService final ClearRequestSession session = new ClearRequestSession( getContext(), + mSessionManager, + mLock, userId, callingUid, callback, request, constructCallingAppInfo(callingPackage, userId, null), + getEnabledProviders(), CancellationSignal.fromTransport(cancelTransport), timestampBegan); + addSessionLocked(userId, session); // Initiate all provider sessions // TODO: Determine if provider needs to have clear capability in their manifest @@ -905,6 +936,13 @@ public final class CredentialManagerService } } + private void addSessionLocked(@UserIdInt int userId, + RequestSession requestSession) { + synchronized (mLock) { + mSessionManager.addSession(userId, requestSession.mRequestId, requestSession); + } + } + private void enforceCallingPackage(String callingPackage, int callingUid) { int packageUid; PackageManager pm = mContext.createContextAsUser( @@ -919,4 +957,23 @@ public final class CredentialManagerService throw new SecurityException(callingPackage + " does not belong to uid " + callingUid); } } + + private class SessionManager implements RequestSession.SessionLifetime { + @Override + @GuardedBy("mLock") + public void onFinishRequestSession(@UserIdInt int userId, IBinder token) { + Log.i(TAG, "In onFinishRequestSession"); + if (mRequestSessions.get(userId) != null) { + mRequestSessions.get(userId).remove(token); + } + } + + @GuardedBy("mLock") + public void addSession(int userId, IBinder token, RequestSession requestSession) { + if (mRequestSessions.get(userId) == null) { + mRequestSessions.put(userId, new HashMap<>()); + } + mRequestSessions.get(userId).put(token, requestSession); + } + } } diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java index 546c37ff95af..87509067f993 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java @@ -20,7 +20,6 @@ import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.pm.ServiceInfo; import android.credentials.CredentialManager; import android.credentials.CredentialProviderInfo; import android.credentials.ui.DisabledProviderData; @@ -30,6 +29,7 @@ import android.credentials.ui.RequestInfo; import android.credentials.ui.UserSelectionDialogResult; import android.os.Bundle; import android.os.Handler; +import android.os.IBinder; import android.os.Looper; import android.os.ResultReceiver; import android.service.credentials.CredentialProviderInfoFactory; @@ -37,20 +37,32 @@ import android.util.Log; import android.util.Slog; import java.util.ArrayList; -import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; /** Initiates the Credential Manager UI and receives results. */ public class CredentialManagerUi { private static final String TAG = "CredentialManagerUi"; @NonNull private final CredentialManagerUiCallback mCallbacks; - @NonNull private final Context mContext; + @NonNull + private final Context mContext; // TODO : Use for starting the activity for this user private final int mUserId; - @NonNull private final ResultReceiver mResultReceiver = new ResultReceiver( + + private UiStatus mStatus; + + private final Set<ComponentName> mEnabledProviders; + + enum UiStatus { + IN_PROGRESS, + USER_INTERACTION, + NOT_STARTED, TERMINATED + } + + @NonNull + private final ResultReceiver mResultReceiver = new ResultReceiver( new Handler(Looper.getMainLooper())) { @Override protected void onReceiveResult(int resultCode, Bundle resultData) { @@ -61,6 +73,7 @@ public class CredentialManagerUi { private void handleUiResult(int resultCode, Bundle resultData) { switch (resultCode) { case UserSelectionDialogResult.RESULT_CODE_DIALOG_COMPLETE_WITH_SELECTION: + mStatus = UiStatus.IN_PROGRESS; UserSelectionDialogResult selection = UserSelectionDialogResult .fromResultData(resultData); if (selection != null) { @@ -70,75 +83,90 @@ public class CredentialManagerUi { } break; case UserSelectionDialogResult.RESULT_CODE_DIALOG_USER_CANCELED: + mStatus = UiStatus.TERMINATED; mCallbacks.onUiCancellation(/* isUserCancellation= */ true); break; case UserSelectionDialogResult.RESULT_CODE_CANCELED_AND_LAUNCHED_SETTINGS: + mStatus = UiStatus.TERMINATED; mCallbacks.onUiCancellation(/* isUserCancellation= */ false); break; case UserSelectionDialogResult.RESULT_CODE_DATA_PARSING_FAILURE: + mStatus = UiStatus.TERMINATED; mCallbacks.onUiSelectorInvocationFailure(); break; default: Slog.i(TAG, "Unknown error code returned from the UI"); + mStatus = UiStatus.IN_PROGRESS; mCallbacks.onUiSelectorInvocationFailure(); break; } } + /** Creates intent that is ot be invoked to cancel an in-progress UI session. */ + public Intent createCancelIntent(IBinder requestId, String packageName) { + return IntentFactory.createCancelUiIntent(requestId, /*shouldShowCancellationUi=*/ true, + packageName); + } + /** * Interface to be implemented by any class that wishes to get callbacks from the UI. */ public interface CredentialManagerUiCallback { /** Called when the user makes a selection. */ void onUiSelection(UserSelectionDialogResult selection); + /** Called when the UI is canceled without a successful provider result. */ void onUiCancellation(boolean isUserCancellation); /** Called when the selector UI fails to come up (mostly due to parsing issue today). */ void onUiSelectorInvocationFailure(); } + public CredentialManagerUi(Context context, int userId, - CredentialManagerUiCallback callbacks) { + CredentialManagerUiCallback callbacks, Set<ComponentName> enabledProviders) { Log.i(TAG, "In CredentialManagerUi constructor"); mContext = context; mUserId = userId; mCallbacks = callbacks; + mEnabledProviders = enabledProviders; + mStatus = UiStatus.IN_PROGRESS; + } + + /** Set status for credential manager UI */ + public void setStatus(UiStatus status) { + mStatus = status; + } + + /** Returns status for credential manager UI */ + public UiStatus getStatus() { + return mStatus; } /** * Creates a {@link PendingIntent} to be used to invoke the credential manager selector UI, * by the calling app process. - * @param requestInfo the information about the request + * + * @param requestInfo the information about the request * @param providerDataList the list of provider data from remote providers */ public PendingIntent createPendingIntent( RequestInfo requestInfo, ArrayList<ProviderData> providerDataList) { Log.i(TAG, "In createPendingIntent"); - ArrayList<DisabledProviderData> disabledProviderDataList = new ArrayList<>(); - Set<String> enabledProviders = providerDataList.stream() - .map(ProviderData::getProviderFlattenedComponentName) - .collect(Collectors.toUnmodifiableSet()); - Set<String> allProviders = + List<CredentialProviderInfo> allProviders = CredentialProviderInfoFactory.getCredentialProviderServices( - mContext, - mUserId, - CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY, - new HashSet<>()) - .stream() - .map(CredentialProviderInfo::getServiceInfo) - .map(ServiceInfo::getComponentName) - .map(ComponentName::flattenToString) - .collect(Collectors.toUnmodifiableSet()); - - for (String provider: allProviders) { - if (!enabledProviders.contains(provider)) { - disabledProviderDataList.add(new DisabledProviderData(provider)); - } - } + mContext, + mUserId, + CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY, + mEnabledProviders); + + List<DisabledProviderData> disabledProviderDataList = allProviders.stream() + .filter(provider -> !provider.isEnabled()) + .map(disabledProvider -> new DisabledProviderData( + disabledProvider.getComponentName().flattenToString())).toList(); Intent intent = IntentFactory.createCredentialSelectorIntent(requestInfo, providerDataList, - disabledProviderDataList, mResultReceiver) + new ArrayList<>(disabledProviderDataList), mResultReceiver) .setAction(UUID.randomUUID().toString()); //TODO: Create unique pending intent using request code and cancel any pre-existing pending // intents diff --git a/services/credentials/java/com/android/server/credentials/GetRequestSession.java b/services/credentials/java/com/android/server/credentials/GetRequestSession.java index c0c7be9d80e2..c44e665ba699 100644 --- a/services/credentials/java/com/android/server/credentials/GetRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/GetRequestSession.java @@ -35,6 +35,7 @@ import android.util.Log; import com.android.server.credentials.metrics.ProviderStatusForMetrics; import java.util.ArrayList; +import java.util.Set; import java.util.stream.Collectors; /** @@ -45,21 +46,26 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, IGetCredentialCallback, GetCredentialResponse> implements ProviderSession.ProviderInternalCallback<GetCredentialResponse> { private static final String TAG = "GetRequestSession"; - public GetRequestSession(Context context, int userId, int callingUid, + + public GetRequestSession(Context context, RequestSession.SessionLifetime sessionCallback, + Object lock, int userId, int callingUid, IGetCredentialCallback callback, GetCredentialRequest request, - CallingAppInfo callingAppInfo, CancellationSignal cancellationSignal, + CallingAppInfo callingAppInfo, Set<ComponentName> enabledProviders, + CancellationSignal cancellationSignal, long startedTimestamp) { - super(context, userId, callingUid, request, callback, RequestInfo.TYPE_GET, - callingAppInfo, cancellationSignal, startedTimestamp); + super(context, sessionCallback, lock, userId, callingUid, request, callback, + RequestInfo.TYPE_GET, callingAppInfo, enabledProviders, cancellationSignal, + startedTimestamp); int numTypes = (request.getCredentialOptions().stream() .map(CredentialOption::getType).collect( - Collectors.toSet())).size(); // Dedupe type strings + Collectors.toSet())).size(); // Dedupe type strings mRequestSessionMetric.collectGetFlowInitialMetricInfo(numTypes); } /** * Creates a new provider session, and adds it list of providers that are contributing to * this session. + * * @return the provider session created within this request session, for the given provider * info. */ @@ -81,6 +87,7 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, @Override protected void launchUiWithProviderData(ArrayList<ProviderData> providerDataList) { mRequestSessionMetric.collectUiCallStartTime(System.nanoTime()); + mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.USER_INTERACTION); try { mClientCallback.onPendingIntent(mCredentialManagerUi.createPendingIntent( RequestInfo.newGetRequestInfo( @@ -88,6 +95,7 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, providerDataList)); } catch (RemoteException e) { mRequestSessionMetric.collectUiReturnedFinalPhase(/*uiReturned=*/ false); + mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.TERMINATED); respondToClientWithErrorAndFinish( GetCredentialException.TYPE_UNKNOWN, "Unable to instantiate selector"); } @@ -146,7 +154,7 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, @Override public void onUiSelectorInvocationFailure() { respondToClientWithErrorAndFinish(GetCredentialException.TYPE_NO_CREDENTIAL, - "No credentials available."); + "No credentials available."); } @Override diff --git a/services/credentials/java/com/android/server/credentials/MetricUtilities.java b/services/credentials/java/com/android/server/credentials/MetricUtilities.java index c48654a9fce7..703ab7c7fae8 100644 --- a/services/credentials/java/com/android/server/credentials/MetricUtilities.java +++ b/services/credentials/java/com/android/server/credentials/MetricUtilities.java @@ -108,7 +108,7 @@ public class MetricUtilities { browsedProviderUid[index] = metric.getProviderUid(); index++; } - FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE, + FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED, /* session_id */ finalPhaseMetric.getSessionId(), /* sequence_num */ emitSequenceId, /* ui_returned_final_start */ finalPhaseMetric.isUiReturned(), @@ -204,7 +204,7 @@ public class MetricUtilities { candidateRemoteEntryCountList[index] = metric.getRemoteEntryCount(); index++; } - FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_CANDIDATE_PHASE, + FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_CANDIDATE_PHASE_REPORTED, /* session_id */ sessionId, /* sequence_num */ emitSequenceId, /* query_returned */ queryReturned, @@ -277,7 +277,7 @@ public class MetricUtilities { if (!LOG_FLAG) { return; } - FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_INIT_PHASE, + FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_INIT_PHASE_REPORTED, /* api_name */ initialPhaseMetric.getApiName(), /* caller_uid */ initialPhaseMetric.getCallerUid(), /* session_id */ initialPhaseMetric.getSessionId(), diff --git a/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java b/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java index c4e480a8e609..f274e65a20c3 100644 --- a/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java @@ -49,14 +49,14 @@ public class PrepareGetRequestSession extends GetRequestSession { private final IPrepareGetCredentialCallback mPrepareGetCredentialCallback; - public PrepareGetRequestSession(Context context, int userId, int callingUid, - IGetCredentialCallback callback, - GetCredentialRequest request, - CallingAppInfo callingAppInfo, + public PrepareGetRequestSession(Context context, + RequestSession.SessionLifetime sessionCallback, Object lock, int userId, + int callingUid, IGetCredentialCallback getCredCallback, GetCredentialRequest request, + CallingAppInfo callingAppInfo, Set<ComponentName> enabledProviders, CancellationSignal cancellationSignal, long startedTimestamp, IPrepareGetCredentialCallback prepareGetCredentialCallback) { - super(context, userId, callingUid, callback, request, callingAppInfo, cancellationSignal, - startedTimestamp); + super(context, sessionCallback, lock, userId, callingUid, getCredCallback, request, + callingAppInfo, enabledProviders, cancellationSignal, startedTimestamp); int numTypes = (request.getCredentialOptions().stream() .map(CredentialOption::getType).collect( Collectors.toSet())).size(); // Dedupe type strings diff --git a/services/credentials/java/com/android/server/credentials/ProviderClearSession.java b/services/credentials/java/com/android/server/credentials/ProviderClearSession.java index 1b736e01c842..0c3d3f4ed6d2 100644 --- a/services/credentials/java/com/android/server/credentials/ProviderClearSession.java +++ b/services/credentials/java/com/android/server/credentials/ProviderClearSession.java @@ -23,6 +23,7 @@ import android.credentials.ClearCredentialStateException; import android.credentials.CredentialProviderInfo; import android.credentials.ui.ProviderData; import android.credentials.ui.ProviderPendingIntentResponse; +import android.os.ICancellationSignal; import android.service.credentials.CallingAppInfo; import android.service.credentials.ClearCredentialStateRequest; import android.util.Log; @@ -109,6 +110,11 @@ public final class ProviderClearSession extends ProviderSession<ClearCredentialS } } + @Override + public void onProviderCancellable(ICancellationSignal cancellation) { + mProviderCancellationSignal = cancellation; + } + @Nullable @Override protected ProviderData prepareUiData() { diff --git a/services/credentials/java/com/android/server/credentials/ProviderCreateSession.java b/services/credentials/java/com/android/server/credentials/ProviderCreateSession.java index bef045f8f890..8b9255a9c56b 100644 --- a/services/credentials/java/com/android/server/credentials/ProviderCreateSession.java +++ b/services/credentials/java/com/android/server/credentials/ProviderCreateSession.java @@ -29,6 +29,7 @@ import android.credentials.ui.CreateCredentialProviderData; import android.credentials.ui.Entry; import android.credentials.ui.ProviderPendingIntentResponse; import android.os.Bundle; +import android.os.ICancellationSignal; import android.service.credentials.BeginCreateCredentialRequest; import android.service.credentials.BeginCreateCredentialResponse; import android.service.credentials.CallingAppInfo; @@ -173,6 +174,11 @@ public final class ProviderCreateSession extends ProviderSession< } } + @Override + public void onProviderCancellable(ICancellationSignal cancellation) { + mProviderCancellationSignal = cancellation; + } + private void onSetInitialRemoteResponse(BeginCreateCredentialResponse response) { Log.i(TAG, "onSetInitialRemoteResponse with save entries"); mProviderResponse = response; @@ -236,7 +242,7 @@ public final class ProviderCreateSession extends ProviderSession< protected void invokeSession() { if (mRemoteCredentialService != null) { startCandidateMetrics(); - mRemoteCredentialService.onCreateCredential(mProviderRequest, this); + mRemoteCredentialService.onBeginCreateCredential(mProviderRequest, this); } } diff --git a/services/credentials/java/com/android/server/credentials/ProviderGetSession.java b/services/credentials/java/com/android/server/credentials/ProviderGetSession.java index 427a8945c573..8d3d06469944 100644 --- a/services/credentials/java/com/android/server/credentials/ProviderGetSession.java +++ b/services/credentials/java/com/android/server/credentials/ProviderGetSession.java @@ -30,6 +30,7 @@ import android.credentials.ui.AuthenticationEntry; import android.credentials.ui.Entry; import android.credentials.ui.GetCredentialProviderData; import android.credentials.ui.ProviderPendingIntentResponse; +import android.os.ICancellationSignal; import android.service.credentials.Action; import android.service.credentials.BeginGetCredentialOption; import android.service.credentials.BeginGetCredentialRequest; @@ -235,6 +236,11 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential } } + @Override + public void onProviderCancellable(ICancellationSignal cancellation) { + mProviderCancellationSignal = cancellation; + } + @Override // Selection call from the request provider protected void onUiEntrySelected(String entryType, String entryKey, ProviderPendingIntentResponse providerPendingIntentResponse) { diff --git a/services/credentials/java/com/android/server/credentials/ProviderRegistryGetSession.java b/services/credentials/java/com/android/server/credentials/ProviderRegistryGetSession.java index 9cf27210dde0..24292ef2cdab 100644 --- a/services/credentials/java/com/android/server/credentials/ProviderRegistryGetSession.java +++ b/services/credentials/java/com/android/server/credentials/ProviderRegistryGetSession.java @@ -29,6 +29,7 @@ import android.credentials.ui.Entry; import android.credentials.ui.GetCredentialProviderData; import android.credentials.ui.ProviderData; import android.credentials.ui.ProviderPendingIntentResponse; +import android.os.ICancellationSignal; import android.service.credentials.CallingAppInfo; import android.service.credentials.CredentialEntry; import android.service.credentials.CredentialProviderService; @@ -115,7 +116,7 @@ public class ProviderRegistryGetSession extends ProviderSession<CredentialOption @NonNull String servicePackageName, @NonNull CredentialOption requestOption) { super(context, requestOption, session, - new ComponentName(servicePackageName, servicePackageName) , + new ComponentName(servicePackageName, servicePackageName), userId, null); mCredentialDescriptionRegistry = CredentialDescriptionRegistry.forUser(userId); mCallingAppInfo = callingAppInfo; @@ -132,7 +133,7 @@ public class ProviderRegistryGetSession extends ProviderSession<CredentialOption @NonNull String servicePackageName, @NonNull CredentialOption requestOption) { super(context, requestOption, session, - new ComponentName(servicePackageName, servicePackageName) , + new ComponentName(servicePackageName, servicePackageName), userId, null); mCredentialDescriptionRegistry = CredentialDescriptionRegistry.forUser(userId); mCallingAppInfo = callingAppInfo; @@ -255,13 +256,18 @@ public class ProviderRegistryGetSession extends ProviderSession<CredentialOption } @Override + public void onProviderCancellable(ICancellationSignal cancellation) { + // No need to do anything since this class does not rely on a remote service. + } + + @Override protected void invokeSession() { mProviderResponse = mCredentialDescriptionRegistry .getFilteredResultForProvider(mCredentialProviderPackageName, mElementKeys); mCredentialEntries = mProviderResponse.stream().flatMap( - (Function<CredentialDescriptionRegistry.FilterResult, - Stream<CredentialEntry>>) filterResult + (Function<CredentialDescriptionRegistry.FilterResult, + Stream<CredentialEntry>>) filterResult -> filterResult.mCredentialEntries.stream()) .collect(Collectors.toList()); updateStatusAndInvokeCallback(Status.CREDENTIALS_RECEIVED, diff --git a/services/credentials/java/com/android/server/credentials/ProviderSession.java b/services/credentials/java/com/android/server/credentials/ProviderSession.java index 8c0e1c1511e6..d165756b3811 100644 --- a/services/credentials/java/com/android/server/credentials/ProviderSession.java +++ b/services/credentials/java/com/android/server/credentials/ProviderSession.java @@ -30,6 +30,7 @@ import android.credentials.ui.ProviderPendingIntentResponse; import android.os.ICancellationSignal; import android.os.RemoteException; import android.util.Log; +import android.util.Slog; import com.android.server.credentials.metrics.ProviderSessionMetric; @@ -189,7 +190,7 @@ public abstract class ProviderSession<T, R> } setStatus(Status.CANCELED); } catch (RemoteException e) { - Log.i(TAG, "Issue while cancelling provider session: " + e.getMessage()); + Slog.e(TAG, "Issue while cancelling provider session: ", e); } } diff --git a/services/credentials/java/com/android/server/credentials/RemoteCredentialService.java b/services/credentials/java/com/android/server/credentials/RemoteCredentialService.java index ff4e3b680131..c1e9bc6a5c3c 100644 --- a/services/credentials/java/com/android/server/credentials/RemoteCredentialService.java +++ b/services/credentials/java/com/android/server/credentials/RemoteCredentialService.java @@ -82,6 +82,9 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr /** Called when the remote provider service dies. */ void onProviderServiceDied(RemoteCredentialService service); + + /** Called to set the cancellation transport from the remote provider service. */ + void onProviderCancellable(ICancellationSignal cancellation); } public RemoteCredentialService(@NonNull Context context, @@ -117,43 +120,56 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr * @param callback the callback to be used to send back the provider response to the * {@link ProviderGetSession} class that maintains provider state */ - public ICancellationSignal onBeginGetCredential(@NonNull BeginGetCredentialRequest request, + public void onBeginGetCredential(@NonNull BeginGetCredentialRequest request, ProviderCallbacks<BeginGetCredentialResponse> callback) { Log.i(TAG, "In onGetCredentials in RemoteCredentialService"); AtomicReference<ICancellationSignal> cancellationSink = new AtomicReference<>(); + AtomicReference<CompletableFuture<BeginGetCredentialResponse>> futureRef = + new AtomicReference<>(); + CompletableFuture<BeginGetCredentialResponse> connectThenExecute = postAsync(service -> { CompletableFuture<BeginGetCredentialResponse> getCredentials = new CompletableFuture<>(); final long originalCallingUidToken = Binder.clearCallingIdentity(); try { - ICancellationSignal cancellationSignal = - service.onBeginGetCredential(request, - new IBeginGetCredentialCallback.Stub() { - @Override - public void onSuccess(BeginGetCredentialResponse response) { - getCredentials.complete(response); - } + service.onBeginGetCredential(request, + new IBeginGetCredentialCallback.Stub() { + @Override + public void onSuccess(BeginGetCredentialResponse response) { + getCredentials.complete(response); + } - @Override - public void onFailure(String errorType, CharSequence message) { - Log.i(TAG, "In onFailure in RemoteCredentialService"); - String errorMsg = message == null ? "" : String.valueOf( - message); - getCredentials.completeExceptionally( - new GetCredentialException(errorType, errorMsg)); - } - }); - cancellationSink.set(cancellationSignal); + @Override + public void onFailure(String errorType, CharSequence message) { + Log.i(TAG, "In onFailure in RemoteCredentialService"); + String errorMsg = message == null ? "" : String.valueOf( + message); + getCredentials.completeExceptionally( + new GetCredentialException(errorType, errorMsg)); + } + + @Override + public void onCancellable(ICancellationSignal cancellation) { + CompletableFuture<BeginGetCredentialResponse> future = + futureRef.get(); + if (future != null && future.isCancelled()) { + dispatchCancellationSignal(cancellation); + } else { + cancellationSink.set(cancellation); + callback.onProviderCancellable(cancellation); + } + } + }); return getCredentials; } finally { Binder.restoreCallingIdentity(originalCallingUidToken); } }).orTimeout(TIMEOUT_REQUEST_MILLIS, TimeUnit.MILLISECONDS); + futureRef.set(connectThenExecute); connectThenExecute.whenComplete((result, error) -> Handler.getMain().post(() -> handleExecutionResponse(result, error, cancellationSink, callback))); - return cancellationSink.get(); } /** @@ -164,10 +180,12 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr * @param callback the callback to be used to send back the provider response to the * {@link ProviderCreateSession} class that maintains provider state */ - public ICancellationSignal onCreateCredential(@NonNull BeginCreateCredentialRequest request, + public void onBeginCreateCredential(@NonNull BeginCreateCredentialRequest request, ProviderCallbacks<BeginCreateCredentialResponse> callback) { Log.i(TAG, "In onCreateCredential in RemoteCredentialService"); AtomicReference<ICancellationSignal> cancellationSink = new AtomicReference<>(); + AtomicReference<CompletableFuture<BeginCreateCredentialResponse>> futureRef = + new AtomicReference<>(); CompletableFuture<BeginCreateCredentialResponse> connectThenExecute = postAsync(service -> { @@ -175,7 +193,7 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr new CompletableFuture<>(); final long originalCallingUidToken = Binder.clearCallingIdentity(); try { - ICancellationSignal cancellationSignal = service.onBeginCreateCredential( + service.onBeginCreateCredential( request, new IBeginCreateCredentialCallback.Stub() { @Override public void onSuccess(BeginCreateCredentialResponse response) { @@ -192,18 +210,28 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr createCredentialFuture.completeExceptionally( new CreateCredentialException(errorType, errorMsg)); } + + @Override + public void onCancellable(ICancellationSignal cancellation) { + CompletableFuture<BeginCreateCredentialResponse> future = + futureRef.get(); + if (future != null && future.isCancelled()) { + dispatchCancellationSignal(cancellation); + } else { + cancellationSink.set(cancellation); + callback.onProviderCancellable(cancellation); + } + } }); - cancellationSink.set(cancellationSignal); return createCredentialFuture; } finally { Binder.restoreCallingIdentity(originalCallingUidToken); } }).orTimeout(TIMEOUT_REQUEST_MILLIS, TimeUnit.MILLISECONDS); + futureRef.set(connectThenExecute); connectThenExecute.whenComplete((result, error) -> Handler.getMain().post(() -> handleExecutionResponse(result, error, cancellationSink, callback))); - - return cancellationSink.get(); } /** @@ -214,10 +242,11 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr * @param callback the callback to be used to send back the provider response to the * {@link ProviderClearSession} class that maintains provider state */ - public ICancellationSignal onClearCredentialState(@NonNull ClearCredentialStateRequest request, + public void onClearCredentialState(@NonNull ClearCredentialStateRequest request, ProviderCallbacks<Void> callback) { Log.i(TAG, "In onClearCredentialState in RemoteCredentialService"); AtomicReference<ICancellationSignal> cancellationSink = new AtomicReference<>(); + AtomicReference<CompletableFuture<Void>> futureRef = new AtomicReference<>(); CompletableFuture<Void> connectThenExecute = postAsync(service -> { @@ -225,7 +254,7 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr new CompletableFuture<>(); final long originalCallingUidToken = Binder.clearCallingIdentity(); try { - ICancellationSignal cancellationSignal = service.onClearCredentialState( + service.onClearCredentialState( request, new IClearCredentialStateCallback.Stub() { @Override public void onSuccess() { @@ -243,18 +272,27 @@ public class RemoteCredentialService extends ServiceConnector.Impl<ICredentialPr new ClearCredentialStateException(errorType, errorMsg)); } + + @Override + public void onCancellable(ICancellationSignal cancellation) { + CompletableFuture<Void> future = futureRef.get(); + if (future != null && future.isCancelled()) { + dispatchCancellationSignal(cancellation); + } else { + cancellationSink.set(cancellation); + callback.onProviderCancellable(cancellation); + } + } }); - cancellationSink.set(cancellationSignal); return clearCredentialFuture; } finally { Binder.restoreCallingIdentity(originalCallingUidToken); } }).orTimeout(TIMEOUT_REQUEST_MILLIS, TimeUnit.MILLISECONDS); + futureRef.set(connectThenExecute); connectThenExecute.whenComplete((result, error) -> Handler.getMain().post(() -> handleExecutionResponse(result, error, cancellationSink, callback))); - - return cancellationSink.get(); } private <T> void handleExecutionResponse(T result, diff --git a/services/credentials/java/com/android/server/credentials/RequestSession.java b/services/credentials/java/com/android/server/credentials/RequestSession.java index cfb9ad46812d..e98c5241ae00 100644 --- a/services/credentials/java/com/android/server/credentials/RequestSession.java +++ b/services/credentials/java/com/android/server/credentials/RequestSession.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.UserIdInt; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.credentials.CredentialProviderInfo; import android.credentials.ui.ProviderData; import android.credentials.ui.UserSelectionDialogResult; @@ -29,8 +30,10 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; +import android.os.UserHandle; import android.service.credentials.CallingAppInfo; import android.util.Log; +import android.util.Slog; import com.android.internal.R; import com.android.server.credentials.metrics.ApiName; @@ -39,8 +42,9 @@ import com.android.server.credentials.metrics.ProviderStatusForMetrics; import com.android.server.credentials.metrics.RequestSessionMetric; import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; /** * Base class of a request session, that listens to UI events. This class must be extended @@ -49,6 +53,11 @@ import java.util.Map; abstract class RequestSession<T, U, V> implements CredentialManagerUi.CredentialManagerUiCallback { private static final String TAG = "RequestSession"; + public interface SessionLifetime { + /** Called when the user makes a selection. */ + void onFinishRequestSession(@UserIdInt int userId, IBinder token); + } + // TODO: Revise access levels of attributes @NonNull protected final T mClientRequest; @@ -72,10 +81,16 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential @NonNull protected final CancellationSignal mCancellationSignal; - protected final Map<String, ProviderSession> mProviders = new HashMap<>(); + protected final Map<String, ProviderSession> mProviders = new ConcurrentHashMap<>(); protected final RequestSessionMetric mRequestSessionMetric = new RequestSessionMetric(); protected final String mHybridService; + protected final Object mLock; + + protected final SessionLifetime mSessionCallback; + + private final Set<ComponentName> mEnabledProviders; + @NonNull protected RequestSessionStatus mRequestSessionStatus = RequestSessionStatus.IN_PROGRESS; @@ -91,26 +106,58 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential } protected RequestSession(@NonNull Context context, - @UserIdInt int userId, int callingUid, @NonNull T clientRequest, U clientCallback, + RequestSession.SessionLifetime sessionCallback, + Object lock, @UserIdInt int userId, int callingUid, + @NonNull T clientRequest, U clientCallback, @NonNull String requestType, CallingAppInfo callingAppInfo, + Set<ComponentName> enabledProviders, CancellationSignal cancellationSignal, long timestampStarted) { mContext = context; + mLock = lock; + mSessionCallback = sessionCallback; mUserId = userId; mCallingUid = callingUid; mClientRequest = clientRequest; mClientCallback = clientCallback; mRequestType = requestType; mClientAppInfo = callingAppInfo; + mEnabledProviders = enabledProviders; mCancellationSignal = cancellationSignal; mHandler = new Handler(Looper.getMainLooper(), null, true); mRequestId = new Binder(); mCredentialManagerUi = new CredentialManagerUi(mContext, - mUserId, this); + mUserId, this, mEnabledProviders); mHybridService = context.getResources().getString( R.string.config_defaultCredentialManagerHybridService); mRequestSessionMetric.collectInitialPhaseMetricInfo(timestampStarted, mRequestId, mCallingUid, ApiName.getMetricCodeFromRequestInfo(mRequestType)); + setCancellationListener(); + } + + private void setCancellationListener() { + mCancellationSignal.setOnCancelListener( + () -> { + boolean isUiActive = maybeCancelUi(); + finishSession(!isUiActive); + } + ); + } + + private boolean maybeCancelUi() { + if (mCredentialManagerUi.getStatus() + == CredentialManagerUi.UiStatus.USER_INTERACTION) { + final long originalCallingUidToken = Binder.clearCallingIdentity(); + try { + mContext.startActivityAsUser(mCredentialManagerUi.createCancelIntent( + mRequestId, mClientAppInfo.getPackageName()) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), UserHandle.of(mUserId)); + return true; + } finally { + Binder.restoreCallingIdentity(originalCallingUidToken); + } + } + return false; } public abstract ProviderSession initiateProviderSession(CredentialProviderInfo providerInfo, @@ -154,12 +201,19 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential } protected void finishSession(boolean propagateCancellation) { - Log.i(TAG, "finishing session"); + Slog.d(TAG, "finishing session with propagateCancellation " + propagateCancellation); if (propagateCancellation) { mProviders.values().forEach(ProviderSession::cancelProviderRemoteSession); } mRequestSessionStatus = RequestSessionStatus.COMPLETE; mProviders.clear(); + clearRequestSessionLocked(); + } + + private void clearRequestSessionLocked() { + synchronized (mLock) { + mSessionCallback.onFinishRequestSession(mUserId, mRequestId); + } } protected boolean isAnyProviderPending() { @@ -194,7 +248,6 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential ArrayList<ProviderData> providerDataList = getProviderDataForUi(); if (!providerDataList.isEmpty()) { Log.i(TAG, "provider list not empty about to initiate ui"); - mRequestSessionMetric.logCandidatePhaseMetrics(mProviders); launchUiWithProviderData(providerDataList); } } @@ -204,9 +257,9 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential Log.i(TAG, "In getProviderDataAndInitiateUi"); Log.i(TAG, "In getProviderDataAndInitiateUi providers size: " + mProviders.size()); ArrayList<ProviderData> providerDataList = new ArrayList<>(); + mRequestSessionMetric.logCandidatePhaseMetrics(mProviders); if (isSessionCancelled()) { - mRequestSessionMetric.logCandidatePhaseMetrics(mProviders); finishSession(/*propagateCancellation=*/true); return providerDataList; } @@ -258,7 +311,7 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential * Allows subclasses to directly finalize the call and set closing metrics on error completion. * * @param errorType the type of error given back in the flow - * @param errorMsg the error message given back in the flow + * @param errorMsg the error message given back in the flow */ protected void respondToClientWithErrorAndFinish(String errorType, String errorMsg) { mRequestSessionMetric.collectFinalPhaseProviderMetricStatus( diff --git a/services/credentials/java/com/android/server/credentials/metrics/ApiName.java b/services/credentials/java/com/android/server/credentials/metrics/ApiName.java index f40e73ee64da..ce84d9af8c14 100644 --- a/services/credentials/java/com/android/server/credentials/metrics/ApiName.java +++ b/services/credentials/java/com/android/server/credentials/metrics/ApiName.java @@ -20,11 +20,11 @@ import static android.credentials.ui.RequestInfo.TYPE_CREATE; import static android.credentials.ui.RequestInfo.TYPE_GET; import static android.credentials.ui.RequestInfo.TYPE_UNDEFINED; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_CLEAR_CREDENTIAL; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_CREATE_CREDENTIAL; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_GET_CREDENTIAL; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_IS_ENABLED_CREDENTIAL_PROVIDER_SERVICE; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_UNKNOWN; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_CLEAR_CREDENTIAL; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_CREATE_CREDENTIAL; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_GET_CREDENTIAL; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_IS_ENABLED_CREDENTIAL_PROVIDER_SERVICE; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_UNKNOWN; import android.credentials.ui.RequestInfo; import android.util.Log; @@ -33,12 +33,14 @@ import java.util.AbstractMap; import java.util.Map; public enum ApiName { - UNKNOWN(CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_UNKNOWN), - GET_CREDENTIAL(CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_GET_CREDENTIAL), - CREATE_CREDENTIAL(CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_CREATE_CREDENTIAL), - CLEAR_CREDENTIAL(CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_CLEAR_CREDENTIAL), + UNKNOWN(CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_UNKNOWN), + GET_CREDENTIAL(CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_GET_CREDENTIAL), + CREATE_CREDENTIAL( + CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_CREATE_CREDENTIAL), + CLEAR_CREDENTIAL( + CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_CLEAR_CREDENTIAL), IS_ENABLED_CREDENTIAL_PROVIDER_SERVICE( - CREDENTIAL_MANAGER_INITIAL_PHASE__API_NAME__API_NAME_IS_ENABLED_CREDENTIAL_PROVIDER_SERVICE +CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_IS_ENABLED_CREDENTIAL_PROVIDER_SERVICE ); private static final String TAG = "ApiName"; @@ -58,7 +60,6 @@ public enum ApiName { this.mInnerMetricCode = innerMetricCode; } - /** * Gives the West-world version of the metric name. * diff --git a/services/credentials/java/com/android/server/credentials/metrics/ApiStatus.java b/services/credentials/java/com/android/server/credentials/metrics/ApiStatus.java index 8fea36903a5c..4097765b8736 100644 --- a/services/credentials/java/com/android/server/credentials/metrics/ApiStatus.java +++ b/services/credentials/java/com/android/server/credentials/metrics/ApiStatus.java @@ -16,18 +16,18 @@ package com.android.server.credentials.metrics; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_CLIENT_CANCELED; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_FAILURE; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_SUCCESS; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_USER_CANCELED; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_CLIENT_CANCELED; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_FAILURE; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_SUCCESS; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_USER_CANCELED; public enum ApiStatus { - SUCCESS(CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_SUCCESS), - FAILURE(CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_FAILURE), + SUCCESS(CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_SUCCESS), + FAILURE(CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_FAILURE), CLIENT_CANCELED( - CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_CLIENT_CANCELED), + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_CLIENT_CANCELED), USER_CANCELED( - CREDENTIAL_MANAGER_FINAL_PHASE__API_STATUS__API_STATUS_USER_CANCELED); + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_USER_CANCELED); private final int mInnerMetricCode; diff --git a/services/credentials/java/com/android/server/credentials/metrics/EntryEnum.java b/services/credentials/java/com/android/server/credentials/metrics/EntryEnum.java index 440ac518cc4e..80f9fdc85a7a 100644 --- a/services/credentials/java/com/android/server/credentials/metrics/EntryEnum.java +++ b/services/credentials/java/com/android/server/credentials/metrics/EntryEnum.java @@ -16,11 +16,11 @@ package com.android.server.credentials.metrics; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__ACTION_ENTRY; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__AUTHENTICATION_ENTRY; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__CREDENTIAL_ENTRY; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__REMOTE_ENTRY; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__UNKNOWN; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__ACTION_ENTRY; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__AUTHENTICATION_ENTRY; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__CREDENTIAL_ENTRY; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__REMOTE_ENTRY; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__UNKNOWN; import static com.android.server.credentials.ProviderGetSession.ACTION_ENTRY_KEY; import static com.android.server.credentials.ProviderGetSession.AUTHENTICATION_ACTION_ENTRY_KEY; import static com.android.server.credentials.ProviderGetSession.CREDENTIAL_ENTRY_KEY; @@ -32,12 +32,12 @@ import java.util.AbstractMap; import java.util.Map; public enum EntryEnum { - UNKNOWN(CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__UNKNOWN), - ACTION_ENTRY(CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__ACTION_ENTRY), - CREDENTIAL_ENTRY(CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__CREDENTIAL_ENTRY), - REMOTE_ENTRY(CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__REMOTE_ENTRY), + UNKNOWN(CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__UNKNOWN), + ACTION_ENTRY(CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__ACTION_ENTRY), + CREDENTIAL_ENTRY(CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__CREDENTIAL_ENTRY), + REMOTE_ENTRY(CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__REMOTE_ENTRY), AUTHENTICATION_ENTRY( - CREDENTIAL_MANAGER_FINAL_PHASE__CLICKED_ENTRIES__AUTHENTICATION_ENTRY + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CLICKED_ENTRIES__AUTHENTICATION_ENTRY ); private static final String TAG = "EntryEnum"; diff --git a/services/credentials/java/com/android/server/credentials/metrics/ProviderStatusForMetrics.java b/services/credentials/java/com/android/server/credentials/metrics/ProviderStatusForMetrics.java index 83713ab1c842..a12a6942a5c2 100644 --- a/services/credentials/java/com/android/server/credentials/metrics/ProviderStatusForMetrics.java +++ b/services/credentials/java/com/android/server/credentials/metrics/ProviderStatusForMetrics.java @@ -16,24 +16,24 @@ package com.android.server.credentials.metrics; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_FAILURE; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_SUCCESS; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_FAILURE; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_SUCCESS; -import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_UNKNOWN; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_FAILURE; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_SUCCESS; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_FAILURE; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_SUCCESS; +import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_UNKNOWN; public enum ProviderStatusForMetrics { UNKNOWN( - CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_UNKNOWN), + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_UNKNOWN), FINAL_FAILURE( - CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_FAILURE), + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_FAILURE), QUERY_FAILURE( - CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_FAILURE), + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_FAILURE), FINAL_SUCCESS( - CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_SUCCESS), + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_FINAL_SUCCESS), QUERY_SUCCESS( - CREDENTIAL_MANAGER_FINAL_PHASE__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_SUCCESS); + CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__CHOSEN_PROVIDER_STATUS__PROVIDER_QUERY_SUCCESS); private final int mInnerMetricCode; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java index 474df98cb1e6..950ec77f5ba8 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java @@ -32,22 +32,25 @@ import java.util.Objects; final class BooleanPolicySerializer extends PolicySerializer<Boolean> { + private static final String ATTR_VALUE = "value"; + + private static final String TAG = "BooleanPolicySerializer"; + @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, String attributeName, - @NonNull Boolean value) + void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull Boolean value) throws IOException { Objects.requireNonNull(value); - serializer.attributeBoolean(/* namespace= */ null, attributeName, value); + serializer.attributeBoolean(/* namespace= */ null, ATTR_VALUE, value); } @Nullable @Override - BooleanPolicyValue readFromXml(TypedXmlPullParser parser, String attributeName) { + BooleanPolicyValue readFromXml(TypedXmlPullParser parser) { try { return new BooleanPolicyValue( - parser.getAttributeBoolean(/* namespace= */ null, attributeName)); + parser.getAttributeBoolean(/* namespace= */ null, ATTR_VALUE)); } catch (XmlPullParserException e) { - Log.e(DevicePolicyEngine.TAG, "Error parsing Boolean policy value", e); + Log.e(TAG, "Error parsing Boolean policy value", e); return null; } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java index c79aac722bd7..ee73f8afabd2 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java @@ -53,6 +53,10 @@ import java.util.Objects; // rather than in its own files. final class BundlePolicySerializer extends PolicySerializer<Bundle> { + private static final String TAG = "BundlePolicySerializer"; + + private static final String ATTR_FILE_NAME = "file-name"; + private static final String RESTRICTIONS_FILE_PREFIX = "AppRestrictions_"; private static final String XML_SUFFIX = ".xml"; @@ -72,7 +76,7 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { @Override void saveToXml(@NonNull PolicyKey policyKey, TypedXmlSerializer serializer, - String attributeName, @NonNull Bundle value) throws IOException { + @NonNull Bundle value) throws IOException { Objects.requireNonNull(value); Objects.requireNonNull(policyKey); if (!(policyKey instanceof PackagePolicyKey)) { @@ -82,13 +86,13 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { String packageName = ((PackagePolicyKey) policyKey).getPackageName(); String fileName = packageToRestrictionsFileName(packageName, value); writeApplicationRestrictionsLAr(fileName, value); - serializer.attribute(/* namespace= */ null, attributeName, fileName); + serializer.attribute(/* namespace= */ null, ATTR_FILE_NAME, fileName); } @Nullable @Override - BundlePolicyValue readFromXml(TypedXmlPullParser parser, String attributeName) { - String fileName = parser.getAttributeValue(/* namespace= */ null, attributeName); + BundlePolicyValue readFromXml(TypedXmlPullParser parser) { + String fileName = parser.getAttributeValue(/* namespace= */ null, ATTR_FILE_NAME); return new BundlePolicyValue(readApplicationRestrictions(fileName)); } @@ -119,7 +123,7 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { final TypedXmlPullParser parser = Xml.resolvePullParser(fis); XmlUtils.nextElement(parser); if (parser.getEventType() != XmlPullParser.START_TAG) { - Slog.e(DevicePolicyEngine.TAG, "Unable to read restrictions file " + Slog.e(TAG, "Unable to read restrictions file " + restrictionsFile.getBaseFile()); return restrictions; } @@ -127,7 +131,7 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { readEntry(restrictions, values, parser); } } catch (IOException | XmlPullParserException e) { - Slog.w(DevicePolicyEngine.TAG, "Error parsing " + restrictionsFile.getBaseFile(), e); + Slog.w(TAG, "Error parsing " + restrictionsFile.getBaseFile(), e); } finally { IoUtils.closeQuietly(fis); } @@ -209,7 +213,7 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { restrictionsFile.finishWrite(fos); } catch (Exception e) { restrictionsFile.failWrite(fos); - Slog.e(DevicePolicyEngine.TAG, "Error writing application restrictions list", e); + Slog.e(TAG, "Error writing application restrictions list", e); } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java index d1c6bcb8b48c..6303a1a8b860 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java @@ -30,30 +30,31 @@ import java.io.IOException; import java.util.Objects; final class ComponentNamePolicySerializer extends PolicySerializer<ComponentName> { - private static final String ATTR_PACKAGE_NAME = ":package-name"; - private static final String ATTR_CLASS_NAME = ":class-name"; + + private static final String TAG = "ComponentNamePolicySerializer"; + + private static final String ATTR_PACKAGE_NAME = "package-name"; + private static final String ATTR_CLASS_NAME = "class-name"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, String attributeNamePrefix, + void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull ComponentName value) throws IOException { Objects.requireNonNull(value); serializer.attribute( - /* namespace= */ null, - attributeNamePrefix + ATTR_PACKAGE_NAME, value.getPackageName()); + /* namespace= */ null, ATTR_PACKAGE_NAME, value.getPackageName()); serializer.attribute( - /* namespace= */ null, - attributeNamePrefix + ATTR_CLASS_NAME, value.getClassName()); + /* namespace= */ null, ATTR_CLASS_NAME, value.getClassName()); } @Nullable @Override - ComponentNamePolicyValue readFromXml(TypedXmlPullParser parser, String attributeNamePrefix) { + ComponentNamePolicyValue readFromXml(TypedXmlPullParser parser) { String packageName = parser.getAttributeValue( - /* namespace= */ null, attributeNamePrefix + ATTR_PACKAGE_NAME); + /* namespace= */ null, ATTR_PACKAGE_NAME); String className = parser.getAttributeValue( - /* namespace= */ null, attributeNamePrefix + ATTR_CLASS_NAME); + /* namespace= */ null, ATTR_CLASS_NAME); if (packageName == null || className == null) { - Log.e(DevicePolicyEngine.TAG, "Error parsing ComponentName policy."); + Log.e(TAG, "Error parsing ComponentName policy."); return null; } return new ComponentNamePolicyValue(new ComponentName(packageName, className)); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java index 7eeb51c84200..f111a9541303 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java @@ -23,7 +23,6 @@ import static android.app.admin.PolicyUpdateResult.RESULT_FAILURE_HARDWARE_LIMIT import static android.app.admin.PolicyUpdateResult.RESULT_POLICY_CLEARED; import static android.app.admin.PolicyUpdateResult.RESULT_POLICY_SET; import static android.content.pm.UserProperties.INHERIT_DEVICE_POLICY_FROM_PARENT; -import static android.provider.DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER; import android.Manifest; import android.annotation.NonNull; @@ -47,7 +46,6 @@ import android.os.Bundle; import android.os.Environment; import android.os.UserHandle; import android.os.UserManager; -import android.provider.DeviceConfig; import android.telephony.TelephonyManager; import android.util.AtomicFile; import android.util.Log; @@ -86,9 +84,6 @@ final class DevicePolicyEngine { DevicePolicyIdentifiers.getIdentifierForUserRestriction( UserManager.DISALLOW_CELLULAR_2G); - private static final String ENABLE_COEXISTENCE_FLAG = "enable_coexistence"; - private static final boolean DEFAULT_ENABLE_COEXISTENCE_FLAG = true; - private final Context mContext; private final UserManager mUserManager; @@ -771,28 +766,31 @@ final class DevicePolicyEngine { Intent intent = new Intent(PolicyUpdateReceiver.ACTION_DEVICE_POLICY_SET_RESULT); intent.setPackage(admin.getPackageName()); - List<ResolveInfo> receivers = mContext.getPackageManager().queryBroadcastReceiversAsUser( - intent, - PackageManager.ResolveInfoFlags.of(PackageManager.GET_RECEIVERS), - admin.getUserId()); - if (receivers.isEmpty()) { - Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_SET_RESULT" - + "in package " + admin.getPackageName()); - return; - } + Binder.withCleanCallingIdentity(() -> { + List<ResolveInfo> receivers = + mContext.getPackageManager().queryBroadcastReceiversAsUser( + intent, + PackageManager.ResolveInfoFlags.of(PackageManager.GET_RECEIVERS), + admin.getUserId()); + if (receivers.isEmpty()) { + Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_SET_RESULT" + + "in package " + admin.getPackageName()); + return; + } - Bundle extras = new Bundle(); - policyDefinition.getPolicyKey().writeToBundle(extras); - extras.putInt( - EXTRA_POLICY_TARGET_USER_ID, - getTargetUser(admin.getUserId(), userId)); - extras.putInt( - EXTRA_POLICY_UPDATE_RESULT_KEY, - result); + Bundle extras = new Bundle(); + policyDefinition.getPolicyKey().writeToBundle(extras); + extras.putInt( + EXTRA_POLICY_TARGET_USER_ID, + getTargetUser(admin.getUserId(), userId)); + extras.putInt( + EXTRA_POLICY_UPDATE_RESULT_KEY, + result); - intent.putExtras(extras); + intent.putExtras(extras); - maybeSendIntentToAdminReceivers(intent, UserHandle.of(admin.getUserId()), receivers); + maybeSendIntentToAdminReceivers(intent, UserHandle.of(admin.getUserId()), receivers); + }); } // TODO(b/261430877): Finalise the decision on which admins to send the updates to. @@ -821,27 +819,30 @@ final class DevicePolicyEngine { Intent intent = new Intent(PolicyUpdateReceiver.ACTION_DEVICE_POLICY_CHANGED); intent.setPackage(admin.getPackageName()); - List<ResolveInfo> receivers = mContext.getPackageManager().queryBroadcastReceiversAsUser( - intent, - PackageManager.ResolveInfoFlags.of(PackageManager.GET_RECEIVERS), - admin.getUserId()); - if (receivers.isEmpty()) { - Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_CHANGED" - + "in package " + admin.getPackageName()); - return; - } - - Bundle extras = new Bundle(); - policyDefinition.getPolicyKey().writeToBundle(extras); - extras.putInt( - EXTRA_POLICY_TARGET_USER_ID, - getTargetUser(admin.getUserId(), userId)); - extras.putInt(EXTRA_POLICY_UPDATE_RESULT_KEY, reason); - intent.putExtras(extras); - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + Binder.withCleanCallingIdentity(() -> { + List<ResolveInfo> receivers = + mContext.getPackageManager().queryBroadcastReceiversAsUser( + intent, + PackageManager.ResolveInfoFlags.of(PackageManager.GET_RECEIVERS), + admin.getUserId()); + if (receivers.isEmpty()) { + Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_CHANGED" + + "in package " + admin.getPackageName()); + return; + } - maybeSendIntentToAdminReceivers( - intent, UserHandle.of(admin.getUserId()), receivers); + Bundle extras = new Bundle(); + policyDefinition.getPolicyKey().writeToBundle(extras); + extras.putInt( + EXTRA_POLICY_TARGET_USER_ID, + getTargetUser(admin.getUserId(), userId)); + extras.putInt(EXTRA_POLICY_UPDATE_RESULT_KEY, reason); + intent.putExtras(extras); + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + + maybeSendIntentToAdminReceivers( + intent, UserHandle.of(admin.getUserId()), receivers); + }); } private void maybeSendIntentToAdminReceivers( @@ -1146,38 +1147,6 @@ final class DevicePolicyEngine { return mEnforcingAdmins.size() > 0; } - /** - * Returns {@code true} if the coexistence flag is enabled or: - * <ul> - * <li>If the provided package is an admin with existing policies - * <li>A new admin and no other admin have policies set - * <li>More than one admin have policies set - */ - boolean canAdminAddPolicies(String packageName, int userId) { - if (isCoexistenceFlagEnabled()) { - return true; - } - - if (mEnforcingAdmins.contains(userId) - && mEnforcingAdmins.get(userId).stream().anyMatch(admin -> - admin.getPackageName().equals(packageName))) { - return true; - } - - int numOfEnforcingAdmins = 0; - for (int i = 0; i < mEnforcingAdmins.size(); i++) { - numOfEnforcingAdmins += mEnforcingAdmins.get(i).size(); - } - return numOfEnforcingAdmins == 0 || numOfEnforcingAdmins > 1; - } - - private boolean isCoexistenceFlagEnabled() { - return DeviceConfig.getBoolean( - NAMESPACE_DEVICE_POLICY_MANAGER, - ENABLE_COEXISTENCE_FLAG, - DEFAULT_ENABLE_COEXISTENCE_FLAG); - } - private <V> boolean checkFor2gFailure(@NonNull PolicyDefinition<V> policyDefinition, @NonNull EnforcingAdmin enforcingAdmin) { if (!policyDefinition.getPolicyKey().getIdentifier().equals( @@ -1212,7 +1181,8 @@ final class DevicePolicyEngine { private static final String DEVICE_POLICIES_XML = "device_policy_state.xml"; private static final String TAG_LOCAL_POLICY_ENTRY = "local-policy-entry"; private static final String TAG_GLOBAL_POLICY_ENTRY = "global-policy-entry"; - private static final String TAG_ADMINS_POLICY_ENTRY = "admins-policy-entry"; + private static final String TAG_POLICY_STATE_ENTRY = "policy-state-entry"; + private static final String TAG_POLICY_KEY_ENTRY = "policy-key-entry"; private static final String TAG_ENFORCING_ADMINS_ENTRY = "enforcing-admins-entry"; private static final String ATTR_USER_ID = "user-id"; @@ -1267,11 +1237,14 @@ final class DevicePolicyEngine { serializer.startTag(/* namespace= */ null, TAG_LOCAL_POLICY_ENTRY); serializer.attributeInt(/* namespace= */ null, ATTR_USER_ID, userId); + + serializer.startTag(/* namespace= */ null, TAG_POLICY_KEY_ENTRY); policy.getKey().saveToXml(serializer); + serializer.endTag(/* namespace= */ null, TAG_POLICY_KEY_ENTRY); - serializer.startTag(/* namespace= */ null, TAG_ADMINS_POLICY_ENTRY); + serializer.startTag(/* namespace= */ null, TAG_POLICY_STATE_ENTRY); policy.getValue().saveToXml(serializer); - serializer.endTag(/* namespace= */ null, TAG_ADMINS_POLICY_ENTRY); + serializer.endTag(/* namespace= */ null, TAG_POLICY_STATE_ENTRY); serializer.endTag(/* namespace= */ null, TAG_LOCAL_POLICY_ENTRY); } @@ -1284,11 +1257,13 @@ final class DevicePolicyEngine { for (Map.Entry<PolicyKey, PolicyState<?>> policy : mGlobalPolicies.entrySet()) { serializer.startTag(/* namespace= */ null, TAG_GLOBAL_POLICY_ENTRY); + serializer.startTag(/* namespace= */ null, TAG_POLICY_KEY_ENTRY); policy.getKey().saveToXml(serializer); + serializer.endTag(/* namespace= */ null, TAG_POLICY_KEY_ENTRY); - serializer.startTag(/* namespace= */ null, TAG_ADMINS_POLICY_ENTRY); + serializer.startTag(/* namespace= */ null, TAG_POLICY_STATE_ENTRY); policy.getValue().saveToXml(serializer); - serializer.endTag(/* namespace= */ null, TAG_ADMINS_POLICY_ENTRY); + serializer.endTag(/* namespace= */ null, TAG_POLICY_STATE_ENTRY); serializer.endTag(/* namespace= */ null, TAG_GLOBAL_POLICY_ENTRY); } @@ -1354,28 +1329,56 @@ final class DevicePolicyEngine { private void readLocalPoliciesInner(TypedXmlPullParser parser) throws XmlPullParserException, IOException { int userId = parser.getAttributeInt(/* namespace= */ null, ATTR_USER_ID); - PolicyKey policyKey = PolicyDefinition.readPolicyKeyFromXml(parser); - if (!mLocalPolicies.contains(userId)) { - mLocalPolicies.put(userId, new HashMap<>()); + PolicyKey policyKey = null; + PolicyState<?> policyState = null; + int outerDepth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + String tag = parser.getName(); + switch (tag) { + case TAG_POLICY_KEY_ENTRY: + policyKey = PolicyDefinition.readPolicyKeyFromXml(parser); + break; + case TAG_POLICY_STATE_ENTRY: + policyState = PolicyState.readFromXml(parser); + break; + default: + Log.e(TAG, "Unknown tag for local policy entry" + tag); + } } - PolicyState<?> adminsPolicy = parseAdminsPolicy(parser); - if (adminsPolicy != null) { - mLocalPolicies.get(userId).put(policyKey, adminsPolicy); + + if (policyKey != null && policyState != null) { + if (!mLocalPolicies.contains(userId)) { + mLocalPolicies.put(userId, new HashMap<>()); + } + mLocalPolicies.get(userId).put(policyKey, policyState); } else { - Log.e(TAG, - "Error parsing file, " + policyKey + "doesn't have an " + "AdminsPolicy."); + Log.e(TAG, "Error parsing local policy"); } } private void readGlobalPoliciesInner(TypedXmlPullParser parser) throws IOException, XmlPullParserException { - PolicyKey policyKey = PolicyDefinition.readPolicyKeyFromXml(parser); - PolicyState<?> adminsPolicy = parseAdminsPolicy(parser); - if (adminsPolicy != null) { - mGlobalPolicies.put(policyKey, adminsPolicy); + PolicyKey policyKey = null; + PolicyState<?> policyState = null; + int outerDepth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + String tag = parser.getName(); + switch (tag) { + case TAG_POLICY_KEY_ENTRY: + policyKey = PolicyDefinition.readPolicyKeyFromXml(parser); + break; + case TAG_POLICY_STATE_ENTRY: + policyState = PolicyState.readFromXml(parser); + break; + default: + Log.e(TAG, "Unknown tag for local policy entry" + tag); + } + } + + if (policyKey != null && policyState != null) { + mGlobalPolicies.put(policyKey, policyState); } else { - Log.e(TAG, - "Error parsing file, " + policyKey + "doesn't have an " + "AdminsPolicy."); + Log.e(TAG, "Error parsing global policy"); } } @@ -1387,20 +1390,5 @@ final class DevicePolicyEngine { } mEnforcingAdmins.get(admin.getUserId()).add(admin); } - - @Nullable - private PolicyState<?> parseAdminsPolicy(TypedXmlPullParser parser) - throws XmlPullParserException, IOException { - int outerDepth = parser.getDepth(); - while (XmlUtils.nextElementWithin(parser, outerDepth)) { - String tag = parser.getName(); - if (tag.equals(TAG_ADMINS_POLICY_ENTRY)) { - return PolicyState.readFromXml(parser); - } - Log.e(TAG, "Unknown tag " + tag); - } - Log.e(TAG, "Error parsing file, AdminsPolicy not found"); - return null; - } } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 96cc36bb135e..94e6e732dd76 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -92,6 +92,8 @@ import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_HIBERNATION; import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS; import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_SUSPENSION; import static android.app.admin.DeviceAdminInfo.HEADLESS_DEVICE_OWNER_MODE_AFFILIATED; +import static android.app.admin.DeviceAdminInfo.USES_POLICY_FORCE_LOCK; +import static android.app.admin.DeviceAdminInfo.USES_POLICY_WIPE_DATA; import static android.app.admin.DeviceAdminReceiver.ACTION_COMPLIANCE_ACKNOWLEDGEMENT_REQUIRED; import static android.app.admin.DeviceAdminReceiver.EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE; import static android.app.admin.DevicePolicyIdentifiers.AUTO_TIMEZONE_POLICY; @@ -439,6 +441,7 @@ import android.util.AtomicFile; import android.util.DebugUtils; import android.util.IndentingPrintWriter; import android.util.IntArray; +import android.util.Log; import android.util.Pair; import android.util.Slog; import android.util.SparseArray; @@ -560,6 +563,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private static final int REQUEST_PROFILE_OFF_DEADLINE = 5572; + private static final int MAX_PROFILE_NAME_LENGTH = 200; + private static final long MS_PER_DAY = TimeUnit.DAYS.toMillis(1); private static final long EXPIRATION_GRACE_PERIOD_MS = 5 * MS_PER_DAY; // 5 days, in ms @@ -773,6 +778,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public static final long EXPLICIT_WIPE_BEHAVIOUR = 242193913L; + /** + * Apps targetting U+ should now expect that attempts to grant sensor permissions without + * authorisation will result in a security exception. + */ + @ChangeId + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + public static final long THROW_SECURITY_EXCEPTION_FOR_SENSOR_PERMISSIONS = 277035314L; + // Only add to the end of the list. Do not change or rearrange these values, that will break // historical data. Do not use negative numbers or zero, logger only handles positive // integers. @@ -836,18 +849,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { + "management app's authentication policy"; private static final String NOT_SYSTEM_CALLER_MSG = "Only the system can %s"; - // ENABLE_DEVICE_POLICY_ENGINE_FLAG must be enabled before this could be enabled. private static final String PERMISSION_BASED_ACCESS_EXPERIMENT_FLAG = "enable_permission_based_access"; private static final boolean DEFAULT_VALUE_PERMISSION_BASED_ACCESS_FLAG = false; - // This must be enabled before PERMISSION_BASED_ACCESS_EXPERIMENT_FLAG is enabled, the reason - // we're not just relying on PERMISSION_BASED_ACCESS_EXPERIMENT_FLAG to enable the policy engine - // is that we might want to enable it before the permission changes are ready if we want to test - // it on DPCs. - // Once this is enabled, it can no longer be disabled in production - private static final String ENABLE_DEVICE_POLICY_ENGINE_FLAG = "enable_device_policy_engine"; - private static final boolean DEFAULT_ENABLE_DEVICE_POLICY_ENGINE_FLAG = false; + private static final String ENABLE_DEVICE_POLICY_ENGINE_FOR_FINANCE_FLAG = + "enable_device_policy_engine"; + private static final boolean DEFAULT_ENABLE_DEVICE_POLICY_ENGINE_FOR_FINANCE_FLAG = false; // TODO(b/265683382) remove the flag after rollout. private static final String KEEP_PROFILES_RUNNING_FLAG = "enable_keep_profiles_running"; @@ -1414,10 +1422,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { && (owner.getPackageName().equals(packageName))) { startOwnerService(userHandle, "package-broadcast"); } - if (shouldMigrateToDevicePolicyEngine()) { - migratePoliciesToDevicePolicyEngine(); - } - if (isDevicePolicyEngineEnabled()) { + if (isPermissionCheckFlagEnabled()) { mDevicePolicyEngine.handlePackageChanged(packageName, userHandle); } // Persist updates if the removed package was an admin or delegate. @@ -2121,7 +2126,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mUserManagerInternal.addUserLifecycleListener(new UserLifecycleListener()); mDeviceManagementResourcesProvider.load(); - if (isDevicePolicyEngineEnabled()) { + if (isPermissionCheckFlagEnabled()) { mDevicePolicyEngine.load(); } @@ -2315,7 +2320,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * Creates a new {@link CallerIdentity} object to represent the caller's identity. */ private CallerIdentity getCallerIdentity(@Nullable String callerPackage) { - return getCallerIdentity(null, callerPackage); } @@ -2618,7 +2622,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { ActiveAdmin profileOwner, boolean newOwner) { if (newOwner || mInjector.settingsSecureGetIntForUser( Settings.Secure.UNKNOWN_SOURCES_DEFAULT_REVERSED, 0, userId) != 0) { - if (isDevicePolicyEngineEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { mDevicePolicyEngine.setLocalPolicy( PolicyDefinition.getPolicyDefinitionForUserRestriction( UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES), @@ -2646,7 +2650,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (defaultRestrictions.equals(admin.defaultEnabledRestrictionsAlreadySet)) { return; // The same set of default restrictions has been already applied. } - if (isDevicePolicyEngineEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { for (String restriction : defaultRestrictions) { mDevicePolicyEngine.setLocalPolicy( PolicyDefinition.getPolicyDefinitionForUserRestriction(restriction), @@ -2828,6 +2832,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return doAdmin; } + ActiveAdmin getDefaultDeviceOwnerLocked(@UserIdInt int userId) { + ensureLocked(); + ComponentName doComponent = mOwners.getDeviceOwnerComponent(); + if (mOwners.getDeviceOwnerType(doComponent.getPackageName()) == DEFAULT_DEVICE_OWNER) { + ActiveAdmin doAdmin = getUserData(userId).mAdminMap.get(doComponent); + return doAdmin; + } + return null; + } + ActiveAdmin getProfileOwnerLocked(@UserIdInt int userId) { ensureLocked(); final ComponentName poAdminComponent = mOwners.getProfileOwnerComponent(userId); @@ -2857,6 +2871,18 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return getDeviceOwnerLocked(userId); } + ActiveAdmin getProfileOwnerOrDefaultDeviceOwnerLocked(@UserIdInt int userId) { + ensureLocked(); + // Try to find an admin which can use reqPolicy + final ComponentName poAdminComponent = mOwners.getProfileOwnerComponent(userId); + + if (poAdminComponent != null) { + return getProfileOwnerLocked(userId); + } + + return getDefaultDeviceOwnerLocked(userId); + } + @NonNull ActiveAdmin getParentOfAdminIfRequired(ActiveAdmin admin, boolean parent) { Objects.requireNonNull(admin); return parent ? admin.getParentActiveAdmin() : admin; @@ -3562,7 +3588,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } startOwnerService(userId, "start-user"); - if (isDevicePolicyEngineEnabled()) { + if (isPermissionCheckFlagEnabled()) { mDevicePolicyEngine.handleStartUser(userId); } } @@ -3589,7 +3615,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { void handleUnlockUser(int userId) { startOwnerService(userId, "unlock-user"); - if (isDevicePolicyEngineEnabled()) { + if (isPermissionCheckFlagEnabled()) { mDevicePolicyEngine.handleUnlockUser(userId); } } @@ -3601,7 +3627,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { void handleStopUser(int userId) { updateNetworkPreferenceForUser(userId, List.of(PreferentialNetworkServiceConfig.DEFAULT)); mDeviceAdminServiceController.stopServicesForUser(userId, /* actionForLog= */ "stop-user"); - if (isDevicePolicyEngineEnabled()) { + if (isPermissionCheckFlagEnabled()) { mDevicePolicyEngine.handleStopUser(userId); } } @@ -3727,11 +3753,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { synchronized (getLockObject()) { checkActiveAdminPrecondition(adminReceiver, info, policy); mInjector.binderWithCleanCallingIdentity(() -> { - if (!canAddActiveAdminIfPolicyEngineEnabled( - adminReceiver.getPackageName(), userHandle)) { - throw new IllegalStateException("Can't add non-coexistable admin."); - } - final ActiveAdmin existingAdmin = getActiveAdminUncheckedLocked(adminReceiver, userHandle); if (!refreshing && existingAdmin != null) { @@ -5305,11 +5326,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Preconditions.checkArgument(allowedModes.contains(passwordComplexity), "Provided complexity is not one of the allowed values."); - CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { - caller = getCallerIdentity(callerPackageName); - } else { - caller = getCallerIdentity(); + CallerIdentity caller = getCallerIdentity(callerPackageName); + if (!isPermissionCheckFlagEnabled()) { Preconditions.checkCallAuthorization( isDefaultDeviceOwner(caller) || isProfileOwner(caller)); Preconditions.checkArgument(!calledOnParent || isProfileOwner(caller)); @@ -5354,9 +5372,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { saveSettingsLocked(caller.getUserId()); }); + + //TODO(b/276855301): caller.getPackageName() will be null when the coexistence flags are + // turned off. Change back to caller.getPackageName once this API is unflagged. DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_COMPLEXITY) - .setAdmin(caller.getPackageName()) + .setAdmin(admin.info.getPackageName()) .setInt(passwordComplexity) .setBoolean(calledOnParent) .write(); @@ -5991,8 +6012,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public void lockNow(int flags, boolean parent) { - final CallerIdentity caller = getCallerIdentity(); + public void lockNow(int flags, String callerPackageName, boolean parent) { + CallerIdentity caller; + if (isPermissionCheckFlagEnabled()) { + caller = getCallerIdentity(callerPackageName); + } else { + caller = getCallerIdentity(); + } final int callingUserId = caller.getUserId(); ComponentName adminComponent = null; @@ -6001,11 +6027,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // Make sure the caller has any active admin with the right policy or // the required permission. if (isPermissionCheckFlagEnabled()) { - admin = getActiveAdminOrCheckPermissionsForCallerLocked( - null, - DeviceAdminInfo.USES_POLICY_FORCE_LOCK, - parent, - Set.of(MANAGE_DEVICE_POLICY_LOCK, LOCK_DEVICE)); + admin = enforcePermissionAndGetEnforcingAdmin( + /* admin= */ null, + /* permission= */ MANAGE_DEVICE_POLICY_LOCK, + USES_POLICY_FORCE_LOCK, + caller.getPackageName(), + getAffectedUser(parent) + ).getActiveAdmin(); } else { admin = getActiveAdminOrCheckPermissionForCallerLocked( null, @@ -7486,7 +7514,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return; } CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(callerPackageName); } else { caller = getCallerIdentity(); @@ -7495,10 +7523,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { boolean calledByProfileOwnerOnOrgOwnedDevice = isProfileOwnerOfOrganizationOwnedDevice(caller.getUserId()); - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( /*admin=*/ null, - MANAGE_DEVICE_POLICY_WIPE_DATA, + /*permission= */ MANAGE_DEVICE_POLICY_WIPE_DATA, + USES_POLICY_WIPE_DATA, caller.getPackageName(), factoryReset ? UserHandle.USER_ALL : getAffectedUser(calledOnParentInstance)); admin = enforcingAdmin.getActiveAdmin(); @@ -8528,7 +8557,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { isProfileOwnerOfOrganizationOwnedDevice(caller)); } else { Preconditions.checkCallAuthorization(isProfileOwner(caller) - || isDeviceOwner(caller)); + || isDefaultDeviceOwner(caller)); } } @@ -8542,7 +8571,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { targetUserId).getActiveAdmin(); } else { ap = getParentOfAdminIfRequired( - getProfileOwnerOrDeviceOwnerLocked(caller.getUserId()), parent); + getProfileOwnerOrDefaultDeviceOwnerLocked(caller.getUserId()), parent); } if (ap.disableScreenCapture != disabled) { @@ -8574,15 +8603,21 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } if (admin != null && admin.disableScreenCapture) { setScreenCaptureDisabled(UserHandle.USER_ALL); - } else { - // Otherwise, update screen capture only for the calling user. - admin = getProfileOwnerAdminLocked(adminUserId); - if (admin != null && admin.disableScreenCapture) { - setScreenCaptureDisabled(adminUserId); - } else { - setScreenCaptureDisabled(UserHandle.USER_NULL); - } + return; + } + // Otherwise, update screen capture only for the calling user. + admin = getProfileOwnerAdminLocked(adminUserId); + if (admin != null && admin.disableScreenCapture) { + setScreenCaptureDisabled(adminUserId); + return; } + // If the admin is permission based, update only for the calling user. + admin = getUserData(adminUserId).createOrGetPermissionBasedAdmin(adminUserId); + if (admin != null && admin.disableScreenCapture) { + setScreenCaptureDisabled(adminUserId); + return; + } + setScreenCaptureDisabled(UserHandle.USER_NULL); } // Set the latest screen capture policy, overriding any existing ones. @@ -8720,18 +8755,25 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { synchronized (getLockObject()) { Preconditions.checkCallAuthorization(!isManagedProfile(caller.getUserId()), "Managed profile cannot set auto time required"); - ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller.getUserId()); - if (admin.requireAutoTime != required) { - admin.requireAutoTime = required; - saveSettingsLocked(caller.getUserId()); - requireAutoTimeChanged = true; + + if (isPolicyEngineForFinanceFlagEnabled()) { + EnforcingAdmin admin = getEnforcingAdminForCaller(who, who.getPackageName()); + setGlobalUserRestrictionInternal( + admin, UserManager.DISALLOW_CONFIG_DATE_TIME, required); + } else { + ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller.getUserId()); + if (admin.requireAutoTime != required) { + admin.requireAutoTime = required; + saveSettingsLocked(caller.getUserId()); + requireAutoTimeChanged = true; + } + // requireAutoTime is now backed by DISALLOW_CONFIG_DATE_TIME restriction, so + // propagate updated restrictions to the framework. + if (requireAutoTimeChanged) { + pushUserRestrictions(caller.getUserId()); + } } } - // requireAutoTime is now backed by DISALLOW_CONFIG_DATE_TIME restriction, so propagate - // updated restrictions to the framework. - if (requireAutoTimeChanged) { - pushUserRestrictions(caller.getUserId()); - } // Turn AUTO_TIME on in settings if it is required if (required) { mInjector.binderWithCleanCallingIdentity( @@ -8753,22 +8795,30 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (!mHasFeature) { return false; } - synchronized (getLockObject()) { - ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked(); - if (deviceOwner != null && deviceOwner.requireAutoTime) { - // If the device owner enforces auto time, we don't need to check the PO's - return true; - } - - // Now check to see if any profile owner on any user enforces auto time - for (Integer userId : mOwners.getProfileOwnerKeys()) { - ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userId); - if (profileOwner != null && profileOwner.requireAutoTime) { + if (isPolicyEngineForFinanceFlagEnabled()) { + Boolean required = mDevicePolicyEngine.getResolvedPolicy( + PolicyDefinition.getPolicyDefinitionForUserRestriction( + UserManager.DISALLOW_CONFIG_DATE_TIME), + mInjector.binderGetCallingUserHandle().getIdentifier()); + return required != null && required; + } else { + synchronized (getLockObject()) { + ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked(); + if (deviceOwner != null && deviceOwner.requireAutoTime) { + // If the device owner enforces auto time, we don't need to check the PO's return true; } - } - return false; + // Now check to see if any profile owner on any user enforces auto time + for (Integer userId : mOwners.getProfileOwnerKeys()) { + ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userId); + if (profileOwner != null && profileOwner.requireAutoTime) { + return true; + } + } + + return false; + } } } @@ -8852,7 +8902,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { caller = getCallerIdentity(who); } - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { // The effect of this policy is device-wide. EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( who, @@ -9065,7 +9115,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); @@ -9074,14 +9124,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_CAMERA_DISABLED); - ActiveAdmin admin; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( who, MANAGE_DEVICE_POLICY_CAMERA, caller.getPackageName(), getProfileParentUserIfRequested(userId, parent)); - admin = enforcingAdmin.getActiveAdmin(); + + setBackwardCompatibleUserRestriction( + caller, enforcingAdmin, UserManager.DISALLOW_CAMERA, disabled, parent); } else { Objects.requireNonNull(who, "ComponentName is null"); if (parent) { @@ -9089,22 +9140,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { isProfileOwnerOfOrganizationOwnedDevice(caller)); } synchronized (getLockObject()) { - admin = getActiveAdminForCallerLocked(who, + ActiveAdmin admin = getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA, parent); + if (admin.disableCamera != disabled) { + admin.disableCamera = disabled; + saveSettingsLocked(userId); + } } + // Tell the user manager that the restrictions have changed. + pushUserRestrictions(userId); } - synchronized (getLockObject()) { - if (admin.disableCamera != disabled) { - admin.disableCamera = disabled; - saveSettingsLocked(userId); - } - } - // Tell the user manager that the restrictions have changed. - pushUserRestrictions(userId); - final int affectedUserId = parent ? getProfileParentId(userId) : userId; - if (SecurityLog.isLoggingEnabled()) { + if (SecurityLog.isLoggingEnabled() && who != null) { SecurityLog.writeEvent(SecurityLog.TAG_CAMERA_POLICY_SET, who.getPackageName(), userId, affectedUserId, disabled ? 1 : 0); } @@ -9127,12 +9175,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return false; } CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { Preconditions.checkCallAuthorization( hasFullCrossUsersPermission(caller, userHandle) || isCameraServerUid(caller) @@ -9148,33 +9196,44 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - synchronized (getLockObject()) { - if (who != null) { - ActiveAdmin admin = getActiveAdminUncheckedLocked(who, userHandle, parent); - return (admin != null) && admin.disableCamera; - } - // First, see if DO has set it. If so, it's device-wide. - final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked(); - if (deviceOwner != null && deviceOwner.disableCamera) { - return true; - } + int affectedUserId = parent ? getProfileParentId(userHandle) : userHandle; - // Return the strictest policy across all participating admins. - List<ActiveAdmin> admins; - final int affectedUserId = parent ? getProfileParentId(userHandle) : userHandle; - if (isPermissionCheckFlagEnabled()) { - admins = getActiveAdminsForAffectedUserInclPermissionBasedAdminLocked( - affectedUserId); + if (isPolicyEngineForFinanceFlagEnabled()) { + PolicyDefinition<Boolean> policy = + PolicyDefinition.getPolicyDefinitionForUserRestriction( + UserManager.DISALLOW_CAMERA); + if (who != null) { + EnforcingAdmin admin = getEnforcingAdminForCaller(who, callerPackageName); + return Boolean.TRUE.equals( + mDevicePolicyEngine.getLocalPolicySetByAdmin( + policy, admin, affectedUserId)); } else { - admins = getActiveAdminsForAffectedUserLocked(affectedUserId); + return Boolean.TRUE.equals( + mDevicePolicyEngine.getResolvedPolicy(policy, affectedUserId)); } - // Determine whether or not the device camera is disabled for any active admins. - for (ActiveAdmin activeAdmin : admins) { - if (activeAdmin.disableCamera) { + } else { + synchronized (getLockObject()) { + if (who != null) { + ActiveAdmin admin = getActiveAdminUncheckedLocked(who, userHandle, parent); + return (admin != null) && admin.disableCamera; + } + // First, see if DO has set it. If so, it's device-wide. + final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked(); + if (deviceOwner != null && deviceOwner.disableCamera) { return true; } + + // Return the strictest policy across all participating admins. + List<ActiveAdmin> admins = getActiveAdminsForAffectedUserLocked(affectedUserId); + + // Determine whether or not the device camera is disabled for any active admins. + for (ActiveAdmin activeAdmin : admins) { + if (activeAdmin.disableCamera) { + return true; + } + } + return false; } - return false; } } @@ -9196,7 +9255,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final int userHandle = caller.getUserId(); int affectedUserId = parent ? getProfileParentId(userHandle) : userHandle; synchronized (getLockObject()) { - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { // SUPPORT USES_POLICY_DISABLE_KEYGUARD_FEATURES EnforcingAdmin admin = enforcePermissionAndGetEnforcingAdmin( who, MANAGE_DEVICE_POLICY_KEYGUARD, caller.getPackageName(), @@ -9275,7 +9334,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { synchronized (getLockObject()) { if (who != null) { - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin admin = getEnforcingAdminForCaller( who, who.getPackageName()); Integer features = mDevicePolicyEngine.getLocalPolicySetByAdmin( @@ -9289,7 +9348,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { Integer features = mDevicePolicyEngine.getResolvedPolicy( PolicyDefinition.KEYGUARD_DISABLED_FEATURES, affectedUserId); @@ -10323,8 +10382,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Preconditions.checkCallAuthorization( isDefaultDeviceOwner(caller) || isProfileOwner(caller)); + final String truncatedProfileName = + profileName.substring(0, Math.min(profileName.length(), MAX_PROFILE_NAME_LENGTH)); mInjector.binderWithCleanCallingIdentity(() -> { - mUserManager.setUserName(caller.getUserId(), profileName); + mUserManager.setUserName(caller.getUserId(), truncatedProfileName); DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PROFILE_NAME) .setAdmin(caller.getComponentName()) @@ -11215,14 +11276,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public void addPersistentPreferredActivity(ComponentName who, String callerPackageName, IntentFilter filter, ComponentName activity) { CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } final int userId = caller.getUserId(); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin; if (who == null) { enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( @@ -11270,14 +11331,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public void clearPackagePersistentPreferredActivities(ComponentName who, String callerPackageName, String packageName) { CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } final int userId = caller.getUserId(); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin; if (who == null) { enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( @@ -11330,7 +11391,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { for (PolicyKey key : keys) { if (!(key instanceof IntentFilterPolicyKey)) { throw new IllegalStateException("PolicyKey for PERSISTENT_PREFERRED_ACTIVITY is not" - + "of type PersistentPreferredActivityPolicyKey"); + + "of type IntentFilterPolicyKey"); } IntentFilterPolicyKey parsedKey = (IntentFilterPolicyKey) key; @@ -11417,7 +11478,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { RoleManager.ROLE_DIALER, packageName, 0, UserHandle.of(callerUserId), AsyncTask.THREAD_POOL_EXECUTOR, callback); try { - future.get(5, TimeUnit.SECONDS); + future.get(20, TimeUnit.SECONDS); } catch (TimeoutException e) { throw new IllegalArgumentException("Timeout when setting the app as the dialer", e); } catch (ExecutionException e) { @@ -11469,7 +11530,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final CallerIdentity caller = getCallerIdentity(who, callerPackage); checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_APPLICATION_RESTRICTIONS); - if (useDevicePolicyEngine(caller, DELEGATION_APP_RESTRICTIONS)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( who, MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, @@ -12465,7 +12526,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final int userId = user.id; - if (isDevicePolicyEngineEnabled()) { + if (isPermissionCheckFlagEnabled()) { mDevicePolicyEngine.handleUserCreated(user); } @@ -12834,7 +12895,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { String packageName) { final CallerIdentity caller = getCallerIdentity(who, callerPackage); - if (useDevicePolicyEngine(caller, DELEGATION_APP_RESTRICTIONS)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforceCanQueryAndGetEnforcingAdmin( who, MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, @@ -13063,7 +13124,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { boolean parent) { CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackage); } else { caller = getCallerIdentity(who); @@ -13075,42 +13136,37 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_USER_RESTRICTION); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { int affectedUserId = parent ? getProfileParentId(userId) : userId; EnforcingAdmin admin = enforcePermissionForUserRestriction( who, key, caller.getPackageName(), affectedUserId); - PolicyDefinition<Boolean> policyDefinition = - PolicyDefinition.getPolicyDefinitionForUserRestriction(key); - if (enabledFromThisOwner) { - mDevicePolicyEngine.setLocalPolicy( - policyDefinition, - admin, - new BooleanPolicyValue(true), - affectedUserId); - } else { - // Remove any local and global policy that was set by the admin - if (!policyDefinition.isLocalOnlyPolicy()) { - mDevicePolicyEngine.removeGlobalPolicy( - policyDefinition, - admin); - } - if (!policyDefinition.isGlobalOnlyPolicy()) { - mDevicePolicyEngine.removeLocalPolicy( - policyDefinition, - admin, - userId); + if (mInjector.isChangeEnabled(ENABLE_COEXISTENCE_CHANGE, callerPackage, userId)) { + PolicyDefinition<Boolean> policyDefinition = + PolicyDefinition.getPolicyDefinitionForUserRestriction(key); + if (enabledFromThisOwner) { + setLocalUserRestrictionInternal( + admin, key, /* enabled= */ true, affectedUserId); + } else { + // Remove any local and global policy that was set by the admin + if (!policyDefinition.isLocalOnlyPolicy()) { + setGlobalUserRestrictionInternal(admin, key, /* enabled= */ false); + } + if (!policyDefinition.isGlobalOnlyPolicy()) { + setLocalUserRestrictionInternal(admin, key, /* enabled= */ false, userId); - int parentUserId = getProfileParentId(userId); - if (parentUserId != userId) { - mDevicePolicyEngine.removeLocalPolicy( - policyDefinition, - admin, - parentUserId); + int parentUserId = getProfileParentId(userId); + if (parentUserId != userId) { + setLocalUserRestrictionInternal( + admin, key, /* enabled= */ false, parentUserId); + } } } + } else { + setBackwardCompatibleUserRestriction( + caller, admin, key, enabledFromThisOwner, parent); } } else { Objects.requireNonNull(who, "ComponentName is null"); @@ -13168,6 +13224,31 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { logUserRestrictionCall(key, enabledFromThisOwner, parent, caller); } + private void setBackwardCompatibleUserRestriction( + CallerIdentity caller, EnforcingAdmin admin, String key, boolean enabled, + boolean parent) { + synchronized (getLockObject()) { + if (isDeviceOwner(caller)) { + if (UserRestrictionsUtils.isGlobal(OWNER_TYPE_DEVICE_OWNER, key)) { + setGlobalUserRestrictionInternal(admin, key, enabled); + } else { + setLocalUserRestrictionInternal(admin, key, enabled, caller.getUserId()); + } + } else if (isProfileOwner(caller)) { + if (UserRestrictionsUtils.isGlobal(OWNER_TYPE_PROFILE_OWNER, key) + || (parent && isProfileOwnerOfOrganizationOwnedDevice(caller) + && UserRestrictionsUtils.isGlobal( + OWNER_TYPE_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE, key))) { + setGlobalUserRestrictionInternal(admin, key, enabled); + } else { + int affectedUserId = parent + ? getProfileParentId(caller.getUserId()) : caller.getUserId(); + setLocalUserRestrictionInternal(admin, key, enabled, affectedUserId); + } + } + } + } + @Override public void setUserRestrictionGlobally(String callerPackage, String key) { final CallerIdentity caller = getCallerIdentity(callerPackage); @@ -13175,27 +13256,63 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return; } - int userHandle = caller.getUserId(); checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_USER_RESTRICTION); - if (!useDevicePolicyEngine(caller, /* delegateScope= */ null)) { - throw new IllegalStateException("One or more admins are not targeting Android 14."); + if (!isPolicyEngineForFinanceFlagEnabled()) { + throw new IllegalStateException("Feature flag is not enabled."); } + + if (!mInjector.isChangeEnabled( + ENABLE_COEXISTENCE_CHANGE, callerPackage, caller.getUserId())) { + throw new IllegalStateException("Calling package is not targeting Android U."); + } + EnforcingAdmin admin = enforcePermissionForUserRestriction( - /*who=*/ null, + /* who= */ null, key, caller.getPackageName(), caller.getUserId() ); - mDevicePolicyEngine.setGlobalPolicy( - PolicyDefinition.getPolicyDefinitionForUserRestriction(key), - admin, - new BooleanPolicyValue(true)); + setGlobalUserRestrictionInternal(admin, key, /* enabled= */ true); logUserRestrictionCall(key, /* enabled= */ true, /* parent= */ false, caller); } + private void setLocalUserRestrictionInternal( + EnforcingAdmin admin, String key, boolean enabled, int userId) { + PolicyDefinition<Boolean> policyDefinition = + PolicyDefinition.getPolicyDefinitionForUserRestriction(key); + if (enabled) { + mDevicePolicyEngine.setLocalPolicy( + policyDefinition, + admin, + new BooleanPolicyValue(true), + userId); + } else { + mDevicePolicyEngine.removeLocalPolicy( + policyDefinition, + admin, + userId); + } + } + + private void setGlobalUserRestrictionInternal( + EnforcingAdmin admin, String key, boolean enabled) { + PolicyDefinition<Boolean> policyDefinition = + PolicyDefinition.getPolicyDefinitionForUserRestriction(key); + if (enabled) { + mDevicePolicyEngine.setGlobalPolicy( + PolicyDefinition.getPolicyDefinitionForUserRestriction(key), + admin, + new BooleanPolicyValue(true)); + } else { + mDevicePolicyEngine.removeGlobalPolicy( + policyDefinition, + admin); + } + } + private void logUserRestrictionCall( String key, boolean enabled, boolean parent, CallerIdentity caller) { final int eventId = enabled @@ -13215,7 +13332,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } private void saveUserRestrictionsLocked(int userId) { - if (isDevicePolicyEngineEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { // User restrictions are handled in the policy engine return; } @@ -13233,6 +13350,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * will be the target user id. */ private void pushUserRestrictions(int originatingUserId) { + if (isPolicyEngineForFinanceFlagEnabled()) { + // User restrictions are handled in the policy engine + return; + } final Bundle global; final RestrictionsSet local = new RestrictionsSet(); final boolean isDeviceOwner; @@ -13285,17 +13406,24 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return null; } CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackage); } else { caller = getCallerIdentity(who); } - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { + int targetUserId = parent + ? getProfileParentId(caller.getUserId()) : caller.getUserId(); EnforcingAdmin admin = getEnforcingAdminForCaller(who, callerPackage); - return getUserRestrictionsFromPolicyEngine( - admin, - parent ? getProfileParentId(caller.getUserId()) : caller.getUserId()); + Bundle restrictions = getUserRestrictionsFromPolicyEngine(admin, targetUserId); + // Add global restrictions set by the admin as well if admin is not targeting Android U. + if (!mInjector.isChangeEnabled( + ENABLE_COEXISTENCE_CHANGE, callerPackage, caller.getUserId())) { + restrictions.putAll( + getUserRestrictionsFromPolicyEngine(admin, UserHandle.USER_ALL)); + } + return restrictions; } else { Objects.requireNonNull(who, "ComponentName is null"); Preconditions.checkCallAuthorization(isDefaultDeviceOwner(caller) @@ -13479,8 +13607,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return null; } final CallerIdentity caller = getCallerIdentity(callerPackage); - if (!useDevicePolicyEngine(caller, /* delegateScope= */ null)) { - throw new IllegalStateException("One or more admins are not targeting Android 14."); + if (!isPolicyEngineForFinanceFlagEnabled()) { + throw new IllegalStateException("Feature flag is not enabled."); } EnforcingAdmin admin = getEnforcingAdminForCaller(/*who=*/ null, caller.getPackageName()); @@ -13548,8 +13676,31 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Slogf.v(LOG_TAG, "calling pm.setApplicationHiddenSettingAsUser(%s, %b, %d)", packageName, hidden, userId); } - result = mInjector.binderWithCleanCallingIdentity(() -> mIPackageManager - .setApplicationHiddenSettingAsUser(packageName, hidden, userId)); + if (isPermissionCheckFlagEnabled()) { + EnforcingAdmin admin = getEnforcingAdminForCaller(who, callerPackage); + mDevicePolicyEngine.setLocalPolicy( + PolicyDefinition.APPLICATION_HIDDEN(packageName), + admin, + new BooleanPolicyValue(hidden), + userId); + Boolean resolvedPolicy = mDevicePolicyEngine.getResolvedPolicy( + PolicyDefinition.APPLICATION_HIDDEN(packageName), userId); + result = mInjector.binderWithCleanCallingIdentity(() -> { + try { + // This is a best effort to continue returning the same value that was + // returned before the policy engine migration. + return mInjector.getIPackageManager().getPackageInfo( + packageName, MATCH_UNINSTALLED_PACKAGES, userId) != null + && (mIPackageManager.getApplicationHiddenSettingAsUser( + packageName, userId) == hidden); + } catch (RemoteException e) { + return false; + } + }); + } else { + result = mInjector.binderWithCleanCallingIdentity(() -> mIPackageManager + .setApplicationHiddenSettingAsUser(packageName, hidden, userId)); + } } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_APPLICATION_HIDDEN) @@ -13865,7 +14016,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { boolean uninstallBlocked) { final CallerIdentity caller = getCallerIdentity(who, callerPackage); - if (useDevicePolicyEngine(caller, DELEGATION_BLOCK_UNINSTALL)) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( who, MANAGE_DEVICE_POLICY_APPS_CONTROL, @@ -14419,14 +14570,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { throws SecurityException { Objects.requireNonNull(packages, "packages is null"); CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_LOCK_TASK_PACKAGES); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin; synchronized (getLockObject()) { enforcingAdmin = enforceCanCallLockTaskLocked(who, callerPackageName); @@ -14477,14 +14628,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @Override public String[] getLockTaskPackages(ComponentName who, String callerPackageName) { CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } final int userHandle = caller.getUserId(); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { synchronized (getLockObject()) { enforceCanQueryLockTaskLocked(who, caller.getPackageName()); } @@ -14517,8 +14668,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } final int userId = mInjector.userHandleGetCallingUserId(); - // Is it ok to just check that no active policies exist currently? - if (isDevicePolicyEngineFlagEnabled() && mDevicePolicyEngine.hasActivePolicies()) { + if (isPermissionCheckFlagEnabled()) { LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy( PolicyDefinition.LOCK_TASK, userId); if (policy == null) { @@ -14544,7 +14694,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { "Cannot use LOCK_TASK_FEATURE_NOTIFICATIONS without LOCK_TASK_FEATURE_HOME"); CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); @@ -14554,7 +14704,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_LOCK_TASK_FEATURES); } - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin; synchronized (getLockObject()) { enforcingAdmin = enforceCanCallLockTaskLocked(who, @@ -14597,14 +14747,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @Override public int getLockTaskFeatures(ComponentName who, String callerPackageName) { CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } final int userHandle = caller.getUserId(); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { synchronized (getLockObject()) { enforceCanQueryLockTaskLocked(who, caller.getPackageName()); } @@ -16364,12 +16514,31 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { enforcePermissionGrantStateOnFinancedDevice(packageName, permission); } } - if (useDevicePolicyEngine(caller, DELEGATION_PERMISSION_GRANT)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( admin, MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, callerPackage, caller.getUserId()); + if (SENSOR_PERMISSIONS.contains(permission) + && grantState == PERMISSION_GRANT_STATE_GRANTED + && (!canAdminGrantSensorsPermissions() || isCallerDelegate(caller))) { + if (mInjector.isChangeEnabled(THROW_SECURITY_EXCEPTION_FOR_SENSOR_PERMISSIONS, + caller.getPackageName(), caller.getUserId())) { + throw new SecurityException( + "Caller not permitted to grant sensor permissions."); + } else { + // This is to match the legacy behaviour. + callback.sendResult(Bundle.EMPTY); + return; + } + } + // Check all the states where Exceptions aren't thrown but the permission + // isn't granted either. + if (!canGrantPermission(caller, permission, packageName)) { + callback.sendResult(null); + return; + } // TODO(b/266924257): decide how to handle the internal state if the package doesn't // exist, or the permission isn't requested by the app, because we could end up with // inconsistent state between the policy engine and package manager. Also a package @@ -16445,6 +16614,41 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } + private static final List<String> SENSOR_PERMISSIONS = new ArrayList<>(); + { + SENSOR_PERMISSIONS.add(Manifest.permission.ACCESS_FINE_LOCATION); + SENSOR_PERMISSIONS.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION); + SENSOR_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION); + SENSOR_PERMISSIONS.add(Manifest.permission.CAMERA); + SENSOR_PERMISSIONS.add(Manifest.permission.RECORD_AUDIO); + SENSOR_PERMISSIONS.add(Manifest.permission.ACTIVITY_RECOGNITION); + SENSOR_PERMISSIONS.add(Manifest.permission.BODY_SENSORS); + SENSOR_PERMISSIONS.add(Manifest.permission.BACKGROUND_CAMERA); + SENSOR_PERMISSIONS.add(Manifest.permission.RECORD_BACKGROUND_AUDIO); + SENSOR_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND); + SENSOR_PERMISSIONS.add( + Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE); + SENSOR_PERMISSIONS.add( + Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND); + } + + private boolean canGrantPermission(CallerIdentity caller, String permission, + String targetPackageName) { + boolean isPostQAdmin = getTargetSdk(caller.getPackageName(), caller.getUserId()) + >= android.os.Build.VERSION_CODES.Q; + if (!isPostQAdmin) { + // Legacy admins assume that they cannot control pre-M apps + if (getTargetSdk(targetPackageName, caller.getUserId()) + < android.os.Build.VERSION_CODES.M) { + return false; + } + } + if (!isRuntimePermission(permission)) { + return false; + } + return true; + } + private void enforcePermissionGrantStateOnFinancedDevice( String packageName, String permission) { if (!Manifest.permission.READ_PHONE_STATE.equals(permission)) { @@ -17541,7 +17745,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { synchronized (getLockObject()) { if (isPermissionCheckFlagEnabled()) { - // TODO: add support for DELEGATION_SECURITY_LOGGING enforcePermission(MANAGE_DEVICE_POLICY_SECURITY_LOGGING, caller.getPackageName(), UserHandle.USER_ALL); } else { @@ -17622,7 +17825,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final CallerIdentity caller = getCallerIdentity(admin, packageName); if (isPermissionCheckFlagEnabled()) { - // TODO: Restore the "affiliated users" check + Preconditions.checkCallAuthorization(isOrganizationOwnedDeviceWithManagedProfile() + || areAllUsersAffiliatedWithDeviceLocked()); enforcePermission(MANAGE_DEVICE_POLICY_SECURITY_LOGGING, caller.getPackageName(), UserHandle.USER_ALL); } else { @@ -17674,7 +17878,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final CallerIdentity caller = getCallerIdentity(admin, packageName); if (isPermissionCheckFlagEnabled()) { - // TODO: Restore the "affiliated users" check + Preconditions.checkCallAuthorization(isOrganizationOwnedDeviceWithManagedProfile() + || areAllUsersAffiliatedWithDeviceLocked()); + enforcePermission(MANAGE_DEVICE_POLICY_SECURITY_LOGGING, caller.getPackageName(), UserHandle.USER_ALL); } else { @@ -17869,11 +18075,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // The removed admin might have disabled camera, so update user // restrictions. pushUserRestrictions(userHandle); - - // The removed admin might've been stopping the migration if it was targeting pre Android U - if (shouldMigrateToDevicePolicyEngine()) { - migratePoliciesToDevicePolicyEngine(); - } } @Override @@ -18551,7 +18752,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } final int userId = caller.getUserId(); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( admin, MANAGE_DEVICE_POLICY_RESET_PASSWORD, @@ -18615,7 +18816,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final int userId = caller.getUserId(); boolean result = false; - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( admin, MANAGE_DEVICE_POLICY_RESET_PASSWORD, @@ -18661,7 +18862,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } int userId = caller.getUserId(); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( admin, MANAGE_DEVICE_POLICY_RESET_PASSWORD, @@ -18713,7 +18914,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { boolean result = false; final String password = passwordOrNull != null ? passwordOrNull : ""; - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPermissionCheckFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( admin, MANAGE_DEVICE_POLICY_RESET_PASSWORD, @@ -19902,7 +20103,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { List<String> packages) { Objects.requireNonNull(packages, "packages is null"); CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); @@ -19910,7 +20111,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { checkCanExecuteOrThrowUnsafe( DevicePolicyManager.OPERATION_SET_USER_CONTROL_DISABLED_PACKAGES); - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin( who, MANAGE_DEVICE_POLICY_APPS_CONTROL, @@ -19984,13 +20185,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public List<String> getUserControlDisabledPackages(ComponentName who, String callerPackageName) { CallerIdentity caller; - if (isPermissionCheckFlagEnabled()) { + if (isPolicyEngineForFinanceFlagEnabled()) { caller = getCallerIdentity(who, callerPackageName); } else { caller = getCallerIdentity(who); } - if (useDevicePolicyEngine(caller, /* delegateScope= */ null)) { + if (isPolicyEngineForFinanceFlagEnabled()) { enforceCanQuery( MANAGE_DEVICE_POLICY_APPS_CONTROL, caller.getPackageName(), @@ -22073,7 +22274,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } private void handleFinancedDeviceKioskRoleChange() { - if (!isDevicePolicyEngineEnabled()) { + if (!isPermissionCheckFlagEnabled()) { return; } Slog.i(LOG_TAG, "Handling action " + ACTION_DEVICE_FINANCING_STATE_CHANGED); @@ -22230,244 +22431,208 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // Permissions of existing DPC types. private static final List<String> DEFAULT_DEVICE_OWNER_PERMISSIONS = List.of( - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL, + MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, MANAGE_DEVICE_POLICY_ACROSS_USERS, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL, MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL, - SET_TIME, - SET_TIME_ZONE, - MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_WIFI, - MANAGE_DEVICE_POLICY_WIPE_DATA, - MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, - MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, - MANAGE_DEVICE_POLICY_SECURITY_LOGGING, - MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, - MANAGE_DEVICE_POLICY_MTE, - MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_LOCK, - MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_CERTIFICATES, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, - MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_LOCK_TASK, - MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, - MANAGE_DEVICE_POLICY_CAMERA, - MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, - MANAGE_DEVICE_POLICY_DEFAULT_SMS, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, - MANAGE_DEVICE_POLICY_RESET_PASSWORD, - MANAGE_DEVICE_POLICY_STATUS_BAR, - MANAGE_DEVICE_POLICY_LOCK_TASK, - MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, MANAGE_DEVICE_POLICY_AIRPLANE_MODE, + MANAGE_DEVICE_POLICY_APPS_CONTROL, + MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, MANAGE_DEVICE_POLICY_AUTOFILL, MANAGE_DEVICE_POLICY_BLUETOOTH, MANAGE_DEVICE_POLICY_CALLS, MANAGE_DEVICE_POLICY_CAMERA, + MANAGE_DEVICE_POLICY_CERTIFICATES, + MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, + MANAGE_DEVICE_POLICY_DEFAULT_SMS, MANAGE_DEVICE_POLICY_DISPLAY, MANAGE_DEVICE_POLICY_FACTORY_RESET, MANAGE_DEVICE_POLICY_FUN, MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, + MANAGE_DEVICE_POLICY_KEYGUARD, MANAGE_DEVICE_POLICY_LOCALE, MANAGE_DEVICE_POLICY_LOCATION, + MANAGE_DEVICE_POLICY_LOCK, MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, + MANAGE_DEVICE_POLICY_LOCK_TASK, MANAGE_DEVICE_POLICY_MICROPHONE, MANAGE_DEVICE_POLICY_MOBILE_NETWORK, + MANAGE_DEVICE_POLICY_MTE, MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, + MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, + MANAGE_DEVICE_POLICY_PACKAGE_STATE, MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, MANAGE_DEVICE_POLICY_PRINTING, - MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS, MANAGE_DEVICE_POLICY_PROFILES, MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, + MANAGE_DEVICE_POLICY_RESET_PASSWORD, + MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS, + MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, MANAGE_DEVICE_POLICY_SAFE_BOOT, + MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, MANAGE_DEVICE_POLICY_SCREEN_CONTENT, + MANAGE_DEVICE_POLICY_SECURITY_LOGGING, MANAGE_DEVICE_POLICY_SMS, + MANAGE_DEVICE_POLICY_STATUS_BAR, + MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS, + MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, MANAGE_DEVICE_POLICY_TIME, + MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, MANAGE_DEVICE_POLICY_USERS, MANAGE_DEVICE_POLICY_VPN, MANAGE_DEVICE_POLICY_WALLPAPER, MANAGE_DEVICE_POLICY_WIFI, MANAGE_DEVICE_POLICY_WINDOWS, - MANAGE_DEVICE_POLICY_APP_RESTRICTIONS + MANAGE_DEVICE_POLICY_WIPE_DATA, + SET_TIME, + SET_TIME_ZONE ); private static final List<String> FINANCED_DEVICE_OWNER_PERMISSIONS = List.of( - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL, MANAGE_DEVICE_POLICY_ACROSS_USERS, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL, MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL, - MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, - MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_LOCK_TASK, MANAGE_DEVICE_POLICY_CALLS, MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, + MANAGE_DEVICE_POLICY_FACTORY_RESET, MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, - MANAGE_DEVICE_POLICY_USERS, + MANAGE_DEVICE_POLICY_KEYGUARD, + MANAGE_DEVICE_POLICY_LOCK_TASK, + MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, + MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, MANAGE_DEVICE_POLICY_SAFE_BOOT, + MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, MANAGE_DEVICE_POLICY_TIME, - MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS); - private static final List<String> PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS = + MANAGE_DEVICE_POLICY_USERS, + MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS + ); + + /** + * All the permisisons granted to a profile owner. + */ + private static final List<String> PROFILE_OWNER_PERMISSIONS = List.of( - MANAGE_DEVICE_POLICY_ACROSS_USERS, + MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL, - SET_TIME, - SET_TIME_ZONE, - MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_WIFI, - MANAGE_DEVICE_POLICY_WIPE_DATA, - MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, - MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, - MANAGE_DEVICE_POLICY_SECURITY_LOGGING, - MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, - MANAGE_DEVICE_POLICY_MTE, - MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_LOCK, - MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_AIRPLANE_MODE, - MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, + MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, MANAGE_DEVICE_POLICY_AUTOFILL, - MANAGE_DEVICE_POLICY_BLUETOOTH, MANAGE_DEVICE_POLICY_CALLS, - MANAGE_DEVICE_POLICY_CAMERA, MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, MANAGE_DEVICE_POLICY_DISPLAY, MANAGE_DEVICE_POLICY_FACTORY_RESET, MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, + MANAGE_DEVICE_POLICY_KEYGUARD, MANAGE_DEVICE_POLICY_LOCALE, MANAGE_DEVICE_POLICY_LOCATION, + MANAGE_DEVICE_POLICY_LOCK, MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_MICROPHONE, - MANAGE_DEVICE_POLICY_MOBILE_NETWORK, MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, - MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, + MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, + MANAGE_DEVICE_POLICY_PACKAGE_STATE, MANAGE_DEVICE_POLICY_PRINTING, MANAGE_DEVICE_POLICY_PROFILES, MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, - MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS, - MANAGE_DEVICE_POLICY_SAFE_BOOT, + MANAGE_DEVICE_POLICY_RESET_PASSWORD, + MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, + MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, MANAGE_DEVICE_POLICY_SCREEN_CONTENT, - MANAGE_DEVICE_POLICY_SMS, + MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS, MANAGE_DEVICE_POLICY_TIME, MANAGE_DEVICE_POLICY_VPN, - MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, - MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, - MANAGE_DEVICE_POLICY_DEFAULT_SMS, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_RESET_PASSWORD, - MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, - MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_WIFI, - MANAGE_DEVICE_POLICY_WIPE_DATA, - MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, - MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, - MANAGE_DEVICE_POLICY_SECURITY_LOGGING, - MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, - MANAGE_DEVICE_POLICY_MTE, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_LOCK, - MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_CERTIFICATES); - private static final List<String> PROFILE_OWNER_ON_USER_0_PERMISSIONS = List.of( - SET_TIME, - SET_TIME_ZONE, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, - MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_LOCK_TASK, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_WIPE_DATA, - MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, - MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_LOCK, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_LOCK_TASK, - MANAGE_DEVICE_POLICY_AIRPLANE_MODE, - MANAGE_DEVICE_POLICY_BLUETOOTH, - MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, - MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_FUN, - MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, - MANAGE_DEVICE_POLICY_MOBILE_NETWORK, - MANAGE_DEVICE_POLICY_USERS, - MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, - MANAGE_DEVICE_POLICY_SAFE_BOOT, - MANAGE_DEVICE_POLICY_SMS, - MANAGE_DEVICE_POLICY_TIME, - MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, - MANAGE_DEVICE_POLICY_WINDOWS, - MANAGE_DEVICE_POLICY_LOCK_TASK, - MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, - MANAGE_DEVICE_POLICY_CAMERA, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_RESET_PASSWORD, - MANAGE_DEVICE_POLICY_STATUS_BAR, - MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, - MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS); - private static final List<String> PROFILE_OWNER_PERMISSIONS = List.of( - MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL, - MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, - MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_WIPE_DATA, - MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, - MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_LOCK, - MANAGE_DEVICE_POLICY_KEYGUARD, - MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, - MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, - MANAGE_DEVICE_POLICY_AUTOFILL, - MANAGE_DEVICE_POLICY_CALLS, - MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, - MANAGE_DEVICE_POLICY_DISPLAY, - MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, - MANAGE_DEVICE_POLICY_LOCALE, - MANAGE_DEVICE_POLICY_LOCATION, - MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, - MANAGE_DEVICE_POLICY_PRINTING, - MANAGE_DEVICE_POLICY_PROFILES, - MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, - MANAGE_DEVICE_POLICY_SCREEN_CONTENT, - MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS, - MANAGE_DEVICE_POLICY_TIME, - MANAGE_DEVICE_POLICY_VPN, - MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, - MANAGE_DEVICE_POLICY_RESET_PASSWORD, - MANAGE_DEVICE_POLICY_APP_RESTRICTIONS + MANAGE_DEVICE_POLICY_WIPE_DATA ); + /** + * All the additional permissions granted to an organisation owned profile owner. + */ + private static final List<String> + ADDITIONAL_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS = + List.of( + MANAGE_DEVICE_POLICY_ACROSS_USERS, + MANAGE_DEVICE_POLICY_AIRPLANE_MODE, + MANAGE_DEVICE_POLICY_APPS_CONTROL, + MANAGE_DEVICE_POLICY_BLUETOOTH, + MANAGE_DEVICE_POLICY_CAMERA, + MANAGE_DEVICE_POLICY_CERTIFICATES, + MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, + MANAGE_DEVICE_POLICY_DEFAULT_SMS, + MANAGE_DEVICE_POLICY_LOCALE, + MANAGE_DEVICE_POLICY_MICROPHONE, + MANAGE_DEVICE_POLICY_MOBILE_NETWORK, + MANAGE_DEVICE_POLICY_MTE, + MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, + MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, + MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS, + MANAGE_DEVICE_POLICY_SAFE_BOOT, + MANAGE_DEVICE_POLICY_SECURITY_LOGGING, + MANAGE_DEVICE_POLICY_SMS, + MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, + MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, + MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, + MANAGE_DEVICE_POLICY_WIFI, + SET_TIME, + SET_TIME_ZONE + ); + + + private static final List<String> ADDITIONAL_PROFILE_OWNER_ON_USER_0_PERMISSIONS = + List.of( + MANAGE_DEVICE_POLICY_AIRPLANE_MODE, + MANAGE_DEVICE_POLICY_BLUETOOTH, + MANAGE_DEVICE_POLICY_CAMERA, + MANAGE_DEVICE_POLICY_DISPLAY, + MANAGE_DEVICE_POLICY_FUN, + MANAGE_DEVICE_POLICY_LOCK_TASK, + MANAGE_DEVICE_POLICY_MOBILE_NETWORK, + MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, + MANAGE_DEVICE_POLICY_PRINTING, + MANAGE_DEVICE_POLICY_PROFILES, + MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, + MANAGE_DEVICE_POLICY_SAFE_BOOT, + MANAGE_DEVICE_POLICY_SMS, + MANAGE_DEVICE_POLICY_STATUS_BAR, + MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS, + MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, + MANAGE_DEVICE_POLICY_USERS, + MANAGE_DEVICE_POLICY_WINDOWS, + SET_TIME, + SET_TIME_ZONE + ); + + /** + * Combination of {@link PROFILE_OWNER_PERMISSIONS} and + * {@link ADDITIONAL_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS}. + */ + private static final List<String> PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS = + new ArrayList(); + + /** + * Combination of {@link PROFILE_OWNER_PERMISSIONS} and + * {@link ADDITIONAL_PROFILE_OWNER_ON_USER_0_PERMISSIONS}. + */ + private static final List<String> PROFILE_OWNER_ON_USER_0_PERMISSIONS = + new ArrayList(); + + private static final HashMap<Integer, List<String>> DPC_PERMISSIONS = new HashMap<>(); { + // Organisation owned profile owners have all the permission of a profile owner plus + // some extra permissions. + PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS.addAll(PROFILE_OWNER_PERMISSIONS); + PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS.addAll( + ADDITIONAL_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS); + // Profile owners on user 0 have all the permission of a profile owner plus + // some extra permissions. + PROFILE_OWNER_ON_USER_0_PERMISSIONS.addAll(PROFILE_OWNER_PERMISSIONS); + PROFILE_OWNER_ON_USER_0_PERMISSIONS.addAll(ADDITIONAL_PROFILE_OWNER_ON_USER_0_PERMISSIONS); + DPC_PERMISSIONS.put(DEFAULT_DEVICE_OWNER, DEFAULT_DEVICE_OWNER_PERMISSIONS); DPC_PERMISSIONS.put(FINANCED_DEVICE_OWNER, FINANCED_DEVICE_OWNER_PERMISSIONS); DPC_PERMISSIONS.put(PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE, @@ -22475,14 +22640,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { DPC_PERMISSIONS.put(PROFILE_OWNER_ON_USER_0, PROFILE_OWNER_ON_USER_0_PERMISSIONS); DPC_PERMISSIONS.put(PROFILE_OWNER, PROFILE_OWNER_PERMISSIONS); } - - // Map of permission Active admin DEVICE_POLICY. - //TODO(b/254253251) Fill this map in as new permissions are added for policies. - private static final HashMap<String, Integer> ACTIVE_ADMIN_POLICIES = new HashMap<>(); - { - //Any ActiveAdmin is able to call the support message APIs without certain policies. - ACTIVE_ADMIN_POLICIES.put(MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, null); - } //Map of Permission to Delegate Scope. private static final HashMap<String, String> DELEGATE_SCOPES = new HashMap<>(); { @@ -22496,123 +22653,119 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private static final HashMap<String, String> CROSS_USER_PERMISSIONS = new HashMap<>(); { - // Time and Timezone is intrinsically global so there is no cross-user permission. - CROSS_USER_PERMISSIONS.put(SET_TIME, null); - CROSS_USER_PERMISSIONS.put(SET_TIME_ZONE, null); - // system updates are intrinsically global so there is no cross-user permission - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, null); - // security logs are intrinsically global so there is no cross-user permission - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SECURITY_LOGGING, null); - // usb signalling is intrinsically global so there is no cross-user permission - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, null); - // mte is intrinsically global so there is no cross-user permission - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MTE, null); + // The permissions are all intrinsically global and therefore have no cross-user permission. CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_FACTORY_RESET, null); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MTE, null); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SECURITY_LOGGING, null); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_STATUS_BAR, null); - // Organisation identity policy will involve data of other organisations on the device and - // therefore the FULL cross-user permission is required. - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WIFI, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WIPE_DATA, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, - MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, null); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, null); + CROSS_USER_PERMISSIONS.put(SET_TIME, null); + CROSS_USER_PERMISSIONS.put(SET_TIME_ZONE, null); + + // The permissions are all critical for securing data within the current user and + // therefore are protected with MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL for + // cross-user calls. + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, + MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_KEYGUARD, + MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put( - MANAGE_DEVICE_POLICY_LOCK, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put( - MANAGE_DEVICE_POLICY_KEYGUARD, MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL); - // Granting runtime permissions can grant applications significant powers therefore the FULL - // cross-user permission is required. - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_TASK, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + + // These permissions are required for securing device ownership without accessing user data + // and therefore are protected with MANAGE_DEVICE_POLICY_ACROSS_USERS for cross-user calls. CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_AIRPLANE_MODE, MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_AUTOFILL, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_BLUETOOTH, MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_CALLS, MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_CAMERA, MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_DEFAULT_SMS, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MICROPHONE, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MOBILE_NETWORK, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PACKAGE_STATE, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SMS, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SAFE_BOOT, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_TIME, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WIFI, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WIPE_DATA, + MANAGE_DEVICE_POLICY_ACROSS_USERS); + + // These permissions may grant access to user data and therefore must be protected with + // MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL for cross-user calls. + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_APPS_CONTROL, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_AUTOFILL, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_DISPLAY, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_FACTORY_RESET, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_FUN, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES, - MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCALE, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCATION, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MICROPHONE, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MOBILE_NETWORK, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PRINTING, + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_TASK, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS, - MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PROFILES, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SAFE_BOOT, - MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PRINTING, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_RESET_PASSWORD, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SCREEN_CONTENT, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SMS, - MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, + MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_TIME, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER, - MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_USERS, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_VPN, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WALLPAPER, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WIFI, - MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WINDOWS, MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_DEFAULT_SMS, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_PACKAGE_STATE, - MANAGE_DEVICE_POLICY_ACROSS_USERS); - CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_RESET_PASSWORD, - MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL); } /** @@ -22636,6 +22789,26 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } /** + * Checks if the calling process has been granted permission to apply a device policy on a + * specific user. + * The given permission will be checked along with its associated cross-user permission if it + * exists and the target user is different to the calling user. + * Returns an {@link EnforcingAdmin} for the caller. + * + * @param admin the component name of the admin. + * @param callerPackageName The package name of the calling application. + * @param permission The name of the permission being checked. + * @param deviceAdminPolicy The userId of the user which the caller needs permission to act on. + * @throws SecurityException if the caller has not been granted the given permission, + * the associated cross-user permission if the caller's user is different to the target user. + */ + private EnforcingAdmin enforcePermissionAndGetEnforcingAdmin(@Nullable ComponentName admin, + String permission, int deviceAdminPolicy, String callerPackageName, int targetUserId) { + enforcePermission(permission, deviceAdminPolicy, callerPackageName, targetUserId); + return getEnforcingAdminForCaller(admin, callerPackageName); + } + + /** * Checks whether the calling process has been granted permission to query a device policy on * a specific user. * The given permission will be checked along with its associated cross-user permission if it @@ -22657,6 +22830,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { POLICY_IDENTIFIER_TO_PERMISSION.put(AUTO_TIMEZONE_POLICY, SET_TIME_ZONE); } + private static final HashMap<String, Integer> POLICY_IDENTIFIER_TO_ACTIVE_ADMIN_POLICY = + new HashMap<>(); + /** * Checks if the calling process has been granted permission to apply a device policy on a * specific user. @@ -22672,6 +22848,36 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private void enforcePermission(String permission, String callerPackageName, int targetUserId) throws SecurityException { if (!hasPermission(permission, callerPackageName, targetUserId)) { + // TODO(b/276920002): Split the error messages so that the cross-user permission + // is only mentioned when it is needed. + throw new SecurityException("Caller does not have the required permissions for " + + "this user. Permissions required: {" + + permission + + ", " + + CROSS_USER_PERMISSIONS.get(permission) + + "(if calling cross-user)" + + "}"); + } + } + + /** + * Checks if the calling process has been granted permission to apply a device policy on a + * specific user. + * The given permission will be checked along with its associated cross-user permission if it + * exists and the target user is different to the calling user. + * + * @param callerPackageName The package name of the calling application. + * @param permission The name of the permission being checked. + * @param targetUserId The userId of the user which the caller needs permission to act on. + * @throws SecurityException if the caller has not been granted the given permission, + * the associated cross-user permission if the caller's user is different to the target user. + */ + private void enforcePermission(String permission, int adminPolicy, + String callerPackageName, int targetUserId) + throws SecurityException { + if (!hasPermissionOrAdminPolicy(permission, callerPackageName, adminPolicy, targetUserId)) { + // TODO(b/276920002): Split the error messages so that the cross-user permission + // is only mentioned when it is needed. throw new SecurityException("Caller does not have the required permissions for " + "this user. Permissions required: {" + permission @@ -22713,16 +22919,26 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { */ private boolean hasPermission(String permission, String callerPackageName, int targetUserId) { CallerIdentity caller = getCallerIdentity(callerPackageName); - boolean hasPermissionOnOwnUser = hasPermission(permission, callerPackageName); + boolean hasPermissionOnOwnUser = hasPermission(permission, caller.getPackageName()); boolean hasPermissionOnTargetUser = true; if (hasPermissionOnOwnUser & caller.getUserId() != targetUserId) { hasPermissionOnTargetUser = hasPermission(CROSS_USER_PERMISSIONS.get(permission), - callerPackageName); + caller.getPackageName()); } return hasPermissionOnOwnUser && hasPermissionOnTargetUser; } + private boolean hasPermissionOrAdminPolicy(String permission, String callerPackageName, + int adminPolicy, int targetUserId) { + CallerIdentity caller = getCallerIdentity(callerPackageName); + if (hasPermission(permission, caller.getPackageName(), targetUserId)) { + return true; + } + ActiveAdmin deviceAdmin = getActiveAdminForCaller(null, caller); + return deviceAdmin != null && deviceAdmin.info.usesPolicy(adminPolicy); + } + /** * Return whether the calling process has been granted the given permission. * @@ -22765,23 +22981,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (DELEGATE_SCOPES.containsKey(permission)) { return isCallerDelegate(caller, DELEGATE_SCOPES.get(permission)); } - // Check if the caller is an active admin that uses a certain policy. - if (ACTIVE_ADMIN_POLICIES.containsKey(permission)) { - try { - if (ACTIVE_ADMIN_POLICIES.get(permission) != null) { - return getActiveAdminForCallerLocked( - null, ACTIVE_ADMIN_POLICIES.get(permission), false) != null; - } else { - // If the permission maps to no policy (null) this means that any active admin - // has permission. - return isCallerActiveAdminOrDelegate(caller, null); - } - } catch (SecurityException e) { - // A security exception means there is not an active admin with permission and - // therefore - return false; - } - } return false; } @@ -22834,9 +23033,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (admin != null) { return EnforcingAdmin.createDeviceAdminEnforcingAdmin(who, userId, admin); } - if (admin == null) { - admin = getUserData(userId).createOrGetPermissionBasedAdmin(userId); - } + admin = getUserData(userId).createOrGetPermissionBasedAdmin(userId); return EnforcingAdmin.createEnforcingAdmin(caller.getPackageName(), userId, admin); } @@ -22852,6 +23049,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { DEFAULT_VALUE_PERMISSION_BASED_ACCESS_FLAG); } + private boolean isPolicyEngineForFinanceFlagEnabled() { + return DeviceConfig.getBoolean( + NAMESPACE_DEVICE_POLICY_MANAGER, + ENABLE_DEVICE_POLICY_ENGINE_FOR_FINANCE_FLAG, + DEFAULT_ENABLE_DEVICE_POLICY_ENGINE_FOR_FINANCE_FLAG); + } + private static boolean isKeepProfilesRunningFlagEnabled() { return DeviceConfig.getBoolean( NAMESPACE_DEVICE_POLICY_MANAGER, @@ -23190,36 +23394,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { }); } - // TODO(b/266808047): handle DeviceAdmin migration when there is no DPCs on the device private boolean shouldMigrateToDevicePolicyEngine() { - return mInjector.binderWithCleanCallingIdentity(() -> { - if (!isDevicePolicyEngineFlagEnabled()) { - return false; - } - if (mOwners.isMigratedToPolicyEngine()) { - return false; - } - // We're only checking if existing DPCs are not targeting U, regardless of what - // DeviceAdmins are targeting, as they can access very limited APIs, and we'll ensure - // that these APIs maintain the current behaviour of strictest applies. - boolean hasDPCs = false; - for (UserInfo userInfo : mUserManager.getUsers()) { - List<ComponentName> activeAdmins = getActiveAdmins(userInfo.id); - if (activeAdmins == null) { - continue; - } - for (ComponentName admin : activeAdmins) { - if ((isProfileOwner(admin, userInfo.id) || isDeviceOwner(admin, userInfo.id))) { - if (!mInjector.isChangeEnabled(ENABLE_COEXISTENCE_CHANGE, - admin.getPackageName(), userInfo.id)) { - return false; - } - hasDPCs = true; - } - } - } - return hasDPCs; - }); + return mInjector.binderWithCleanCallingIdentity(() -> + isPermissionCheckFlagEnabled() && !mOwners.isMigratedToPolicyEngine()); } /** @@ -23405,15 +23582,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // We need to add a mapping of policyId to permission in POLICY_IDENTIFIER_TO_PERMISSION // for each migrated permission. private List<ActiveAdmin> getNonDPCActiveAdminsForPolicyLocked(String policyIdentifier) { - String permission = POLICY_IDENTIFIER_TO_PERMISSION.get(policyIdentifier); - if (permission == null) { - Slogf.e(LOG_TAG, "Can't find a permission for %s in POLICY_IDENTIFIER_TO_PERMISSION", + Integer activeAdminPolicy = POLICY_IDENTIFIER_TO_ACTIVE_ADMIN_POLICY.get(policyIdentifier); + if (activeAdminPolicy == null) { + Slogf.e(LOG_TAG, + "Can't find a active admin policy for %s in POLICY_IDENTIFIER_TO_PERMISSION", policyIdentifier); return new ArrayList<>(); } - if (!ACTIVE_ADMIN_POLICIES.containsKey(permission)) { - return new ArrayList<>(); - } List<ActiveAdmin> admins = new ArrayList<>(); for (UserInfo userInfo : mUserManager.getUsers()) { @@ -23424,7 +23599,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } DevicePolicyData policy = getUserDataUnchecked(userInfo.id); if (isActiveAdminWithPolicyForUserLocked( - policy.mAdminMap.get(admin), ACTIVE_ADMIN_POLICIES.get(permission), + policy.mAdminMap.get(admin), activeAdminPolicy, userInfo.id)) { admins.add(policy.mAdminMap.get(admin)); } @@ -23433,40 +23608,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return admins; } - private boolean useDevicePolicyEngine(CallerIdentity caller, @Nullable String delegateScope) { - return isDevicePolicyEngineEnabled(); - } - - private boolean isDevicePolicyEngineEnabled() { - return isDevicePolicyEngineFlagEnabled() && isPermissionCheckFlagEnabled(); - } - - private boolean isDevicePolicyEngineFlagEnabled() { - return DeviceConfig.getBoolean( - NAMESPACE_DEVICE_POLICY_MANAGER, - ENABLE_DEVICE_POLICY_ENGINE_FLAG, - DEFAULT_ENABLE_DEVICE_POLICY_ENGINE_FLAG); - } - - private boolean hasDPCsNotSupportingCoexistence() { - return mInjector.binderWithCleanCallingIdentity(() -> { - for (UserInfo userInfo : mUserManager.getUsers()) { - List<ComponentName> activeAdmins = getActiveAdmins(userInfo.id); - if (activeAdmins == null) { - continue; - } - for (ComponentName admin : activeAdmins) { - if ((isProfileOwner(admin, userInfo.id) || isDeviceOwner(admin, userInfo.id)) - && !mInjector.isChangeEnabled(ENABLE_COEXISTENCE_CHANGE, - admin.getPackageName(), userInfo.id)) { - return true; - } - } - } - return false; - }); - } - // TODO: this can actually accept an EnforcingAdmin that gets created in the permission // check method. private boolean isCallerActiveAdminOrDelegate( @@ -23504,25 +23645,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - // TODO(b/266808047): This will return false for DeviceAdmins not targetting U, which is - // inconsistent with the migration logic that allows migration with old DeviceAdmins. - private boolean canAddActiveAdminIfPolicyEngineEnabled(String packageName, int userId) { - if (!isDevicePolicyEngineFlagEnabled()) { - return true; - } - if (hasDPCsNotSupportingCoexistence()) { - return true; - } - if (mInjector.isChangeEnabled(ENABLE_COEXISTENCE_CHANGE, packageName, userId)) { - // This will always return true unless we turn off coexistence, in which case it will - // return true if no current admins exist, or more than one admin exist - return mDevicePolicyEngine.canAdminAddPolicies(packageName, userId); - } - // Is it ok to just check that no active policies exist currently, or should we return false - // if the policy engine was ever used? - return !mDevicePolicyEngine.hasActivePolicies(); - } - @Override public boolean isDeviceFinanced(String callerPackageName) { CallerIdentity caller = getCallerIdentity(callerPackageName); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java index bff6d3288dca..45a2d2a7bda1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java @@ -32,21 +32,25 @@ import java.util.Objects; final class IntegerPolicySerializer extends PolicySerializer<Integer> { + private static final String TAG = "IntegerPolicySerializer"; + + private static final String ATTR_VALUE = "value"; + @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, String attributeName, + void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull Integer value) throws IOException { Objects.requireNonNull(value); - serializer.attributeInt(/* namespace= */ null, attributeName, value); + serializer.attributeInt(/* namespace= */ null, ATTR_VALUE, value); } @Nullable @Override - IntegerPolicyValue readFromXml(TypedXmlPullParser parser, String attributeName) { + IntegerPolicyValue readFromXml(TypedXmlPullParser parser) { try { return new IntegerPolicyValue( - parser.getAttributeInt(/* namespace= */ null, attributeName)); + parser.getAttributeInt(/* namespace= */ null, ATTR_VALUE)); } catch (XmlPullParserException e) { - Log.e(DevicePolicyEngine.TAG, "Error parsing Integer policy value", e); + Log.e(TAG, "Error parsing Integer policy value", e); return null; } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java index 3265b61a3543..0f6f3c5a5921 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java @@ -32,12 +32,14 @@ import java.util.Set; final class LockTaskPolicySerializer extends PolicySerializer<LockTaskPolicy> { - private static final String ATTR_PACKAGES = ":packages"; + private static final String TAG = "LockTaskPolicySerializer"; + + private static final String ATTR_PACKAGES = "packages"; private static final String ATTR_PACKAGES_SEPARATOR = ";"; - private static final String ATTR_FLAGS = ":flags"; + private static final String ATTR_FLAGS = "flags"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, String attributeNamePrefix, + void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull LockTaskPolicy value) throws IOException { Objects.requireNonNull(value); if (value.getPackages() == null || value.getPackages().isEmpty()) { @@ -46,31 +48,31 @@ final class LockTaskPolicySerializer extends PolicySerializer<LockTaskPolicy> { } serializer.attribute( /* namespace= */ null, - attributeNamePrefix + ATTR_PACKAGES, + ATTR_PACKAGES, String.join(ATTR_PACKAGES_SEPARATOR, value.getPackages())); serializer.attributeInt( /* namespace= */ null, - attributeNamePrefix + ATTR_FLAGS, + ATTR_FLAGS, value.getFlags()); } @Override - LockTaskPolicy readFromXml(TypedXmlPullParser parser, String attributeNamePrefix) { + LockTaskPolicy readFromXml(TypedXmlPullParser parser) { String packagesStr = parser.getAttributeValue( /* namespace= */ null, - attributeNamePrefix + ATTR_PACKAGES); + ATTR_PACKAGES); if (packagesStr == null) { - Log.e(DevicePolicyEngine.TAG, "Error parsing LockTask policy value."); + Log.e(TAG, "Error parsing LockTask policy value."); return null; } Set<String> packages = Set.of(packagesStr.split(ATTR_PACKAGES_SEPARATOR)); try { int flags = parser.getAttributeInt( /* namespace= */ null, - attributeNamePrefix + ATTR_FLAGS); + ATTR_FLAGS); return new LockTaskPolicy(packages, flags); } catch (XmlPullParserException e) { - Log.e(DevicePolicyEngine.TAG, "Error parsing LockTask policy value", e); + Log.e(TAG, "Error parsing LockTask policy value", e); return null; } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java index f77d051cab86..522c4b5e84be 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java @@ -32,21 +32,25 @@ import java.util.Objects; final class LongPolicySerializer extends PolicySerializer<Long> { + private static final String TAG = "LongPolicySerializer"; + + private static final String ATTR_VALUE = "value"; + @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, String attributeName, + void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull Long value) throws IOException { Objects.requireNonNull(value); - serializer.attributeLong(/* namespace= */ null, attributeName, value); + serializer.attributeLong(/* namespace= */ null, ATTR_VALUE, value); } @Nullable @Override - LongPolicyValue readFromXml(TypedXmlPullParser parser, String attributeName) { + LongPolicyValue readFromXml(TypedXmlPullParser parser) { try { return new LongPolicyValue( - parser.getAttributeLong(/* namespace= */ null, attributeName)); + parser.getAttributeLong(/* namespace= */ null, ATTR_VALUE)); } catch (XmlPullParserException e) { - Log.e(DevicePolicyEngine.TAG, "Error parsing Long policy value", e); + Log.e(TAG, "Error parsing Long policy value", e); return null; } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java index 8812c3d3c557..509a66b4f8f7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java @@ -226,8 +226,7 @@ final class PolicyDefinition<V> { * Passing in {@code null} for {@code packageName} will return * {@link #GENERIC_APPLICATION_RESTRICTIONS}. */ - static PolicyDefinition<Bundle> APPLICATION_RESTRICTIONS( - String packageName) { + static PolicyDefinition<Bundle> APPLICATION_RESTRICTIONS(String packageName) { if (packageName == null) { return GENERIC_APPLICATION_RESTRICTIONS; } @@ -254,6 +253,34 @@ final class PolicyDefinition<V> { (Integer value, Context context, Integer userId, PolicyKey policyKey) -> true, new IntegerPolicySerializer()); + // This is saved in the static map sPolicyDefinitions so that we're able to reconstruct the + // actual policy with the correct arguments (i.e. packageName) when reading the policies from + // xml. + static PolicyDefinition<Boolean> GENERIC_APPLICATION_HIDDEN = + new PolicyDefinition<>( + new PackagePolicyKey( + DevicePolicyIdentifiers.APPLICATION_HIDDEN_POLICY), + // TODO(b/276713779): Don't need to take in a resolution mechanism since its + // never used, but might need some refactoring to not always assume a non-null + // mechanism. + TRUE_MORE_RESTRICTIVE, + POLICY_FLAG_LOCAL_ONLY_POLICY, + PolicyEnforcerCallbacks::setApplicationHidden, + new BooleanPolicySerializer()); + + /** + * Passing in {@code null} for {@code packageName} will return + * {@link #GENERIC_APPLICATION_HIDDEN}. + */ + static PolicyDefinition<Boolean> APPLICATION_HIDDEN(String packageName) { + if (packageName == null) { + return GENERIC_APPLICATION_HIDDEN; + } + return GENERIC_APPLICATION_HIDDEN.createPolicyDefinition( + new PackagePolicyKey( + DevicePolicyIdentifiers.APPLICATION_HIDDEN_POLICY, packageName)); + } + private static final Map<String, PolicyDefinition<?>> POLICY_DEFINITIONS = new HashMap<>(); private static Map<String, Integer> USER_RESTRICTION_FLAGS = new HashMap<>(); @@ -272,6 +299,10 @@ final class PolicyDefinition<V> { GENERIC_APPLICATION_RESTRICTIONS); POLICY_DEFINITIONS.put(DevicePolicyIdentifiers.RESET_PASSWORD_TOKEN_POLICY, RESET_PASSWORD_TOKEN); + POLICY_DEFINITIONS.put(DevicePolicyIdentifiers.KEYGUARD_DISABLED_FEATURES_POLICY, + KEYGUARD_DISABLED_FEATURES); + POLICY_DEFINITIONS.put(DevicePolicyIdentifiers.APPLICATION_HIDDEN_POLICY, + GENERIC_APPLICATION_HIDDEN); // User Restriction Policies USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_MODIFY_ACCOUNTS, /* flags= */ 0); @@ -500,7 +531,6 @@ final class PolicyDefinition<V> { } void saveToXml(TypedXmlSerializer serializer) throws IOException { - // TODO: here and elsewhere, add tags to ensure attributes aren't overridden by duplication. mPolicyKey.saveToXml(serializer); } @@ -523,14 +553,14 @@ final class PolicyDefinition<V> { return genericPolicyDefinition.mPolicyKey.readFromXml(parser); } - void savePolicyValueToXml(TypedXmlSerializer serializer, String attributeName, V value) + void savePolicyValueToXml(TypedXmlSerializer serializer, V value) throws IOException { - mPolicySerializer.saveToXml(mPolicyKey, serializer, attributeName, value); + mPolicySerializer.saveToXml(mPolicyKey, serializer, value); } @Nullable - PolicyValue<V> readPolicyValueFromXml(TypedXmlPullParser parser, String attributeName) { - return mPolicySerializer.readFromXml(parser, attributeName); + PolicyValue<V> readPolicyValueFromXml(TypedXmlPullParser parser) { + return mPolicySerializer.readFromXml(parser); } @Override diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java index fd91249fac62..d65d366e4476 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java @@ -73,7 +73,7 @@ final class PolicyEnforcerCallbacks { return Boolean.TRUE.equals(Binder.withCleanCallingIdentity(() -> { if (!(policyKey instanceof PackagePermissionPolicyKey)) { throw new IllegalArgumentException("policyKey is not of type " - + "PermissionGrantStatePolicyKey"); + + "PermissionGrantStatePolicyKey, passed in policyKey is: " + policyKey); } PackagePermissionPolicyKey parsedKey = (PackagePermissionPolicyKey) policyKey; Objects.requireNonNull(parsedKey.getPermissionName()); @@ -165,7 +165,7 @@ final class PolicyEnforcerCallbacks { try { if (!(policyKey instanceof IntentFilterPolicyKey)) { throw new IllegalArgumentException("policyKey is not of type " - + "IntentFilterPolicyKey"); + + "IntentFilterPolicyKey, passed in policyKey is: " + policyKey); } IntentFilterPolicyKey parsedKey = (IntentFilterPolicyKey) policyKey; @@ -193,7 +193,7 @@ final class PolicyEnforcerCallbacks { return Boolean.TRUE.equals(Binder.withCleanCallingIdentity(() -> { if (!(policyKey instanceof PackagePolicyKey)) { throw new IllegalArgumentException("policyKey is not of type " - + "PackagePolicyKey"); + + "PackagePolicyKey, passed in policyKey is: " + policyKey); } PackagePolicyKey parsedKey = (PackagePolicyKey) policyKey; String packageName = Objects.requireNonNull(parsedKey.getPackageName()); @@ -211,7 +211,7 @@ final class PolicyEnforcerCallbacks { return Boolean.TRUE.equals(Binder.withCleanCallingIdentity(() -> { if (!(policyKey instanceof UserRestrictionPolicyKey)) { throw new IllegalArgumentException("policyKey is not of type " - + "UserRestrictionPolicyKey"); + + "UserRestrictionPolicyKey, passed in policyKey is: " + policyKey); } UserRestrictionPolicyKey parsedKey = (UserRestrictionPolicyKey) policyKey; @@ -221,4 +221,20 @@ final class PolicyEnforcerCallbacks { return true; })); } + + static boolean setApplicationHidden( + @Nullable Boolean hide, @NonNull Context context, int userId, + @NonNull PolicyKey policyKey) { + return Boolean.TRUE.equals(Binder.withCleanCallingIdentity(() -> { + if (!(policyKey instanceof PackagePolicyKey)) { + throw new IllegalArgumentException("policyKey is not of type " + + "PackagePolicyKey, passed in policyKey is: " + policyKey); + } + PackagePolicyKey parsedKey = (PackagePolicyKey) policyKey; + String packageName = Objects.requireNonNull(parsedKey.getPackageName()); + IPackageManager packageManager = AppGlobals.getPackageManager(); + return packageManager.setApplicationHiddenSettingAsUser( + packageName, hide != null && hide, userId); + })); + } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java index 0ef431f6ff90..5af2fa285483 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java @@ -26,8 +26,7 @@ import com.android.modules.utils.TypedXmlSerializer; import java.io.IOException; abstract class PolicySerializer<V> { - abstract void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, - String attributeName, @NonNull V value) + abstract void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull V value) throws IOException; - abstract PolicyValue<V> readFromXml(TypedXmlPullParser parser, String attributeName); + abstract PolicyValue<V> readFromXml(TypedXmlPullParser parser); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyState.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyState.java index 3a792d82d2ba..741f209a90c3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyState.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyState.java @@ -35,11 +35,14 @@ import java.util.Objects; * Class containing all values set for a certain policy by different admins. */ final class PolicyState<V> { + + private static final String TAG = "PolicyState"; private static final String TAG_ADMIN_POLICY_ENTRY = "admin-policy-entry"; - private static final String TAG_ENFORCING_ADMIN_ENTRY = "enforcing-admin-entry"; - private static final String ATTR_POLICY_VALUE = "policy-value"; - private static final String ATTR_RESOLVED_POLICY = "resolved-policy"; + private static final String TAG_POLICY_DEFINITION_ENTRY = "policy-definition-entry"; + private static final String TAG_RESOLVED_VALUE_ENTRY = "resolved-value-entry"; + private static final String TAG_ENFORCING_ADMIN_ENTRY = "enforcing-admin-entry"; + private static final String TAG_POLICY_VALUE_ENTRY = "policy-value-entry"; private final PolicyDefinition<V> mPolicyDefinition; private final LinkedHashMap<EnforcingAdmin, PolicyValue<V>> mPoliciesSetByAdmins = new LinkedHashMap<>(); @@ -193,18 +196,24 @@ final class PolicyState<V> { } void saveToXml(TypedXmlSerializer serializer) throws IOException { + serializer.startTag(/* namespace= */ null, TAG_POLICY_DEFINITION_ENTRY); mPolicyDefinition.saveToXml(serializer); + serializer.endTag(/* namespace= */ null, TAG_POLICY_DEFINITION_ENTRY); if (mCurrentResolvedPolicy != null) { + serializer.startTag(/* namespace= */ null, TAG_RESOLVED_VALUE_ENTRY); mPolicyDefinition.savePolicyValueToXml( - serializer, ATTR_RESOLVED_POLICY, mCurrentResolvedPolicy.getValue()); + serializer, mCurrentResolvedPolicy.getValue()); + serializer.endTag(/* namespace= */ null, TAG_RESOLVED_VALUE_ENTRY); } for (EnforcingAdmin admin : mPoliciesSetByAdmins.keySet()) { serializer.startTag(/* namespace= */ null, TAG_ADMIN_POLICY_ENTRY); + serializer.startTag(/* namespace= */ null, TAG_POLICY_VALUE_ENTRY); mPolicyDefinition.savePolicyValueToXml( - serializer, ATTR_POLICY_VALUE, mPoliciesSetByAdmins.get(admin).getValue()); + serializer, mPoliciesSetByAdmins.get(admin).getValue()); + serializer.endTag(/* namespace= */ null, TAG_POLICY_VALUE_ENTRY); serializer.startTag(/* namespace= */ null, TAG_ENFORCING_ADMIN_ENTRY); admin.saveToXml(serializer); @@ -217,32 +226,57 @@ final class PolicyState<V> { static <V> PolicyState<V> readFromXml(TypedXmlPullParser parser) throws IOException, XmlPullParserException { - PolicyDefinition<V> policyDefinition = PolicyDefinition.readFromXml(parser); + PolicyDefinition<V> policyDefinition = null; - PolicyValue<V> currentResolvedPolicy = policyDefinition.readPolicyValueFromXml( - parser, ATTR_RESOLVED_POLICY); + PolicyValue<V> currentResolvedPolicy = null; LinkedHashMap<EnforcingAdmin, PolicyValue<V>> policiesSetByAdmins = new LinkedHashMap<>(); int outerDepth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, outerDepth)) { String tag = parser.getName(); - if (TAG_ADMIN_POLICY_ENTRY.equals(tag)) { - PolicyValue<V> value = policyDefinition.readPolicyValueFromXml( - parser, ATTR_POLICY_VALUE); - EnforcingAdmin admin; - int adminPolicyDepth = parser.getDepth(); - if (XmlUtils.nextElementWithin(parser, adminPolicyDepth) - && parser.getName().equals(TAG_ENFORCING_ADMIN_ENTRY)) { - admin = EnforcingAdmin.readFromXml(parser); - policiesSetByAdmins.put(admin, value); - } - } else { - Log.e(DevicePolicyEngine.TAG, "Unknown tag: " + tag); + switch (tag) { + case TAG_ADMIN_POLICY_ENTRY: + PolicyValue<V> value = null; + EnforcingAdmin admin = null; + int adminPolicyDepth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, adminPolicyDepth)) { + String adminPolicyTag = parser.getName(); + switch (adminPolicyTag) { + case TAG_ENFORCING_ADMIN_ENTRY: + admin = EnforcingAdmin.readFromXml(parser); + break; + case TAG_POLICY_VALUE_ENTRY: + value = policyDefinition.readPolicyValueFromXml(parser); + break; + } + } + if (admin != null && value != null) { + policiesSetByAdmins.put(admin, value); + } else { + Log.e(TAG, "Error Parsing TAG_ADMIN_POLICY_ENTRY"); + } + break; + case TAG_POLICY_DEFINITION_ENTRY: + policyDefinition = PolicyDefinition.readFromXml(parser); + break; + + case TAG_RESOLVED_VALUE_ENTRY: + currentResolvedPolicy = policyDefinition.readPolicyValueFromXml(parser); + break; + default: + Log.e(TAG, "Unknown tag: " + tag); } } - return new PolicyState<V>(policyDefinition, policiesSetByAdmins, currentResolvedPolicy); + if (policyDefinition != null) { + return new PolicyState<V>(policyDefinition, policiesSetByAdmins, currentResolvedPolicy); + } else { + Log.e("PolicyState", "Error parsing policyState"); + return null; + } } + + PolicyDefinition<V> getPolicyDefinition() { return mPolicyDefinition; } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java index dc6592d73116..24d0521471f7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java @@ -36,21 +36,17 @@ final class StringSetPolicySerializer extends PolicySerializer<Set<String>> { private static final String ATTR_VALUES_SEPARATOR = ";"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, String attributeNamePrefix, + void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull Set<String> value) throws IOException { Objects.requireNonNull(value); serializer.attribute( - /* namespace= */ null, - attributeNamePrefix + ATTR_VALUES, - String.join(ATTR_VALUES_SEPARATOR, value)); + /* namespace= */ null, ATTR_VALUES, String.join(ATTR_VALUES_SEPARATOR, value)); } @Nullable @Override - PolicyValue<Set<String>> readFromXml(TypedXmlPullParser parser, String attributeNamePrefix) { - String valuesStr = parser.getAttributeValue( - /* namespace= */ null, - attributeNamePrefix + ATTR_VALUES); + PolicyValue<Set<String>> readFromXml(TypedXmlPullParser parser) { + String valuesStr = parser.getAttributeValue(/* namespace= */ null, ATTR_VALUES); if (valuesStr == null) { Log.e(DevicePolicyEngine.TAG, "Error parsing StringSet policy value."); return null; diff --git a/services/people/java/com/android/server/people/data/DataManager.java b/services/people/java/com/android/server/people/data/DataManager.java index 54d2c194e63a..db84b6c4a17d 100644 --- a/services/people/java/com/android/server/people/data/DataManager.java +++ b/services/people/java/com/android/server/people/data/DataManager.java @@ -1339,7 +1339,7 @@ public class DataManager { /** Adds {@code listener} to be notified on conversation changes. */ public void addConversationsListener( @NonNull PeopleService.ConversationsListener listener) { - synchronized (mConversationsListeners) { + synchronized (mLock) { mConversationsListeners.add(Objects.requireNonNull(listener)); } } diff --git a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt index d8139623f393..a849b669ac3a 100644 --- a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt +++ b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt @@ -22,6 +22,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before +import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -41,6 +42,7 @@ import java.util.regex.Pattern @RunWith(DeviceJUnit4Parameterized::class) @Parameterized.UseParametersRunnerFactory( DeviceJUnit4ClassRunnerWithParameters.RunnerFactory::class) +@Ignore("b/275403538") class SdCardEjectionTests : BaseHostJUnit4Test() { companion object { diff --git a/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml index ddc8dfdb280b..1ed3c7b6f549 100644 --- a/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml +++ b/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml @@ -75,7 +75,8 @@ <uses-permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS"/> <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"/> <uses-permission android:name="android.permission.HARDWARE_TEST"/> <uses-permission android:name="android.permission.BLUETOOTH"/> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> diff --git a/services/tests/mockingservicestests/AndroidManifest.xml b/services/tests/mockingservicestests/AndroidManifest.xml index ea0481e03b97..aa3930ac7c07 100644 --- a/services/tests/mockingservicestests/AndroidManifest.xml +++ b/services/tests/mockingservicestests/AndroidManifest.xml @@ -27,7 +27,8 @@ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.MANAGE_APPOPS"/> <uses-permission android:name="android.permission.MONITOR_DEVICE_CONFIG_ACCESS"/> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD"/> diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java index 3042edec6aad..bad04dc020c7 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java @@ -60,6 +60,8 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE; +import static android.os.PowerExemptionManager.REASON_CARRIER_PRIVILEGED_APP; +import static android.os.PowerExemptionManager.REASON_DENIED; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; @@ -90,6 +92,7 @@ import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -132,8 +135,10 @@ import android.permission.PermissionManager; import android.provider.DeviceConfig; import android.service.notification.StatusBarNotification; import android.telephony.TelephonyManager; +import android.telephony.TelephonyManager.CarrierPrivilegesCallback; import android.util.Log; import android.util.Pair; +import android.util.SparseArray; import androidx.test.runner.AndroidJUnit4; @@ -176,9 +181,12 @@ import java.io.File; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.BiConsumer; @@ -233,8 +241,42 @@ public final class BackgroundRestrictionTest { private static final int BATTERY_FULL_CHARGE_MAH = 5_000; + private static final String[] MOCK_PRIVILEGED_PACKAGES_0 = new String[] { + TEST_PACKAGE_BASE + 0, + TEST_PACKAGE_BASE + 1, + }; + private static final String[] MOCK_PRIVILEGED_PACKAGES_1 = new String[] { + TEST_PACKAGE_BASE + 2, + TEST_PACKAGE_BASE + 3, + }; + private static final String[] MOCK_PRIVILEGED_PACKAGES_2 = new String[] { + TEST_PACKAGE_BASE + 4, + TEST_PACKAGE_BASE + 5, + }; + private static final int[] MOCK_PRIVILEGED_UIDS_0 = new int[] { + UserHandle.getUid(TEST_USER0, TEST_PACKAGE_APPID_BASE + 0), + UserHandle.getUid(TEST_USER0, TEST_PACKAGE_APPID_BASE + 1), + }; + private static final int[] MOCK_PRIVILEGED_UIDS_1 = new int[] { + UserHandle.getUid(TEST_USER0, TEST_PACKAGE_APPID_BASE + 2), + UserHandle.getUid(TEST_USER0, TEST_PACKAGE_APPID_BASE + 3), + }; + private static final int[] MOCK_PRIVILEGED_UIDS_2 = new int[] { + UserHandle.getUid(TEST_USER0, TEST_PACKAGE_APPID_BASE + 4), + UserHandle.getUid(TEST_USER0, TEST_PACKAGE_APPID_BASE + 5), + }; + private static final String[][] MOCK_PRIVILEGED_PACKAGES = new String[][] { + MOCK_PRIVILEGED_PACKAGES_0, + MOCK_PRIVILEGED_PACKAGES_1, + }; + private static final int[][] MOCK_PRIVILEGED_UIDS = new int[][] { + MOCK_PRIVILEGED_UIDS_0, + MOCK_PRIVILEGED_UIDS_1, + }; + @Mock private ActivityManagerInternal mActivityManagerInternal; @Mock private ActivityManagerService mActivityManagerService; + @Mock private ActivityManagerConstants mActivityManagerConstants; @Mock private AppOpsManager mAppOpsManager; @Mock private AppStandbyInternal mAppStandbyInternal; @Mock private AppHibernationManagerInternal mAppHibernationInternal; @@ -255,6 +297,8 @@ public final class BackgroundRestrictionTest { @Mock private TelephonyManager mTelephonyManager; @Mock private IAppOpsService mIAppOpsService; + private PhoneCarrierPrivileges mPhoneCarrierPrivileges; + private long mCurrentTimeMillis; @Captor private ArgumentCaptor<AppStateTracker.BackgroundRestrictedAppListener> mFasListenerCap; @@ -298,6 +342,14 @@ public final class BackgroundRestrictionTest { mBgRestrictionController = spy(new AppRestrictionController(mInjector, mActivityManagerService)); + mActivityManagerService.mConstants = mActivityManagerConstants; + mPhoneCarrierPrivileges = new PhoneCarrierPrivileges( + mInjector.getTelephonyManager(), MOCK_PRIVILEGED_PACKAGES.length); + for (int i = 0; i < MOCK_PRIVILEGED_PACKAGES.length; i++) { + mPhoneCarrierPrivileges.addNewPrivilegePackages(i, + MOCK_PRIVILEGED_PACKAGES[i], MOCK_PRIVILEGED_UIDS[i]); + } + doReturn(PROCESS_STATE_FOREGROUND_SERVICE).when(mActivityManagerInternal) .getUidProcessState(anyInt()); doReturn(TEST_USERS).when(mUserManagerInternal).getUserIds(); @@ -2984,6 +3036,78 @@ public final class BackgroundRestrictionTest { verifyLoadedSettings(settings); } + @Test + public void testCarrierPrivilegedAppListener() throws Exception { + final long shortMs = 1_000L; + for (int i = 0; i < MOCK_PRIVILEGED_PACKAGES.length; i++) { + verifyPotentialSystemExemptionReason(REASON_CARRIER_PRIVILEGED_APP, + MOCK_PRIVILEGED_PACKAGES[i], + MOCK_PRIVILEGED_UIDS[i]); + } + verifyPotentialSystemExemptionReason(REASON_DENIED, + MOCK_PRIVILEGED_PACKAGES_2, + MOCK_PRIVILEGED_UIDS_2); + + mPhoneCarrierPrivileges.addNewPrivilegePackages(0, + MOCK_PRIVILEGED_PACKAGES_2, + MOCK_PRIVILEGED_UIDS_2); + Thread.sleep(shortMs); + + verifyPotentialSystemExemptionReason(REASON_CARRIER_PRIVILEGED_APP, + MOCK_PRIVILEGED_PACKAGES_2, + MOCK_PRIVILEGED_UIDS_2); + + verifyPotentialSystemExemptionReason(REASON_DENIED, + MOCK_PRIVILEGED_PACKAGES_0, + MOCK_PRIVILEGED_UIDS_0); + + verifyPotentialSystemExemptionReason(REASON_CARRIER_PRIVILEGED_APP, + MOCK_PRIVILEGED_PACKAGES_1, + MOCK_PRIVILEGED_UIDS_1); + + mPhoneCarrierPrivileges.addNewPrivilegePackages(1, + new String[0], new int[0]); + Thread.sleep(shortMs); + + verifyPotentialSystemExemptionReason(REASON_CARRIER_PRIVILEGED_APP, + MOCK_PRIVILEGED_PACKAGES_2, + MOCK_PRIVILEGED_UIDS_2); + + verifyPotentialSystemExemptionReason(REASON_DENIED, + MOCK_PRIVILEGED_PACKAGES_0, + MOCK_PRIVILEGED_UIDS_0); + + verifyPotentialSystemExemptionReason(REASON_DENIED, + MOCK_PRIVILEGED_PACKAGES_1, + MOCK_PRIVILEGED_UIDS_1); + + mPhoneCarrierPrivileges.addNewPrivilegePackages(0, + MOCK_PRIVILEGED_PACKAGES_0, + MOCK_PRIVILEGED_UIDS_0); + Thread.sleep(shortMs); + + verifyPotentialSystemExemptionReason(REASON_DENIED, + MOCK_PRIVILEGED_PACKAGES_2, + MOCK_PRIVILEGED_UIDS_2); + + verifyPotentialSystemExemptionReason(REASON_CARRIER_PRIVILEGED_APP, + MOCK_PRIVILEGED_PACKAGES_0, + MOCK_PRIVILEGED_UIDS_0); + + verifyPotentialSystemExemptionReason(REASON_DENIED, + MOCK_PRIVILEGED_PACKAGES_1, + MOCK_PRIVILEGED_UIDS_1); + } + + private void verifyPotentialSystemExemptionReason(int expectedReason, + String[] packages, int[] uids) throws Exception { + for (int i = 0; i < packages.length; i++) { + assertEquals(expectedReason, + mBgRestrictionController.getPotentialSystemExemptionReason( + uids[i], packages[i])); + } + } + private void verifyLoadedSettings(RestrictionSettings settings) throws Exception { // Make a new copy and reset it. RestrictionSettings test = (RestrictionSettings) settings.clone(); @@ -3019,6 +3143,47 @@ public final class BackgroundRestrictionTest { return result; } + private class PhoneCarrierPrivileges { + private final SparseArray<Pair<String[], int[]>> mPackages = new SparseArray<>(); + private final SparseArray<Pair<Executor, CarrierPrivilegesCallback>> mListeners = + new SparseArray<>(); + + PhoneCarrierPrivileges(TelephonyManager telephonyManager, int phoneIds) { + doReturn(phoneIds).when(telephonyManager).getActiveModemCount(); + doAnswer(inv -> { + registerCarrierPrivilegesCallback( + inv.getArgument(0), + inv.getArgument(1), + inv.getArgument(2)); + return null; + }).when(telephonyManager).registerCarrierPrivilegesCallback( + anyInt(), anyObject(), anyObject()); + } + + public void registerCarrierPrivilegesCallback(int phoneId, Executor executor, + CarrierPrivilegesCallback callback) { + mListeners.put(phoneId, Pair.create(executor, callback)); + final Pair<String[], int[]> pkgs = mPackages.get(phoneId); + final Set<String> pkgNames = pkgs != null + ? Arrays.stream(pkgs.first).collect(Collectors.toUnmodifiableSet()) + : Collections.emptySet(); + final Set<Integer> uids = pkgs != null + ? Arrays.stream(pkgs.second).boxed().collect(Collectors.toUnmodifiableSet()) + : Collections.emptySet(); + executor.execute(() -> callback.onCarrierPrivilegesChanged(pkgNames, uids)); + } + + public void addNewPrivilegePackages(int phoneId, String[] pkgNames, int[] uids) { + mPackages.put(phoneId, Pair.create(pkgNames, uids)); + final Pair<Executor, CarrierPrivilegesCallback> callback = mListeners.get(phoneId); + if (callback != null) { + callback.first.execute(() -> callback.second.onCarrierPrivilegesChanged( + Arrays.stream(pkgNames).collect(Collectors.toUnmodifiableSet()), + Arrays.stream(uids).boxed().collect(Collectors.toUnmodifiableSet()))); + } + } + } + private class TestBgRestrictionInjector extends AppRestrictionController.Injector { private Context mContext; diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java index 41a5ddb60a7f..8211d6fc03a2 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java @@ -91,8 +91,8 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; -import java.io.ByteArrayOutputStream; import java.io.PrintWriter; +import java.io.Writer; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; @@ -372,9 +372,9 @@ public final class BroadcastQueueModernImplTest { List.of(makeMockRegisteredReceiver()), false); queue.enqueueOrReplaceBroadcast(airplaneRecord, 0, false); - queue.setProcessCached(false); + queue.setProcessAndUidCached(null, false); final long notCachedRunnableAt = queue.getRunnableAt(); - queue.setProcessCached(true); + queue.setProcessAndUidCached(null, true); final long cachedRunnableAt = queue.getRunnableAt(); assertThat(cachedRunnableAt).isGreaterThan(notCachedRunnableAt); assertFalse(queue.isRunnable()); @@ -399,14 +399,14 @@ public final class BroadcastQueueModernImplTest { List.of(makeMockRegisteredReceiver()), false); queue.enqueueOrReplaceBroadcast(airplaneRecord, 0, false); - queue.setProcessCached(false); + queue.setProcessAndUidCached(null, false); final long notCachedRunnableAt = queue.getRunnableAt(); - queue.setProcessCached(true); + queue.setProcessAndUidCached(null, true); final long cachedRunnableAt = queue.getRunnableAt(); assertThat(cachedRunnableAt).isGreaterThan(notCachedRunnableAt); assertTrue(queue.isRunnable()); assertEquals(BroadcastProcessQueue.REASON_CACHED, queue.getRunnableAtReason()); - assertEquals(ProcessList.SCHED_GROUP_BACKGROUND, queue.getPreferredSchedulingGroupLocked()); + assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked()); } /** @@ -431,16 +431,16 @@ public final class BroadcastQueueModernImplTest { // verify that: // (a) the queue is immediately runnable by existence of a fg-priority broadcast // (b) the next one up is the fg-priority broadcast despite its later enqueue time - queue.setProcessCached(false); + queue.setProcessAndUidCached(null, false); assertTrue(queue.isRunnable()); assertThat(queue.getRunnableAt()).isAtMost(airplaneRecord.enqueueClockTime); - assertEquals(ProcessList.SCHED_GROUP_DEFAULT, queue.getPreferredSchedulingGroupLocked()); + assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked()); assertEquals(queue.peekNextBroadcastRecord(), airplaneRecord); - queue.setProcessCached(true); + queue.setProcessAndUidCached(null, true); assertTrue(queue.isRunnable()); assertThat(queue.getRunnableAt()).isAtMost(airplaneRecord.enqueueClockTime); - assertEquals(ProcessList.SCHED_GROUP_DEFAULT, queue.getPreferredSchedulingGroupLocked()); + assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked()); assertEquals(queue.peekNextBroadcastRecord(), airplaneRecord); } @@ -500,7 +500,7 @@ public final class BroadcastQueueModernImplTest { private void doRunnableAt_Cached(BroadcastRecord testRecord, int testRunnableAtReason) { final BroadcastProcessQueue queue = new BroadcastProcessQueue(mConstants, PACKAGE_GREEN, getUidForPackage(PACKAGE_GREEN)); - queue.setProcessCached(true); + queue.setProcessAndUidCached(null, true); final BroadcastRecord lazyRecord = makeBroadcastRecord( new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED), @@ -596,7 +596,7 @@ public final class BroadcastQueueModernImplTest { // about the actual output, just that we don't crash queue.getActive().setDeliveryState(0, BroadcastRecord.DELIVERY_SCHEDULED, "Test-driven"); queue.dumpLocked(SystemClock.uptimeMillis(), - new IndentingPrintWriter(new PrintWriter(new ByteArrayOutputStream()))); + new IndentingPrintWriter(new PrintWriter(Writer.nullWriter()))); queue.makeActiveNextPending(); assertEquals(Intent.ACTION_LOCALE_CHANGED, queue.getActive().intent.getAction()); @@ -1154,6 +1154,41 @@ public final class BroadcastQueueModernImplTest { times(1)); } + @Test + public void testGetPreferredSchedulingGroup() throws Exception { + final BroadcastProcessQueue queue = new BroadcastProcessQueue(mConstants, + PACKAGE_GREEN, getUidForPackage(PACKAGE_GREEN)); + + assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked()); + + final Intent timeTick = new Intent(Intent.ACTION_TIME_TICK) + .addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + queue.enqueueOrReplaceBroadcast(makeBroadcastRecord(timeTick, + List.of(makeMockRegisteredReceiver())), 0, false); + assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked()); + + // Make the foreground broadcast as active. + queue.makeActiveNextPending(); + assertEquals(ProcessList.SCHED_GROUP_DEFAULT, queue.getPreferredSchedulingGroupLocked()); + + queue.makeActiveIdle(); + assertEquals(ProcessList.SCHED_GROUP_UNDEFINED, queue.getPreferredSchedulingGroupLocked()); + + final Intent airplane = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); + queue.enqueueOrReplaceBroadcast(makeBroadcastRecord(airplane, + List.of(makeMockRegisteredReceiver())), 0, false); + + // Make the background broadcast as active. + queue.makeActiveNextPending(); + assertEquals(ProcessList.SCHED_GROUP_BACKGROUND, queue.getPreferredSchedulingGroupLocked()); + + queue.enqueueOrReplaceBroadcast(makeBroadcastRecord(timeTick, + List.of(makeMockRegisteredReceiver())), 0, false); + // Even though the active broadcast is not a foreground one, scheduling group will be + // DEFAULT since there is a foreground broadcast waiting to be delivered. + assertEquals(ProcessList.SCHED_GROUP_DEFAULT, queue.getPreferredSchedulingGroupLocked()); + } + private Intent createPackageChangedIntent(int uid, List<String> componentNameList) { final Intent packageChangedIntent = new Intent(Intent.ACTION_PACKAGE_CHANGED); packageChangedIntent.putExtra(Intent.EXTRA_UID, uid); @@ -1166,6 +1201,11 @@ public final class BroadcastQueueModernImplTest { List<Intent> intents) { for (int i = 0; i < intents.size(); i++) { queue.makeActiveNextPending(); + + // While we're here, give our health check some test coverage + queue.assertHealthLocked(); + queue.dumpLocked(0L, new IndentingPrintWriter(Writer.nullWriter())); + final Intent actualIntent = queue.getActive().intent; final Intent expectedIntent = intents.get(i); final String errMsg = "actual=" + actualIntent + ", expected=" + expectedIntent diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java index 3b964bcb78ac..b6bc02a41c21 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java @@ -39,6 +39,7 @@ import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -106,10 +107,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.verification.VerificationMode; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -231,6 +232,7 @@ public class BroadcastQueueTest { doAnswer((invocation) -> { Log.v(TAG, "Intercepting startProcessLocked() for " + Arrays.toString(invocation.getArguments())); + assertHealth(); final ProcessStartBehavior behavior = mNextProcessStartBehavior .getAndSet(ProcessStartBehavior.SUCCESS); if (behavior == ProcessStartBehavior.FAIL_NULL) { @@ -462,6 +464,7 @@ public class BroadcastQueueTest { doAnswer((invocation) -> { Log.v(TAG, "Intercepting scheduleReceiver() for " + Arrays.toString(invocation.getArguments())); + assertHealth(); final Intent intent = invocation.getArgument(0); final Bundle extras = invocation.getArgument(5); mScheduledBroadcasts.add(makeScheduledBroadcast(r, intent)); @@ -483,6 +486,7 @@ public class BroadcastQueueTest { doAnswer((invocation) -> { Log.v(TAG, "Intercepting scheduleRegisteredReceiver() for " + Arrays.toString(invocation.getArguments())); + assertHealth(); final Intent intent = invocation.getArgument(1); final Bundle extras = invocation.getArgument(4); final boolean ordered = invocation.getArgument(5); @@ -600,6 +604,13 @@ public class BroadcastQueueTest { BackgroundStartPrivileges.NONE, false, null); } + private void assertHealth() { + if (mImpl == Impl.MODERN) { + // If this fails, it'll throw a clear reason message + ((BroadcastQueueModernImpl) mQueue).assertHealthLocked(); + } + } + private static Map<String, Object> asMap(Bundle bundle) { final Map<String, Object> map = new HashMap<>(); if (bundle != null) { @@ -769,7 +780,7 @@ public class BroadcastQueueTest { // about the actual output, just that we don't crash mQueue.dumpDebug(new ProtoOutputStream(), ActivityManagerServiceDumpBroadcastsProto.BROADCAST_QUEUE); - mQueue.dumpLocked(FileDescriptor.err, new PrintWriter(new ByteArrayOutputStream()), + mQueue.dumpLocked(FileDescriptor.err, new PrintWriter(Writer.nullWriter()), null, 0, true, true, true, null, false); mQueue.dumpToDropBoxLocked(TAG); @@ -1166,7 +1177,7 @@ public class BroadcastQueueTest { // about the actual output, just that we don't crash mQueue.dumpDebug(new ProtoOutputStream(), ActivityManagerServiceDumpBroadcastsProto.BROADCAST_QUEUE); - mQueue.dumpLocked(FileDescriptor.err, new PrintWriter(new ByteArrayOutputStream()), + mQueue.dumpLocked(FileDescriptor.err, new PrintWriter(Writer.nullWriter()), null, 0, true, true, true, null, false); } @@ -1659,8 +1670,8 @@ public class BroadcastQueueTest { final ProcessRecord receiverYellowApp = makeActiveProcessRecord(PACKAGE_YELLOW); final ProcessRecord receiverOrangeApp = makeActiveProcessRecord(PACKAGE_ORANGE); - receiverGreenApp.setCached(true); - receiverBlueApp.setCached(true); + mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_GREEN), true); + mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_BLUE), true); final Intent timeTick = new Intent(Intent.ACTION_TIME_TICK); final BroadcastOptions opts = BroadcastOptions.makeBasic() @@ -1704,13 +1715,11 @@ public class BroadcastQueueTest { eq(UserHandle.USER_SYSTEM), anyInt(), anyInt(), any()); // Shift blue to be active and confirm that deferred broadcast is delivered - receiverBlueApp.setCached(false); mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_BLUE), false); waitForIdle(); verifyScheduleRegisteredReceiver(times(1), receiverBlueApp, timeTick); // Shift green to be active and confirm that deferred broadcast is delivered - receiverGreenApp.setCached(false); mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_GREEN), false); waitForIdle(); verifyScheduleRegisteredReceiver(times(1), receiverGreenApp, timeTick); @@ -2044,9 +2053,9 @@ public class BroadcastQueueTest { final ProcessRecord receiverBlueApp = makeActiveProcessRecord(PACKAGE_BLUE); final ProcessRecord receiverYellowApp = makeActiveProcessRecord(PACKAGE_YELLOW); - receiverGreenApp.setCached(true); - receiverBlueApp.setCached(true); - receiverYellowApp.setCached(false); + mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_GREEN), true); + mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_BLUE), true); + mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_YELLOW), false); final Intent airplane = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); final BroadcastOptions opts = BroadcastOptions.makeBasic() @@ -2069,7 +2078,6 @@ public class BroadcastQueueTest { verifyScheduleRegisteredReceiver(times(1), receiverYellowApp, airplane); // Shift green to be active and confirm that deferred broadcast is delivered - receiverGreenApp.setCached(false); mUidObserver.onUidCachedChanged(getUidForPackage(PACKAGE_GREEN), false); waitForIdle(); verifyScheduleRegisteredReceiver(times(1), receiverGreenApp, airplane); diff --git a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java index 1fbb8dd5ac9d..eb6efd2e859f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java @@ -166,10 +166,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE); assertThat(mCachedAppOptimizerUnderTest.mFreezerStatsdSampleRate).isEqualTo( CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); assertThat(mCachedAppOptimizerUnderTest.mFullAnonRssThrottleKb).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_FULL_RSS_THROTTLE_KB); assertThat(mCachedAppOptimizerUnderTest.mFullDeltaRssThrottleKb).isEqualTo( @@ -261,10 +257,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3 + 1); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4 + 1); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5 + 1); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1); assertThat(mCachedAppOptimizerUnderTest.mFullDeltaRssThrottleKb).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_FULL_DELTA_RSS_THROTTLE_KB + 1); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleMinOomAdj).isEqualTo( @@ -275,10 +267,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE + 0.1f); assertThat(mCachedAppOptimizerUnderTest.mFreezerStatsdSampleRate).isEqualTo( CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE + 0.1f); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5 + 1); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1); assertThat(mCachedAppOptimizerUnderTest.mFullAnonRssThrottleKb).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_FULL_RSS_THROTTLE_KB + 1); assertThat(mCachedAppOptimizerUnderTest.mProcStateThrottle).containsExactly(1, 2, 3); @@ -425,10 +413,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3 + 1); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4 + 1); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5 + 1); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleMinOomAdj).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ + 1); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleMaxOomAdj).isEqualTo( @@ -454,10 +438,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); // Repeat for each of the throttle keys. mCountDown = new CountDownLatch(1); @@ -472,10 +452,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); mCountDown = new CountDownLatch(1); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -489,10 +465,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); mCountDown = new CountDownLatch(1); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -506,10 +478,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); mCountDown = new CountDownLatch(1); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -523,10 +491,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); mCountDown = new CountDownLatch(1); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -540,10 +504,6 @@ public final class CachedAppOptimizerTest { CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3); assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo( CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5); - assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo( - CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6); } @Test @@ -953,15 +913,7 @@ public final class CachedAppOptimizerTest { mProcessDependencies.setRssAfterCompaction(rssAfter); // When moving within cached state - mCachedAppOptimizerUnderTest.onOomAdjustChanged( - ProcessList.CACHED_APP_MIN_ADJ, ProcessList.CACHED_APP_MIN_ADJ + 1, processRecord); - waitForHandler(); - // THEN process IS NOT compacted. - assertThat(mCachedAppOptimizerUnderTest.mLastCompactionStats.get(pid)).isNull(); - - // When moving into cached state - mCachedAppOptimizerUnderTest.onOomAdjustChanged(ProcessList.CACHED_APP_MIN_ADJ - 1, - ProcessList.CACHED_APP_MIN_ADJ + 1, processRecord); + mCachedAppOptimizerUnderTest.onProcessFrozen(processRecord); waitForHandler(); // THEN process IS compacted. assertThat(mCachedAppOptimizerUnderTest.mLastCompactionStats.get(pid)).isNotNull(); diff --git a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java index fc503b7a749b..45fefe477f8a 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java @@ -804,7 +804,7 @@ public final class DisplayPowerController2Test { when(logicalDisplayMock.getDisplayInfoLocked()).thenReturn(info); when(logicalDisplayMock.isEnabledLocked()).thenReturn(isEnabled); when(logicalDisplayMock.isInTransitionLocked()).thenReturn(false); - when(logicalDisplayMock.getBrightnessThrottlingDataIdLocked()).thenReturn( + when(logicalDisplayMock.getThermalBrightnessThrottlingDataIdLocked()).thenReturn( DisplayDeviceConfig.DEFAULT_ID); when(displayDeviceMock.getDisplayDeviceInfoLocked()).thenReturn(deviceInfo); when(displayDeviceMock.getUniqueId()).thenReturn(uniqueId); diff --git a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java index c021ef65a291..d9133a441aff 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -809,7 +809,7 @@ public final class DisplayPowerControllerTest { when(logicalDisplayMock.getDisplayInfoLocked()).thenReturn(info); when(logicalDisplayMock.isEnabledLocked()).thenReturn(isEnabled); when(logicalDisplayMock.isInTransitionLocked()).thenReturn(false); - when(logicalDisplayMock.getBrightnessThrottlingDataIdLocked()).thenReturn( + when(logicalDisplayMock.getThermalBrightnessThrottlingDataIdLocked()).thenReturn( DisplayDeviceConfig.DEFAULT_ID); when(displayDeviceMock.getDisplayDeviceInfoLocked()).thenReturn(deviceInfo); when(displayDeviceMock.getUniqueId()).thenReturn(uniqueId); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/JobNotificationCoordinatorTest.java b/services/tests/mockingservicestests/src/com/android/server/job/JobNotificationCoordinatorTest.java index 03f667f0d336..df2f59a1cefc 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/JobNotificationCoordinatorTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/JobNotificationCoordinatorTest.java @@ -23,6 +23,8 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.inOrder; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -39,6 +41,7 @@ import android.graphics.drawable.Icon; import android.os.UserHandle; import com.android.server.LocalServices; +import com.android.server.job.controllers.JobStatus; import com.android.server.notification.NotificationManagerInternal; import org.junit.After; @@ -493,6 +496,44 @@ public class JobNotificationCoordinatorTest { eq(notificationId), eq(UserHandle.getUserId(uid))); } + @Test + public void testUserInitiatedJob_hasNotificationFlag() { + final JobNotificationCoordinator coordinator = new JobNotificationCoordinator(); + final JobServiceContext jsc = mock(JobServiceContext.class); + final JobStatus js = mock(JobStatus.class); + js.startedAsUserInitiatedJob = true; + doReturn(js).when(jsc).getRunningJobLocked(); + final Notification notification = createValidNotification(); + final int uid = 10123; + final int pid = 42; + final int notificationId = 23; + + coordinator.enqueueNotification(jsc, TEST_PACKAGE, pid, uid, notificationId, notification, + JobService.JOB_END_NOTIFICATION_POLICY_REMOVE); + verify(mNotificationManagerInternal) + .enqueueNotification(eq(TEST_PACKAGE), eq(TEST_PACKAGE), eq(uid), eq(pid), any(), + eq(notificationId), eq(notification), eq(UserHandle.getUserId(uid))); + assertNotEquals(notification.flags & Notification.FLAG_USER_INITIATED_JOB, 0); + } + + @Test + public void testNonUserInitiatedJob_doesNotHaveNotificationFlag() { + final JobNotificationCoordinator coordinator = new JobNotificationCoordinator(); + final JobServiceContext jsc = mock(JobServiceContext.class); + doReturn(mock(JobStatus.class)).when(jsc).getRunningJobLocked(); + final Notification notification = createValidNotification(); + final int uid = 10123; + final int pid = 42; + final int notificationId = 23; + + coordinator.enqueueNotification(jsc, TEST_PACKAGE, pid, uid, notificationId, notification, + JobService.JOB_END_NOTIFICATION_POLICY_REMOVE); + verify(mNotificationManagerInternal) + .enqueueNotification(eq(TEST_PACKAGE), eq(TEST_PACKAGE), eq(uid), eq(pid), any(), + eq(notificationId), eq(notification), eq(UserHandle.getUserId(uid))); + assertEquals(notification.flags & Notification.FLAG_USER_INITIATED_JOB, 0); + } + private Notification createValidNotification() { final Notification notification = mock(Notification.class); doReturn(mock(Icon.class)).when(notification).getSmallIcon(); diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 6f26a5fe8970..cfeaf0b54552 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -42,6 +42,7 @@ android_test { "androidx.test.ext.truth", "androidx.test.runner", "androidx.test.rules", + "androidx.test.ext.junit", "cts-wm-util", "platform-compat-test-rules", "mockito-target-minus-junit4", diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index 6861c2f049fb..107dde244940 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -74,7 +74,8 @@ <uses-permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS"/> <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"/> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"/> <uses-permission android:name="android.permission.HARDWARE_TEST"/> <uses-permission android:name="android.permission.BLUETOOTH"/> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java index 6216c66aa54f..4b86dd048cd1 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java @@ -152,8 +152,7 @@ public class AuthServiceTest { verify(mBiometricService, never()).registerAuthenticator( anyInt(), - anyInt(), - anyInt(), + any(), any()); } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java index 4cdca268fc4b..dbf5021d3c6b 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java @@ -44,13 +44,14 @@ import android.app.admin.DevicePolicyManager; import android.app.trust.ITrustManager; import android.content.Context; import android.hardware.biometrics.BiometricManager.Authenticators; -import android.hardware.biometrics.ComponentInfoInternal; import android.hardware.biometrics.IBiometricAuthenticator; import android.hardware.biometrics.IBiometricSensorReceiver; import android.hardware.biometrics.IBiometricServiceReceiver; import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; import android.hardware.biometrics.SensorProperties; +import android.hardware.face.FaceSensorProperties; +import android.hardware.face.FaceSensorPropertiesInternal; import android.hardware.fingerprint.FingerprintSensorProperties; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.os.Binder; @@ -458,9 +459,16 @@ public class AuthSessionTest { IBiometricAuthenticator fingerprintAuthenticator = mock(IBiometricAuthenticator.class); when(fingerprintAuthenticator.isHardwareDetected(any())).thenReturn(true); when(fingerprintAuthenticator.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); - mSensors.add(new BiometricSensor(mContext, id, + + final FingerprintSensorPropertiesInternal props = new FingerprintSensorPropertiesInternal( + id, SensorProperties.STRENGTH_STRONG, 5 /* maxEnrollmentsPerUser */, + List.of() /* componentInfo */, type, + false /* resetLockoutRequiresHardwareAuthToken */); + mFingerprintSensorProps.add(props); + + mSensors.add(new BiometricSensor(mContext, TYPE_FINGERPRINT /* modality */, - Authenticators.BIOMETRIC_STRONG /* strength */, + props, fingerprintAuthenticator) { @Override boolean confirmationAlwaysRequired(int userId) { @@ -473,21 +481,6 @@ public class AuthSessionTest { } }); - final List<ComponentInfoInternal> componentInfo = new ArrayList<>(); - componentInfo.add(new ComponentInfoInternal("faceSensor" /* componentId */, - "vendor/model/revision" /* hardwareVersion */, "1.01" /* firmwareVersion */, - "00000001" /* serialNumber */, "" /* softwareVersion */)); - componentInfo.add(new ComponentInfoInternal("matchingAlgorithm" /* componentId */, - "" /* hardwareVersion */, "" /* firmwareVersion */, "" /* serialNumber */, - "vendor/version/revision" /* softwareVersion */)); - - mFingerprintSensorProps.add(new FingerprintSensorPropertiesInternal(id, - SensorProperties.STRENGTH_STRONG, - 5 /* maxEnrollmentsPerUser */, - componentInfo, - type, - false /* resetLockoutRequiresHardwareAuthToken */)); - when(mSettingObserver.getEnabledForApps(anyInt())).thenReturn(true); } @@ -495,9 +488,13 @@ public class AuthSessionTest { IBiometricAuthenticator authenticator) throws RemoteException { when(authenticator.isHardwareDetected(any())).thenReturn(true); when(authenticator.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); - mSensors.add(new BiometricSensor(mContext, id, + mSensors.add(new BiometricSensor(mContext, TYPE_FACE /* modality */, - Authenticators.BIOMETRIC_STRONG /* strength */, + new FaceSensorPropertiesInternal(id, + SensorProperties.STRENGTH_STRONG, 5 /* maxEnrollmentsPerUser */, + List.of() /* componentInfo */, FaceSensorProperties.TYPE_UNKNOWN, + true /* supportsFace Detection */, true /* supportsSelfIllumination */, + false /* resetLockoutRequiresHardwareAuthToken */), authenticator) { @Override boolean confirmationAlwaysRequired(int userId) { diff --git a/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java index 168642e3533f..b51a8c4e1b6c 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java @@ -19,6 +19,7 @@ package com.android.server.biometrics; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; import static android.hardware.biometrics.BiometricManager.Authenticators; import static android.hardware.biometrics.BiometricManager.BIOMETRIC_MULTI_SENSOR_DEFAULT; +import static android.hardware.biometrics.SensorProperties.STRENGTH_STRONG; import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; import static com.android.server.biometrics.BiometricServiceStateProto.STATE_AUTHENTICATED_PENDING_SYSUI; @@ -66,7 +67,11 @@ import android.hardware.biometrics.IBiometricServiceReceiver; import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; import android.hardware.display.DisplayManagerGlobal; +import android.hardware.face.FaceSensorProperties; +import android.hardware.face.FaceSensorPropertiesInternal; import android.hardware.fingerprint.FingerprintManager; +import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.os.Binder; import android.os.IBinder; import android.os.RemoteException; @@ -93,6 +98,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.List; import java.util.Random; @Presubmit @@ -114,6 +120,7 @@ public class BiometricServiceTest { private static final int SENSOR_ID_FINGERPRINT = 0; private static final int SENSOR_ID_FACE = 1; + private FingerprintSensorPropertiesInternal mFingerprintProps; private BiometricService mBiometricService; @@ -193,6 +200,11 @@ public class BiometricServiceTest { }; when(mInjector.getConfiguration(any())).thenReturn(config); + + mFingerprintProps = new FingerprintSensorPropertiesInternal(SENSOR_ID_FINGERPRINT, + STRENGTH_STRONG, 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_UNKNOWN, + false /* resetLockoutRequiresHardwareAuthToken */); } @Test @@ -328,8 +340,7 @@ public class BiometricServiceTest { mBiometricService = new BiometricService(mContext, mInjector); mBiometricService.onStart(); - mBiometricService.mImpl.registerAuthenticator(0 /* id */, - TYPE_FINGERPRINT, Authenticators.BIOMETRIC_STRONG, + mBiometricService.mImpl.registerAuthenticator(TYPE_FINGERPRINT, mFingerprintProps, mFingerprintAuthenticator); invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, @@ -401,8 +412,7 @@ public class BiometricServiceTest { mBiometricService = new BiometricService(mContext, mInjector); mBiometricService.onStart(); - mBiometricService.mImpl.registerAuthenticator(0 /* id */, - TYPE_FINGERPRINT, Authenticators.BIOMETRIC_STRONG, + mBiometricService.mImpl.registerAuthenticator(TYPE_FINGERPRINT, mFingerprintProps, mFingerprintAuthenticator); invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, @@ -1334,9 +1344,13 @@ public class BiometricServiceTest { for (int i = 0; i < testCases.length; i++) { final BiometricSensor sensor = - new BiometricSensor(mContext, 0 /* id */, + new BiometricSensor(mContext, TYPE_FINGERPRINT, - testCases[i][0], + new FingerprintSensorPropertiesInternal(i /* id */, + Utils.authenticatorStrengthToPropertyStrength(testCases[i][0]), + 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_UNKNOWN, + false /* resetLockoutRequiresHardwareAuthToken */), mock(IBiometricAuthenticator.class)) { @Override boolean confirmationAlwaysRequired(int userId) { @@ -1364,8 +1378,7 @@ public class BiometricServiceTest { when(mFingerprintAuthenticator.hasEnrolledTemplates(anyInt(), any())) .thenReturn(true); when(mFingerprintAuthenticator.isHardwareDetected(any())).thenReturn(true); - mBiometricService.mImpl.registerAuthenticator(0 /* testId */, - TYPE_FINGERPRINT, Authenticators.BIOMETRIC_STRONG, + mBiometricService.mImpl.registerAuthenticator(TYPE_FINGERPRINT, mFingerprintProps, mFingerprintAuthenticator); verify(mBiometricService.mBiometricStrengthController).updateStrengths(); @@ -1376,15 +1389,14 @@ public class BiometricServiceTest { mBiometricService = new BiometricService(mContext, mInjector); mBiometricService.onStart(); - final int testId = 0; - when(mBiometricService.mSettingObserver.getEnabledForApps(anyInt())).thenReturn(true); when(mFingerprintAuthenticator.hasEnrolledTemplates(anyInt(), any())) .thenReturn(true); when(mFingerprintAuthenticator.isHardwareDetected(any())).thenReturn(true); - mBiometricService.mImpl.registerAuthenticator(testId /* id */, - TYPE_FINGERPRINT, Authenticators.BIOMETRIC_STRONG, + + final int testId = SENSOR_ID_FINGERPRINT; + mBiometricService.mImpl.registerAuthenticator(TYPE_FINGERPRINT, mFingerprintProps, mFingerprintAuthenticator); // Downgrade the authenticator @@ -1484,11 +1496,9 @@ public class BiometricServiceTest { mBiometricService.onStart(); mBiometricService.mImpl.registerAuthenticator( - 0 /* id */, 2 /* modality */, 15 /* strength */, - mFingerprintAuthenticator); + 2 /* modality */, mFingerprintProps, mFingerprintAuthenticator); mBiometricService.mImpl.registerAuthenticator( - 0 /* id */, 2 /* modality */, 15 /* strength */, - mFingerprintAuthenticator); + 2 /* modality */, mFingerprintProps, mFingerprintAuthenticator); } @Test(expected = IllegalArgumentException.class) @@ -1498,9 +1508,7 @@ public class BiometricServiceTest { mBiometricService.onStart(); mBiometricService.mImpl.registerAuthenticator( - 0 /* id */, 2 /* modality */, - Authenticators.BIOMETRIC_STRONG /* strength */, - null /* authenticator */); + 2 /* modality */, mFingerprintProps, null /* authenticator */); } @Test @@ -1511,8 +1519,13 @@ public class BiometricServiceTest { for (String s : mInjector.getConfiguration(null)) { SensorConfig config = new SensorConfig(s); - mBiometricService.mImpl.registerAuthenticator(config.id, config.modality, - config.strength, mFingerprintAuthenticator); + mBiometricService.mImpl.registerAuthenticator(config.modality, + new FingerprintSensorPropertiesInternal(config.id, + Utils.authenticatorStrengthToPropertyStrength(config.strength), + 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_UNKNOWN, + false /* resetLockoutRequiresHardwareAuthToken */), + mFingerprintAuthenticator); } } @@ -1609,7 +1622,12 @@ public class BiometricServiceTest { when(mFingerprintAuthenticator.isHardwareDetected(any())).thenReturn(true); when(mFingerprintAuthenticator.getLockoutModeForUser(anyInt())) .thenReturn(LockoutTracker.LOCKOUT_NONE); - mBiometricService.mImpl.registerAuthenticator(SENSOR_ID_FINGERPRINT, modality, strength, + mBiometricService.mImpl.registerAuthenticator(modality, + new FingerprintSensorPropertiesInternal(SENSOR_ID_FINGERPRINT, + Utils.authenticatorStrengthToPropertyStrength(strength), + 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_UNKNOWN, + false /* resetLockoutRequiresHardwareAuthToken */), mFingerprintAuthenticator); } @@ -1618,7 +1636,13 @@ public class BiometricServiceTest { when(mFaceAuthenticator.isHardwareDetected(any())).thenReturn(true); when(mFaceAuthenticator.getLockoutModeForUser(anyInt())) .thenReturn(LockoutTracker.LOCKOUT_NONE); - mBiometricService.mImpl.registerAuthenticator(SENSOR_ID_FACE, modality, strength, + mBiometricService.mImpl.registerAuthenticator(modality, + new FaceSensorPropertiesInternal(SENSOR_ID_FACE, + Utils.authenticatorStrengthToPropertyStrength(strength), + 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FaceSensorProperties.TYPE_UNKNOWN, true /* supportsFace Detection */, + true /* supportsSelfIllumination */, + false /* resetLockoutRequiresHardwareAuthToken */), mFaceAuthenticator); } } @@ -1641,15 +1665,27 @@ public class BiometricServiceTest { when(mFingerprintAuthenticator.hasEnrolledTemplates(anyInt(), any())) .thenReturn(true); when(mFingerprintAuthenticator.isHardwareDetected(any())).thenReturn(true); - mBiometricService.mImpl.registerAuthenticator(SENSOR_ID_FINGERPRINT, modality, - strength, mFingerprintAuthenticator); + mBiometricService.mImpl.registerAuthenticator(modality, + new FingerprintSensorPropertiesInternal(SENSOR_ID_FINGERPRINT, + Utils.authenticatorStrengthToPropertyStrength(strength), + 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_UNKNOWN, + false /* resetLockoutRequiresHardwareAuthToken */), + mFingerprintAuthenticator); } if ((modality & BiometricAuthenticator.TYPE_FACE) != 0) { when(mFaceAuthenticator.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); when(mFaceAuthenticator.isHardwareDetected(any())).thenReturn(true); - mBiometricService.mImpl.registerAuthenticator(SENSOR_ID_FACE, modality, - strength, mFaceAuthenticator); + mBiometricService.mImpl.registerAuthenticator(modality, + new FaceSensorPropertiesInternal(SENSOR_ID_FACE, + Utils.authenticatorStrengthToPropertyStrength(strength), + 5 /* maxEnrollmentsPerUser */, List.of() /* componentInfo */, + FaceSensorProperties.TYPE_UNKNOWN, + true /* supportsFace Detection */, + true /* supportsSelfIllumination */, + false /* resetLockoutRequiresHardwareAuthToken */), + mFaceAuthenticator); } } } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/InvalidationTrackerTest.java b/services/tests/servicestests/src/com/android/server/biometrics/InvalidationTrackerTest.java index ee5ab92065ee..f7539bd27c9d 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/InvalidationTrackerTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/InvalidationTrackerTest.java @@ -16,6 +16,9 @@ package com.android.server.biometrics; +import static android.hardware.biometrics.SensorProperties.STRENGTH_STRONG; +import static android.hardware.biometrics.SensorProperties.STRENGTH_WEAK; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -27,9 +30,13 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.content.Context; import android.hardware.biometrics.BiometricAuthenticator; -import android.hardware.biometrics.BiometricManager.Authenticators; import android.hardware.biometrics.IBiometricAuthenticator; import android.hardware.biometrics.IInvalidationCallback; +import android.hardware.biometrics.SensorPropertiesInternal; +import android.hardware.face.FaceSensorProperties; +import android.hardware.face.FaceSensorPropertiesInternal; +import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.platform.test.annotations.Presubmit; import androidx.test.filters.SmallTest; @@ -42,6 +49,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.List; @Presubmit @SmallTest @@ -59,26 +67,54 @@ public class InvalidationTrackerTest { public void testCallbackReceived_whenAllStrongSensorsInvalidated() throws Exception { final IBiometricAuthenticator authenticator1 = mock(IBiometricAuthenticator.class); when(authenticator1.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); - final TestSensor sensor1 = new TestSensor(mContext, 0 /* id */, - BiometricAuthenticator.TYPE_FINGERPRINT, Authenticators.BIOMETRIC_STRONG, + final TestSensor sensor1 = new TestSensor(mContext, + BiometricAuthenticator.TYPE_FINGERPRINT, + new FingerprintSensorPropertiesInternal(0 /* id */, + STRENGTH_STRONG, + 5 /* maxEnrollmentsPerUser */, + List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_UDFPS_OPTICAL, + false /* resetLockoutRequiresHardwareAuthToken */), authenticator1); final IBiometricAuthenticator authenticator2 = mock(IBiometricAuthenticator.class); when(authenticator2.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); - final TestSensor sensor2 = new TestSensor(mContext, 1 /* id */, - BiometricAuthenticator.TYPE_FINGERPRINT, Authenticators.BIOMETRIC_STRONG, + final TestSensor sensor2 = new TestSensor(mContext, + BiometricAuthenticator.TYPE_FINGERPRINT, + new FingerprintSensorPropertiesInternal(1 /* id */, + STRENGTH_STRONG, + 5 /* maxEnrollmentsPerUser */, + List.of() /* componentInfo */, + FingerprintSensorProperties.TYPE_REAR, + false /* resetLockoutRequiresHardwareAuthToken */), authenticator2); final IBiometricAuthenticator authenticator3 = mock(IBiometricAuthenticator.class); when(authenticator3.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); - final TestSensor sensor3 = new TestSensor(mContext, 2 /* id */, - BiometricAuthenticator.TYPE_FACE, Authenticators.BIOMETRIC_STRONG, + final TestSensor sensor3 = new TestSensor(mContext, + BiometricAuthenticator.TYPE_FACE, + new FaceSensorPropertiesInternal(2 /* id */, + STRENGTH_STRONG, + 5 /* maxEnrollmentsPerUser */, + List.of() /* componentInfo */, + FaceSensorProperties.TYPE_RGB, + true /* supportsFace Detection */, + true /* supportsSelfIllumination */, + false /* resetLockoutRequiresHardwareAuthToken */), authenticator3); final IBiometricAuthenticator authenticator4 = mock(IBiometricAuthenticator.class); when(authenticator4.hasEnrolledTemplates(anyInt(), any())).thenReturn(true); - final TestSensor sensor4 = new TestSensor(mContext, 3 /* id */, - BiometricAuthenticator.TYPE_FACE, Authenticators.BIOMETRIC_WEAK, + final TestSensor sensor4 = new TestSensor(mContext, + BiometricAuthenticator.TYPE_FACE, + new FaceSensorPropertiesInternal(3 /* id */, + STRENGTH_WEAK, + 5 /* maxEnrollmentsPerUser */, + List.of() /* componentInfo */, + FaceSensorProperties.TYPE_IR, + true /* supportsFace Detection */, + true /* supportsSelfIllumination */, + false /* resetLockoutRequiresHardwareAuthToken */), authenticator4); final ArrayList<BiometricSensor> sensors = new ArrayList<>(); @@ -113,9 +149,9 @@ public class InvalidationTrackerTest { private static class TestSensor extends BiometricSensor { - TestSensor(@NonNull Context context, int id, int modality, int strength, + TestSensor(@NonNull Context context, int modality, @NonNull SensorPropertiesInternal props, @NonNull IBiometricAuthenticator impl) { - super(context, id, modality, strength, impl); + super(context, modality, props, impl); } @Override diff --git a/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java b/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java index e4aed975102c..07c6182569b2 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.when; import android.app.StatusBarManager; import android.content.Intent; +import android.hardware.biometrics.AuthenticateOptions; import android.hardware.biometrics.IBiometricContextListener; import android.hardware.biometrics.IBiometricContextListener.FoldState; import android.hardware.biometrics.common.OperationContext; @@ -59,6 +60,7 @@ import org.mockito.junit.MockitoRule; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.function.Consumer; @Presubmit @@ -102,22 +104,52 @@ public class BiometricContextProviderTest { @Test public void testIsAod() throws RemoteException { - mListener.onDozeChanged(true /* isAod */, false /* isAwake */); - assertThat(mProvider.isAod()).isTrue(); - mListener.onDozeChanged(false /* isAod */, false /* isAwake */); - assertThat(mProvider.isAod()).isFalse(); + final Map<Integer, Boolean> expectedAod = Map.of( + AuthenticateOptions.DISPLAY_STATE_UNKNOWN, false, + AuthenticateOptions.DISPLAY_STATE_AOD, true, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, false, + AuthenticateOptions.DISPLAY_STATE_NO_UI, false, + AuthenticateOptions.DISPLAY_STATE_SCREENSAVER, false + ); + + for (Map.Entry<Integer, Boolean> entry : expectedAod.entrySet()) { + mListener.onDisplayStateChanged(entry.getKey()); + + assertThat(mProvider.isAod()).isEqualTo(entry.getValue()); + } } @Test public void testIsAwake() throws RemoteException { - mListener.onDozeChanged(false /* isAod */, true /* isAwake */); - assertThat(mProvider.isAwake()).isTrue(); - mListener.onDozeChanged(false /* isAod */, false /* isAwake */); - assertThat(mProvider.isAwake()).isFalse(); - mListener.onDozeChanged(true /* isAod */, true /* isAwake */); - assertThat(mProvider.isAwake()).isTrue(); - mListener.onDozeChanged(true /* isAod */, false /* isAwake */); - assertThat(mProvider.isAwake()).isFalse(); + final Map<Integer, Boolean> expectedAwake = Map.of( + AuthenticateOptions.DISPLAY_STATE_UNKNOWN, true, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, true, + AuthenticateOptions.DISPLAY_STATE_SCREENSAVER, true, + AuthenticateOptions.DISPLAY_STATE_NO_UI, false, + AuthenticateOptions.DISPLAY_STATE_AOD, false + ); + + for (Map.Entry<Integer, Boolean> entry : expectedAwake.entrySet()) { + mListener.onDisplayStateChanged(entry.getKey()); + + assertThat(mProvider.isAwake()).isEqualTo(entry.getValue()); + } + } + + @Test + public void testGetDisplayState() throws RemoteException { + final List<Integer> states = List.of( + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_SCREENSAVER, + AuthenticateOptions.DISPLAY_STATE_NO_UI, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_UNKNOWN); + + for (int state : states) { + mListener.onDisplayStateChanged(state); + + assertThat(mProvider.getDisplayState()).isEqualTo(state); + } } @Test @@ -147,21 +179,54 @@ public class BiometricContextProviderTest { } @Test + public void testSubscribesToDisplayState() throws RemoteException { + final List<Integer> actual = new ArrayList<>(); + final List<Integer> expected = List.of(AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_NO_UI, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN); + + mProvider.subscribe(mOpContext, ctx -> { + assertThat(ctx).isSameInstanceAs(mOpContext.toAidlContext()); + assertThat(mProvider.getDisplayState()).isEqualTo(ctx.displayState); + actual.add(ctx.displayState); + }); + + for (int v : expected) { + mListener.onDisplayStateChanged(v); + } + + assertThat(actual).containsExactly( + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_NO_UI, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN).inOrder(); + } + + @Test public void testSubscribesToAod() throws RemoteException { final List<Boolean> actual = new ArrayList<>(); mProvider.subscribe(mOpContext, ctx -> { assertThat(ctx).isSameInstanceAs(mOpContext.toAidlContext()); assertThat(mProvider.isAod()).isEqualTo(ctx.isAod); - assertThat(mProvider.isAwake()).isFalse(); actual.add(ctx.isAod); }); - for (boolean v : List.of(true, false, true, true, false, false)) { - mListener.onDozeChanged(v /* isDozing */, false /* isAwake */); + for (int v : List.of( + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_NO_UI, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN)) { + mListener.onDisplayStateChanged(v); } - assertThat(actual).containsExactly(true, false, true, false).inOrder(); + assertThat(actual).containsExactly(true, false, true, false, false).inOrder(); } @Test @@ -170,16 +235,20 @@ public class BiometricContextProviderTest { mProvider.subscribe(mOpContext, ctx -> { assertThat(ctx).isSameInstanceAs(mOpContext.toAidlContext()); - assertThat(ctx.isAod).isFalse(); - assertThat(mProvider.isAod()).isFalse(); actual.add(mProvider.isAwake()); }); - for (boolean v : List.of(true, false, true, true, false, false)) { - mListener.onDozeChanged(false /* isDozing */, v /* isAwake */); + for (int v : List.of( + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_NO_UI, + AuthenticateOptions.DISPLAY_STATE_SCREENSAVER, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_AOD, + AuthenticateOptions.DISPLAY_STATE_NO_UI)) { + mListener.onDisplayStateChanged(v); } - assertThat(actual).containsExactly(true, false, true, false).inOrder(); + assertThat(actual).containsExactly(true, false, true, true, false, false).inOrder(); } @Test @@ -188,13 +257,13 @@ public class BiometricContextProviderTest { mProvider.subscribe(mOpContext, emptyConsumer); mProvider.unsubscribe(mOpContext); - mListener.onDozeChanged(true /* isDozing */, false /* isAwake */); + mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_AOD); final Consumer<OperationContext> nonEmptyConsumer = mock(Consumer.class); mProvider.subscribe(mOpContext, nonEmptyConsumer); - mListener.onDozeChanged(false /* isDozing */, false /* isAwake */); + mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN); mProvider.unsubscribe(mOpContext); - mListener.onDozeChanged(true /* isDozing */, false /* isAwake */); + mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_NO_UI); verify(emptyConsumer, never()).accept(any()); verify(nonEmptyConsumer).accept(same(mOpContext.toAidlContext())); @@ -235,7 +304,7 @@ public class BiometricContextProviderTest { @Test public void testUpdate() throws RemoteException { - mListener.onDozeChanged(false /* isDozing */, false /* isAwake */); + mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_NO_UI); OperationContextExt context = mProvider.updateContext(mOpContext, false /* crypto */); OperationContext aidlContext = context.toAidlContext(); @@ -252,7 +321,8 @@ public class BiometricContextProviderTest { final int id = 40 + type; final boolean aod = (type & 1) == 0; - mListener.onDozeChanged(aod /* isDozing */, false /* isAwake */); + mListener.onDisplayStateChanged(aod ? AuthenticateOptions.DISPLAY_STATE_AOD + : AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN); mSessionListener.onSessionStarted(type, InstanceId.fakeInstanceId(id)); context = mProvider.updateContext(mOpContext, false /* crypto */); aidlContext = context.toAidlContext(); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/log/OperationContextExtTest.java b/services/tests/servicestests/src/com/android/server/biometrics/log/OperationContextExtTest.java index c7962c82471a..c652b74f5848 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/log/OperationContextExtTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/log/OperationContextExtTest.java @@ -19,7 +19,9 @@ package com.android.server.biometrics.log; import static com.google.common.truth.Truth.assertThat; import android.content.Intent; +import android.hardware.biometrics.AuthenticateOptions; import android.hardware.biometrics.IBiometricContextListener; +import android.hardware.biometrics.common.DisplayState; import android.hardware.biometrics.common.OperationContext; import android.hardware.biometrics.common.OperationReason; import android.platform.test.annotations.Presubmit; @@ -37,6 +39,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import java.util.Map; + @Presubmit @SmallTest public class OperationContextExtTest { @@ -59,15 +63,18 @@ public class OperationContextExtTest { final int id = 5; final byte reason = OperationReason.UNKNOWN; + final int displayState = DisplayState.NO_UI; aidlContext.id = id; aidlContext.isAod = true; aidlContext.isCrypto = true; aidlContext.reason = reason; + aidlContext.displayState = displayState; assertThat(context.getId()).isEqualTo(id); assertThat(context.isAod()).isTrue(); assertThat(context.isCrypto()).isTrue(); assertThat(context.getReason()).isEqualTo(reason); + assertThat(context.getDisplayState()).isEqualTo(displayState); } @Test @@ -78,6 +85,25 @@ public class OperationContextExtTest { } @Test + public void mapsDisplayStatesToAidl() { + final Map<Integer, Integer> map = Map.of( + AuthenticateOptions.DISPLAY_STATE_UNKNOWN, DisplayState.UNKNOWN, + AuthenticateOptions.DISPLAY_STATE_AOD, DisplayState.AOD, + AuthenticateOptions.DISPLAY_STATE_NO_UI, DisplayState.NO_UI, + AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN, DisplayState.LOCKSCREEN, + AuthenticateOptions.DISPLAY_STATE_SCREENSAVER, DisplayState.SCREENSAVER, + 100, DisplayState.UNKNOWN + ); + + for (Map.Entry<Integer, Integer> entry : map.entrySet()) { + final OperationContextExt context = new OperationContextExt(newAidlContext()); + when(mBiometricContext.getDisplayState()).thenReturn(entry.getKey()); + assertThat(context.update(mBiometricContext).getDisplayState()) + .isEqualTo(entry.getValue()); + } + } + + @Test public void updatesFromSourceForKeyguard() { final BiometricContextSessionInfo info = new BiometricContextSessionInfo(InstanceId.fakeInstanceId(9)); @@ -102,11 +128,13 @@ public class OperationContextExtTest { final int rotation = Surface.ROTATION_270; final int foldState = IBiometricContextListener.FoldState.HALF_OPENED; final int dockState = Intent.EXTRA_DOCK_STATE_CAR; + final int displayState = AuthenticateOptions.DISPLAY_STATE_AOD; when(mBiometricContext.getCurrentRotation()).thenReturn(rotation); when(mBiometricContext.getFoldState()).thenReturn(foldState); when(mBiometricContext.getDockedState()).thenReturn(dockState); when(mBiometricContext.isDisplayOn()).thenReturn(true); + when(mBiometricContext.getDisplayState()).thenReturn(displayState); final OperationContextExt context = new OperationContextExt(newAidlContext()); @@ -124,6 +152,7 @@ public class OperationContextExtTest { assertThat(context.getFoldState()).isEqualTo(foldState); assertThat(context.getOrientation()).isEqualTo(rotation); assertThat(context.isDisplayOn()).isTrue(); + assertThat(context.getDisplayState()).isEqualTo(DisplayState.AOD); } private static OperationContext newAidlContext() { diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceRegistryTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceRegistryTest.java index 903ed9082481..d3f04dfcfa17 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceRegistryTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceRegistryTest.java @@ -17,8 +17,6 @@ package com.android.server.biometrics.sensors.face; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; -import static android.hardware.biometrics.BiometricManager.Authenticators.BIOMETRIC_STRONG; -import static android.hardware.biometrics.BiometricManager.Authenticators.BIOMETRIC_WEAK; import static android.hardware.biometrics.SensorProperties.STRENGTH_STRONG; import static android.hardware.biometrics.SensorProperties.STRENGTH_WEAK; @@ -70,9 +68,7 @@ public class FaceServiceRegistryTest { @Mock private ServiceProvider mProvider2; @Captor - private ArgumentCaptor<Integer> mIdCaptor; - @Captor - private ArgumentCaptor<Integer> mStrengthCaptor; + private ArgumentCaptor<FaceSensorPropertiesInternal> mPropsCaptor; private FaceSensorPropertiesInternal mProvider1Props; private FaceSensorPropertiesInternal mProvider2Props; @@ -82,13 +78,13 @@ public class FaceServiceRegistryTest { public void setup() { mProvider1Props = new FaceSensorPropertiesInternal(SENSOR_ID_1, STRENGTH_WEAK, 5 /* maxEnrollmentsPerUser */, - List.of(), FaceSensorProperties.TYPE_RGB, + List.of() /* componentInfo */, FaceSensorProperties.TYPE_RGB, true /* supportsFace Detection */, true /* supportsSelfIllumination */, false /* resetLockoutRequiresHardwareAuthToken */); mProvider2Props = new FaceSensorPropertiesInternal(SENSOR_ID_2, STRENGTH_STRONG, 5 /* maxEnrollmentsPerUser */, - List.of(), FaceSensorProperties.TYPE_IR, + List.of() /* componentInfo */, FaceSensorProperties.TYPE_IR, true /* supportsFace Detection */, true /* supportsSelfIllumination */, false /* resetLockoutRequiresHardwareAuthToken */); @@ -107,10 +103,9 @@ public class FaceServiceRegistryTest { assertThat(mRegistry.getProviders()).containsExactly(mProvider1, mProvider2); assertThat(mRegistry.getAllProperties()).containsExactly(mProvider1Props, mProvider2Props); verify(mBiometricService, times(2)).registerAuthenticator( - mIdCaptor.capture(), eq(TYPE_FACE), mStrengthCaptor.capture(), any()); - assertThat(mIdCaptor.getAllValues()).containsExactly(SENSOR_ID_1, SENSOR_ID_2); - assertThat(mStrengthCaptor.getAllValues()) - .containsExactly(BIOMETRIC_WEAK, BIOMETRIC_STRONG); + eq(TYPE_FACE), mPropsCaptor.capture(), any()); + assertThat(mPropsCaptor.getAllValues()) + .containsExactly(mProvider1Props, mProvider2Props); } @Test diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java index 6b0e33037af8..7468901a16af 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java @@ -68,6 +68,7 @@ import org.mockito.junit.MockitoRule; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; @Presubmit @SmallTest @@ -106,6 +107,8 @@ public class FaceAuthenticationClientTest { private AuthSessionCoordinator mAuthSessionCoordinator; @Captor private ArgumentCaptor<OperationContextExt> mOperationContextCaptor; + @Captor + private ArgumentCaptor<Consumer<OperationContext>> mContextInjector; @Rule public final MockitoRule mockito = MockitoJUnit.rule(); @@ -145,6 +148,28 @@ public class FaceAuthenticationClientTest { } @Test + public void notifyHalWhenContextChanges() throws RemoteException { + final FaceAuthenticationClient client = createClient(); + client.start(mCallback); + + final ArgumentCaptor<OperationContext> captor = + ArgumentCaptor.forClass(OperationContext.class); + verify(mHal).authenticateWithContext(eq(OP_ID), captor.capture()); + OperationContext opContext = captor.getValue(); + + // fake an update to the context + verify(mBiometricContext).subscribe( + mOperationContextCaptor.capture(), mContextInjector.capture()); + assertThat(opContext).isSameInstanceAs( + mOperationContextCaptor.getValue().toAidlContext()); + mContextInjector.getValue().accept(opContext); + verify(mHal).onContextChanged(same(opContext)); + + client.stopHalOperation(); + verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); + } + + @Test public void cancelsAuthWhenNotInForeground() throws Exception { final ActivityManager.RunningTaskInfo topTask = new ActivityManager.RunningTaskInfo(); topTask.topActivity = new ComponentName("other", "thing"); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceDetectClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceDetectClientTest.java index 0abfa7e6546d..c26eee97fbfe 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceDetectClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceDetectClientTest.java @@ -56,6 +56,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import java.util.function.Consumer; + @Presubmit @SmallTest public class FaceDetectClientTest { @@ -84,6 +86,8 @@ public class FaceDetectClientTest { private Sensor.HalSessionCallback mHalSessionCallback; @Captor private ArgumentCaptor<OperationContextExt> mOperationContextCaptor; + @Captor + private ArgumentCaptor<Consumer<OperationContext>> mContextInjector; @Rule public final MockitoRule mockito = MockitoJUnit.rule(); @@ -121,6 +125,32 @@ public class FaceDetectClientTest { verify(mHal, never()).detectInteraction(); } + @Test + public void notifyHalWhenContextChanges() throws RemoteException { + final FaceDetectClient client = createClient(); + client.start(mCallback); + + final ArgumentCaptor<OperationContext> captor = + ArgumentCaptor.forClass(OperationContext.class); + verify(mHal).detectInteractionWithContext(captor.capture()); + OperationContext opContext = captor.getValue(); + + // fake an update to the context + verify(mBiometricContext).subscribe( + mOperationContextCaptor.capture(), mContextInjector.capture()); + assertThat(opContext).isSameInstanceAs( + mOperationContextCaptor.getValue().toAidlContext()); + mContextInjector.getValue().accept(opContext); + verify(mHal).onContextChanged(same(opContext)); + + client.stopHalOperation(); + verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); + } + + private FaceDetectClient createClient() throws RemoteException { + return createClient(100 /* version */); + } + private FaceDetectClient createClient(int version) throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClientTest.java index d75aca1ce480..54d116f07805 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClientTest.java @@ -16,6 +16,8 @@ package com.android.server.biometrics.sensors.face.aidl; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyByte; @@ -25,6 +27,7 @@ import static org.mockito.Mockito.same; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.hardware.biometrics.common.OperationContext; import android.hardware.biometrics.face.ISession; import android.hardware.face.Face; import android.os.IBinder; @@ -52,6 +55,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import java.util.function.Consumer; + @Presubmit @SmallTest public class FaceEnrollClientTest { @@ -81,6 +86,8 @@ public class FaceEnrollClientTest { private Sensor.HalSessionCallback mHalSessionCallback; @Captor private ArgumentCaptor<OperationContextExt> mOperationContextCaptor; + @Captor + private ArgumentCaptor<Consumer<OperationContext>> mContextInjector; @Rule public final MockitoRule mockito = MockitoJUnit.rule(); @@ -108,11 +115,38 @@ public class FaceEnrollClientTest { InOrder order = inOrder(mHal, mBiometricContext); order.verify(mBiometricContext).updateContext( mOperationContextCaptor.capture(), anyBoolean()); - order.verify(mHal).enrollWithContext(any(), anyByte(), any(), any(), - same(mOperationContextCaptor.getValue().toAidlContext())); + + final OperationContext aidlContext = mOperationContextCaptor.getValue().toAidlContext(); + order.verify(mHal).enrollWithContext(any(), anyByte(), any(), any(), same(aidlContext)); verify(mHal, never()).enroll(any(), anyByte(), any(), any()); } + @Test + public void notifyHalWhenContextChanges() throws RemoteException { + final FaceEnrollClient client = createClient(); + client.start(mCallback); + + final ArgumentCaptor<OperationContext> captor = + ArgumentCaptor.forClass(OperationContext.class); + verify(mHal).enrollWithContext(any(), anyByte(), any(), any(), captor.capture()); + OperationContext opContext = captor.getValue(); + + // fake an update to the context + verify(mBiometricContext).subscribe( + mOperationContextCaptor.capture(), mContextInjector.capture()); + assertThat(opContext).isSameInstanceAs( + mOperationContextCaptor.getValue().toAidlContext()); + mContextInjector.getValue().accept(opContext); + verify(mHal).onContextChanged(same(opContext)); + + client.stopHalOperation(); + verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); + } + + private FaceEnrollClient createClient() throws RemoteException { + return createClient(200 /* version */); + } + private FaceEnrollClient createClient(int version) throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistryTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistryTest.java index 13c3f64fec93..6e09069e654b 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistryTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceRegistryTest.java @@ -17,8 +17,6 @@ package com.android.server.biometrics.sensors.fingerprint; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; -import static android.hardware.biometrics.BiometricManager.Authenticators.BIOMETRIC_STRONG; -import static android.hardware.biometrics.BiometricManager.Authenticators.BIOMETRIC_WEAK; import static android.hardware.biometrics.SensorProperties.STRENGTH_STRONG; import static android.hardware.biometrics.SensorProperties.STRENGTH_WEAK; @@ -70,9 +68,7 @@ public class FingerprintServiceRegistryTest { @Mock private ServiceProvider mProvider2; @Captor - private ArgumentCaptor<Integer> mIdCaptor; - @Captor - private ArgumentCaptor<Integer> mStrengthCaptor; + private ArgumentCaptor<FingerprintSensorPropertiesInternal> mPropsCaptor; private FingerprintSensorPropertiesInternal mProvider1Props; private FingerprintSensorPropertiesInternal mProvider2Props; @@ -82,11 +78,11 @@ public class FingerprintServiceRegistryTest { public void setup() { mProvider1Props = new FingerprintSensorPropertiesInternal(SENSOR_ID_1, STRENGTH_WEAK, 5 /* maxEnrollmentsPerUser */, - List.of(), FingerprintSensorProperties.TYPE_UDFPS_OPTICAL, + List.of() /* componentInfo */, FingerprintSensorProperties.TYPE_UDFPS_OPTICAL, false /* resetLockoutRequiresHardwareAuthToken */); mProvider2Props = new FingerprintSensorPropertiesInternal(SENSOR_ID_2, STRENGTH_STRONG, 5 /* maxEnrollmentsPerUser */, - List.of(), FingerprintSensorProperties.TYPE_UNKNOWN, + List.of() /* componentInfo */, FingerprintSensorProperties.TYPE_UNKNOWN, false /* resetLockoutRequiresHardwareAuthToken */); when(mProvider1.getSensorProperties()).thenReturn(List.of(mProvider1Props)); @@ -103,10 +99,9 @@ public class FingerprintServiceRegistryTest { assertThat(mRegistry.getProviders()).containsExactly(mProvider1, mProvider2); assertThat(mRegistry.getAllProperties()).containsExactly(mProvider1Props, mProvider2Props); verify(mBiometricService, times(2)).registerAuthenticator( - mIdCaptor.capture(), eq(TYPE_FINGERPRINT), mStrengthCaptor.capture(), any()); - assertThat(mIdCaptor.getAllValues()).containsExactly(SENSOR_ID_1, SENSOR_ID_2); - assertThat(mStrengthCaptor.getAllValues()) - .containsExactly(BIOMETRIC_WEAK, BIOMETRIC_STRONG); + eq(TYPE_FINGERPRINT), mPropsCaptor.capture(), any()); + assertThat(mPropsCaptor.getAllValues()) + .containsExactly(mProvider1Props, mProvider2Props); } @Test diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java index 25a700a5275f..1089c07e6787 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java @@ -110,15 +110,17 @@ public class FingerprintServiceTest { private final FingerprintSensorPropertiesInternal mSensorPropsDefault = new FingerprintSensorPropertiesInternal(ID_DEFAULT, STRENGTH_STRONG, 2 /* maxEnrollmentsPerUser */, - List.of(), + List.of() /* componentInfo */, TYPE_REAR, false /* resetLockoutRequiresHardwareAuthToken */); private final FingerprintSensorPropertiesInternal mSensorPropsVirtual = new FingerprintSensorPropertiesInternal(ID_VIRTUAL, STRENGTH_STRONG, 2 /* maxEnrollmentsPerUser */, - List.of(), + List.of() /* componentInfo */, TYPE_UDFPS_OPTICAL, false /* resetLockoutRequiresHardwareAuthToken */); + @Captor + private ArgumentCaptor<FingerprintSensorPropertiesInternal> mPropsCaptor; private FingerprintService mService; @Before @@ -166,7 +168,8 @@ public class FingerprintServiceTest { mService.mServiceWrapper.registerAuthenticators(HIDL_AUTHENTICATORS); waitForRegistration(); - verify(mIBiometricService).registerAuthenticator(eq(ID_DEFAULT), anyInt(), anyInt(), any()); + verify(mIBiometricService).registerAuthenticator(anyInt(), mPropsCaptor.capture(), any()); + assertThat(mPropsCaptor.getAllValues()).containsExactly(mSensorPropsDefault); } @Test @@ -178,7 +181,8 @@ public class FingerprintServiceTest { mService.mServiceWrapper.registerAuthenticators(HIDL_AUTHENTICATORS); waitForRegistration(); - verify(mIBiometricService).registerAuthenticator(eq(ID_VIRTUAL), anyInt(), anyInt(), any()); + verify(mIBiometricService).registerAuthenticator(anyInt(), mPropsCaptor.capture(), any()); + assertThat(mPropsCaptor.getAllValues()).containsExactly(mSensorPropsVirtual); } @Test @@ -188,7 +192,8 @@ public class FingerprintServiceTest { mService.mServiceWrapper.registerAuthenticators(HIDL_AUTHENTICATORS); waitForRegistration(); - verify(mIBiometricService).registerAuthenticator(eq(ID_VIRTUAL), anyInt(), anyInt(), any()); + verify(mIBiometricService).registerAuthenticator(anyInt(), mPropsCaptor.capture(), any()); + assertThat(mPropsCaptor.getAllValues()).containsExactly(mSensorPropsVirtual); } private void waitForRegistration() throws Exception { diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java index c6645003c7e2..f8f40fe44457 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java @@ -338,7 +338,7 @@ public class FingerprintAuthenticationClientTest { assertThat(opContext).isSameInstanceAs( mOperationContextCaptor.getValue().toAidlContext()); mContextInjector.getValue().accept(opContext); - verify(mHal).onContextChanged(eq(opContext)); + verify(mHal).onContextChanged(same(opContext)); client.stopHalOperation(); verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java index c20cc392f5c0..6dfdd8712d66 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java @@ -55,6 +55,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import java.util.function.Consumer; + @Presubmit @SmallTest public class FingerprintDetectClientTest { @@ -83,6 +85,8 @@ public class FingerprintDetectClientTest { private Sensor.HalSessionCallback mHalSessionCallback; @Captor private ArgumentCaptor<OperationContextExt> mOperationContextCaptor; + @Captor + private ArgumentCaptor<Consumer<OperationContext>> mContextInjector; @Rule public final MockitoRule mockito = MockitoJUnit.rule(); @@ -121,6 +125,32 @@ public class FingerprintDetectClientTest { verify(mHal, never()).detectInteraction(); } + @Test + public void notifyHalWhenContextChanges() throws RemoteException { + final FingerprintDetectClient client = createClient(); + client.start(mCallback); + + final ArgumentCaptor<OperationContext> captor = + ArgumentCaptor.forClass(OperationContext.class); + verify(mHal).detectInteractionWithContext(captor.capture()); + OperationContext opContext = captor.getValue(); + + // fake an update to the context + verify(mBiometricContext).subscribe( + mOperationContextCaptor.capture(), mContextInjector.capture()); + assertThat(opContext).isSameInstanceAs( + mOperationContextCaptor.getValue().toAidlContext()); + mContextInjector.getValue().accept(opContext); + verify(mHal).onContextChanged(same(opContext)); + + client.stopHalOperation(); + verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); + } + + private FingerprintDetectClient createClient() throws RemoteException { + return createClient(200 /* version */); + } + private FingerprintDetectClient createClient(int version) throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java index 7646c401193f..3c89278c69b0 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java @@ -16,8 +16,6 @@ package com.android.server.biometrics.sensors.fingerprint.aidl; -import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED; - import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; @@ -110,8 +108,6 @@ public class FingerprintEnrollClientTest { @Captor private ArgumentCaptor<OperationContextExt> mOperationContextCaptor; @Captor - private ArgumentCaptor<PointerContext> mPointerContextCaptor; - @Captor private ArgumentCaptor<Consumer<OperationContext>> mContextInjector; @Rule @@ -246,7 +242,7 @@ public class FingerprintEnrollClientTest { mOperationContextCaptor.capture(), mContextInjector.capture()); mContextInjector.getValue().accept( mOperationContextCaptor.getValue().toAidlContext()); - verify(mHal).onContextChanged(eq(opContext)); + verify(mHal).onContextChanged(same(opContext)); client.stopHalOperation(); verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); diff --git a/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java b/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java index fc251526476e..3bef413a3e72 100644 --- a/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java @@ -126,7 +126,7 @@ public class AutomaticBrightnessControllerTest { return mClock::now; } - }, // pass in test looper instead, pass in offsetable clock + }, // pass in test looper instead, pass in offsettable clock () -> { }, mTestLooper.getLooper(), mSensorManager, lightSensor, mBrightnessMappingStrategy, LIGHT_SENSOR_WARMUP_TIME, BRIGHTNESS_MIN_FLOAT, BRIGHTNESS_MAX_FLOAT, DOZE_SCALE_FACTOR, LIGHT_SENSOR_RATE, @@ -300,6 +300,179 @@ public class AutomaticBrightnessControllerTest { } @Test + public void testShortTermModelTimesOut() throws Exception { + ArgumentCaptor<SensorEventListener> listenerCaptor = + ArgumentCaptor.forClass(SensorEventListener.class); + verify(mSensorManager).registerListener(listenerCaptor.capture(), eq(mLightSensor), + eq(INITIAL_LIGHT_SENSOR_RATE * 1000), any(Handler.class)); + SensorEventListener listener = listenerCaptor.getValue(); + + // Sensor reads 123 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123)); + // User sets brightness to 100 + mController.configure(AUTO_BRIGHTNESS_ENABLED, /* configuration= */ null, + /* brightness= */ 0.5f, /* userChangedBrightness= */ true, /* adjustment= */ 0, + /* userChanged= */ false, DisplayPowerRequest.POLICY_BRIGHT, + /* shouldResetShortTermModel= */ true); + + when(mBrightnessMappingStrategy.getShortTermModelTimeout()).thenReturn(2000L); + + mController.switchToIdleMode(); + when(mIdleBrightnessMappingStrategy.isForIdleMode()).thenReturn(true); + when(mBrightnessMappingStrategy.shouldResetShortTermModel( + 123f, 0.5f)).thenReturn(true); + + // Sensor reads 1000 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000)); + mTestLooper.moveTimeForward( + mBrightnessMappingStrategy.getShortTermModelTimeout() + 1000); + mTestLooper.dispatchAll(); + + mController.switchToInteractiveScreenBrightnessMode(); + mTestLooper.moveTimeForward(4000); + mTestLooper.dispatchAll(); + + // Verify only happens on the first configure. (i.e. not again when switching back) + // Intentionally using any() to ensure it's not called whatsoever. + verify(mBrightnessMappingStrategy, times(1)) + .addUserDataPoint(123.0f, 0.5f); + verify(mBrightnessMappingStrategy, times(1)) + .addUserDataPoint(anyFloat(), anyFloat()); + } + + @Test + public void testShortTermModelDoesntTimeOut() throws Exception { + ArgumentCaptor<SensorEventListener> listenerCaptor = + ArgumentCaptor.forClass(SensorEventListener.class); + verify(mSensorManager).registerListener(listenerCaptor.capture(), eq(mLightSensor), + eq(INITIAL_LIGHT_SENSOR_RATE * 1000), any(Handler.class)); + SensorEventListener listener = listenerCaptor.getValue(); + + // Sensor reads 123 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123)); + // User sets brightness to 100 + mController.configure(AUTO_BRIGHTNESS_ENABLED, null /* configuration= */, + 0.51f /* brightness= */, true /* userChangedBrightness= */, 0 /* adjustment= */, + false /* userChanged= */, DisplayPowerRequest.POLICY_BRIGHT, + /* shouldResetShortTermModel= */ true); + + when(mBrightnessMappingStrategy.shouldResetShortTermModel( + anyFloat(), anyFloat())).thenReturn(true); + when(mBrightnessMappingStrategy.getShortTermModelTimeout()).thenReturn(2000L); + when(mBrightnessMappingStrategy.getUserBrightness()).thenReturn(0.51f); + when(mBrightnessMappingStrategy.getUserLux()).thenReturn(123.0f); + + mController.switchToIdleMode(); + when(mIdleBrightnessMappingStrategy.isForIdleMode()).thenReturn(true); + + // Time does not move forward, since clock is doesn't increment naturally. + mTestLooper.dispatchAll(); + + // Sensor reads 100000 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 678910)); + mController.switchToInteractiveScreenBrightnessMode(); + + // Verify short term model is not reset. + verify(mBrightnessMappingStrategy, never()).clearUserDataPoints(); + + // Verify that we add the data point once when the user sets it, and again when we return + // interactive mode. + verify(mBrightnessMappingStrategy, times(2)) + .addUserDataPoint(123.0f, 0.51f); + } + + @Test + public void testShortTermModelIsRestoredWhenSwitchingWithinTimeout() throws Exception { + ArgumentCaptor<SensorEventListener> listenerCaptor = + ArgumentCaptor.forClass(SensorEventListener.class); + verify(mSensorManager).registerListener(listenerCaptor.capture(), eq(mLightSensor), + eq(INITIAL_LIGHT_SENSOR_RATE * 1000), any(Handler.class)); + SensorEventListener listener = listenerCaptor.getValue(); + + // Sensor reads 123 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123)); + // User sets brightness to 100 + mController.configure(AUTO_BRIGHTNESS_ENABLED, /* configuration= */ null, + /* brightness= */ 0.5f, /* userChangedBrightness= */ true, /* adjustment= */ 0, + /* userChanged= */ false, DisplayPowerRequest.POLICY_BRIGHT, + /* shouldResetShortTermModel= */ true); + + when(mBrightnessMappingStrategy.getShortTermModelTimeout()).thenReturn(2000L); + when(mBrightnessMappingStrategy.getUserBrightness()).thenReturn(0.5f); + when(mBrightnessMappingStrategy.getUserLux()).thenReturn(123f); + + mController.switchToIdleMode(); + when(mIdleBrightnessMappingStrategy.isForIdleMode()).thenReturn(true); + when(mIdleBrightnessMappingStrategy.getUserBrightness()).thenReturn(-1f); + when(mIdleBrightnessMappingStrategy.getUserLux()).thenReturn(-1f); + when(mBrightnessMappingStrategy.shouldResetShortTermModel( + 123f, 0.5f)).thenReturn(true); + + // Sensor reads 1000 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000)); + mTestLooper.moveTimeForward( + mBrightnessMappingStrategy.getShortTermModelTimeout() + 1000); + mTestLooper.dispatchAll(); + + mController.switchToInteractiveScreenBrightnessMode(); + mTestLooper.moveTimeForward(4000); + mTestLooper.dispatchAll(); + + // Verify only happens on the first configure. (i.e. not again when switching back) + // Intentionally using any() to ensure it's not called whatsoever. + verify(mBrightnessMappingStrategy, times(1)) + .addUserDataPoint(123.0f, 0.5f); + verify(mBrightnessMappingStrategy, times(1)) + .addUserDataPoint(anyFloat(), anyFloat()); + } + + @Test + public void testShortTermModelNotRestoredAfterTimeout() throws Exception { + ArgumentCaptor<SensorEventListener> listenerCaptor = + ArgumentCaptor.forClass(SensorEventListener.class); + verify(mSensorManager).registerListener(listenerCaptor.capture(), eq(mLightSensor), + eq(INITIAL_LIGHT_SENSOR_RATE * 1000), any(Handler.class)); + SensorEventListener listener = listenerCaptor.getValue(); + + // Sensor reads 123 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123)); + // User sets brightness to 100 + mController.configure(AUTO_BRIGHTNESS_ENABLED, /* configuration= */ null, + /* brightness= */ 0.5f, /* userChangedBrightness= */ true, /* adjustment= */ 0, + /* userChanged= */ false, DisplayPowerRequest.POLICY_BRIGHT, + /* shouldResetShortTermModel= */ true); + + when(mBrightnessMappingStrategy.getShortTermModelTimeout()).thenReturn(2000L); + + when(mBrightnessMappingStrategy.getUserBrightness()).thenReturn(0.5f); + when(mBrightnessMappingStrategy.getUserLux()).thenReturn(123f); + + mController.switchToIdleMode(); + when(mIdleBrightnessMappingStrategy.isForIdleMode()).thenReturn(true); + when(mIdleBrightnessMappingStrategy.getUserBrightness()).thenReturn(-1f); + when(mIdleBrightnessMappingStrategy.getUserLux()).thenReturn(-1f); + + when(mBrightnessMappingStrategy.shouldResetShortTermModel( + 123f, 0.5f)).thenReturn(true); + + // Sensor reads 1000 lux, + listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000)); + // Do not fast-forward time. + mTestLooper.dispatchAll(); + + mController.switchToInteractiveScreenBrightnessMode(); + // Do not fast-forward time + mTestLooper.dispatchAll(); + + // Verify this happens on the first configure and again when switching back + // Intentionally using any() to ensure it's not called any other times whatsoever. + verify(mBrightnessMappingStrategy, times(2)) + .addUserDataPoint(123.0f, 0.5f); + verify(mBrightnessMappingStrategy, times(2)) + .addUserDataPoint(anyFloat(), anyFloat()); + } + + @Test public void testSwitchToIdleMappingStrategy() throws Exception { ArgumentCaptor<SensorEventListener> listenerCaptor = ArgumentCaptor.forClass(SensorEventListener.class); @@ -326,6 +499,11 @@ public class AutomaticBrightnessControllerTest { // Called once for init, and once when switching, // setAmbientLux() is called twice and once in updateAutoBrightness() verify(mBrightnessMappingStrategy, times(5)).isForIdleMode(); + // Called when switching. + verify(mBrightnessMappingStrategy, times(1)).getShortTermModelTimeout(); + verify(mBrightnessMappingStrategy, times(1)).getUserBrightness(); + verify(mBrightnessMappingStrategy, times(1)).getUserLux(); + // Ensure, after switching, original BMS is not used anymore verifyNoMoreInteractions(mBrightnessMappingStrategy); diff --git a/services/tests/servicestests/src/com/android/server/display/BrightnessThrottlerTest.java b/services/tests/servicestests/src/com/android/server/display/BrightnessThrottlerTest.java index ffe2fec380a8..46956d74cc5c 100644 --- a/services/tests/servicestests/src/com/android/server/display/BrightnessThrottlerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/BrightnessThrottlerTest.java @@ -41,8 +41,8 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.BackgroundThread; import com.android.server.display.BrightnessThrottler.Injector; -import com.android.server.display.DisplayDeviceConfig.BrightnessThrottlingData; -import com.android.server.display.DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel; +import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData; +import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel; import com.android.server.display.mode.DisplayModeDirectorTest; import org.junit.Before; @@ -54,6 +54,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; @SmallTest @@ -92,7 +93,7 @@ public class BrightnessThrottlerTest { ///////////////// @Test - public void testBrightnessThrottlingData() { + public void testThermalBrightnessThrottlingData() { List<ThrottlingLevel> singleLevel = new ArrayList<>(); singleLevel.add(new ThrottlingLevel(PowerManager.THERMAL_STATUS_CRITICAL, 0.25f)); @@ -119,34 +120,32 @@ public class BrightnessThrottlerTest { PowerManager.BRIGHTNESS_MAX + EPSILON)); // Test invalid data - BrightnessThrottlingData data; - data = BrightnessThrottlingData.create((List<ThrottlingLevel>)null); + ThermalBrightnessThrottlingData data; + data = ThermalBrightnessThrottlingData.create((List<ThrottlingLevel>) null); assertEquals(data, null); - data = BrightnessThrottlingData.create((BrightnessThrottlingData)null); + data = ThermalBrightnessThrottlingData.create(new ArrayList<ThrottlingLevel>()); assertEquals(data, null); - data = BrightnessThrottlingData.create(new ArrayList<ThrottlingLevel>()); + data = ThermalBrightnessThrottlingData.create(unsortedThermalLevels); assertEquals(data, null); - data = BrightnessThrottlingData.create(unsortedThermalLevels); + data = ThermalBrightnessThrottlingData.create(unsortedBrightnessLevels); assertEquals(data, null); - data = BrightnessThrottlingData.create(unsortedBrightnessLevels); + data = ThermalBrightnessThrottlingData.create(unsortedLevels); assertEquals(data, null); - data = BrightnessThrottlingData.create(unsortedLevels); - assertEquals(data, null); - data = BrightnessThrottlingData.create(invalidLevel); + data = ThermalBrightnessThrottlingData.create(invalidLevel); assertEquals(data, null); // Test valid data - data = BrightnessThrottlingData.create(singleLevel); + data = ThermalBrightnessThrottlingData.create(singleLevel); assertNotEquals(data, null); assertThrottlingLevelsEquals(singleLevel, data.throttlingLevels); - data = BrightnessThrottlingData.create(validLevels); + data = ThermalBrightnessThrottlingData.create(validLevels); assertNotEquals(data, null); assertThrottlingLevelsEquals(validLevels, data.throttlingLevels); } @Test - public void testThrottlingUnsupported() throws Exception { + public void testThermalThrottlingUnsupported() { final BrightnessThrottler throttler = createThrottlerUnsupported(); assertFalse(throttler.deviceSupportsThrottling()); @@ -158,13 +157,13 @@ public class BrightnessThrottlerTest { } @Test - public void testThrottlingSingleLevel() throws Exception { + public void testThermalThrottlingSingleLevel() throws Exception { final ThrottlingLevel level = new ThrottlingLevel(PowerManager.THERMAL_STATUS_CRITICAL, 0.25f); List<ThrottlingLevel> levels = new ArrayList<>(); levels.add(level); - final BrightnessThrottlingData data = BrightnessThrottlingData.create(levels); + final ThermalBrightnessThrottlingData data = ThermalBrightnessThrottlingData.create(levels); final BrightnessThrottler throttler = createThrottlerSupported(data); assertTrue(throttler.deviceSupportsThrottling()); @@ -213,7 +212,7 @@ public class BrightnessThrottlerTest { } @Test - public void testThrottlingMultiLevel() throws Exception { + public void testThermalThrottlingMultiLevel() throws Exception { final ThrottlingLevel levelLo = new ThrottlingLevel(PowerManager.THERMAL_STATUS_MODERATE, 0.62f); final ThrottlingLevel levelHi = new ThrottlingLevel(PowerManager.THERMAL_STATUS_CRITICAL, @@ -222,7 +221,7 @@ public class BrightnessThrottlerTest { List<ThrottlingLevel> levels = new ArrayList<>(); levels.add(levelLo); levels.add(levelHi); - final BrightnessThrottlingData data = BrightnessThrottlingData.create(levels); + final ThermalBrightnessThrottlingData data = ThermalBrightnessThrottlingData.create(levels); final BrightnessThrottler throttler = createThrottlerSupported(data); assertTrue(throttler.deviceSupportsThrottling()); @@ -293,51 +292,32 @@ public class BrightnessThrottlerTest { assertEquals(BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE, throttler.getBrightnessMaxReason()); } - @Test public void testUpdateThrottlingData() throws Exception { + @Test public void testUpdateThermalThrottlingData() throws Exception { // Initialise brightness throttling levels // Ensure that they are overridden by setting the data through device config. final ThrottlingLevel level = new ThrottlingLevel(PowerManager.THERMAL_STATUS_CRITICAL, 0.25f); List<ThrottlingLevel> levels = new ArrayList<>(); levels.add(level); - final BrightnessThrottlingData data = BrightnessThrottlingData.create(levels); - mDeviceConfigFake.setBrightnessThrottlingData("123,1,critical,0.4"); + final ThermalBrightnessThrottlingData data = ThermalBrightnessThrottlingData.create(levels); + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,1,critical,0.4"); final BrightnessThrottler throttler = createThrottlerSupported(data); verify(mThermalServiceMock).registerThermalEventListenerWithType( mThermalEventListenerCaptor.capture(), eq(Temperature.TYPE_SKIN)); final IThermalEventListener listener = mThermalEventListenerCaptor.getValue(); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.4f); - // Set status too low to trigger throttling - listener.notifyThrottling(getSkinTemp(level.thermalStatus - 1)); - mTestLooper.dispatchAll(); - assertEquals(PowerManager.BRIGHTNESS_MAX, throttler.getBrightnessCap(), 0f); - assertFalse(throttler.isThrottled()); - - // Set status high enough to trigger throttling - listener.notifyThrottling(getSkinTemp(level.thermalStatus)); - mTestLooper.dispatchAll(); - assertEquals(0.4f, throttler.getBrightnessCap(), 0f); - assertTrue(throttler.isThrottled()); - - // Update thresholds - // This data is equivalent to the string "123,1,critical,0.8", passed below - final ThrottlingLevel newLevel = new ThrottlingLevel(PowerManager.THERMAL_STATUS_CRITICAL, - 0.8f); // Set new (valid) data from device config - mDeviceConfigFake.setBrightnessThrottlingData("123,1,critical,0.8"); - - // Set status too low to trigger throttling - listener.notifyThrottling(getSkinTemp(newLevel.thermalStatus - 1)); - mTestLooper.dispatchAll(); - assertEquals(PowerManager.BRIGHTNESS_MAX, throttler.getBrightnessCap(), 0f); - assertFalse(throttler.isThrottled()); - - // Set status high enough to trigger throttling - listener.notifyThrottling(getSkinTemp(newLevel.thermalStatus)); - mTestLooper.dispatchAll(); - assertEquals(newLevel.brightness, throttler.getBrightnessCap(), 0f); - assertTrue(throttler.isThrottled()); + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,1,critical,0.8"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.8f); + + mDeviceConfigFake.setThermalBrightnessThrottlingData( + "123,1,critical,0.75;123,1,critical,0.99,id_2"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.75f); + mDeviceConfigFake.setThermalBrightnessThrottlingData( + "123,1,critical,0.8,default;123,1,critical,0.99,id_2"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.8f); } @Test public void testInvalidThrottlingStrings() throws Exception { @@ -347,33 +327,54 @@ public class BrightnessThrottlerTest { 0.25f); List<ThrottlingLevel> levels = new ArrayList<>(); levels.add(level); - final BrightnessThrottlingData data = BrightnessThrottlingData.create(levels); + final ThermalBrightnessThrottlingData data = ThermalBrightnessThrottlingData.create(levels); final BrightnessThrottler throttler = createThrottlerSupported(data); verify(mThermalServiceMock).registerThermalEventListenerWithType( mThermalEventListenerCaptor.capture(), eq(Temperature.TYPE_SKIN)); final IThermalEventListener listener = mThermalEventListenerCaptor.getValue(); // None of these are valid so shouldn't override the original data - mDeviceConfigFake.setBrightnessThrottlingData("321,1,critical,0.4"); // Not the current id - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData("123,0,critical,0.4"); // Incorrect number - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData("123,2,critical,0.4"); // Incorrect number - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData("123,1,invalid,0.4"); // Invalid level - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData("123,1,critical,none"); // Invalid brightness - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData("123,1,critical,-3"); // Invalid brightness - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData("invalid string"); // Invalid format - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); - mDeviceConfigFake.setBrightnessThrottlingData(""); // Invalid format - testThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + + // Not the current id + mDeviceConfigFake.setThermalBrightnessThrottlingData("321,1,critical,0.4"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Incorrect number + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,0,critical,0.4"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Incorrect number + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,2,critical,0.4"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid level + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,1,invalid,0.4"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid brightness + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,1,critical,none"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid brightness + mDeviceConfigFake.setThermalBrightnessThrottlingData("123,1,critical,-3"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid format + mDeviceConfigFake.setThermalBrightnessThrottlingData("invalid string"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid format + mDeviceConfigFake.setThermalBrightnessThrottlingData(""); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid string format + mDeviceConfigFake.setThermalBrightnessThrottlingData( + "123,default,1,critical,0.75,1,critical,0.99"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid level string and number string + mDeviceConfigFake.setThermalBrightnessThrottlingData( + "123,1,1,critical,0.75,id_2,1,critical,0.99"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); + // Invalid format - (two default ids for same display) + mDeviceConfigFake.setThermalBrightnessThrottlingData( + "123,1,critical,0.75,default;123,1,critical,0.99"); + testThermalThrottling(throttler, listener, PowerManager.BRIGHTNESS_MAX, 0.25f); } - private void testThrottling(BrightnessThrottler throttler, IThermalEventListener listener, - float tooLowCap, float tooHighCap) throws Exception { + private void testThermalThrottling(BrightnessThrottler throttler, + IThermalEventListener listener, float tooLowCap, float tooHighCap) throws Exception { final ThrottlingLevel level = new ThrottlingLevel(PowerManager.THERMAL_STATUS_CRITICAL, tooHighCap); @@ -396,7 +397,7 @@ public class BrightnessThrottlerTest { 0.25f); List<ThrottlingLevel> levels = new ArrayList<>(); levels.add(level); - final BrightnessThrottlingData data = BrightnessThrottlingData.create(levels); + final ThermalBrightnessThrottlingData data = ThermalBrightnessThrottlingData.create(levels); // These are identical to the string set below final ThrottlingLevel levelSevere = new ThrottlingLevel(PowerManager.THERMAL_STATUS_SEVERE, @@ -406,7 +407,7 @@ public class BrightnessThrottlerTest { final ThrottlingLevel levelEmergency = new ThrottlingLevel( PowerManager.THERMAL_STATUS_EMERGENCY, 0.1f); - mDeviceConfigFake.setBrightnessThrottlingData( + mDeviceConfigFake.setThermalBrightnessThrottlingData( "123,3,severe,0.9,critical,0.5,emergency,0.1"); final BrightnessThrottler throttler = createThrottlerSupported(data); @@ -472,13 +473,18 @@ public class BrightnessThrottlerTest { } private BrightnessThrottler createThrottlerUnsupported() { - return new BrightnessThrottler(mInjectorMock, mHandler, mHandler, null, () -> {}, null); + return new BrightnessThrottler(mInjectorMock, mHandler, mHandler, + /* throttlingChangeCallback= */ () -> {}, /* uniqueDisplayId= */ null, + /* thermalThrottlingDataId= */ null, + /* thermalThrottlingDataMap= */ new HashMap<>(1)); } - private BrightnessThrottler createThrottlerSupported(BrightnessThrottlingData data) { + private BrightnessThrottler createThrottlerSupported(ThermalBrightnessThrottlingData data) { assertNotNull(data); + HashMap<String, ThermalBrightnessThrottlingData> throttlingDataMap = new HashMap<>(1); + throttlingDataMap.put("default", data); return new BrightnessThrottler(mInjectorMock, mHandler, BackgroundThread.getHandler(), - data, () -> {}, "123"); + () -> {}, "123", "default", throttlingDataMap); } private Temperature getSkinTemp(@ThrottlingStatus int status) { diff --git a/services/tests/servicestests/src/com/android/server/display/DeviceStateToLayoutMapTest.java b/services/tests/servicestests/src/com/android/server/display/DeviceStateToLayoutMapTest.java index a7d3df90751f..130e6ad91b49 100644 --- a/services/tests/servicestests/src/com/android/server/display/DeviceStateToLayoutMapTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DeviceStateToLayoutMapTest.java @@ -84,11 +84,11 @@ public class DeviceStateToLayoutMapTest { } @Test - public void testBrightnessThrottlingMapId() { + public void testThermalBrightnessThrottlingMapId() { Layout configLayout = mDeviceStateToLayoutMap.get(2); - assertEquals("concurrent1", configLayout.getAt(0).getBrightnessThrottlingMapId()); - assertEquals("concurrent2", configLayout.getAt(1).getBrightnessThrottlingMapId()); + assertEquals("concurrent1", configLayout.getAt(0).getThermalBrightnessThrottlingMapId()); + assertEquals("concurrent2", configLayout.getAt(1).getThermalBrightnessThrottlingMapId()); } @Test @@ -108,7 +108,7 @@ public class DeviceStateToLayoutMapTest { } @Test - public void testRefreshRateThermalThrottlingMapId() { + public void testThermalRefreshRateThrottlingMapId() { Layout configLayout = mDeviceStateToLayoutMap.get(4); assertEquals("test2", configLayout.getAt(0).getRefreshRateThermalThrottlingMapId()); @@ -124,12 +124,14 @@ public class DeviceStateToLayoutMapTest { /* isDefault= */ true, /* isEnabled= */ true, /* displayGroupName= */ null, mDisplayIdProducerMock, Layout.Display.POSITION_FRONT, Display.DEFAULT_DISPLAY, /* brightnessThrottlingMapId= */ "brightness1", - /* refreshRateZoneId= */ "zone1", /* refreshRateThermalThrottlingMapId= */ "rr1"); + /* refreshRateZoneId= */ "zone1", + /* refreshRateThermalThrottlingMapId= */ "rr1"); testLayout.createDisplayLocked(DisplayAddress.fromPhysicalDisplayId(678L), /* isDefault= */ false, /* isEnabled= */ false, /* displayGroupName= */ "group1", mDisplayIdProducerMock, Layout.Display.POSITION_REAR, Display.DEFAULT_DISPLAY, /* brightnessThrottlingMapId= */ "brightness2", - /* refreshRateZoneId= */ "zone2", /* refreshRateThermalThrottlingMapId= */ "rr2"); + /* refreshRateZoneId= */ "zone2", + /* refreshRateThermalThrottlingMapId= */ "rr2"); assertEquals(testLayout, configLayout); } @@ -147,7 +149,8 @@ public class DeviceStateToLayoutMapTest { layout.createDisplayLocked(DisplayAddress.fromPhysicalDisplayId(id), /* isDefault= */ false, enabled, group, mDisplayIdProducerMock, Layout.Display.POSITION_UNKNOWN, Display.DEFAULT_DISPLAY, /* brightnessThrottlingMapId= */ null, - /* refreshRateZoneId= */ null, /* refreshRateThermalThrottlingMapId= */ null); + /* refreshRateZoneId= */ null, + /* refreshRateThermalThrottlingMapId= */ null); } private void setupDeviceStateToLayoutMap() throws IOException { diff --git a/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java b/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java index 9fd647bb0b90..5837b21b89fd 100644 --- a/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java @@ -50,6 +50,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; @SmallTest @@ -186,50 +187,72 @@ public final class DisplayDeviceConfigTest { assertArrayEquals(new int[]{-1, 10, 20, 30, 40}, mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux()); - List<DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel> throttlingLevels = - new ArrayList(); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + List<DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel> + defaultThrottlingLevels = new ArrayList<>(); + defaultThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.light), 0.4f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + defaultThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.moderate), 0.3f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + defaultThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.severe), 0.2f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + defaultThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.critical), 0.1f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + defaultThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.emergency), 0.05f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + defaultThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.shutdown), 0.025f )); - assertEquals(new DisplayDeviceConfig.BrightnessThrottlingData(throttlingLevels), - mDisplayDeviceConfig.getBrightnessThrottlingData("default")); - throttlingLevels.clear(); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + DisplayDeviceConfig.ThermalBrightnessThrottlingData defaultThrottlingData = + new DisplayDeviceConfig.ThermalBrightnessThrottlingData(defaultThrottlingLevels); + + List<DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel> + concurrentThrottlingLevels = new ArrayList<>(); + concurrentThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.light), 0.2f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + concurrentThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.moderate), 0.15f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + concurrentThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.severe), 0.1f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + concurrentThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.critical), 0.05f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + concurrentThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.emergency), 0.025f )); - throttlingLevels.add(new DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel( + concurrentThrottlingLevels.add( + new DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel( DisplayDeviceConfig.convertThermalStatus(ThermalStatus.shutdown), 0.0125f )); - assertEquals(new DisplayDeviceConfig.BrightnessThrottlingData(throttlingLevels), - mDisplayDeviceConfig.getBrightnessThrottlingData("concurrent")); + DisplayDeviceConfig.ThermalBrightnessThrottlingData concurrentThrottlingData = + new DisplayDeviceConfig.ThermalBrightnessThrottlingData(concurrentThrottlingLevels); + + HashMap<String, DisplayDeviceConfig.ThermalBrightnessThrottlingData> throttlingDataMap = + new HashMap<>(2); + throttlingDataMap.put("default", defaultThrottlingData); + throttlingDataMap.put("concurrent", concurrentThrottlingData); + + assertEquals(throttlingDataMap, + mDisplayDeviceConfig.getThermalBrightnessThrottlingDataMapByThrottlingId()); assertNotNull(mDisplayDeviceConfig.getHostUsiVersion()); assertEquals(mDisplayDeviceConfig.getHostUsiVersion().getMajorVersion(), 2); @@ -246,8 +269,7 @@ public final class DisplayDeviceConfigTest { mDisplayDeviceConfig.getHdrBrightnessFromSdr(0.62f, 1.25f), SMALL_DELTA); - - // Todo: Add asserts for BrightnessThrottlingData, DensityMapping, + // Todo: Add asserts for DensityMapping, // HighBrightnessModeData AmbientLightSensor, RefreshRateLimitations and ProximitySensor. } @@ -329,16 +351,16 @@ public final class DisplayDeviceConfigTest { assertArrayEquals(mDisplayDeviceConfig.getHighAmbientBrightnessThresholds(), HIGH_AMBIENT_THRESHOLD_OF_PEAK_REFRESH_RATE); - // Todo: Add asserts for BrightnessThrottlingData, DensityMapping, + // Todo: Add asserts for ThermalBrightnessThrottlingData, DensityMapping, // HighBrightnessModeData AmbientLightSensor, RefreshRateLimitations and ProximitySensor. } @Test - public void testRefreshRateThermalThrottlingFromDisplayConfig() throws IOException { + public void testThermalRefreshRateThrottlingFromDisplayConfig() throws IOException { setupDisplayDeviceConfigFromDisplayConfigFile(); SparseArray<SurfaceControl.RefreshRateRange> defaultMap = - mDisplayDeviceConfig.getRefreshRateThrottlingData(null); + mDisplayDeviceConfig.getThermalRefreshRateThrottlingData(null); assertNotNull(defaultMap); assertEquals(2, defaultMap.size()); assertEquals(30, defaultMap.get(Temperature.THROTTLING_CRITICAL).min, SMALL_DELTA); @@ -347,7 +369,7 @@ public final class DisplayDeviceConfigTest { assertEquals(30, defaultMap.get(Temperature.THROTTLING_SHUTDOWN).max, SMALL_DELTA); SparseArray<SurfaceControl.RefreshRateRange> testMap = - mDisplayDeviceConfig.getRefreshRateThrottlingData("test"); + mDisplayDeviceConfig.getThermalRefreshRateThrottlingData("test"); assertNotNull(testMap); assertEquals(1, testMap.size()); assertEquals(60, testMap.get(Temperature.THROTTLING_EMERGENCY).min, SMALL_DELTA); diff --git a/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java index b5237a5b34fd..acfc0736282e 100644 --- a/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java @@ -37,6 +37,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; @@ -289,7 +290,7 @@ public class DisplayManagerServiceTest { } @Test - public void testCreateVirtualDisplay_sentToInputManager() { + public void testCreateVirtualDisplay_sentToInputManager() throws RemoteException { // This is to update the display device config such that DisplayManagerService can ignore // the usage of SensorManager, which is available only after the PowerManagerService // is ready. @@ -316,7 +317,8 @@ public class DisplayManagerServiceTest { builder.setFlags(flags); int displayId = bs.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); @@ -442,7 +444,8 @@ public class DisplayManagerServiceTest { builder.setUniqueId(uniqueId); int displayId = bs.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); @@ -455,7 +458,7 @@ public class DisplayManagerServiceTest { } @Test - public void testCreateVirtualDisplayOwnFocus() { + public void testCreateVirtualDisplayOwnFocus() throws RemoteException { DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); registerDefaultDisplays(displayManager); @@ -479,7 +482,8 @@ public class DisplayManagerServiceTest { builder.setUniqueId(uniqueId); int displayId = bs.createVirtualDisplay(builder.build(), /* callback= */ mMockAppToken, /* projection= */ null, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); @@ -492,7 +496,7 @@ public class DisplayManagerServiceTest { } @Test - public void testCreateVirtualDisplayOwnFocus_nonTrustedDisplay() { + public void testCreateVirtualDisplayOwnFocus_nonTrustedDisplay() throws RemoteException { DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); registerDefaultDisplays(displayManager); @@ -513,7 +517,8 @@ public class DisplayManagerServiceTest { builder.setUniqueId(uniqueId); int displayId = bs.createVirtualDisplay(builder.build(), /* callback= */ mMockAppToken, /* projection= */ null, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); @@ -755,7 +760,8 @@ public class DisplayManagerServiceTest { builder.setUniqueId(uniqueId); final int firstDisplayId = binderService.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); // The second virtual display requests to mirror the first virtual display. final String uniqueId2 = "uniqueId --- displayIdToMirrorTest #2"; @@ -767,7 +773,8 @@ public class DisplayManagerServiceTest { final int secondDisplayId = binderService.createVirtualDisplay(builder2.build(), mMockAppToken2 /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); // flush the handler @@ -805,7 +812,8 @@ public class DisplayManagerServiceTest { virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); int displayGroupId1 = localService.getDisplayInfo(displayId1).displayGroupId; // Create a second virtual display. This should be added to the previously created display @@ -821,7 +829,8 @@ public class DisplayManagerServiceTest { virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); int displayGroupId2 = localService.getDisplayInfo(displayId2).displayGroupId; assertEquals( @@ -859,7 +868,8 @@ public class DisplayManagerServiceTest { virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); int displayGroupId1 = localService.getDisplayInfo(displayId1).displayGroupId; // Create a second virtual display. With the flag VIRTUAL_DISPLAY_FLAG_OWN_DISPLAY_GROUP, @@ -878,7 +888,8 @@ public class DisplayManagerServiceTest { virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); int displayGroupId2 = localService.getDisplayInfo(displayId2).displayGroupId; assertNotEquals( @@ -922,7 +933,8 @@ public class DisplayManagerServiceTest { virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); // Check that FLAG_ALWAYS_UNLOCKED is set. assertNotEquals( @@ -948,7 +960,8 @@ public class DisplayManagerServiceTest { virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); // Check that FLAG_ALWAYS_UNLOCKED is set. assertNotEquals( @@ -972,7 +985,8 @@ public class DisplayManagerServiceTest { null /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); // Check that FLAG_ALWAYS_UNLOCKED is not set. assertEquals( @@ -1004,7 +1018,8 @@ public class DisplayManagerServiceTest { .setFlags(VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY); final int firstDisplayId = binderService.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); // The second virtual display requests to mirror the first virtual display. final String uniqueId2 = "uniqueId --- displayIdToMirrorTest #2"; @@ -1016,7 +1031,8 @@ public class DisplayManagerServiceTest { final int secondDisplayId = binderService.createVirtualDisplay(builder2.build(), mMockAppToken2 /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); // flush the handler @@ -1032,14 +1048,50 @@ public class DisplayManagerServiceTest { } @Test + public void testCreateVirtualDisplay_isValidProjection_notValid() + throws RemoteException { + when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); + IMediaProjection projection = mock(IMediaProjection.class); + doReturn(false).when(projection).isValid(); + when(mMockProjectionService + .setContentRecordingSession(any(ContentRecordingSession.class), eq(projection))) + .thenReturn(true); + doReturn(true).when(mMockProjectionService).isCurrentProjection(eq(projection)); + + final VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder( + VIRTUAL_DISPLAY_NAME, 600, 800, 320); + builder.setUniqueId("uniqueId --- isValid false"); + + DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + registerDefaultDisplays(displayManager); + displayManager.windowManagerAndInputReady(); + + // Pass in a non-null projection. + DisplayManagerService.BinderService binderService = displayManager.new BinderService(); + final int displayId = binderService.createVirtualDisplay(builder.build(), + mMockAppToken /* callback */, projection, PACKAGE_NAME); + + // VirtualDisplay is created for mirroring. + assertThat(displayId).isNotEqualTo(Display.INVALID_DISPLAY); + verify(mMockProjectionService, atLeastOnce()).setContentRecordingSession( + any(ContentRecordingSession.class), nullable(IMediaProjection.class)); + // But mirroring doesn't begin. + verify(mMockProjectionService, atLeastOnce()).setContentRecordingSession( + mContentRecordingSessionCaptor.capture(), nullable(IMediaProjection.class)); + ContentRecordingSession session = mContentRecordingSessionCaptor.getValue(); + assertThat(session.isWaitingToRecord()).isTrue(); + } + + @Test public void testCreateVirtualDisplay_setContentRecordingSessionSuccess() throws RemoteException { final int displayToRecord = 50; when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); - when(mMockWindowManagerInternal - .setContentRecordingSession(any(ContentRecordingSession.class))) - .thenReturn(true); IMediaProjection projection = mock(IMediaProjection.class); + doReturn(true).when(projection).isValid(); + when(mMockProjectionService + .setContentRecordingSession(any(ContentRecordingSession.class), eq(projection))) + .thenReturn(true); doReturn(true).when(mMockProjectionService).isCurrentProjection(eq(projection)); final VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder( @@ -1056,21 +1108,23 @@ public class DisplayManagerServiceTest { mMockAppToken /* callback */, projection, PACKAGE_NAME); assertThat(displayId).isNotEqualTo(Display.INVALID_DISPLAY); - verify(mMockWindowManagerInternal, atLeastOnce()).setContentRecordingSession( - mContentRecordingSessionCaptor.capture()); + verify(mMockProjectionService, atLeastOnce()).setContentRecordingSession( + mContentRecordingSessionCaptor.capture(), nullable(IMediaProjection.class)); ContentRecordingSession session = mContentRecordingSessionCaptor.getValue(); assertThat(session.getContentToRecord()).isEqualTo(RECORD_CONTENT_DISPLAY); assertThat(session.getVirtualDisplayId()).isEqualTo(displayId); assertThat(session.getDisplayToRecord()).isEqualTo(displayToRecord); + assertThat(session.isWaitingToRecord()).isFalse(); } @Test public void testCreateVirtualDisplay_setContentRecordingSessionFail() throws RemoteException { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); - when(mMockWindowManagerInternal - .setContentRecordingSession(any(ContentRecordingSession.class))) - .thenReturn(false); IMediaProjection projection = mock(IMediaProjection.class); + doReturn(true).when(projection).isValid(); + when(mMockProjectionService + .setContentRecordingSession(any(ContentRecordingSession.class), eq(projection))) + .thenReturn(false); doReturn(true).when(mMockProjectionService).isCurrentProjection(eq(projection)); final VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder( @@ -1093,12 +1147,12 @@ public class DisplayManagerServiceTest { throws RemoteException { final int displayToRecord = 50; when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); - when(mMockWindowManagerInternal - .setContentRecordingSession(any(ContentRecordingSession.class))) - .thenReturn(true); IMediaProjection projection = mock(IMediaProjection.class); + doReturn(true).when(projection).isValid(); + when(mMockProjectionService + .setContentRecordingSession(any(ContentRecordingSession.class), eq(projection))) + .thenReturn(true); doReturn(mock(IBinder.class)).when(projection).getLaunchCookie(); - doReturn(true).when(mMockProjectionService).isCurrentProjection(eq(projection)); final VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder( @@ -1115,8 +1169,8 @@ public class DisplayManagerServiceTest { mMockAppToken /* callback */, projection, PACKAGE_NAME); assertThat(displayId).isNotEqualTo(Display.INVALID_DISPLAY); - verify(mMockWindowManagerInternal, atLeastOnce()).setContentRecordingSession( - mContentRecordingSessionCaptor.capture()); + verify(mMockProjectionService, atLeastOnce()).setContentRecordingSession( + mContentRecordingSessionCaptor.capture(), nullable(IMediaProjection.class)); ContentRecordingSession session = mContentRecordingSessionCaptor.getValue(); assertThat(session.getContentToRecord()).isEqualTo(RECORD_CONTENT_TASK); assertThat(session.getVirtualDisplayId()).isEqualTo(displayId); @@ -1124,7 +1178,8 @@ public class DisplayManagerServiceTest { } @Test - public void testCreateVirtualDisplay_setContentRecordingSession_noProjection_noFlags() { + public void testCreateVirtualDisplay_setContentRecordingSession_noProjection_noFlags() + throws RemoteException { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); // Set no flags for the VirtualDisplay. @@ -1143,12 +1198,13 @@ public class DisplayManagerServiceTest { // VirtualDisplay is created but not for mirroring. assertThat(displayId).isNotEqualTo(Display.INVALID_DISPLAY); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession( - any(ContentRecordingSession.class)); + verify(mMockProjectionService, never()).setContentRecordingSession( + any(ContentRecordingSession.class), nullable(IMediaProjection.class)); } @Test - public void testCreateVirtualDisplay_setContentRecordingSession_noProjection_noMirroringFlag() { + public void testCreateVirtualDisplay_setContentRecordingSession_noProjection_noMirroringFlag() + throws RemoteException { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); // Set a non-mirroring flag for the VirtualDisplay. @@ -1168,18 +1224,19 @@ public class DisplayManagerServiceTest { // VirtualDisplay is created but not for mirroring. assertThat(displayId).isNotEqualTo(Display.INVALID_DISPLAY); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession( - any(ContentRecordingSession.class)); + verify(mMockProjectionService, never()).setContentRecordingSession( + any(ContentRecordingSession.class), nullable(IMediaProjection.class)); } @Test public void testCreateVirtualDisplay_setContentRecordingSession_projection_noMirroringFlag() throws RemoteException { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); - when(mMockWindowManagerInternal - .setContentRecordingSession(any(ContentRecordingSession.class))) - .thenReturn(true); IMediaProjection projection = mock(IMediaProjection.class); + doReturn(true).when(projection).isValid(); + when(mMockProjectionService + .setContentRecordingSession(any(ContentRecordingSession.class), eq(projection))) + .thenReturn(true); doReturn(true).when(mMockProjectionService).isCurrentProjection(eq(projection)); // Set no flags for the VirtualDisplay. @@ -1198,8 +1255,8 @@ public class DisplayManagerServiceTest { // VirtualDisplay is created for mirroring. assertThat(displayId).isNotEqualTo(Display.INVALID_DISPLAY); - verify(mMockWindowManagerInternal, atLeastOnce()).setContentRecordingSession( - any(ContentRecordingSession.class)); + verify(mMockProjectionService, atLeastOnce()).setContentRecordingSession( + any(ContentRecordingSession.class), nullable(IMediaProjection.class)); } /** @@ -1228,7 +1285,8 @@ public class DisplayManagerServiceTest { builder.setUniqueId(uniqueId); final int displayId = binderService.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); @@ -1243,7 +1301,8 @@ public class DisplayManagerServiceTest { * ADD_TRUSTED_DISPLAY is granted. */ @Test - public void testOwnDisplayGroup_allowCreationWithAddTrustedDisplayPermission() { + public void testOwnDisplayGroup_allowCreationWithAddTrustedDisplayPermission() + throws RemoteException { DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); registerDefaultDisplays(displayManager); @@ -1261,7 +1320,8 @@ public class DisplayManagerServiceTest { int displayId = bs.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); displayManager.getDisplayHandler().runWithScissors(() -> {}, 0 /* now */); DisplayDeviceInfo ddi = displayManager.getDisplayDeviceInfoInternal(displayId); @@ -1329,7 +1389,8 @@ public class DisplayManagerServiceTest { int displayId = localService.createVirtualDisplay(builder.build(), mMockAppToken /* callback */, virtualDevice /* virtualDeviceToken */, mock(DisplayWindowPolicyController.class), PACKAGE_NAME); - verify(mMockWindowManagerInternal, never()).setContentRecordingSession(Mockito.any()); + verify(mMockProjectionService, never()).setContentRecordingSession(any(), + nullable(IMediaProjection.class)); displayManager.performTraversalInternal(mock(SurfaceControl.Transaction.class)); displayManager.getDisplayHandler().runWithScissors(() -> {}, 0 /* now */); DisplayDeviceInfo ddi = displayManager.getDisplayDeviceInfoInternal(displayId); diff --git a/services/tests/servicestests/src/com/android/server/display/LogicalDisplayMapperTest.java b/services/tests/servicestests/src/com/android/server/display/LogicalDisplayMapperTest.java index 567548e83dc8..7536c7949bcb 100644 --- a/services/tests/servicestests/src/com/android/server/display/LogicalDisplayMapperTest.java +++ b/services/tests/servicestests/src/com/android/server/display/LogicalDisplayMapperTest.java @@ -649,9 +649,9 @@ public class LogicalDisplayMapperTest { assertEquals(0, mLogicalDisplayMapper.getDisplayLocked(device2) .getLeadDisplayIdLocked()); assertEquals("concurrent", mLogicalDisplayMapper.getDisplayLocked(device1) - .getBrightnessThrottlingDataIdLocked()); + .getThermalBrightnessThrottlingDataIdLocked()); assertEquals("concurrent", mLogicalDisplayMapper.getDisplayLocked(device2) - .getBrightnessThrottlingDataIdLocked()); + .getThermalBrightnessThrottlingDataIdLocked()); mLogicalDisplayMapper.setDeviceStateLocked(1, false); advanceTime(1000); @@ -661,10 +661,10 @@ public class LogicalDisplayMapperTest { assertFalse(mLogicalDisplayMapper.getDisplayLocked(device2).isInTransitionLocked()); assertEquals(DisplayDeviceConfig.DEFAULT_ID, mLogicalDisplayMapper.getDisplayLocked(device1) - .getBrightnessThrottlingDataIdLocked()); + .getThermalBrightnessThrottlingDataIdLocked()); assertEquals(DisplayDeviceConfig.DEFAULT_ID, mLogicalDisplayMapper.getDisplayLocked(device2) - .getBrightnessThrottlingDataIdLocked()); + .getThermalBrightnessThrottlingDataIdLocked()); mLogicalDisplayMapper.setDeviceStateLocked(2, false); advanceTime(1000); @@ -674,10 +674,10 @@ public class LogicalDisplayMapperTest { assertFalse(mLogicalDisplayMapper.getDisplayLocked(device2).isInTransitionLocked()); assertEquals(DisplayDeviceConfig.DEFAULT_ID, mLogicalDisplayMapper.getDisplayLocked(device1) - .getBrightnessThrottlingDataIdLocked()); + .getThermalBrightnessThrottlingDataIdLocked()); assertEquals(DisplayDeviceConfig.DEFAULT_ID, mLogicalDisplayMapper.getDisplayLocked(device2) - .getBrightnessThrottlingDataIdLocked()); + .getThermalBrightnessThrottlingDataIdLocked()); } @Test @@ -863,7 +863,7 @@ public class LogicalDisplayMapperTest { layout.createDisplayLocked(address, /* isDefault= */ false, enabled, group, mIdProducer, Layout.Display.POSITION_UNKNOWN, Display.DEFAULT_DISPLAY, /* brightnessThrottlingMapId= */ null, /* refreshRateZoneId= */ null, - /* refreshRateThrottlingMapId= */ null); + /* refreshRateThermalThrottlingMapId= */ null); } private void advanceTime(long timeMs) { diff --git a/services/tests/servicestests/src/com/android/server/display/mode/DisplayModeDirectorTest.java b/services/tests/servicestests/src/com/android/server/display/mode/DisplayModeDirectorTest.java index db5a46976748..6907145542cc 100644 --- a/services/tests/servicestests/src/com/android/server/display/mode/DisplayModeDirectorTest.java +++ b/services/tests/servicestests/src/com/android/server/display/mode/DisplayModeDirectorTest.java @@ -2583,7 +2583,7 @@ public class DisplayModeDirectorTest { KEY_REFRESH_RATE_IN_HBM_HDR, String.valueOf(fps)); } - public void setBrightnessThrottlingData(String brightnessThrottlingData) { + public void setThermalBrightnessThrottlingData(String brightnessThrottlingData) { putPropertyAndNotify(DeviceConfig.NAMESPACE_DISPLAY_MANAGER, KEY_BRIGHTNESS_THROTTLING_DATA, brightnessThrottlingData); } diff --git a/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java new file mode 100644 index 000000000000..36c200188fcf --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java @@ -0,0 +1,427 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.media.projection; + + +import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; +import static android.media.projection.MediaProjectionManager.TYPE_MIRRORING; +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertThrows; + +import android.app.ActivityManagerInternal; +import android.content.Context; +import android.content.ContextWrapper; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.ApplicationInfoFlags; +import android.content.pm.PackageManager.NameNotFoundException; +import android.media.projection.IMediaProjectionCallback; +import android.os.IBinder; +import android.os.RemoteException; +import android.os.UserHandle; +import android.platform.test.annotations.Presubmit; +import android.view.ContentRecordingSession; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.server.LocalServices; +import com.android.server.testutils.OffsettableClock; +import com.android.server.wm.WindowManagerInternal; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * Tests for the {@link MediaProjectionManagerService} class. + * + * Build/Install/Run: + * atest FrameworksServicesTests:MediaProjectionManagerServiceTest + */ +@SmallTest +@Presubmit +@RunWith(AndroidJUnit4.class) +public class MediaProjectionManagerServiceTest { + private static final int UID = 10; + private static final String PACKAGE_NAME = "test.package"; + private final ApplicationInfo mAppInfo = new ApplicationInfo(); + private static final ContentRecordingSession DISPLAY_SESSION = + ContentRecordingSession.createDisplaySession(DEFAULT_DISPLAY); + // Callback registered by an app on a MediaProjection instance. + private final FakeIMediaProjectionCallback mIMediaProjectionCallback = + new FakeIMediaProjectionCallback(); + + private final MediaProjectionManagerService.Injector mPreventReusedTokenEnabledInjector = + new MediaProjectionManagerService.Injector() { + @Override + boolean shouldMediaProjectionPreventReusingConsent( + MediaProjectionManagerService.MediaProjection projection) { + return true; + } + }; + + private final MediaProjectionManagerService.Injector mPreventReusedTokenDisabledInjector = + new MediaProjectionManagerService.Injector() { + @Override + boolean shouldMediaProjectionPreventReusingConsent( + MediaProjectionManagerService.MediaProjection projection) { + return false; + } + }; + + private Context mContext; + private MediaProjectionManagerService mService; + private OffsettableClock mClock; + private ContentRecordingSession mWaitingDisplaySession = + ContentRecordingSession.createDisplaySession(DEFAULT_DISPLAY); + + @Mock + private ActivityManagerInternal mAmInternal; + @Mock + private WindowManagerInternal mWindowManagerInternal; + @Mock + private PackageManager mPackageManager; + + @Before + public void setup() throws Exception { + MockitoAnnotations.initMocks(this); + + LocalServices.removeServiceForTest(ActivityManagerInternal.class); + LocalServices.addService(ActivityManagerInternal.class, mAmInternal); + LocalServices.removeServiceForTest(WindowManagerInternal.class); + LocalServices.addService(WindowManagerInternal.class, mWindowManagerInternal); + + mContext = spy(new ContextWrapper( + InstrumentationRegistry.getInstrumentation().getTargetContext())); + doReturn(mPackageManager).when(mContext).getPackageManager(); + + mClock = new OffsettableClock.Stopped(); + mWaitingDisplaySession.setWaitingToRecord(true); + mWaitingDisplaySession.setVirtualDisplayId(5); + + mAppInfo.targetSdkVersion = 32; + + mService = new MediaProjectionManagerService(mContext); + } + + @After + public void tearDown() { + LocalServices.removeServiceForTest(ActivityManagerInternal.class); + LocalServices.removeServiceForTest(WindowManagerInternal.class); + } + + @Test + public void testGetActiveProjectionInfoInternal() throws NameNotFoundException { + assertThat(mService.getActiveProjectionInfo()).isNull(); + + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions(); + + // Create a projection, active is still null. + assertThat(projection).isNotNull(); + assertThat(mService.getActiveProjectionInfo()).isNull(); + + // Start the projection, active is now not null. + projection.start(mIMediaProjectionCallback); + assertThat(mService.getActiveProjectionInfo()).isNotNull(); + } + + @Test + public void testCreateProjection() throws NameNotFoundException { + MediaProjectionManagerService.MediaProjection projection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ false); + projection.start(mIMediaProjectionCallback); + + MediaProjectionManagerService.MediaProjection secondProjection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ false); + assertThat(secondProjection).isNotNull(); + assertThat(secondProjection).isNotEqualTo(projection); + } + + @Test + public void testCreateProjection_attemptReuse_noPriorProjectionGrant() + throws NameNotFoundException { + MediaProjectionManagerService.MediaProjection projection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ false); + projection.start(mIMediaProjectionCallback); + + MediaProjectionManagerService.MediaProjection secondProjection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ true); + + assertThat(secondProjection).isNotNull(); + assertThat(secondProjection).isNotEqualTo(projection); + } + + @Test + public void testCreateProjection_attemptReuse_priorProjectionGrant_notWaiting() + throws NameNotFoundException { + MediaProjectionManagerService.MediaProjection projection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ false); + projection.start(mIMediaProjectionCallback); + + // Mark this projection as not waiting. + doReturn(true).when(mWindowManagerInternal).setContentRecordingSession( + any(ContentRecordingSession.class)); + mService.setContentRecordingSession(DISPLAY_SESSION); + + // We are allowed to create another projection. + MediaProjectionManagerService.MediaProjection secondProjection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ true); + + assertThat(secondProjection).isNotNull(); + + // But this is a new projection. + assertThat(secondProjection).isNotEqualTo(projection); + } + + @Test + public void testCreateProjection_attemptReuse_priorProjectionGrant_waiting_differentPackage() + throws NameNotFoundException { + MediaProjectionManagerService.MediaProjection projection = + startProjectionPreconditions(/* packageAttemptedReusingGrantedConsent= */ false); + projection.start(mIMediaProjectionCallback); + + // Mark this projection as not waiting. + mService.setContentRecordingSession(mWaitingDisplaySession); + + // We are allowed to create another projection. + MediaProjectionManagerService.MediaProjection secondProjection = + mService.createProjectionInternal(UID + 10, PACKAGE_NAME + "foo", + TYPE_MIRRORING, /* isPermanentGrant= */ true, + UserHandle.CURRENT, /* packageAttemptedReusingGrantedConsent= */ true); + + assertThat(secondProjection).isNotNull(); + + // But this is a new projection. + assertThat(secondProjection).isNotEqualTo(projection); + } + + @Test + public void testIsValid_multipleStarts_preventionDisabled() throws NameNotFoundException { + MediaProjectionManagerService service = new MediaProjectionManagerService(mContext, + mPreventReusedTokenDisabledInjector); + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions( + service); + // No starts yet, and not timed out yet - so still valid. + assertThat(projection.isValid()).isTrue(); + + // Only one start - so still valid. + projection.start(mIMediaProjectionCallback); + assertThat(projection.isValid()).isTrue(); + + // Second start - technically allowed to start again, without stopping in between. + // Token should no longer be valid. + projection.start(mIMediaProjectionCallback); + assertThat(projection.isValid()).isFalse(); + } + + @Test + public void testIsValid_restart() throws NameNotFoundException { + MediaProjectionManagerService service = new MediaProjectionManagerService(mContext, + mPreventReusedTokenDisabledInjector); + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions( + service); + // No starts yet, and not timed out yet - so still valid. + assertThat(projection.isValid()).isTrue(); + + // Only one start - so still valid. + projection.start(mIMediaProjectionCallback); + assertThat(projection.isValid()).isTrue(); + + projection.stop(); + + // Second start - so not valid. + projection.start(mIMediaProjectionCallback); + assertThat(projection.isValid()).isFalse(); + } + + @Test + public void testIsValid_timeout() throws NameNotFoundException { + final MediaProjectionManagerService.Injector mClockInjector = + new MediaProjectionManagerService.Injector() { + @Override + MediaProjectionManagerService.Clock createClock() { + // Always return the same value for elapsed time. + return () -> mClock.now(); + } + @Override + boolean shouldMediaProjectionPreventReusingConsent( + MediaProjectionManagerService.MediaProjection projection) { + return false; + } + }; + final MediaProjectionManagerService service = new MediaProjectionManagerService(mContext, + mClockInjector); + MediaProjectionManagerService.MediaProjection projection = createProjectionPreconditions( + service); + mClock.fastForward(projection.mDefaultTimeoutMs + 10); + + // Immediate timeout - so no longer valid. + assertThat(projection.isValid()).isFalse(); + } + + @Test + public void testIsValid_virtualDisplayAlreadyCreated() throws NameNotFoundException { + MediaProjectionManagerService service = new MediaProjectionManagerService(mContext, + mPreventReusedTokenDisabledInjector); + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions( + service); + // Simulate MediaProjection#createVirtualDisplay being invoked previously. + projection.notifyVirtualDisplayCreated(10); + + // Trying to re-use token on another MediaProjection#createVirtualDisplay - no longer valid. + assertThat(projection.isValid()).isFalse(); + } + + // TODO(269273190): Test flag using compat annotations instead. + @Test + public void testIsValid_invalid_preventionEnabled() + throws NameNotFoundException { + MediaProjectionManagerService service = new MediaProjectionManagerService(mContext, + mPreventReusedTokenEnabledInjector); + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions( + service); + projection.start(mIMediaProjectionCallback); + projection.stop(); + // Second start - so not valid. + projection.start(mIMediaProjectionCallback); + + assertThrows(IllegalStateException.class, projection::isValid); + } + + // TODO(269273190): Test flag using compat annotations instead. + @Test + public void testIsValid_invalid_preventionDisabled() + throws NameNotFoundException { + MediaProjectionManagerService service = new MediaProjectionManagerService(mContext, + mPreventReusedTokenDisabledInjector); + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions( + service); + projection.start(mIMediaProjectionCallback); + projection.stop(); + + // Second start - so not valid. + projection.start(mIMediaProjectionCallback); + + assertThat(projection.isValid()).isFalse(); + } + + @Test + public void testIsCurrentProjectionInternal_invalid() throws NameNotFoundException { + IBinder iBinder = mock(IBinder.class); + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions(); + + // Create a projection, current is false. + assertThat(projection).isNotNull(); + assertThat(mService.isCurrentProjection(iBinder)).isFalse(); + + // Start the projection, and test a random token. + projection.start(mIMediaProjectionCallback); + assertThat(mService.isCurrentProjection(iBinder)).isFalse(); + } + + @Test + public void testIsCurrentProjectionInternal_noProjection() { + IBinder iBinder = mock(IBinder.class); + assertThat(mService.isCurrentProjection(iBinder)).isFalse(); + } + + @Test + public void testIsCurrentProjectionInternal_currentProjection() + throws NameNotFoundException { + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions(); + + // Create a projection, current is false. + assertThat(projection).isNotNull(); + assertThat(mService.isCurrentProjection(projection.asBinder())).isFalse(); + + // Start the projection, is current is now true. + projection.start(mIMediaProjectionCallback); + assertThat(mService.isCurrentProjection(projection.asBinder())).isTrue(); + } + + // Set up preconditions for creating a projection. + private MediaProjectionManagerService.MediaProjection createProjectionPreconditions( + MediaProjectionManagerService service) + throws NameNotFoundException { + doReturn(mAppInfo).when(mPackageManager).getApplicationInfoAsUser(anyString(), + any(ApplicationInfoFlags.class), any(UserHandle.class)); + return service.createProjectionInternal(UID, PACKAGE_NAME, + TYPE_MIRRORING, /* isPermanentGrant= */ true, UserHandle.CURRENT, + /* packageAttemptedReusingGrantedConsent= */ false); + } + + // Set up preconditions for creating a projection. + private MediaProjectionManagerService.MediaProjection createProjectionPreconditions() + throws NameNotFoundException { + return createProjectionPreconditions(mService); + } + + // Set up preconditions for starting a projection, with no foreground service requirements. + private MediaProjectionManagerService.MediaProjection startProjectionPreconditions( + MediaProjectionManagerService service) + throws NameNotFoundException { + mAppInfo.privateFlags |= PRIVATE_FLAG_PRIVILEGED; + return createProjectionPreconditions(service); + } + + // Set up preconditions for starting a projection, specifying if it is possible to reuse the + // the current projection. + private MediaProjectionManagerService.MediaProjection startProjectionPreconditions( + boolean packageAttemptedReusingGrantedConsent) + throws NameNotFoundException { + mAppInfo.privateFlags |= PRIVATE_FLAG_PRIVILEGED; + doReturn(mAppInfo).when(mPackageManager).getApplicationInfoAsUser(anyString(), + any(ApplicationInfoFlags.class), any(UserHandle.class)); + return mService.createProjectionInternal(UID, PACKAGE_NAME, + TYPE_MIRRORING, /* isPermanentGrant= */ true, UserHandle.CURRENT, + packageAttemptedReusingGrantedConsent); + } + + // Set up preconditions for starting a projection, with no foreground service requirements. + private MediaProjectionManagerService.MediaProjection startProjectionPreconditions() + throws NameNotFoundException { + mAppInfo.privateFlags |= PRIVATE_FLAG_PRIVILEGED; + return createProjectionPreconditions(mService); + } + + private static class FakeIMediaProjectionCallback extends IMediaProjectionCallback.Stub { + @Override + public void onStop() throws RemoteException { + } + + @Override + public void onCapturedContentResize(int width, int height) throws RemoteException { + } + + @Override + public void onCapturedContentVisibilityChanged(boolean isVisible) throws RemoteException { + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java index 0b6756d7c063..6bcda3fbcf43 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java @@ -178,6 +178,8 @@ public final class UserManagerTest { UserHandle.of(userInfo.id)); assertThat(userContext.getSystemService( UserManager.class).isMediaSharedWithParent()).isTrue(); + assertThat(Settings.Secure.getInt(userContext.getContentResolver(), + Settings.Secure.USER_SETUP_COMPLETE, 0)).isEqualTo(1); List<UserInfo> list = mUserManager.getUsers(); List<UserInfo> cloneUsers = list.stream().filter( diff --git a/services/tests/servicestests/src/com/android/server/pm/dex/DexMetadataHelperTest.java b/services/tests/servicestests/src/com/android/server/pm/dex/DexMetadataHelperTest.java index b2843d82a08a..de82854d42ee 100644 --- a/services/tests/servicestests/src/com/android/server/pm/dex/DexMetadataHelperTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/dex/DexMetadataHelperTest.java @@ -422,7 +422,8 @@ public class DexMetadataHelperTest { null /* splitNames */, null /* isFeatureSplits */, null /* usesSplitNames */, null /* configForSplit */, null /* splitApkPaths */, null /* splitRevisionCodes */, baseApk.getTargetSdkVersion(), - null /* requiredSplitTypes */, null /* splitTypes */); + null /* requiredSplitTypes */, null /* splitTypes */, + false /* allowUpdateOwnership */); Assert.assertEquals(dm.length(), DexMetadataHelper.getPackageDexMetadataSize(pkgLite)); } diff --git a/services/tests/uiservicestests/AndroidManifest.xml b/services/tests/uiservicestests/AndroidManifest.xml index 09ee59816a2c..f44c1d18614d 100644 --- a/services/tests/uiservicestests/AndroidManifest.xml +++ b/services/tests/uiservicestests/AndroidManifest.xml @@ -33,7 +33,8 @@ <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" /> <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT"/> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG" /> <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> <application android:debuggable="true"> diff --git a/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java b/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java index 82bc6f6c5263..06fc01738967 100644 --- a/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java +++ b/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java @@ -87,6 +87,7 @@ public class UiServiceTestCase { Mockito.doReturn(new Intent()).when(mContext).registerReceiverAsUser( any(), any(), any(), any(), any()); Mockito.doReturn(new Intent()).when(mContext).registerReceiver(any(), any()); + Mockito.doReturn(new Intent()).when(mContext).registerReceiver(any(), any(), anyInt()); Mockito.doNothing().when(mContext).unregisterReceiver(any()); } 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 3888b9b14c15..eceb589bba76 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -28,6 +28,7 @@ import static android.app.Notification.FLAG_CAN_COLORIZE; import static android.app.Notification.FLAG_FOREGROUND_SERVICE; import static android.app.Notification.FLAG_NO_CLEAR; import static android.app.Notification.FLAG_ONGOING_EVENT; +import static android.app.Notification.FLAG_USER_INITIATED_JOB; import static android.app.NotificationChannel.USER_LOCKED_ALLOW_BUBBLE; import static android.app.NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED; import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL; @@ -197,7 +198,6 @@ import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; -import android.testing.TestableContext; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; import android.testing.TestablePermissions; @@ -228,6 +228,7 @@ import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.SystemService.TargetUser; import com.android.server.UiServiceTestCase; +import com.android.server.job.JobSchedulerInternal; import com.android.server.lights.LightsManager; import com.android.server.lights.LogicalLight; import com.android.server.notification.NotificationManagerService.NotificationAssistants; @@ -254,7 +255,6 @@ import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatchers; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -337,6 +337,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Mock ActivityManagerInternal mAmi; @Mock + JobSchedulerInternal mJsi; + @Mock private Looper mMainLooper; @Mock private NotificationManager mMockNm; @@ -445,6 +447,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { LocalServices.addService(DeviceIdleInternal.class, deviceIdleInternal); LocalServices.removeServiceForTest(ActivityManagerInternal.class); LocalServices.addService(ActivityManagerInternal.class, mAmi); + LocalServices.removeServiceForTest(JobSchedulerInternal.class); + LocalServices.addService(JobSchedulerInternal.class, mJsi); LocalServices.removeServiceForTest(PackageManagerInternal.class); LocalServices.addService(PackageManagerInternal.class, mPackageManagerInternal); LocalServices.removeServiceForTest(PermissionPolicyInternal.class); @@ -1253,7 +1257,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); update = new NotificationChannel("blockedbyuser", "name", IMPORTANCE_NONE); - update.setFgServiceShown(true); + update.setUserVisibleTaskShown(true); mBinderService.updateNotificationChannelForPackage(PKG, mUid, update); waitForIdle(); assertEquals(IMPORTANCE_NONE, mBinderService.getNotificationChannel( @@ -4736,7 +4740,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test - public void testBumpFGImportance_noChannelChangePreOApp() throws Exception { + public void testBumpFGImportance_channelChangePreOApp() throws Exception { String preOPkg = PKG_N_MR1; final ApplicationInfo legacy = new ApplicationInfo(); legacy.targetSdkVersion = Build.VERSION_CODES.N_MR1; @@ -4754,7 +4758,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setPriority(Notification.PRIORITY_MIN); StatusBarNotification sbn = new StatusBarNotification(preOPkg, preOPkg, 9, - "testBumpFGImportance_noChannelChangePreOApp", + "testBumpFGImportance_channelChangePreOApp", Binder.getCallingUid(), 0, nb.build(), UserHandle.getUserHandleForUid(Binder.getCallingUid()), null, 0); @@ -4774,11 +4778,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setPriority(Notification.PRIORITY_MIN); sbn = new StatusBarNotification(preOPkg, preOPkg, 9, - "testBumpFGImportance_noChannelChangePreOApp", Binder.getCallingUid(), + "testBumpFGImportance_channelChangePreOApp", Binder.getCallingUid(), 0, nb.build(), UserHandle.getUserHandleForUid(Binder.getCallingUid()), null, 0); mBinderService.enqueueNotificationWithTag(preOPkg, preOPkg, - "testBumpFGImportance_noChannelChangePreOApp", + "testBumpFGImportance_channelChangePreOApp", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); assertEquals(IMPORTANCE_LOW, @@ -4786,7 +4790,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel defaultChannel = mBinderService.getNotificationChannel( preOPkg, mContext.getUserId(), preOPkg, NotificationChannel.DEFAULT_CHANNEL_ID); - assertEquals(IMPORTANCE_UNSPECIFIED, defaultChannel.getImportance()); + assertEquals(IMPORTANCE_LOW, defaultChannel.getImportance()); } @Test @@ -6909,6 +6913,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testTextToastsCallStatusBar_visibleBgUsers_nonUiContext_defaultDisplay() throws Exception { mockIsVisibleBackgroundUsersSupported(true); + mockIsUserVisible(SECONDARY_DISPLAY_ID, true); mockDisplayAssignedToUser(SECONDARY_DISPLAY_ID); allowTestPackageToToast(); @@ -8610,7 +8615,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertNotNull(n.publicVersion.bigContentView); assertNotNull(n.publicVersion.headsUpContentView); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); assertNull(n.contentView); assertNull(n.bigContentView); @@ -10440,7 +10445,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setFullScreenIntent(mock(PendingIntent.class), true) .build(); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); final int stickyFlag = n.flags & Notification.FLAG_FSI_REQUESTED_BUT_DENIED; @@ -10525,7 +10530,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setFlag(FLAG_CAN_COLORIZE, true) .build(); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); assertFalse(n.isForegroundService()); assertFalse(n.hasColorizedPermission()); @@ -10553,7 +10558,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10572,7 +10577,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10596,7 +10601,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10613,7 +10618,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10631,7 +10636,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { n.flags |= Notification.FLAG_NO_DISMISS; // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be cleared assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10649,7 +10654,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10670,7 +10675,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { n.flags |= Notification.FLAG_NO_DISMISS; // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be cleared assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10687,7 +10692,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10706,7 +10711,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10734,7 +10739,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be cleared assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -10755,12 +10760,589 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE); + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertSame(0, n.flags & Notification.FLAG_NO_DISMISS); } + @Test + public void testCancelAllNotifications_IgnoreUserInitiatedJob() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); + sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCancelAllNotifications_IgnoreUserInitiatedJob", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertEquals(1, notifs.length); + assertEquals(1, mService.getNotificationRecordCount()); + } + + @Test + public void testCancelAllNotifications_UijFlag_NoUij_Allowed() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(false); + final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); + sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCancelAllNotifications_UijFlag_NoUij_Allowed", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testCancelAllNotificationsOtherPackage_IgnoresUijNotification() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); + sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCancelAllNotifications_IgnoreOtherPackages", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + mBinderService.cancelAllNotifications("other_pkg_name", sbn.getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertEquals(1, notifs.length); + assertEquals(1, mService.getNotificationRecordCount()); + } + + @Test + public void testRemoveUserInitiatedJobFlag_ImmediatelyAfterEnqueue() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + Notification n = new Notification.Builder(mContext, mTestNotificationChannel.getId()) + .setSmallIcon(android.R.drawable.sym_def_app_icon) + .build(); + StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, null, + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + mInternalService.removeUserInitiatedJobFlagFromNotification(PKG, sbn.getId(), + sbn.getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertFalse(notifs[0].getNotification().isUserInitiatedJob()); + } + + @Test + public void testCancelAfterSecondEnqueueDoesNotSpecifyUserInitiatedJobFlag() throws Exception { + final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); + sbn.getNotification().flags = Notification.FLAG_ONGOING_EVENT | FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + sbn.getNotification().flags = Notification.FLAG_ONGOING_EVENT; + mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + mBinderService.cancelNotificationWithTag(PKG, PKG, sbn.getTag(), sbn.getId(), + sbn.getUserId()); + waitForIdle(); + assertEquals(0, mBinderService.getActiveNotifications(sbn.getPackageName()).length); + assertEquals(0, mService.getNotificationRecordCount()); + } + + @Test + public void testCancelNotificationWithTag_fromApp_cannotCancelUijChild() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + mService.isSystemUid = false; + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + child2.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.getBinderService().cancelNotificationWithTag( + parent.getSbn().getPackageName(), parent.getSbn().getPackageName(), + parent.getSbn().getTag(), parent.getSbn().getId(), parent.getSbn().getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(1, notifs.length); + } + + @Test + public void testCancelNotificationWithTag_fromApp_cannotCancelUijParent() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + mService.isSystemUid = false; + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + parent.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.getBinderService().cancelNotificationWithTag( + parent.getSbn().getPackageName(), parent.getSbn().getPackageName(), + parent.getSbn().getTag(), parent.getSbn().getId(), parent.getSbn().getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(3, notifs.length); + } + + @Test + public void testCancelAllNotificationsFromApp_cannotCancelUijChild() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + mService.isSystemUid = false; + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + child2.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + mService.getBinderService().cancelAllNotifications( + parent.getSbn().getPackageName(), parent.getSbn().getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(1, notifs.length); + } + + @Test + public void testCancelAllNotifications_fromApp_cannotCancelUijParent() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + mService.isSystemUid = false; + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + parent.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + mService.getBinderService().cancelAllNotifications( + parent.getSbn().getPackageName(), parent.getSbn().getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(1, notifs.length); + } + + @Test + public void testCancelNotificationsFromListener_clearAll_GroupWithUijParent() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + parent.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + mService.getBinderService().cancelNotificationsFromListener(null, null); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testCancelNotificationsFromListener_clearAll_GroupWithUijChild() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + child2.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + mService.getBinderService().cancelNotificationsFromListener(null, null); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testCancelNotificationsFromListener_clearAll_Uij() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, null, false); + child2.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mService.addNotification(child2); + mService.getBinderService().cancelNotificationsFromListener(null, null); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(child2.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testCancelNotificationsFromListener_byKey_GroupWithUijParent() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + parent.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + String[] keys = {parent.getSbn().getKey(), child.getSbn().getKey(), + child2.getSbn().getKey(), newGroup.getSbn().getKey()}; + mService.getBinderService().cancelNotificationsFromListener(null, keys); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testCancelNotificationsFromListener_byKey_GroupWithUijChild() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + child2.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + String[] keys = {parent.getSbn().getKey(), child.getSbn().getKey(), + child2.getSbn().getKey(), newGroup.getSbn().getKey()}; + mService.getBinderService().cancelNotificationsFromListener(null, keys); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testCancelNotificationsFromListener_byKey_Uij() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 3, null, false); + child.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mService.addNotification(child); + String[] keys = {child.getSbn().getKey()}; + mService.getBinderService().cancelNotificationsFromListener(null, keys); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(child.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testUserInitiatedCancelAllWithGroup_UserInitiatedFlag() throws Exception { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + final NotificationRecord parent = generateNotificationRecord( + mTestNotificationChannel, 1, "group", true); + final NotificationRecord child = generateNotificationRecord( + mTestNotificationChannel, 2, "group", false); + final NotificationRecord child2 = generateNotificationRecord( + mTestNotificationChannel, 3, "group", false); + child2.getNotification().flags |= FLAG_USER_INITIATED_JOB; + final NotificationRecord newGroup = generateNotificationRecord( + mTestNotificationChannel, 4, "group2", false); + mService.addNotification(parent); + mService.addNotification(child); + mService.addNotification(child2); + mService.addNotification(newGroup); + mService.mNotificationDelegate.onClearAll(mUid, Binder.getCallingPid(), parent.getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(parent.getSbn().getPackageName()); + assertEquals(0, notifs.length); + } + + @Test + public void testDeleteChannelGroupChecksForUijs() throws Exception { + when(mCompanionMgr.getAssociations(PKG, UserHandle.getUserId(mUid))) + .thenReturn(singletonList(mock(AssociationInfo.class))); + CountDownLatch latch = new CountDownLatch(2); + mService.createNotificationChannelGroup(PKG, mUid, + new NotificationChannelGroup("group", "group"), true, false); + new Thread(() -> { + NotificationChannel notificationChannel = new NotificationChannel("id", "id", + NotificationManager.IMPORTANCE_HIGH); + notificationChannel.setGroup("group"); + ParceledListSlice<NotificationChannel> pls = + new ParceledListSlice(ImmutableList.of(notificationChannel)); + try { + mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + latch.countDown(); + }).start(); + new Thread(() -> { + try { + synchronized (this) { + wait(5000); + } + mService.createNotificationChannelGroup(PKG, mUid, + new NotificationChannelGroup("new", "new group"), true, false); + NotificationChannel notificationChannel = + new NotificationChannel("id", "id", NotificationManager.IMPORTANCE_HIGH); + notificationChannel.setGroup("new"); + ParceledListSlice<NotificationChannel> pls = + new ParceledListSlice(ImmutableList.of(notificationChannel)); + try { + mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls); + mBinderService.deleteNotificationChannelGroup(PKG, "group"); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + } catch (Exception e) { + e.printStackTrace(); + } + latch.countDown(); + }).start(); + + latch.await(); + verify(mJsi).isNotificationChannelAssociatedWithAnyUserInitiatedJobs( + anyString(), anyInt(), anyString()); + } + + @Test + public void testRemoveUserInitiatedJobFlagFromNotification_enqueued() { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + Notification n = new Notification.Builder(mContext, "").build(); + n.flags |= FLAG_USER_INITIATED_JOB; + + StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + + mService.addEnqueuedNotification(r); + + mInternalService.removeUserInitiatedJobFlagFromNotification( + PKG, r.getSbn().getId(), r.getSbn().getUserId()); + + waitForIdle(); + + verify(mListeners, timeout(200).times(0)).notifyPostedLocked(any(), any()); + } + + @Test + public void testRemoveUserInitiatedJobFlagFromNotification_posted() { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + Notification n = new Notification.Builder(mContext, "").build(); + n.flags |= FLAG_USER_INITIATED_JOB; + + StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + + mService.addNotification(r); + + mInternalService.removeUserInitiatedJobFlagFromNotification( + PKG, r.getSbn().getId(), r.getSbn().getUserId()); + + waitForIdle(); + + ArgumentCaptor<NotificationRecord> captor = + ArgumentCaptor.forClass(NotificationRecord.class); + verify(mListeners, times(1)).notifyPostedLocked(captor.capture(), any()); + + assertEquals(0, captor.getValue().getNotification().flags); + } + + @Test + public void testCannotRemoveUserInitiatedJobFlagWhenOverLimit_enqueued() { + for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { + Notification n = new Notification.Builder(mContext, "").build(); + StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, i, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + mService.addEnqueuedNotification(r); + } + Notification n = new Notification.Builder(mContext, "").build(); + n.flags |= FLAG_USER_INITIATED_JOB; + + StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, + NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + + mService.addEnqueuedNotification(r); + + mInternalService.removeUserInitiatedJobFlagFromNotification( + PKG, r.getSbn().getId(), r.getSbn().getUserId()); + + waitForIdle(); + + assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, + mService.getNotificationRecordCount()); + } + + @Test + public void testCannotRemoveUserInitiatedJobFlagWhenOverLimit_posted() { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { + Notification n = new Notification.Builder(mContext, "").build(); + StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, i, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + mService.addNotification(r); + } + Notification n = new Notification.Builder(mContext, "").build(); + n.flags |= FLAG_USER_INITIATED_JOB; + + StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, + NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, null, mUid, 0, + n, UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + + mService.addNotification(r); + + mInternalService.removeUserInitiatedJobFlagFromNotification( + PKG, r.getSbn().getId(), r.getSbn().getUserId()); + + waitForIdle(); + + assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, + mService.getNotificationRecordCount()); + } + + @Test + public void testCanPostUijWhenOverLimit() throws RemoteException { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { + StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, + i, null, false).getSbn(); + mBinderService.enqueueNotificationWithTag(PKG, PKG, "testCanPostUijWhenOverLimit", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + } + + final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); + sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCanPostUijWhenOverLimit - uij over limit!", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + + waitForIdle(); + + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1, notifs.length); + assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1, + mService.getNotificationRecordCount()); + } + + @Test + public void testCannotPostNonUijWhenOverLimit() throws RemoteException { + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(true); + for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { + StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, + i, null, false).getSbn(); + mBinderService.enqueueNotificationWithTag(PKG, PKG, "testCannotPostNonUijWhenOverLimit", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + waitForIdle(); + } + + final StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, + 100, null, false).getSbn(); + sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCannotPostNonUijWhenOverLimit - uij over limit!", + sbn.getId(), sbn.getNotification(), sbn.getUserId()); + + final StatusBarNotification sbn2 = generateNotificationRecord(mTestNotificationChannel, + 101, null, false).getSbn(); + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCannotPostNonUijWhenOverLimit - non uij over limit!", + sbn2.getId(), sbn2.getNotification(), sbn2.getUserId()); + + when(mJsi.isNotificationAssociatedWithAnyUserInitiatedJobs(anyInt(), anyInt(), anyString())) + .thenReturn(false); + final StatusBarNotification sbn3 = generateNotificationRecord(mTestNotificationChannel, + 101, null, false).getSbn(); + sbn3.getNotification().flags |= FLAG_USER_INITIATED_JOB; + mBinderService.enqueueNotificationWithTag(PKG, PKG, + "testCannotPostNonUijWhenOverLimit - fake uij over limit!", + sbn3.getId(), sbn3.getNotification(), sbn3.getUserId()); + + waitForIdle(); + + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1, notifs.length); + assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1, + mService.getNotificationRecordCount()); + } + + @Test + public void fixNotification_withUijFlag_butIsNotUij() throws Exception { + final ApplicationInfo applicationInfo = new ApplicationInfo(); + when(mPackageManagerClient.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) + .thenReturn(applicationInfo); + + Notification n = new Notification.Builder(mContext, "test") + .setFlag(FLAG_USER_INITIATED_JOB, true) + .build(); + + mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + assertFalse(n.isUserInitiatedJob()); + } + private void setDpmAppOppsExemptFromDismissal(boolean isOn) { DeviceConfig.setProperty( DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER, diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java index b1a9f081253c..34bb664c9598 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java @@ -96,8 +96,6 @@ public class RoleObserverTest extends UiServiceTestCase { private TestableNotificationManagerService mService; private NotificationManagerService.RoleObserver mRoleObserver; - private TestableContext mContext = spy(getContext()); - @Mock private PreferencesHelper mPreferencesHelper; @Mock diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java index 893f53825bbb..3ba94000d4a5 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java @@ -120,12 +120,20 @@ public class ZenModeConfigTest extends UiServiceTestCase { .showLights(false) .showBadges(false) .showInAmbientDisplay(false) + .allowCalls(ZenPolicy.PEOPLE_TYPE_CONTACTS) + .allowMessages(ZenPolicy.PEOPLE_TYPE_STARRED) + .allowConversations(ZenPolicy.CONVERSATION_SENDERS_NONE) .build(); ZenModeConfig config = getMutedAllConfig(); config.allowAlarms = true; config.allowReminders = true; config.allowEvents = true; + config.allowCalls = true; + config.allowCallsFrom = Policy.PRIORITY_SENDERS_CONTACTS; + config.allowMessages = true; + config.allowMessagesFrom = Policy.PRIORITY_SENDERS_STARRED; + config.allowConversations = false; config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_BADGE; config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_LIGHTS; config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_AMBIENT; @@ -138,6 +146,10 @@ public class ZenModeConfigTest extends UiServiceTestCase { assertEquals(expected.getPriorityCategoryEvents(), actual.getPriorityCategoryEvents()); assertEquals(expected.getVisualEffectLights(), actual.getVisualEffectLights()); assertEquals(expected.getVisualEffectAmbient(), actual.getVisualEffectAmbient()); + assertEquals(expected.getPriorityConversationSenders(), + actual.getPriorityConversationSenders()); + assertEquals(expected.getPriorityCallSenders(), actual.getPriorityCallSenders()); + assertEquals(expected.getPriorityMessageSenders(), actual.getPriorityMessageSenders()); } @Test diff --git a/services/tests/wmtests/AndroidManifest.xml b/services/tests/wmtests/AndroidManifest.xml index 593ee4a7fa1a..2696d2bf58b9 100644 --- a/services/tests/wmtests/AndroidManifest.xml +++ b/services/tests/wmtests/AndroidManifest.xml @@ -42,7 +42,8 @@ <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG" /> <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE" /> <uses-permission android:name="android.permission.CAPTURE_BLACKOUT_CONTENT"/> - <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION"/> diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index b8a21ec4c030..341b331b74e0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -589,12 +589,18 @@ public class ActivityRecordTests extends WindowTestsBase { throw new IllegalStateException("Orientation in new config should be either" + "landscape or portrait."); } + + final DisplayRotation displayRotation = activity.mDisplayContent.getDisplayRotation(); + spyOn(displayRotation); + activity.setRequestedOrientation(requestedOrientation); final ActivityConfigurationChangeItem expected = ActivityConfigurationChangeItem.obtain(newConfig); verify(mAtm.getLifecycleManager()).scheduleTransaction(eq(activity.app.getThread()), eq(activity.token), eq(expected)); + + verify(displayRotation).onSetRequestedOrientation(); } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java b/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java index e85b574baa22..5282585e9757 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java @@ -147,8 +147,8 @@ public class DimmerTests extends WindowTestsBase { int width = 100; int height = 300; - Rect bounds = new Rect(0, 0, width, height); - mDimmer.updateDims(mTransaction, bounds); + mDimmer.mDimState.mDimBounds.set(0, 0, width, height); + mDimmer.updateDims(mTransaction); verify(mTransaction).setWindowCrop(getDimLayer(), width, height); verify(mTransaction).show(getDimLayer()); @@ -194,7 +194,7 @@ public class DimmerTests extends WindowTestsBase { SurfaceControl dimLayer = getDimLayer(); mDimmer.resetDimStates(); - mDimmer.updateDims(mTransaction, new Rect()); + mDimmer.updateDims(mTransaction); verify(mSurfaceAnimatorStarter).startAnimation(any(SurfaceAnimator.class), any( SurfaceControl.Transaction.class), any(AnimationAdapter.class), anyBoolean(), eq(ANIMATION_TYPE_DIMMER)); @@ -212,29 +212,29 @@ public class DimmerTests extends WindowTestsBase { mDimmer.resetDimStates(); mDimmer.dimAbove(mTransaction, child, alpha); - mDimmer.updateDims(mTransaction, new Rect()); + mDimmer.updateDims(mTransaction); verify(mTransaction).show(dimLayer); verify(mTransaction, never()).remove(dimLayer); } @Test public void testDimUpdateWhileDimming() { - Rect bounds = new Rect(); TestWindowContainer child = new TestWindowContainer(mWm); mHost.addChild(child, 0); final float alpha = 0.8f; mDimmer.dimAbove(mTransaction, child, alpha); + final Rect bounds = mDimmer.mDimState.mDimBounds; SurfaceControl dimLayer = getDimLayer(); bounds.set(0, 0, 10, 10); - mDimmer.updateDims(mTransaction, bounds); + mDimmer.updateDims(mTransaction); verify(mTransaction).setWindowCrop(dimLayer, bounds.width(), bounds.height()); verify(mTransaction, times(1)).show(dimLayer); verify(mTransaction).setPosition(dimLayer, 0, 0); bounds.set(10, 10, 30, 30); - mDimmer.updateDims(mTransaction, bounds); + mDimmer.updateDims(mTransaction); verify(mTransaction).setWindowCrop(dimLayer, bounds.width(), bounds.height()); verify(mTransaction).setPosition(dimLayer, 10, 10); } @@ -246,13 +246,13 @@ public class DimmerTests extends WindowTestsBase { mDimmer.dimAbove(mTransaction, child, 1); SurfaceControl dimLayer = getDimLayer(); - mDimmer.updateDims(mTransaction, new Rect()); + mDimmer.updateDims(mTransaction); verify(mTransaction, times(1)).show(dimLayer); reset(mSurfaceAnimatorStarter); mDimmer.dontAnimateExit(); mDimmer.resetDimStates(); - mDimmer.updateDims(mTransaction, new Rect()); + mDimmer.updateDims(mTransaction); verify(mSurfaceAnimatorStarter, never()).startAnimation(any(SurfaceAnimator.class), any( SurfaceControl.Transaction.class), any(AnimationAdapter.class), anyBoolean(), eq(ANIMATION_TYPE_DIMMER)); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java index 2914de115eff..c8fdee06f3e4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java @@ -352,27 +352,28 @@ public class DisplayPolicyTests extends WindowTestsBase { assertTrue(imeSource.getFrame().contains(navBarSource.getFrame())); } - @SetupWindows(addWindows = W_NAVIGATION_BAR) + @SetupWindows(addWindows = W_INPUT_METHOD) @Test - public void testInsetsGivenContentFrame() { + public void testImeInsetsGivenContentFrame() { final DisplayPolicy displayPolicy = mDisplayContent.getDisplayPolicy(); final DisplayInfo displayInfo = new DisplayInfo(); displayInfo.logicalWidth = 1000; displayInfo.logicalHeight = 2000; displayInfo.rotation = ROTATION_0; - WindowManager.LayoutParams attrs = mNavBarWindow.mAttrs; - displayPolicy.addWindowLw(mNavBarWindow, attrs); - mNavBarWindow.setRequestedSize(attrs.width, attrs.height); - mNavBarWindow.getControllableInsetProvider().setServerVisible(true); + mDisplayContent.setInputMethodWindowLocked(mImeWindow); + mImeWindow.getControllableInsetProvider().setServerVisible(true); - mNavBarWindow.mGivenContentInsets.set(0, 10, 0, 0); + mImeWindow.mGivenContentInsets.set(0, 10, 0, 0); - displayPolicy.layoutWindowLw(mNavBarWindow, null, mDisplayContent.mDisplayFrames); + displayPolicy.layoutWindowLw(mImeWindow, null, mDisplayContent.mDisplayFrames); final InsetsState state = mDisplayContent.getInsetsStateController().getRawInsetsState(); - final InsetsSource navBarSource = state.peekSource( - mNavBarWindow.getControllableInsetProvider().getSource().getId()); - assertEquals(attrs.height - 10, navBarSource.getFrame().height()); + final InsetsSource imeSource = state.peekSource(ID_IME); + + assertNotNull(imeSource); + assertFalse(imeSource.getFrame().isEmpty()); + assertEquals(mImeWindow.getWindowFrames().mFrame.height() - 10, + imeSource.getFrame().height()); } @SetupWindows(addWindows = { W_ACTIVITY, W_NAVIGATION_BAR }) diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java index 146ed34204f5..19a1eddb4da7 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java @@ -62,6 +62,7 @@ import android.hardware.devicestate.DeviceStateManager; import android.os.IBinder; import android.os.PowerManagerInternal; import android.os.SystemClock; +import android.os.Handler; import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.view.DisplayAddress; @@ -69,6 +70,7 @@ import android.view.IRotationWatcher; import android.view.Surface; import android.view.WindowManager; +import androidx.annotation.Nullable; import androidx.test.filters.SmallTest; import com.android.internal.util.test.FakeSettingsProvider; @@ -76,6 +78,9 @@ import com.android.server.LocalServices; import com.android.server.UiThread; import com.android.server.policy.WindowManagerPolicy; import com.android.server.statusbar.StatusBarManagerInternal; +import com.android.server.testutils.OffsettableClock; +import com.android.server.testutils.TestHandler; +import com.android.server.wm.DisplayContent.FixedRotationTransitionListener; import org.junit.After; import org.junit.AfterClass; @@ -104,6 +109,9 @@ public class DisplayRotationTests { private static final long UI_HANDLER_WAIT_TIMEOUT_MS = 50; private StatusBarManagerInternal mPreviousStatusBarManagerInternal; + private static final OffsettableClock sClock = new OffsettableClock.Stopped(); + private static TestHandler sHandler; + private static long sCurrentUptimeMillis = 10_000; private static WindowManagerService sMockWm; private DisplayContent mMockDisplayContent; @@ -113,6 +121,7 @@ public class DisplayRotationTests { private Resources mMockRes; private SensorManager mMockSensorManager; private Sensor mFakeOrientationSensor; + private Sensor mFakeHingeAngleSensor; private DisplayWindowSettings mMockDisplayWindowSettings; private ContentResolver mMockResolver; private FakeSettingsProvider mFakeSettingsProvider; @@ -125,16 +134,22 @@ public class DisplayRotationTests { private ContentObserver mUserRotationObserver; private SensorEventListener mOrientationSensorListener; + ArgumentCaptor<SensorEventListener> mHingeAngleSensorListenerCaptor = ArgumentCaptor.forClass( + SensorEventListener.class); + private DisplayRotationBuilder mBuilder; private DeviceStateController mDeviceStateController; private TestDisplayRotation mTarget; + @Nullable + private DisplayRotationImmersiveAppCompatPolicy mDisplayRotationImmersiveAppCompatPolicyMock; @BeforeClass public static void setUpOnce() { sMockWm = mock(WindowManagerService.class); sMockWm.mPowerManagerInternal = mock(PowerManagerInternal.class); sMockWm.mPolicy = mock(WindowManagerPolicy.class); + sHandler = new TestHandler(null, sClock); } @AfterClass @@ -153,7 +168,7 @@ public class DisplayRotationTests { LocalServices.removeServiceForTest(StatusBarManagerInternal.class); mMockStatusBarManagerInternal = mock(StatusBarManagerInternal.class); LocalServices.addService(StatusBarManagerInternal.class, mMockStatusBarManagerInternal); - + mDisplayRotationImmersiveAppCompatPolicyMock = null; mBuilder = new DisplayRotationBuilder(); } @@ -468,12 +483,16 @@ public class DisplayRotationTests { } private SensorEvent createSensorEvent(int rotation) throws Exception { + return createSensorEvent(mFakeOrientationSensor, rotation); + } + + private SensorEvent createSensorEvent(Sensor sensor, int value) throws Exception { final Constructor<SensorEvent> constructor = SensorEvent.class.getDeclaredConstructor(int.class); constructor.setAccessible(true); final SensorEvent event = constructor.newInstance(1); - event.sensor = mFakeOrientationSensor; - event.values[0] = rotation; + event.sensor = sensor; + event.values[0] = value; event.timestamp = SystemClock.elapsedRealtimeNanos(); return event; } @@ -562,6 +581,38 @@ public class DisplayRotationTests { } @Test + public void testNotifiesChoiceWhenSensorUpdates_immersiveApp() throws Exception { + mDisplayRotationImmersiveAppCompatPolicyMock = mock( + DisplayRotationImmersiveAppCompatPolicy.class); + when(mDisplayRotationImmersiveAppCompatPolicyMock.isRotationLockEnforced( + Surface.ROTATION_90)).thenReturn(true); + + mBuilder.build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + + thawRotation(); + + enableOrientationSensor(); + + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertTrue(waitForUiHandler()); + + verify(mMockStatusBarManagerInternal).onProposedRotationChanged(Surface.ROTATION_90, true); + + // An imaginary ActivityRecord.setRequestedOrientation call disables immersive mode: + when(mDisplayRotationImmersiveAppCompatPolicyMock.isRotationLockEnforced( + Surface.ROTATION_90)).thenReturn(false); + + // And then ActivityRecord.setRequestedOrientation calls onSetRequestedOrientation. + mTarget.onSetRequestedOrientation(); + + // onSetRequestedOrientation should lead to a second call to + // mOrientationListener.onProposedRotationChanged + // but now, instead of notifying mMockStatusBarManagerInternal, it calls updateRotation: + verify(sMockWm).updateRotation(false, false); + } + + @Test public void testAllowAllRotations_allowsUpsideDownSuggestion() throws Exception { mBuilder.build(); @@ -943,6 +994,120 @@ public class DisplayRotationTests { Surface.ROTATION_0, Surface.ROTATION_90, false /* forceUpdate */)); } + @Test + public void testSensorRotationAfterDisplayChangeBeforeTimeout_ignoresSensor() throws Exception { + mBuilder.setSupportHalfFoldAutoRotateOverride(true) + .setPauseRotationWhenUnfolding(true) + .setDisplaySwitchRotationBlockTimeMs(1000) + .build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + thawRotation(); + enableOrientationSensor(); + + mTarget.physicalDisplayChanged(); + + moveTimeForward(900); + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_0, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + } + + @Test + public void testSensorRotationAfterDisplayChangeAfterTimeout_usesSensor() throws Exception { + mBuilder.setSupportHalfFoldAutoRotateOverride(true) + .setPauseRotationWhenUnfolding(true) + .setDisplaySwitchRotationBlockTimeMs(1000) + .build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + thawRotation(); + enableOrientationSensor(); + + mTarget.physicalDisplayChanged(); + + moveTimeForward(1100); + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_90, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + } + + @Test + public void testSensorRotationAfterHingeEventBeforeTimeout_ignoresSensor() throws Exception { + mBuilder.setSupportHalfFoldAutoRotateOverride(true) + .setPauseRotationWhenUnfolding(true) + .setMaxHingeAngle(165) + .setHingeAngleRotationBlockTimeMs(400) + .build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + thawRotation(); + enableOrientationSensor(); + + sendHingeAngleEvent(130); + + moveTimeForward( 300); + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_0, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + } + + @Test + public void testSensorRotationAfterHingeEventBeforeTimeoutFlagDisabled_usesSensorData() + throws Exception { + mBuilder.setSupportHalfFoldAutoRotateOverride(true) + .setPauseRotationWhenUnfolding(false) + .setMaxHingeAngle(165) + .setHingeAngleRotationBlockTimeMs(400) + .build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + thawRotation(); + enableOrientationSensor(); + + sendHingeAngleEvent(130); + + moveTimeForward( 300); + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_90, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + } + + @Test + public void testSensorRotationAfterHingeEventAfterTimeout_usesSensorData() throws Exception { + mBuilder.setSupportHalfFoldAutoRotateOverride(true) + .setPauseRotationWhenUnfolding(true) + .setMaxHingeAngle(165) + .setHingeAngleRotationBlockTimeMs(400) + .build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + thawRotation(); + enableOrientationSensor(); + + sendHingeAngleEvent(180); + + moveTimeForward(1010); + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_90, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + } + + + @Test + public void testSensorRotationAfterLargeHingeEventBeforeTimeout_usesSensor() throws Exception { + mBuilder.setSupportHalfFoldAutoRotateOverride(true) + .setPauseRotationWhenUnfolding(true) + .setMaxHingeAngle(165) + .setHingeAngleRotationBlockTimeMs(400) + .build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + thawRotation(); + enableOrientationSensor(); + + sendHingeAngleEvent(180); + + moveTimeForward(300); + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_90, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + } + // ======================== // Non-rotation API Tests // ======================== @@ -963,6 +1128,12 @@ public class DisplayRotationTests { + " fixed to user rotation.", mTarget.isFixedToUserRotation()); } + private void moveTimeForward(long timeMillis) { + sCurrentUptimeMillis += timeMillis; + sClock.fastForward(timeMillis); + sHandler.timeAdvance(); + } + /** * Call {@link DisplayRotation#configure(int, int)} to configure {@link #mTarget} * according to given parameters. @@ -995,6 +1166,17 @@ public class DisplayRotationTests { mTarget.configure(width, height); } + private void sendHingeAngleEvent(int hingeAngle) { + mHingeAngleSensorListenerCaptor.getAllValues().forEach(sensorEventListener -> { + try { + sensorEventListener.onSensorChanged(createSensorEvent(mFakeHingeAngleSensor, + hingeAngle)); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + } + private void freezeRotation(int rotation) { mTarget.freezeRotation(rotation); @@ -1016,7 +1198,11 @@ public class DisplayRotationTests { private class DisplayRotationBuilder { private boolean mIsDefaultDisplay = true; private boolean mSupportAutoRotation = true; + private boolean mPauseRotationWhenUnfolding = false; private boolean mSupportHalfFoldAutoRotateOverride = false; + private int mDisplaySwitchRotationBlockTimeMs; + private int mHingeAngleRotationBlockTimeMs; + private int mMaxHingeAngle; private int mLidOpenRotation = WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; private int mCarDockRotation; @@ -1028,6 +1214,29 @@ public class DisplayRotationTests { return this; } + public DisplayRotationBuilder setPauseRotationWhenUnfolding( + boolean pauseRotationWhenUnfolding) { + mPauseRotationWhenUnfolding = pauseRotationWhenUnfolding; + return this; + } + + public DisplayRotationBuilder setDisplaySwitchRotationBlockTimeMs( + int displaySwitchRotationBlockTimeMs) { + mDisplaySwitchRotationBlockTimeMs = displaySwitchRotationBlockTimeMs; + return this; + } + + public DisplayRotationBuilder setHingeAngleRotationBlockTimeMs( + int hingeAngleRotationBlockTimeMs) { + mHingeAngleRotationBlockTimeMs = hingeAngleRotationBlockTimeMs; + return this; + } + + public DisplayRotationBuilder setMaxHingeAngle(int maxHingeAngle) { + mMaxHingeAngle = maxHingeAngle; + return this; + } + private DisplayRotationBuilder setSupportAutoRotation(boolean supportAutoRotation) { mSupportAutoRotation = supportAutoRotation; return this; @@ -1153,10 +1362,27 @@ public class DisplayRotationTests { when(mMockDisplayContent.getWindowConfiguration()) .thenReturn(new WindowConfiguration()); + Field field = DisplayContent.class + .getDeclaredField("mFixedRotationTransitionListener"); + field.setAccessible(true); + field.set(mMockDisplayContent, mock(FixedRotationTransitionListener.class)); + mMockDisplayPolicy = mock(DisplayPolicy.class); mMockRes = mock(Resources.class); when(mMockContext.getResources()).thenReturn((mMockRes)); + when(mMockRes.getBoolean(com.android.internal.R.bool + .config_windowManagerPauseRotationWhenUnfolding)) + .thenReturn(mPauseRotationWhenUnfolding); + when(mMockRes.getInteger(com.android.internal.R.integer + .config_pauseRotationWhenUnfolding_displaySwitchTimeout)) + .thenReturn(mDisplaySwitchRotationBlockTimeMs); + when(mMockRes.getInteger(com.android.internal.R.integer + .config_pauseRotationWhenUnfolding_hingeEventTimeout)) + .thenReturn(mHingeAngleRotationBlockTimeMs); + when(mMockRes.getInteger(com.android.internal.R.integer + .config_pauseRotationWhenUnfolding_maxHingeAngle)) + .thenReturn(mMaxHingeAngle); when(mMockRes.getBoolean(com.android.internal.R.bool.config_supportAutoRotation)) .thenReturn(mSupportAutoRotation); when(mMockRes.getInteger(com.android.internal.R.integer.config_lidOpenRotation)) @@ -1169,11 +1395,16 @@ public class DisplayRotationTests { .thenReturn(convertRotationToDegrees(mUndockedHdmiRotation)); mMockSensorManager = mock(SensorManager.class); + when(mMockContext.getSystemService(SensorManager.class)) + .thenReturn(mMockSensorManager); when(mMockContext.getSystemService(Context.SENSOR_SERVICE)) .thenReturn(mMockSensorManager); mFakeOrientationSensor = createSensor(Sensor.TYPE_DEVICE_ORIENTATION); when(mMockSensorManager.getSensorList(Sensor.TYPE_DEVICE_ORIENTATION)).thenReturn( Collections.singletonList(mFakeOrientationSensor)); + mFakeHingeAngleSensor = mock(Sensor.class); + when(mMockSensorManager.getDefaultSensor(Sensor.TYPE_HINGE_ANGLE)).thenReturn( + mFakeHingeAngleSensor); when(mMockContext.getResources().getBoolean( com.android.internal.R.bool.config_windowManagerHalfFoldAutoRotateOverride)) @@ -1200,11 +1431,15 @@ public class DisplayRotationTests { reset(sMockWm); + verify(mMockSensorManager, atLeast(0)).registerListener( + mHingeAngleSensorListenerCaptor.capture(), eq(mFakeHingeAngleSensor), anyInt(), + any()); + captureObservers(); } } - private static class TestDisplayRotation extends DisplayRotation { + private class TestDisplayRotation extends DisplayRotation { IntConsumer mProposedRotationCallback; TestDisplayRotation(DisplayContent dc, DisplayAddress address, DisplayPolicy policy, @@ -1217,7 +1452,7 @@ public class DisplayRotationTests { @Override DisplayRotationImmersiveAppCompatPolicy initImmersiveAppCompatPolicy( WindowManagerService service, DisplayContent displayContent) { - return null; + return mDisplayRotationImmersiveAppCompatPolicyMock; } @Override @@ -1226,5 +1461,15 @@ public class DisplayRotationTests { mProposedRotationCallback.accept(rotation); } } + + @Override + Handler getHandler() { + return sHandler; + } + + @Override + long uptimeMillis() { + return sCurrentUptimeMillis; + } } } diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java index b35eceb6dd11..5e513f1a0d01 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java @@ -76,25 +76,6 @@ public class InsetsSourceProviderTest extends WindowTestsBase { } @Test - public void testPostLayout_givenInsets() { - final WindowState ime = createWindow(null, TYPE_APPLICATION, "ime"); - ime.getFrame().set(0, 0, 500, 100); - ime.mGivenContentInsets.set(0, 0, 0, 60); - ime.mGivenVisibleInsets.set(0, 0, 0, 75); - ime.mHasSurface = true; - mProvider.setWindowContainer(ime, null, null); - mProvider.updateSourceFrame(ime.getFrame()); - mProvider.onPostLayout(); - assertEquals(new Rect(0, 0, 500, 40), mProvider.getSource().getFrame()); - assertEquals(new Rect(0, 0, 500, 25), mProvider.getSource().getVisibleFrame()); - assertEquals(Insets.of(0, 40, 0, 0), - mProvider.getSource().calculateInsets(new Rect(0, 0, 500, 500), - false /* ignoreVisibility */)); - assertEquals(Insets.of(0, 25, 0, 0), - mProvider.getSource().calculateVisibleInsets(new Rect(0, 0, 500, 500))); - } - - @Test public void testPostLayout_invisible() { final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar"); statusBar.getFrame().set(0, 0, 500, 100); diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java index 43fc1c43d6ba..7cb7c79d63a0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java @@ -111,7 +111,6 @@ public class LaunchParamsPersisterTests extends WindowTestsBase { mDisplayUniqueId = "test:" + sNextUniqueId++; mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500) .setUniqueId(mDisplayUniqueId).build(); - mTestDisplay.getDefaultTaskDisplayArea().setWindowingMode(TEST_WINDOWING_MODE); when(mRootWindowContainer.getDisplayContent(eq(mDisplayUniqueId))) .thenReturn(mTestDisplay); diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java index 12e4825e5f85..a15ee694d6a4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java @@ -41,6 +41,7 @@ import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_V import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE; import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE; import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS; +import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED; import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; @@ -146,7 +147,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { mActivity = setUpActivityWithComponent(); mController = new LetterboxUiController(mWm, mActivity); prepareActivityThatShouldIgnoreRequestedOrientationDuringRelaunch(); - mController.setRelauchingAfterRequestedOrientationChanged(false); + mController.setRelaunchingAfterRequestedOrientationChanged(false); spyOn(mDisplayContent.mDisplayRotationCompatPolicy); doReturn(true).when(mDisplayContent.mDisplayRotationCompatPolicy) @@ -190,7 +191,28 @@ public class LetterboxUiControllerTest extends WindowTestsBase { @Test public void testShouldIgnoreOrientationRequestLoop_overrideDisabled_returnsFalse() { + doReturn(true).when(mLetterboxConfiguration) + .isPolicyForIgnoringRequestedOrientationEnabled(); + doReturn(false).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio(); + // Request 3 times to simulate orientation request loop + for (int i = 0; i <= MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP; i++) { + assertShouldIgnoreOrientationRequestLoop(/* shouldIgnore */ false, + /* expectedCount */ 0); + } + } + + @Test + @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED}) + public void testShouldIgnoreOrientationRequestLoop_propertyIsFalseAndOverride_returnsFalse() + throws Exception { + doReturn(true).when(mLetterboxConfiguration) + .isPolicyForIgnoringRequestedOrientationEnabled(); + mockThatProperty(PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED, + /* value */ false); doReturn(false).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio(); + + mController = new LetterboxUiController(mWm, mActivity); + // Request 3 times to simulate orientation request loop for (int i = 0; i <= MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP; i++) { assertShouldIgnoreOrientationRequestLoop(/* shouldIgnore */ false, @@ -201,7 +223,10 @@ public class LetterboxUiControllerTest extends WindowTestsBase { @Test @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED}) public void testShouldIgnoreOrientationRequestLoop_isLetterboxed_returnsFalse() { + doReturn(true).when(mLetterboxConfiguration) + .isPolicyForIgnoringRequestedOrientationEnabled(); doReturn(true).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio(); + // Request 3 times to simulate orientation request loop for (int i = 0; i <= MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP; i++) { assertShouldIgnoreOrientationRequestLoop(/* shouldIgnore */ false, @@ -212,7 +237,10 @@ public class LetterboxUiControllerTest extends WindowTestsBase { @Test @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED}) public void testShouldIgnoreOrientationRequestLoop_noLoop_returnsFalse() { + doReturn(true).when(mLetterboxConfiguration) + .isPolicyForIgnoringRequestedOrientationEnabled(); doReturn(false).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio(); + // No orientation request loop assertShouldIgnoreOrientationRequestLoop(/* shouldIgnore */ false, /* expectedCount */ 0); @@ -222,7 +250,10 @@ public class LetterboxUiControllerTest extends WindowTestsBase { @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED}) public void testShouldIgnoreOrientationRequestLoop_timeout_returnsFalse() throws InterruptedException { + doReturn(true).when(mLetterboxConfiguration) + .isPolicyForIgnoringRequestedOrientationEnabled(); doReturn(false).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio(); + for (int i = MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP; i > 0; i--) { assertShouldIgnoreOrientationRequestLoop(/* shouldIgnore */ false, /* expectedCount */ 0); @@ -233,7 +264,10 @@ public class LetterboxUiControllerTest extends WindowTestsBase { @Test @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED}) public void testShouldIgnoreOrientationRequestLoop_returnsTrue() { + doReturn(true).when(mLetterboxConfiguration) + .isPolicyForIgnoringRequestedOrientationEnabled(); doReturn(false).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio(); + for (int i = 0; i < MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP; i++) { assertShouldIgnoreOrientationRequestLoop(/* shouldIgnore */ false, /* expectedCount */ i); @@ -870,7 +904,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { private void prepareActivityThatShouldIgnoreRequestedOrientationDuringRelaunch() { doReturn(true).when(mLetterboxConfiguration) .isPolicyForIgnoringRequestedOrientationEnabled(); - mController.setRelauchingAfterRequestedOrientationChanged(true); + mController.setRelaunchingAfterRequestedOrientationChanged(true); } private ActivityRecord setUpActivityWithComponent() { diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java index 9ebc7307418d..10f4158205e6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java @@ -924,6 +924,11 @@ public class RecentTasksTest extends WindowTestsBase { @Test public void testFreezeTaskListOrder_timeout() { + for (Task t : mTasks) { + // Make all the tasks non-empty + new ActivityBuilder(mAtm).setTask(t).build(); + } + // Add some tasks mRecentTasks.add(mTasks.get(0)); mRecentTasks.add(mTasks.get(1)); diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index de41117c001d..de943d240084 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -17,6 +17,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; +import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; @@ -178,6 +179,44 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + public void testActivityInHistoryAndNotVisibleIsNotUsedAsOpaqueForTranslucentActivities() { + mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true); + setUpDisplaySizeWithApp(2000, 1000); + prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT); + mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = false; + // Translucent Activity + final ActivityRecord translucentActivity = new ActivityBuilder(mAtm) + .setLaunchedFromUid(mActivity.getUid()) + .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT) + .build(); + doReturn(false).when(translucentActivity).fillsParent(); + + mTask.addChild(translucentActivity); + + assertFalse(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior()); + } + + @Test + public void testActivityInHistoryAndVisibleIsUsedAsOpaqueForTranslucentActivities() { + mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true); + setUpDisplaySizeWithApp(2000, 1000); + prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT); + mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = true; + // Translucent Activity + final ActivityRecord translucentActivity = new ActivityBuilder(mAtm) + .setLaunchedFromUid(mActivity.getUid()) + .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT) + .build(); + doReturn(false).when(translucentActivity).fillsParent(); + + mTask.addChild(translucentActivity); + + assertTrue(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior()); + } + + @Test public void testCleanLetterboxConfigListenerWhenTranslucentIsDestroyed() { mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true); setUpDisplaySizeWithApp(2000, 1000); @@ -201,6 +240,7 @@ public class SizeCompatTests extends WindowTestsBase { public void testHorizontalReachabilityEnabledForTranslucentActivities() { setUpDisplaySizeWithApp(2500, 1000); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = true; final LetterboxConfiguration config = mWm.mLetterboxConfiguration; config.setTranslucentLetterboxingOverrideEnabled(true); config.setLetterboxHorizontalPositionMultiplier(0.5f); @@ -276,6 +316,7 @@ public class SizeCompatTests extends WindowTestsBase { public void testVerticalReachabilityEnabledForTranslucentActivities() { setUpDisplaySizeWithApp(1000, 2500); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = true; final LetterboxConfiguration config = mWm.mLetterboxConfiguration; config.setTranslucentLetterboxingOverrideEnabled(true); config.setLetterboxVerticalPositionMultiplier(0.5f); @@ -354,6 +395,7 @@ public class SizeCompatTests extends WindowTestsBase { prepareUnresizable(mActivity, 1.5f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); mActivity.info.setMinAspectRatio(1.2f); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = true; // Translucent Activity final ActivityRecord translucentActivity = new ActivityBuilder(mAtm) .setLaunchedFromUid(mActivity.getUid()) @@ -387,20 +429,24 @@ public class SizeCompatTests extends WindowTestsBase { .setLaunchedFromUid(mActivity.getUid()) .build(); doReturn(false).when(translucentActivity).fillsParent(); - WindowConfiguration translucentWinConf = translucentActivity.getWindowConfiguration(); - translucentActivity.setActivityType(ACTIVITY_TYPE_STANDARD); - translucentActivity.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); - translucentActivity.setDisplayWindowingMode(WINDOWING_MODE_MULTI_WINDOW); - translucentActivity.setAlwaysOnTop(true); + final Configuration requestedConfig = + translucentActivity.getRequestedOverrideConfiguration(); + final WindowConfiguration translucentWinConf = requestedConfig.windowConfiguration; + translucentWinConf.setActivityType(ACTIVITY_TYPE_STANDARD); + translucentWinConf.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); + translucentWinConf.setDisplayWindowingMode(WINDOWING_MODE_MULTI_WINDOW); + translucentWinConf.setAlwaysOnTop(true); + translucentActivity.onRequestedOverrideConfigurationChanged(requestedConfig); mTask.addChild(translucentActivity); - // We check the WIndowConfiguration properties - translucentWinConf = translucentActivity.getWindowConfiguration(); + // The original override of WindowConfiguration should keep. assertEquals(ACTIVITY_TYPE_STANDARD, translucentActivity.getActivityType()); assertEquals(WINDOWING_MODE_MULTI_WINDOW, translucentWinConf.getWindowingMode()); assertEquals(WINDOWING_MODE_MULTI_WINDOW, translucentWinConf.getDisplayWindowingMode()); assertTrue(translucentWinConf.isAlwaysOnTop()); + // Unless display is going to be rotated, it should always inherit from parent. + assertEquals(ROTATION_UNDEFINED, translucentWinConf.getDisplayRotation()); } @Test @@ -410,6 +456,7 @@ public class SizeCompatTests extends WindowTestsBase { prepareUnresizable(mActivity, 1.5f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); mActivity.info.setMinAspectRatio(1.2f); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = true; // Translucent Activity final ActivityRecord translucentActivity = new ActivityBuilder(mAtm) .setLaunchedFromUid(mActivity.getUid()) @@ -503,6 +550,7 @@ public class SizeCompatTests extends WindowTestsBase { true /* ignoreOrientationRequest */); mActivity.mWmService.mLetterboxConfiguration.setLetterboxHorizontalPositionMultiplier( 1.0f /*letterboxVerticalPositionMultiplier*/); + mActivity.nowVisible = true; prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT); // We launch a transparent activity final ActivityRecord translucentActivity = new ActivityBuilder(mAtm) @@ -535,6 +583,7 @@ public class SizeCompatTests extends WindowTestsBase { mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true); setUpDisplaySizeWithApp(2800, 1400); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mActivity.nowVisible = true; prepareUnresizable(mActivity, -1f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); // Rotate to put activity in size compat mode. rotateDisplay(mActivity.mDisplayContent, ROTATION_90); @@ -769,6 +818,8 @@ public class SizeCompatTests extends WindowTestsBase { spyOn(mActivity.mLetterboxUiController); doReturn(true).when(mActivity.mLetterboxUiController) + .isSurfaceReadyToShow(any()); + doReturn(true).when(mActivity.mLetterboxUiController) .isSurfaceVisible(any()); assertTrue(mActivity.mLetterboxUiController.shouldShowLetterboxUi( diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index b48fd7d60f06..fdb3502f2ce7 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -691,6 +691,7 @@ public class WindowStateTests extends WindowTestsBase { // Child window without scale (e.g. different app) should apply inverse scale of parent. doReturn(1f).when(cmp).getCompatScale(anyString(), anyInt()); final WindowState child2 = createWindow(w, TYPE_APPLICATION_SUB_PANEL, "child2"); + makeWindowVisible(w, child2); clearInvocations(t); child2.prepareSurfaces(); verify(t).setMatrix(child2.mSurfaceControl, w.mInvGlobalScale, 0, 0, w.mInvGlobalScale); diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 8948e494d851..a98429ad4902 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -46,6 +46,7 @@ import android.app.ActivityManager.ProcessState; import android.app.AppOpsManager; import android.app.IUidObserver; import android.app.PendingIntent; +import android.app.UidObserver; import android.app.admin.DevicePolicyManagerInternal; import android.app.usage.AppLaunchEstimateInfo; import android.app.usage.AppStandbyInfo; @@ -592,33 +593,17 @@ public class UsageStatsService extends SystemService implements } } - private final IUidObserver mUidObserver = new IUidObserver.Stub() { + private final IUidObserver mUidObserver = new UidObserver() { @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { mHandler.obtainMessage(MSG_UID_STATE_CHANGED, uid, procState).sendToTarget(); } @Override - public void onUidIdle(int uid, boolean disabled) { - // Ignored - } - - @Override public void onUidGone(int uid, boolean disabled) { onUidStateChanged(uid, ActivityManager.PROCESS_STATE_NONEXISTENT, 0, ActivityManager.PROCESS_CAPABILITY_NONE); } - - @Override - public void onUidActive(int uid) { - // Ignored - } - - @Override public void onUidCachedChanged(int uid, boolean cached) { - } - - @Override public void onUidProcAdjChanged(int uid) { - } }; @Override diff --git a/telecomm/java/android/telecom/CallAttributes.java b/telecomm/java/android/telecom/CallAttributes.java index 1a0f192ab72b..f3ef834168b5 100644 --- a/telecomm/java/android/telecom/CallAttributes.java +++ b/telecomm/java/android/telecom/CallAttributes.java @@ -58,6 +58,9 @@ public final class CallAttributes implements Parcelable { /** @hide **/ public static final String CALL_CAPABILITIES_KEY = "TelecomCapabilities"; + /** @hide **/ + public static final String CALLER_PID = "CallerPid"; + private CallAttributes(@NonNull PhoneAccountHandle phoneAccountHandle, @NonNull CharSequence displayName, @NonNull Uri address, diff --git a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java index cfebf3462b57..4299e0d616fb 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java +++ b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java @@ -87,7 +87,7 @@ public final class DynamicCodeLoggerIntegrationTests { // avoid flakiness we run these tests multiple times, allowing progressively longer between // code loading and checking the logs on each try.) private static final int AUDIT_LOG_RETRIES = 10; - private static final int RETRY_DELAY_MS = 2_000; + private static final int RETRY_DELAY_MS = 500; private static Context sContext; private static int sMyUid; @@ -253,7 +253,7 @@ public final class DynamicCodeLoggerIntegrationTests { "/DynamicCodeLoggerNativeExecutable", privateCopyFile); EventLog.writeEvent(EventLog.getTagCode("auditd"), - "type=1400 avc: granted { execute_no_trans } " + "type=1400 avc: granted { execute_no_trans } " + "path=\"" + privateCopyFile + "\" " + "scontext=u:r:untrusted_app: " + "tcontext=u:object_r:app_data_file: " diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt index 314b9e4a853b..f389e13a6884 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -260,7 +260,7 @@ fun FlickerTest.snapshotStartingWindowLayerCoversExactlyOnApp(component: ICompon snapshotLayers .mapNotNull { snapshotLayer -> snapshotLayer.layer.visibleRegion } .toTypedArray() - val snapshotRegion = RegionSubject(visibleAreas, this, timestamp) + val snapshotRegion = RegionSubject(visibleAreas, timestamp) val appVisibleRegion = it.visibleRegion(component) if (snapshotRegion.region.isNotEmpty) { snapshotRegion.coversExactly(appVisibleRegion.region) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt index 47b2cda62f51..5dc2dd7d93a8 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt @@ -17,6 +17,7 @@ package com.android.server.wm.flicker.close import android.platform.test.annotations.FlakyTest +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest @@ -39,27 +40,20 @@ import org.junit.runners.Parameterized * Launch an app [testApp] and wait animation to complete * Press back button * ``` - * * To run only the presubmit assertions add: `-- - * * ``` * --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest * --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit` * ``` - * * To run only the postsubmit assertions add: `-- - * * ``` * --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest * --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit` * ``` - * * To run only the flaky assertions add: `-- - * * ``` * --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest` * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) @@ -71,6 +65,7 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt index 70eedd93e1ba..9fa840190fbf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.close +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -24,6 +25,7 @@ import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt index d8abb4e8b343..b042a14b30da 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt @@ -17,6 +17,7 @@ package com.android.server.wm.flicker.close import android.platform.test.annotations.FlakyTest +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest @@ -39,27 +40,20 @@ import org.junit.runners.Parameterized * Launch an app [testApp] and wait animation to complete * Press home button * ``` - * * To run only the presubmit assertions add: `-- - * * ``` * --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest * --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit` * ``` - * * To run only the postsubmit assertions add: `-- - * * ``` * --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest * --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit` * ``` - * * To run only the flaky assertions add: `-- - * * ``` * --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest` * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) @@ -71,6 +65,7 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt index c74f54be61c9..136995a78fd7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.close +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -24,6 +25,7 @@ import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java index a8f1b3de564e..6b24598dc9cd 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.app.Instrumentation; import android.app.UiAutomation; import android.os.SystemClock; +import android.util.Log; import android.view.InputDevice; import android.view.InputEvent; import android.view.MotionEvent; @@ -32,6 +33,7 @@ import androidx.annotation.Nullable; * Injects gestures given an {@link Instrumentation} object. */ public class GestureHelper { + private static final String TAG = GestureHelper.class.getSimpleName(); // Inserted after each motion event injection. private static final int MOTION_EVENT_INJECTION_DELAY_MILLIS = 5; @@ -208,6 +210,9 @@ public class GestureHelper { for (int j = 0; j < coords.length; j++) { coords[j].x += (endPoints[j].x - startPoints[j].x) / steps; coords[j].y += (endPoints[j].y - startPoints[j].y) / steps; + + // TODO: remove logging once b/269505548 is resolved + Log.d(TAG, "(" + coords[j].x + ", " + coords[j].y + ")"); } eventTime = SystemClock.uptimeMillis(); diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt index 6066d2e74209..34fa921f5777 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt @@ -88,7 +88,7 @@ open class CloseImeOnDismissPopupDialogTest(flicker: FlickerTest) : BaseTest(fli imeSnapshotLayers .mapNotNull { imeSnapshotLayer -> imeSnapshotLayer.layer.visibleRegion } .toTypedArray() - val imeVisibleRegion = RegionSubject(visibleAreas, this, timestamp) + val imeVisibleRegion = RegionSubject(visibleAreas, timestamp) val appVisibleRegion = it.visibleRegion(imeTestApp) if (imeVisibleRegion.region.isNotEmpty) { imeVisibleRegion.coversAtMost(appVisibleRegion.region) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeToHomeOnFinishActivityTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeToHomeOnFinishActivityTest.kt index 2fff00133eb8..d5208e060883 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeToHomeOnFinishActivityTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeToHomeOnFinishActivityTest.kt @@ -73,7 +73,16 @@ open class CloseImeToHomeOnFinishActivityTest(flicker: FlickerTest) : BaseTest(f @Test @IwTest(focusArea = "ime") override fun cujCompleted() { - super.cujCompleted() + runAndIgnoreAssumptionViolation { entireScreenCovered() } + runAndIgnoreAssumptionViolation { statusBarLayerIsVisibleAtStartAndEnd() } + runAndIgnoreAssumptionViolation { statusBarLayerPositionAtStartAndEnd() } + runAndIgnoreAssumptionViolation { statusBarWindowIsAlwaysVisible() } + runAndIgnoreAssumptionViolation { visibleWindowsShownMoreThanOneConsecutiveEntry() } + runAndIgnoreAssumptionViolation { taskBarLayerIsVisibleAtStartAndEnd() } + runAndIgnoreAssumptionViolation { taskBarWindowIsAlwaysVisible() } + runAndIgnoreAssumptionViolation { navBarLayerIsVisibleAtStartAndEnd() } + runAndIgnoreAssumptionViolation { navBarWindowIsAlwaysVisible() } + runAndIgnoreAssumptionViolation { navBarWindowIsVisibleAtStartAndEnd() } imeLayerBecomesInvisible() imeWindowBecomesInvisible() } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt index ac05c7687311..3289bc601160 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt @@ -41,4 +41,4 @@ class OpenAppAfterCameraTestCfArm(flicker: FlickerTest) : OpenAppAfterCameraTest return FlickerTestFactory.nonRotationTests() } } -} +}
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt index 09c17b17a3c5..ccbe74f04a70 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.FlakyTest import android.tools.common.NavBar +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -28,6 +29,7 @@ import org.junit.runners.MethodSorters import org.junit.runners.Parameterized /** Some assertions will fail because of b/264415996 */ +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 5cacb04e4b16..d0dc42f29b9e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -18,13 +18,14 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory -import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.helpers.setRotation +import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -41,7 +42,6 @@ import org.junit.runners.Parameterized * Make sure no apps are running on the device * Launch an app [testApp] and wait animation to complete * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) @@ -53,6 +53,7 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt index f77f96874fb9..f75d9eede25b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt @@ -17,6 +17,7 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.FlakyTest +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -26,6 +27,7 @@ import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @@ -47,4 +49,4 @@ class OpenAppColdTestCfArm(flicker: FlickerTest) : OpenAppColdTest(flicker) { return FlickerTestFactory.nonRotationTests() } } -} +}
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdCfArm.kt index 8b4a613305c0..4aa78d4482fb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdCfArm.kt @@ -44,4 +44,4 @@ class OpenAppFromNotificationColdCfArm(flicker: FlickerTest) : return FlickerTestFactory.nonRotationTests() } } -} +}
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 66e0f0657064..00d7544f7217 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -19,6 +19,7 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import android.tools.common.Rotation +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest @@ -43,7 +44,6 @@ import org.junit.runners.Parameterized * Relaunch an app [testApp] by selecting it in the overview screen, and wait animation to * complete (only this action is traced) * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) @@ -55,6 +55,7 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTestCfArm.kt index 8139e1f5f507..ff24190a7aef 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTestCfArm.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -25,6 +26,7 @@ import org.junit.runners.MethodSorters import org.junit.runners.Parameterized /** Some assertions will fail because of b/264415996 */ +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt index 14df84e26ac4..9ab61566e13f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt @@ -22,6 +22,7 @@ import android.platform.test.annotations.Presubmit import android.tools.common.NavBar import android.tools.common.Rotation import android.tools.common.datatypes.component.ComponentNameMatcher +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -47,7 +48,6 @@ import org.junit.runners.Parameterized * Lock the device. * Launch an app on top of the lock screen [testApp] and wait animation to complete * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) @@ -59,6 +59,7 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index cfc8e4672ddf..cdd2d45769bb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest @@ -41,7 +42,6 @@ import org.junit.runners.Parameterized * Press home * Relaunch an app [testApp] and wait animation to complete (only this action is traced) * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) @@ -53,6 +53,7 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTestCfArm.kt index b47c9319aced..9679059e5069 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTestCfArm.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import android.tools.device.flicker.annotation.FlickerServiceCompatible import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory @@ -24,6 +25,7 @@ import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized +@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @@ -41,4 +43,4 @@ class OpenAppWarmTestCfArm(flicker: FlickerTest) : OpenAppWarmTest(flicker) { return FlickerTestFactory.nonRotationTests() } } -} +}
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt index e876e5777145..786bb32096ad 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt @@ -24,10 +24,10 @@ import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory -import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule import android.view.KeyEvent import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.helpers.setRotation +import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -44,7 +44,6 @@ import org.junit.runners.Parameterized * Make sure no apps are running on the device * Launch an app [testApp] and wait animation to complete * ``` - * * Notes: * ``` * 1. Some default assertions (e.g., nav bar, status bar and screen covered) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OverrideTaskTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OverrideTaskTransitionTest.kt index 6cbb975b34a9..b848e63c9c87 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OverrideTaskTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OverrideTaskTransitionTest.kt @@ -27,13 +27,13 @@ import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTestFactory -import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule -import android.tools.device.helpers.wakeUpAndGoToHomeScreen import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.R -import com.android.server.wm.flicker.helpers.SimpleAppHelper import com.android.server.wm.flicker.helpers.setRotation +import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule +import android.tools.device.helpers.wakeUpAndGoToHomeScreen +import com.android.server.wm.flicker.helpers.SimpleAppHelper import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith diff --git a/tests/OdmApps/Android.bp b/tests/OdmApps/Android.bp index 5f03aa27e6df..a5c6d6513f50 100644 --- a/tests/OdmApps/Android.bp +++ b/tests/OdmApps/Android.bp @@ -28,5 +28,6 @@ java_test_host { test_suites: ["device-tests"], data: [ ":TestOdmApp", + ":TestOdmPrivApp", ], } diff --git a/tests/SilkFX/assets/gainmaps/cave.jpg b/tests/SilkFX/assets/gainmaps/cave.jpg Binary files differdeleted file mode 100644 index fa7d3fc325d5..000000000000 --- a/tests/SilkFX/assets/gainmaps/cave.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/city_night.jpg b/tests/SilkFX/assets/gainmaps/city_night.jpg Binary files differnew file mode 100644 index 000000000000..cdb4311ddcbe --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/city_night.jpg diff --git a/tests/SilkFX/assets/gainmaps/desert_palms.jpg b/tests/SilkFX/assets/gainmaps/desert_palms.jpg Binary files differnew file mode 100644 index 000000000000..c337aadc2d4d --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/desert_palms.jpg diff --git a/tests/SilkFX/assets/gainmaps/desert_sunset.jpg b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg Binary files differnew file mode 100644 index 000000000000..fa15f5606af6 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg diff --git a/tests/SilkFX/assets/gainmaps/desert_wanda.jpg b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg Binary files differnew file mode 100644 index 000000000000..33f69a92bac3 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg diff --git a/tests/SilkFX/assets/gainmaps/fountain_night.jpg b/tests/SilkFX/assets/gainmaps/fountain_night.jpg Binary files differnew file mode 100644 index 000000000000..863127b7ac59 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/fountain_night.jpg diff --git a/tests/SilkFX/assets/gainmaps/grand_canyon.jpg b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg Binary files differnew file mode 100644 index 000000000000..12cd9665776e --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg diff --git a/tests/SilkFX/assets/gainmaps/granddam.jpg b/tests/SilkFX/assets/gainmaps/granddam.jpg Binary files differdeleted file mode 100644 index 823f14efcbb2..000000000000 --- a/tests/SilkFX/assets/gainmaps/granddam.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/lamps.jpg b/tests/SilkFX/assets/gainmaps/lamps.jpg Binary files differnew file mode 100644 index 000000000000..65bda89ad660 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/lamps.jpg diff --git a/tests/SilkFX/assets/gainmaps/lightbulb.jpg b/tests/SilkFX/assets/gainmaps/lightbulb.jpg Binary files differdeleted file mode 100644 index 232c5f0937df..000000000000 --- a/tests/SilkFX/assets/gainmaps/lightbulb.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/mountain_lake.jpg b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg Binary files differnew file mode 100644 index 000000000000..b2b10d287c69 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg diff --git a/tests/SilkFX/assets/gainmaps/mountains.jpg b/tests/SilkFX/assets/gainmaps/mountains.jpg Binary files differnew file mode 100644 index 000000000000..82acd45fc0d8 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/mountains.jpg diff --git a/tests/SilkFX/assets/gainmaps/porsche911.jpg b/tests/SilkFX/assets/gainmaps/porsche911.jpg Binary files differdeleted file mode 100644 index 50f4fc83910e..000000000000 --- a/tests/SilkFX/assets/gainmaps/porsche911.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/sunflower.jpg b/tests/SilkFX/assets/gainmaps/sunflower.jpg Binary files differnew file mode 100644 index 000000000000..55b1b14c0ff4 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/sunflower.jpg diff --git a/tests/SilkFX/assets/gainmaps/train_station_night.jpg b/tests/SilkFX/assets/gainmaps/train_station_night.jpg Binary files differnew file mode 100644 index 000000000000..45142bb326ee --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/train_station_night.jpg diff --git a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt index db812ace0d85..a004fb5a4305 100644 --- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt +++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt @@ -38,7 +38,7 @@ class GainmapDecodeTest(context: Context, attrs: AttributeSet?) : LinearLayout(c private fun decode(mode: DecodeMode) { val source = ImageDecoder.createSource(resources.assets, - "gainmaps/cave.jpg") + "gainmaps/${context.assets.list("gainmaps")!![0]}") val sourceInfo = findViewById<TextView>(R.id.source_info)!! diff --git a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt index e079b6d5e4db..78bc4c45fa4f 100644 --- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt +++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt @@ -92,7 +92,7 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context } } - setImage(gainmapImages.indexOf("cave.jpg")) + setImage(0) imageView.apply { isClickable = true |
