diff options
419 files changed, 11270 insertions, 6512 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 284e807bfc45..23dc7207343c 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -123,13 +123,19 @@ droidstubs { }, dists: [ { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/public/api", dest: "android-non-updatable.txt", tag: ".api.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/public/api", dest: "android-non-updatable-removed.txt", tag: ".removed-api.txt", @@ -137,21 +143,18 @@ droidstubs { ], } -priv_apps = - " --show-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + +priv_apps = " --show-annotation android.annotation.SystemApi\\(" + + "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + "\\)" -priv_apps_in_stubs = - " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + +priv_apps_in_stubs = " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" + + "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + "\\)" test = " --show-annotation android.annotation.TestApi" -module_libs = - " --show-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" + +module_libs = " --show-annotation android.annotation.SystemApi\\(" + + "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" + "\\)" droidstubs { @@ -166,7 +169,7 @@ droidstubs { last_released: { api_file: ":android-non-updatable.api.system.latest", removed_api_file: ":android-non-updatable-removed.api.system.latest", - baseline_file: ":android-non-updatable-incompatibilities.api.system.latest" + baseline_file: ":android-non-updatable-incompatibilities.api.system.latest", }, api_lint: { enabled: true, @@ -176,13 +179,19 @@ droidstubs { }, dists: [ { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/system/api", dest: "android-non-updatable.txt", tag: ".api.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/system/api", dest: "android-non-updatable-removed.txt", tag: ".removed-api.txt", @@ -206,25 +215,37 @@ droidstubs { }, dists: [ { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/test/api", dest: "android.txt", tag: ".api.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/test/api", dest: "removed.txt", tag: ".removed-api.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/test/api", dest: "android-non-updatable.txt", tag: ".api.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/test/api", dest: "android-non-updatable-removed.txt", tag: ".removed-api.txt", @@ -252,13 +273,19 @@ droidstubs { }, dists: [ { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/module-lib/api", dest: "android-non-updatable.txt", tag: ".api.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/module-lib/api", dest: "android-non-updatable-removed.txt", tag: ".removed-api.txt", @@ -318,10 +345,13 @@ java_defaults { java_version: "1.8", compile_dex: true, dist: { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], tag: ".jar", dest: "android-non-updatable.jar", - } + }, } java_library_static { @@ -337,7 +367,7 @@ java_library_static { java_library_static { name: "android-non-updatable.stubs.system", defaults: ["android-non-updatable_defaults_stubs_current"], - srcs: [ ":system-api-stubs-docs-non-updatable" ], + srcs: [":system-api-stubs-docs-non-updatable"], libs: modules_system_stubs, dist: { dir: "apistubs/android/system", @@ -380,7 +410,10 @@ java_defaults { java_defaults { name: "android_stubs_dists_default", dist: { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], tag: ".jar", dest: "android.jar", }, @@ -411,7 +444,10 @@ java_library_static { dists: [ { // Legacy dist path - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], tag: ".jar", dest: "android_system.jar", }, @@ -433,14 +469,6 @@ java_library_static { dist: { dir: "apistubs/android/test", }, - dists: [ - { - // Legacy dist path - targets: ["sdk", "win_sdk"], - tag: ".jar", - dest: "android_test.jar", - }, - ], } java_library_static { diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java index 35c441e9eb98..509877e21862 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java @@ -16,6 +16,7 @@ package com.android.server.appsearch; import static android.app.appsearch.AppSearchResult.throwableToFailedResult; +import static android.os.Process.INVALID_UID; import static android.os.UserHandle.USER_NULL; import android.annotation.ElapsedRealtimeLong; @@ -36,6 +37,7 @@ import android.app.appsearch.SearchResultPage; import android.app.appsearch.SearchSpec; import android.app.appsearch.SetSchemaResponse; import android.app.appsearch.StorageInfo; +import android.app.appsearch.exceptions.AppSearchException; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -52,7 +54,6 @@ import android.os.UserManager; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; -import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; @@ -120,6 +121,14 @@ public class AppSearchManagerService extends SystemService { mContext.registerReceiverAsUser(new UserActionReceiver(), UserHandle.ALL, new IntentFilter(Intent.ACTION_USER_REMOVED), /*broadcastPermission=*/ null, /*scheduler=*/ null); + + IntentFilter packageChangedFilter = new IntentFilter(); + packageChangedFilter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); + packageChangedFilter.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED); + packageChangedFilter.addDataScheme("package"); + mContext.registerReceiverAsUser(new PackageChangedReceiver(), UserHandle.ALL, + packageChangedFilter, /*broadcastPermission=*/ null, + /*scheduler=*/ null); } private class UserActionReceiver extends BroadcastReceiver { @@ -127,15 +136,15 @@ public class AppSearchManagerService extends SystemService { public void onReceive(@NonNull Context context, @NonNull Intent intent) { switch (intent.getAction()) { case Intent.ACTION_USER_REMOVED: - final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL); + int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL); if (userId == USER_NULL) { - Slog.e(TAG, "userId is missing in the intent: " + intent); + Log.e(TAG, "userId is missing in the intent: " + intent); return; } handleUserRemoved(userId); break; default: - Slog.e(TAG, "Received unknown intent: " + intent); + Log.e(TAG, "Received unknown intent: " + intent); } } } @@ -155,9 +164,44 @@ public class AppSearchManagerService extends SystemService { try { mImplInstanceManager.removeAppSearchImplForUser(userId); mLoggerInstanceManager.removePlatformLoggerForUser(userId); - Slog.i(TAG, "Removed AppSearchImpl instance for user: " + userId); + Log.i(TAG, "Removed AppSearchImpl instance for user: " + userId); } catch (Throwable t) { - Slog.e(TAG, "Unable to remove data for user: " + userId, t); + Log.e(TAG, "Unable to remove data for user: " + userId, t); + } + } + + private class PackageChangedReceiver extends BroadcastReceiver { + @Override + public void onReceive(@NonNull Context context, @NonNull Intent intent) { + switch (intent.getAction()) { + case Intent.ACTION_PACKAGE_FULLY_REMOVED: + case Intent.ACTION_PACKAGE_DATA_CLEARED: + String packageName = intent.getData().getSchemeSpecificPart(); + if (packageName == null) { + Log.e(TAG, "Package name is missing in the intent: " + intent); + return; + } + int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID); + if (uid == INVALID_UID) { + Log.e(TAG, "uid is missing in the intent: " + intent); + return; + } + handlePackageRemoved(packageName, uid); + break; + default: + Log.e(TAG, "Received unknown intent: " + intent); + } + } + } + + private void handlePackageRemoved(String packageName, int uid) { + int userId = UserHandle.getUserId(uid); + try { + AppSearchImpl impl = mImplInstanceManager.getOrCreateAppSearchImpl(mContext, userId); + //TODO(b/145759910) clear visibility setting for package. + impl.clearPackageData(packageName); + } catch (AppSearchException e) { + Log.e(TAG, "Unable to remove data for package: " + packageName, e); } } diff --git a/apex/blobstore/framework/java/android/app/blob/BlobHandle.java b/apex/blobstore/framework/java/android/app/blob/BlobHandle.java index 113f8fe9e248..6dbbcb564b4c 100644 --- a/apex/blobstore/framework/java/android/app/blob/BlobHandle.java +++ b/apex/blobstore/framework/java/android/app/blob/BlobHandle.java @@ -26,8 +26,8 @@ import android.annotation.NonNull; import android.os.Parcel; import android.os.Parcelable; import android.util.Base64; +import android.util.IndentingPrintWriter; -import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobAccessMode.java b/apex/blobstore/service/java/com/android/server/blob/BlobAccessMode.java index ca588c509594..09260b775444 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobAccessMode.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobAccessMode.java @@ -37,9 +37,9 @@ import android.permission.PermissionManager; import android.util.ArraySet; import android.util.Base64; import android.util.DebugUtils; +import android.util.IndentingPrintWriter; import android.util.Slog; -import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java b/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java index 8b12beb57195..e47715685323 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java @@ -15,6 +15,7 @@ */ package com.android.server.blob; +import static android.Manifest.permission.ACCESS_BLOBS_ACROSS_USERS; import static android.app.blob.XmlTags.ATTR_COMMIT_TIME_MS; import static android.app.blob.XmlTags.ATTR_DESCRIPTION; import static android.app.blob.XmlTags.ATTR_DESCRIPTION_RES_NAME; @@ -36,6 +37,7 @@ import static com.android.server.blob.BlobStoreConfig.TAG; import static com.android.server.blob.BlobStoreConfig.XML_VERSION_ADD_COMMIT_TIME; import static com.android.server.blob.BlobStoreConfig.XML_VERSION_ADD_DESC_RES_NAME; import static com.android.server.blob.BlobStoreConfig.XML_VERSION_ADD_STRING_DESC; +import static com.android.server.blob.BlobStoreConfig.XML_VERSION_ALLOW_ACCESS_ACROSS_USERS; import static com.android.server.blob.BlobStoreConfig.hasLeaseWaitTimeElapsed; import static com.android.server.blob.BlobStoreUtils.getDescriptionResourceId; import static com.android.server.blob.BlobStoreUtils.getPackageResources; @@ -45,15 +47,18 @@ import android.annotation.Nullable; import android.app.blob.BlobHandle; import android.app.blob.LeaseInfo; import android.content.Context; +import android.content.pm.PackageManager; import android.content.res.ResourceId; import android.content.res.Resources; import android.os.ParcelFileDescriptor; import android.os.RevocableFileDescriptor; import android.os.UserHandle; +import android.permission.PermissionManager; import android.system.ErrnoException; import android.system.Os; import android.util.ArrayMap; import android.util.ArraySet; +import android.util.IndentingPrintWriter; import android.util.Slog; import android.util.SparseArray; import android.util.StatsEvent; @@ -62,7 +67,6 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.XmlUtils; import com.android.server.blob.BlobStoreManagerService.DumpArgs; @@ -85,7 +89,6 @@ class BlobMetadata { private final long mBlobId; private final BlobHandle mBlobHandle; - private final int mUserId; @GuardedBy("mMetadataLock") private final ArraySet<Committer> mCommitters = new ArraySet<>(); @@ -94,24 +97,23 @@ class BlobMetadata { private final ArraySet<Leasee> mLeasees = new ArraySet<>(); /** - * Contains packageName -> {RevocableFileDescriptors}. + * Contains Accessor -> {RevocableFileDescriptors}. * * Keep track of RevocableFileDescriptors given to clients which are not yet revoked/closed so * that when clients access is revoked or the blob gets deleted, we can be sure that clients * do not have any reference to the blob and the space occupied by the blob can be freed. */ @GuardedBy("mRevocableFds") - private final ArrayMap<String, ArraySet<RevocableFileDescriptor>> mRevocableFds = + private final ArrayMap<Accessor, ArraySet<RevocableFileDescriptor>> mRevocableFds = new ArrayMap<>(); // Do not access this directly, instead use #getBlobFile(). private File mBlobFile; - BlobMetadata(Context context, long blobId, BlobHandle blobHandle, int userId) { + BlobMetadata(Context context, long blobId, BlobHandle blobHandle) { mContext = context; this.mBlobId = blobId; this.mBlobHandle = blobHandle; - this.mUserId = userId; } long getBlobId() { @@ -122,10 +124,6 @@ class BlobMetadata { return mBlobHandle; } - int getUserId() { - return mUserId; - } - void addOrReplaceCommitter(@NonNull Committer committer) { synchronized (mMetadataLock) { // We need to override the committer data, so first remove any existing @@ -155,13 +153,24 @@ class BlobMetadata { } } - void removeCommittersFromUnknownPkgs(SparseArray<String> knownPackages) { + void removeCommittersFromUnknownPkgs(SparseArray<SparseArray<String>> knownPackages) { synchronized (mMetadataLock) { - mCommitters.removeIf(committer -> - !committer.packageName.equals(knownPackages.get(committer.uid))); + mCommitters.removeIf(committer -> { + final int userId = UserHandle.getUserId(committer.uid); + final SparseArray<String> userPackages = knownPackages.get(userId); + if (userPackages == null) { + return true; + } + return !committer.packageName.equals(userPackages.get(committer.uid)); + }); } } + void addCommittersAndLeasees(BlobMetadata blobMetadata) { + mCommitters.addAll(blobMetadata.mCommitters); + mLeasees.addAll(blobMetadata.mLeasees); + } + @Nullable Committer getExistingCommitter(@NonNull String packageName, int uid) { synchronized (mCommitters) { @@ -201,10 +210,16 @@ class BlobMetadata { } } - void removeLeaseesFromUnknownPkgs(SparseArray<String> knownPackages) { + void removeLeaseesFromUnknownPkgs(SparseArray<SparseArray<String>> knownPackages) { synchronized (mMetadataLock) { - mLeasees.removeIf(leasee -> - !leasee.packageName.equals(knownPackages.get(leasee.uid))); + mLeasees.removeIf(leasee -> { + final int userId = UserHandle.getUserId(leasee.uid); + final SparseArray<String> userPackages = knownPackages.get(userId); + if (userPackages == null) { + return true; + } + return !leasee.packageName.equals(userPackages.get(leasee.uid)); + }); } } @@ -214,6 +229,25 @@ class BlobMetadata { } } + void removeDataForUser(int userId) { + synchronized (mMetadataLock) { + mCommitters.removeIf(committer -> (userId == UserHandle.getUserId(committer.uid))); + mLeasees.removeIf(leasee -> (userId == UserHandle.getUserId(leasee.uid))); + mRevocableFds.entrySet().removeIf(entry -> { + final Accessor accessor = entry.getKey(); + final ArraySet<RevocableFileDescriptor> rFds = entry.getValue(); + if (userId != UserHandle.getUserId(accessor.uid)) { + return false; + } + for (int i = 0, fdCount = rFds.size(); i < fdCount; ++i) { + rFds.valueAt(i).revoke(); + } + rFds.clear(); + return true; + }); + } + } + boolean hasValidLeases() { synchronized (mMetadataLock) { for (int i = 0, size = mLeasees.size(); i < size; ++i) { @@ -244,8 +278,12 @@ class BlobMetadata { } } + final int callingUserId = UserHandle.getUserId(callingUid); for (int i = 0, size = mCommitters.size(); i < size; ++i) { final Committer committer = mCommitters.valueAt(i); + if (callingUserId != UserHandle.getUserId(committer.uid)) { + continue; + } // Check if the caller is the same package that committed the blob. if (committer.equals(callingPackage, callingUid)) { @@ -259,38 +297,105 @@ class BlobMetadata { return true; } } + + final boolean canCallerAccessBlobsAcrossUsers = checkCallerCanAccessBlobsAcrossUsers( + callingPackage, callingUserId); + if (!canCallerAccessBlobsAcrossUsers) { + return false; + } + for (int i = 0, size = mCommitters.size(); i < size; ++i) { + final Committer committer = mCommitters.valueAt(i); + final int committerUserId = UserHandle.getUserId(committer.uid); + if (callingUserId == committerUserId) { + continue; + } + if (!checkCallerCanAccessBlobsAcrossUsers(callingPackage, committerUserId)) { + continue; + } + + // Check if the caller is allowed access as per the access mode specified + // by the committer. + if (committer.blobAccessMode.isAccessAllowedForCaller(mContext, + callingPackage, committer.packageName, callingUid, attributionTag)) { + return true; + } + } + + } + return false; + } + + private static boolean checkCallerCanAccessBlobsAcrossUsers( + String callingPackage, int callingUserId) { + return PermissionManager.checkPackageNamePermission(ACCESS_BLOBS_ACROSS_USERS, + callingPackage, callingUserId) == PackageManager.PERMISSION_GRANTED; + } + + boolean hasACommitterOrLeaseeInUser(int userId) { + return hasACommitterInUser(userId) || hasALeaseeInUser(userId); + } + + boolean hasACommitterInUser(int userId) { + synchronized (mMetadataLock) { + for (int i = 0, size = mCommitters.size(); i < size; ++i) { + final Committer committer = mCommitters.valueAt(i); + if (userId == UserHandle.getUserId(committer.uid)) { + return true; + } + } + } + return false; + } + + private boolean hasALeaseeInUser(int userId) { + synchronized (mMetadataLock) { + for (int i = 0, size = mLeasees.size(); i < size; ++i) { + final Leasee leasee = mLeasees.valueAt(i); + if (userId == UserHandle.getUserId(leasee.uid)) { + return true; + } + } } return false; } boolean isACommitter(@NonNull String packageName, int uid) { synchronized (mMetadataLock) { - return isAnAccessor(mCommitters, packageName, uid); + return isAnAccessor(mCommitters, packageName, uid, UserHandle.getUserId(uid)); } } boolean isALeasee(@Nullable String packageName, int uid) { synchronized (mMetadataLock) { - final Leasee leasee = getAccessor(mLeasees, packageName, uid); + final Leasee leasee = getAccessor(mLeasees, packageName, uid, + UserHandle.getUserId(uid)); + return leasee != null && leasee.isStillValid(); + } + } + + private boolean isALeaseeInUser(@Nullable String packageName, int uid, int userId) { + synchronized (mMetadataLock) { + final Leasee leasee = getAccessor(mLeasees, packageName, uid, userId); return leasee != null && leasee.isStillValid(); } } private static <T extends Accessor> boolean isAnAccessor(@NonNull ArraySet<T> accessors, - @Nullable String packageName, int uid) { + @Nullable String packageName, int uid, int userId) { // Check if the package is an accessor of the data blob. - return getAccessor(accessors, packageName, uid) != null; + return getAccessor(accessors, packageName, uid, userId) != null; } private static <T extends Accessor> T getAccessor(@NonNull ArraySet<T> accessors, - @Nullable String packageName, int uid) { + @Nullable String packageName, int uid, int userId) { // Check if the package is an accessor of the data blob. for (int i = 0, size = accessors.size(); i < size; ++i) { final Accessor accessor = accessors.valueAt(i); if (packageName != null && uid != INVALID_UID && accessor.equals(packageName, uid)) { return (T) accessor; - } else if (packageName != null && accessor.packageName.equals(packageName)) { + } else if (packageName != null && accessor.packageName.equals(packageName) + && userId == UserHandle.getUserId(accessor.uid)) { return (T) accessor; } else if (uid != INVALID_UID && accessor.uid == uid) { return (T) accessor; @@ -299,23 +404,29 @@ class BlobMetadata { return null; } - boolean isALeasee(@NonNull String packageName) { - return isALeasee(packageName, INVALID_UID); - } - - boolean isALeasee(int uid) { - return isALeasee(null, uid); - } - - boolean hasOtherLeasees(@NonNull String packageName) { - return hasOtherLeasees(packageName, INVALID_UID); + boolean shouldAttributeToLeasee(@NonNull String packageName, int userId, + boolean callerHasStatsPermission) { + if (!isALeaseeInUser(packageName, INVALID_UID, userId)) { + return false; + } + if (!callerHasStatsPermission || !hasOtherLeasees(packageName, INVALID_UID, userId)) { + return true; + } + return false; } - boolean hasOtherLeasees(int uid) { - return hasOtherLeasees(null, uid); + boolean shouldAttributeToLeasee(int uid, boolean callerHasStatsPermission) { + final int userId = UserHandle.getUserId(uid); + if (!isALeaseeInUser(null, uid, userId)) { + return false; + } + if (!callerHasStatsPermission || !hasOtherLeasees(null, uid, userId)) { + return true; + } + return false; } - private boolean hasOtherLeasees(@Nullable String packageName, int uid) { + private boolean hasOtherLeasees(@Nullable String packageName, int uid, int userId) { synchronized (mMetadataLock) { for (int i = 0, size = mLeasees.size(); i < size; ++i) { final Leasee leasee = mLeasees.valueAt(i); @@ -326,7 +437,8 @@ class BlobMetadata { if (packageName != null && uid != INVALID_UID && !leasee.equals(packageName, uid)) { return true; - } else if (packageName != null && !leasee.packageName.equals(packageName)) { + } else if (packageName != null && (!leasee.packageName.equals(packageName) + || userId != UserHandle.getUserId(leasee.uid))) { return true; } else if (uid != INVALID_UID && leasee.uid != uid) { return true; @@ -371,7 +483,7 @@ class BlobMetadata { return mBlobFile; } - ParcelFileDescriptor openForRead(String callingPackage) throws IOException { + ParcelFileDescriptor openForRead(String callingPackage, int callingUid) throws IOException { // TODO: Add limit on opened fds FileDescriptor fd; try { @@ -381,7 +493,7 @@ class BlobMetadata { } try { if (BlobStoreConfig.shouldUseRevocableFdForReads()) { - return createRevocableFd(fd, callingPackage); + return createRevocableFd(fd, callingPackage, callingUid); } else { return new ParcelFileDescriptor(fd); } @@ -393,26 +505,28 @@ class BlobMetadata { @NonNull private ParcelFileDescriptor createRevocableFd(FileDescriptor fd, - String callingPackage) throws IOException { + String callingPackage, int callingUid) throws IOException { final RevocableFileDescriptor revocableFd = new RevocableFileDescriptor(mContext, fd); + final Accessor accessor; synchronized (mRevocableFds) { - ArraySet<RevocableFileDescriptor> revocableFdsForPkg = - mRevocableFds.get(callingPackage); - if (revocableFdsForPkg == null) { - revocableFdsForPkg = new ArraySet<>(); - mRevocableFds.put(callingPackage, revocableFdsForPkg); + accessor = new Accessor(callingPackage, callingUid); + ArraySet<RevocableFileDescriptor> revocableFdsForAccessor = + mRevocableFds.get(accessor); + if (revocableFdsForAccessor == null) { + revocableFdsForAccessor = new ArraySet<>(); + mRevocableFds.put(accessor, revocableFdsForAccessor); } - revocableFdsForPkg.add(revocableFd); + revocableFdsForAccessor.add(revocableFd); } revocableFd.addOnCloseListener((e) -> { synchronized (mRevocableFds) { - final ArraySet<RevocableFileDescriptor> revocableFdsForPkg = - mRevocableFds.get(callingPackage); - if (revocableFdsForPkg != null) { - revocableFdsForPkg.remove(revocableFd); - if (revocableFdsForPkg.isEmpty()) { - mRevocableFds.remove(callingPackage); + final ArraySet<RevocableFileDescriptor> revocableFdsForAccessor = + mRevocableFds.get(accessor); + if (revocableFdsForAccessor != null) { + revocableFdsForAccessor.remove(revocableFd); + if (revocableFdsForAccessor.isEmpty()) { + mRevocableFds.remove(accessor); } } } @@ -421,22 +535,23 @@ class BlobMetadata { } void destroy() { - revokeAllFds(); + revokeAndClearAllFds(); getBlobFile().delete(); } - private void revokeAllFds() { + private void revokeAndClearAllFds() { synchronized (mRevocableFds) { - for (int i = 0, pkgCount = mRevocableFds.size(); i < pkgCount; ++i) { - final ArraySet<RevocableFileDescriptor> packageFds = + for (int i = 0, accessorCount = mRevocableFds.size(); i < accessorCount; ++i) { + final ArraySet<RevocableFileDescriptor> rFds = mRevocableFds.valueAt(i); - if (packageFds == null) { + if (rFds == null) { continue; } - for (int j = 0, fdCount = packageFds.size(); j < fdCount; ++j) { - packageFds.valueAt(j).revoke(); + for (int j = 0, fdCount = rFds.size(); j < fdCount; ++j) { + rFds.valueAt(j).revoke(); } } + mRevocableFds.clear(); } } @@ -547,10 +662,10 @@ class BlobMetadata { fout.println("<empty>"); } else { for (int i = 0, count = mRevocableFds.size(); i < count; ++i) { - final String packageName = mRevocableFds.keyAt(i); - final ArraySet<RevocableFileDescriptor> packageFds = + final Accessor accessor = mRevocableFds.keyAt(i); + final ArraySet<RevocableFileDescriptor> rFds = mRevocableFds.valueAt(i); - fout.println(packageName + "#" + packageFds.size()); + fout.println(accessor + ": #" + rFds.size()); } } fout.decreaseIndent(); @@ -560,7 +675,6 @@ class BlobMetadata { void writeToXml(XmlSerializer out) throws IOException { synchronized (mMetadataLock) { XmlUtils.writeLongAttribute(out, ATTR_ID, mBlobId); - XmlUtils.writeIntAttribute(out, ATTR_USER_ID, mUserId); out.startTag(null, TAG_BLOB_HANDLE); mBlobHandle.writeToXml(out); @@ -584,7 +698,9 @@ class BlobMetadata { static BlobMetadata createFromXml(XmlPullParser in, int version, Context context) throws XmlPullParserException, IOException { final long blobId = XmlUtils.readLongAttribute(in, ATTR_ID); - final int userId = XmlUtils.readIntAttribute(in, ATTR_USER_ID); + if (version < XML_VERSION_ALLOW_ACCESS_ACROSS_USERS) { + XmlUtils.readIntAttribute(in, ATTR_USER_ID); + } BlobHandle blobHandle = null; final ArraySet<Committer> committers = new ArraySet<>(); @@ -608,7 +724,7 @@ class BlobMetadata { return null; } - final BlobMetadata blobMetadata = new BlobMetadata(context, blobId, blobHandle, userId); + final BlobMetadata blobMetadata = new BlobMetadata(context, blobId, blobHandle); blobMetadata.setCommitters(committers); blobMetadata.setLeasees(leasees); return blobMetadata; diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java index 5cebf8d91cfc..502b29eb1a1f 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java @@ -27,12 +27,11 @@ import android.provider.DeviceConfig; import android.provider.DeviceConfig.Properties; import android.text.TextUtils; import android.util.DataUnit; +import android.util.IndentingPrintWriter; import android.util.Log; import android.util.Slog; import android.util.TimeUtils; -import com.android.internal.util.IndentingPrintWriter; - import java.io.File; import java.util.concurrent.TimeUnit; @@ -47,8 +46,9 @@ class BlobStoreConfig { public static final int XML_VERSION_ADD_DESC_RES_NAME = 3; public static final int XML_VERSION_ADD_COMMIT_TIME = 4; public static final int XML_VERSION_ADD_SESSION_CREATION_TIME = 5; + public static final int XML_VERSION_ALLOW_ACCESS_ACROSS_USERS = 6; - public static final int XML_VERSION_CURRENT = XML_VERSION_ADD_SESSION_CREATION_TIME; + public static final int XML_VERSION_CURRENT = XML_VERSION_ALLOW_ACCESS_ACROSS_USERS; public static final long INVALID_BLOB_ID = 0; public static final long INVALID_BLOB_SIZE = 0; diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java index 0e7354726123..cc5e31a91123 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java @@ -32,6 +32,7 @@ import static com.android.server.blob.BlobStoreConfig.INVALID_BLOB_ID; import static com.android.server.blob.BlobStoreConfig.INVALID_BLOB_SIZE; import static com.android.server.blob.BlobStoreConfig.LOGV; import static com.android.server.blob.BlobStoreConfig.TAG; +import static com.android.server.blob.BlobStoreConfig.XML_VERSION_ALLOW_ACCESS_ACROSS_USERS; import static com.android.server.blob.BlobStoreConfig.XML_VERSION_CURRENT; import static com.android.server.blob.BlobStoreConfig.getAdjustedCommitTimeMs; import static com.android.server.blob.BlobStoreConfig.getDeletionOnLastLeaseDelayMs; @@ -83,6 +84,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.AtomicFile; import android.util.ExceptionUtils; +import android.util.IndentingPrintWriter; import android.util.LongSparseArray; import android.util.Slog; import android.util.SparseArray; @@ -96,7 +98,6 @@ import com.android.internal.util.CollectionUtils; import com.android.internal.util.DumpUtils; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; import com.android.internal.util.function.pooled.PooledLambda; @@ -129,6 +130,7 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; @@ -146,9 +148,9 @@ public class BlobStoreManagerService extends SystemService { @GuardedBy("mBlobsLock") private long mCurrentMaxSessionId; - // Contains data of userId -> {BlobHandle -> {BlobMetadata}} + // Contains data of BlobHandle -> BlobMetadata. @GuardedBy("mBlobsLock") - private final SparseArray<ArrayMap<BlobHandle, BlobMetadata>> mBlobsMap = new SparseArray<>(); + private final ArrayMap<BlobHandle, BlobMetadata> mBlobsMap = new ArrayMap<>(); // Contains all ids that are currently in use. @GuardedBy("mBlobsLock") @@ -265,27 +267,24 @@ public class BlobStoreManagerService extends SystemService { return userSessions; } - @GuardedBy("mBlobsLock") - private ArrayMap<BlobHandle, BlobMetadata> getUserBlobsLocked(int userId) { - ArrayMap<BlobHandle, BlobMetadata> userBlobs = mBlobsMap.get(userId); - if (userBlobs == null) { - userBlobs = new ArrayMap<>(); - mBlobsMap.put(userId, userBlobs); + @VisibleForTesting + void addUserSessionsForTest(LongSparseArray<BlobStoreSession> userSessions, int userId) { + synchronized (mBlobsLock) { + mSessions.put(userId, userSessions); } - return userBlobs; } @VisibleForTesting - void addUserSessionsForTest(LongSparseArray<BlobStoreSession> userSessions, int userId) { + BlobMetadata getBlobForTest(BlobHandle blobHandle) { synchronized (mBlobsLock) { - mSessions.put(userId, userSessions); + return mBlobsMap.get(blobHandle); } } @VisibleForTesting - void addUserBlobsForTest(ArrayMap<BlobHandle, BlobMetadata> userBlobs, int userId) { + int getBlobsCountForTest() { synchronized (mBlobsLock) { - mBlobsMap.put(userId, userBlobs); + return mBlobsMap.size(); } } @@ -319,14 +318,9 @@ public class BlobStoreManagerService extends SystemService { } @GuardedBy("mBlobsLock") - private void addBlobForUserLocked(BlobMetadata blobMetadata, int userId) { - addBlobForUserLocked(blobMetadata, getUserBlobsLocked(userId)); - } - - @GuardedBy("mBlobsLock") - private void addBlobForUserLocked(BlobMetadata blobMetadata, - ArrayMap<BlobHandle, BlobMetadata> userBlobs) { - userBlobs.put(blobMetadata.getBlobHandle(), blobMetadata); + @VisibleForTesting + void addBlobLocked(BlobMetadata blobMetadata) { + mBlobsMap.put(blobMetadata.getBlobHandle(), blobMetadata); addActiveBlobIdLocked(blobMetadata.getBlobId()); } @@ -404,8 +398,7 @@ public class BlobStoreManagerService extends SystemService { private ParcelFileDescriptor openBlobInternal(BlobHandle blobHandle, int callingUid, String callingPackage, String attributionTag) throws IOException { synchronized (mBlobsLock) { - final BlobMetadata blobMetadata = getUserBlobsLocked(UserHandle.getUserId(callingUid)) - .get(blobHandle); + final BlobMetadata blobMetadata = mBlobsMap.get(blobHandle); if (blobMetadata == null || !blobMetadata.isAccessAllowedForCaller( callingPackage, callingUid, attributionTag)) { if (blobMetadata == null) { @@ -415,7 +408,7 @@ public class BlobStoreManagerService extends SystemService { } else { FrameworkStatsLog.write(FrameworkStatsLog.BLOB_OPENED, callingUid, blobMetadata.getBlobId(), blobMetadata.getSize(), - FrameworkStatsLog.BLOB_LEASED__RESULT__ACCESS_NOT_ALLOWED); + FrameworkStatsLog.BLOB_OPENED__RESULT__ACCESS_NOT_ALLOWED); } throw new SecurityException("Caller not allowed to access " + blobHandle + "; callingUid=" + callingUid + ", callingPackage=" + callingPackage); @@ -425,7 +418,7 @@ public class BlobStoreManagerService extends SystemService { blobMetadata.getBlobId(), blobMetadata.getSize(), FrameworkStatsLog.BLOB_OPENED__RESULT__SUCCESS); - return blobMetadata.openForRead(callingPackage); + return blobMetadata.openForRead(callingPackage, callingUid); } } @@ -433,11 +426,11 @@ public class BlobStoreManagerService extends SystemService { private int getCommittedBlobsCountLocked(int uid, String packageName) { // TODO: Maintain a counter instead of traversing all the blobs final AtomicInteger blobsCount = new AtomicInteger(0); - forEachBlobInUser((blobMetadata) -> { + forEachBlobLocked(blobMetadata -> { if (blobMetadata.isACommitter(packageName, uid)) { blobsCount.getAndIncrement(); } - }, UserHandle.getUserId(uid)); + }); return blobsCount.get(); } @@ -445,11 +438,11 @@ public class BlobStoreManagerService extends SystemService { private int getLeasedBlobsCountLocked(int uid, String packageName) { // TODO: Maintain a counter instead of traversing all the blobs final AtomicInteger blobsCount = new AtomicInteger(0); - forEachBlobInUser((blobMetadata) -> { + forEachBlobLocked(blobMetadata -> { if (blobMetadata.isALeasee(packageName, uid)) { blobsCount.getAndIncrement(); } - }, UserHandle.getUserId(uid)); + }); return blobsCount.get(); } @@ -465,8 +458,16 @@ public class BlobStoreManagerService extends SystemService { throw new LimitExceededException("Too many leased blobs for the caller: " + leasesCount); } - final BlobMetadata blobMetadata = getUserBlobsLocked(UserHandle.getUserId(callingUid)) - .get(blobHandle); + if (leaseExpiryTimeMillis != 0 && blobHandle.expiryTimeMillis != 0 + && leaseExpiryTimeMillis > blobHandle.expiryTimeMillis) { + FrameworkStatsLog.write(FrameworkStatsLog.BLOB_LEASED, callingUid, + INVALID_BLOB_ID, INVALID_BLOB_SIZE, + FrameworkStatsLog.BLOB_LEASED__RESULT__LEASE_EXPIRY_INVALID); + throw new IllegalArgumentException( + "Lease expiry cannot be later than blobs expiry time"); + } + + final BlobMetadata blobMetadata = mBlobsMap.get(blobHandle); if (blobMetadata == null || !blobMetadata.isAccessAllowedForCaller( callingPackage, callingUid, attributionTag)) { if (blobMetadata == null) { @@ -481,15 +482,7 @@ public class BlobStoreManagerService extends SystemService { throw new SecurityException("Caller not allowed to access " + blobHandle + "; callingUid=" + callingUid + ", callingPackage=" + callingPackage); } - if (leaseExpiryTimeMillis != 0 && blobHandle.expiryTimeMillis != 0 - && leaseExpiryTimeMillis > blobHandle.expiryTimeMillis) { - FrameworkStatsLog.write(FrameworkStatsLog.BLOB_LEASED, callingUid, - blobMetadata.getBlobId(), blobMetadata.getSize(), - FrameworkStatsLog.BLOB_LEASED__RESULT__LEASE_EXPIRY_INVALID); - throw new IllegalArgumentException( - "Lease expiry cannot be later than blobs expiry time"); - } if (blobMetadata.getSize() > getRemainingLeaseQuotaBytesInternal(callingUid, callingPackage)) { @@ -518,20 +511,18 @@ public class BlobStoreManagerService extends SystemService { @GuardedBy("mBlobsLock") long getTotalUsageBytesLocked(int callingUid, String callingPackage) { final AtomicLong totalBytes = new AtomicLong(0); - forEachBlobInUser((blobMetadata) -> { + forEachBlobLocked((blobMetadata) -> { if (blobMetadata.isALeasee(callingPackage, callingUid)) { totalBytes.getAndAdd(blobMetadata.getSize()); } - }, UserHandle.getUserId(callingUid)); + }); return totalBytes.get(); } private void releaseLeaseInternal(BlobHandle blobHandle, int callingUid, String callingPackage, String attributionTag) { synchronized (mBlobsLock) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = - getUserBlobsLocked(UserHandle.getUserId(callingUid)); - final BlobMetadata blobMetadata = userBlobs.get(blobHandle); + final BlobMetadata blobMetadata = mBlobsMap.get(blobHandle); if (blobMetadata == null || !blobMetadata.isAccessAllowedForCaller( callingPackage, callingUid, attributionTag)) { throw new SecurityException("Caller not allowed to access " + blobHandle @@ -547,12 +538,12 @@ public class BlobStoreManagerService extends SystemService { synchronized (mBlobsLock) { // Check if blobMetadata object is still valid. If it is not, then // it means that it was already deleted and nothing else to do here. - if (!Objects.equals(userBlobs.get(blobHandle), blobMetadata)) { + if (!Objects.equals(mBlobsMap.get(blobHandle), blobMetadata)) { return; } if (blobMetadata.shouldBeDeleted(true /* respectLeaseWaitTime */)) { deleteBlobLocked(blobMetadata); - userBlobs.remove(blobHandle); + mBlobsMap.remove(blobHandle); } writeBlobsInfoAsync(); } @@ -583,12 +574,18 @@ public class BlobStoreManagerService extends SystemService { } return packageResources; }; - getUserBlobsLocked(userId).forEach((blobHandle, blobMetadata) -> { + forEachBlobLocked((blobHandle, blobMetadata) -> { + if (!blobMetadata.hasACommitterOrLeaseeInUser(userId)) { + return; + } final ArrayList<LeaseInfo> leaseInfos = new ArrayList<>(); blobMetadata.forEachLeasee(leasee -> { if (!leasee.isStillValid()) { return; } + if (userId != UserHandle.getUserId(leasee.uid)) { + return; + } final int descriptionResId = leasee.descriptionResEntryName == null ? Resources.ID_NULL : getDescriptionResourceId(resourcesGetter.apply(leasee.packageName), @@ -608,9 +605,7 @@ public class BlobStoreManagerService extends SystemService { private void deleteBlobInternal(long blobId, int callingUid) { synchronized (mBlobsLock) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = getUserBlobsLocked( - UserHandle.getUserId(callingUid)); - userBlobs.entrySet().removeIf(entry -> { + mBlobsMap.entrySet().removeIf(entry -> { final BlobMetadata blobMetadata = entry.getValue(); if (blobMetadata.getBlobId() == blobId) { deleteBlobLocked(blobMetadata); @@ -625,19 +620,20 @@ public class BlobStoreManagerService extends SystemService { private List<BlobHandle> getLeasedBlobsInternal(int callingUid, @NonNull String callingPackage) { final ArrayList<BlobHandle> leasedBlobs = new ArrayList<>(); - forEachBlobInUser(blobMetadata -> { - if (blobMetadata.isALeasee(callingPackage, callingUid)) { - leasedBlobs.add(blobMetadata.getBlobHandle()); - } - }, UserHandle.getUserId(callingUid)); + synchronized (mBlobsLock) { + forEachBlobLocked(blobMetadata -> { + if (blobMetadata.isALeasee(callingPackage, callingUid)) { + leasedBlobs.add(blobMetadata.getBlobHandle()); + } + }); + } return leasedBlobs; } private LeaseInfo getLeaseInfoInternal(BlobHandle blobHandle, int callingUid, @NonNull String callingPackage, String attributionTag) { synchronized (mBlobsLock) { - final BlobMetadata blobMetadata = getUserBlobsLocked(UserHandle.getUserId(callingUid)) - .get(blobHandle); + final BlobMetadata blobMetadata = mBlobsMap.get(blobHandle); if (blobMetadata == null || !blobMetadata.isAccessAllowedForCaller( callingPackage, callingUid, attributionTag)) { throw new SecurityException("Caller not allowed to access " + blobHandle @@ -699,14 +695,14 @@ public class BlobStoreManagerService extends SystemService { FrameworkStatsLog.BLOB_COMMITTED__RESULT__COUNT_LIMIT_EXCEEDED); break; } - final int userId = UserHandle.getUserId(session.getOwnerUid()); - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = getUserBlobsLocked( - userId); - BlobMetadata blob = userBlobs.get(session.getBlobHandle()); - if (blob == null) { + final BlobMetadata blob; + final int blobIndex = mBlobsMap.indexOfKey(session.getBlobHandle()); + if (blobIndex >= 0) { + blob = mBlobsMap.valueAt(blobIndex); + } else { blob = new BlobMetadata(mContext, session.getSessionId(), - session.getBlobHandle(), userId); - addBlobForUserLocked(blob, userBlobs); + session.getBlobHandle()); + addBlobLocked(blob); } final Committer existingCommitter = blob.getExistingCommitter( session.getOwnerPackageName(), session.getOwnerUid()); @@ -738,7 +734,7 @@ public class BlobStoreManagerService extends SystemService { // But if it is a recommit, just leave it as is. if (session.getSessionId() == blob.getBlobId()) { deleteBlobLocked(blob); - userBlobs.remove(blob.getBlobHandle()); + mBlobsMap.remove(blob.getBlobHandle()); } } // Delete redundant data from recommits. @@ -874,13 +870,10 @@ public class BlobStoreManagerService extends SystemService { out.startTag(null, TAG_BLOBS); XmlUtils.writeIntAttribute(out, ATTR_VERSION, XML_VERSION_CURRENT); - for (int i = 0, userCount = mBlobsMap.size(); i < userCount; ++i) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = mBlobsMap.valueAt(i); - for (int j = 0, blobsCount = userBlobs.size(); j < blobsCount; ++j) { - out.startTag(null, TAG_BLOB); - userBlobs.valueAt(j).writeToXml(out); - out.endTag(null, TAG_BLOB); - } + for (int i = 0, count = mBlobsMap.size(); i < count; ++i) { + out.startTag(null, TAG_BLOB); + mBlobsMap.valueAt(i).writeToXml(out); + out.endTag(null, TAG_BLOB); } out.endTag(null, TAG_BLOBS); @@ -925,16 +918,21 @@ public class BlobStoreManagerService extends SystemService { if (TAG_BLOB.equals(in.getName())) { final BlobMetadata blobMetadata = BlobMetadata.createFromXml( in, version, mContext); - final SparseArray<String> userPackages = allPackages.get( - blobMetadata.getUserId()); - if (userPackages == null) { - blobMetadata.getBlobFile().delete(); + blobMetadata.removeCommittersFromUnknownPkgs(allPackages); + blobMetadata.removeLeaseesFromUnknownPkgs(allPackages); + mCurrentMaxSessionId = Math.max(mCurrentMaxSessionId, blobMetadata.getBlobId()); + if (version >= XML_VERSION_ALLOW_ACCESS_ACROSS_USERS) { + addBlobLocked(blobMetadata); } else { - addBlobForUserLocked(blobMetadata, blobMetadata.getUserId()); - blobMetadata.removeCommittersFromUnknownPkgs(userPackages); - blobMetadata.removeLeaseesFromUnknownPkgs(userPackages); + final BlobMetadata existingBlobMetadata = mBlobsMap.get( + blobMetadata.getBlobHandle()); + if (existingBlobMetadata == null) { + addBlobLocked(blobMetadata); + } else { + existingBlobMetadata.addCommittersAndLeasees(blobMetadata); + blobMetadata.getBlobFile().delete(); + } } - mCurrentMaxSessionId = Math.max(mCurrentMaxSessionId, blobMetadata.getBlobId()); } } if (LOGV) { @@ -977,14 +975,6 @@ public class BlobStoreManagerService extends SystemService { } } - private int getPackageUid(String packageName, int userId) { - final int uid = mPackageManagerInternal.getPackageUid( - packageName, - MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE | MATCH_UNINSTALLED_PACKAGES, - userId); - return uid; - } - private SparseArray<SparseArray<String>> getAllPackages() { final SparseArray<SparseArray<String>> allPackages = new SparseArray<>(); final int[] allUsers = LocalServices.getService(UserManagerInternal.class).getUserIds(); @@ -1004,7 +994,7 @@ public class BlobStoreManagerService extends SystemService { return allPackages; } - AtomicFile prepareSessionsIndexFile() { + private AtomicFile prepareSessionsIndexFile() { final File file = BlobStoreConfig.prepareSessionIndexFile(); if (file == null) { return null; @@ -1012,7 +1002,7 @@ public class BlobStoreManagerService extends SystemService { return new AtomicFile(file, "session_index" /* commitLogTag */); } - AtomicFile prepareBlobsIndexFile() { + private AtomicFile prepareBlobsIndexFile() { final File file = BlobStoreConfig.prepareBlobsIndexFile(); if (file == null) { return null; @@ -1037,9 +1027,7 @@ public class BlobStoreManagerService extends SystemService { writeBlobSessionsAsync(); // Remove the package from the committer and leasee list - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = - getUserBlobsLocked(UserHandle.getUserId(uid)); - userBlobs.entrySet().removeIf(entry -> { + mBlobsMap.entrySet().removeIf(entry -> { final BlobMetadata blobMetadata = entry.getValue(); final boolean isACommitter = blobMetadata.isACommitter(packageName, uid); if (isACommitter) { @@ -1074,14 +1062,15 @@ public class BlobStoreManagerService extends SystemService { } } - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = - mBlobsMap.removeReturnOld(userId); - if (userBlobs != null) { - for (int i = 0, count = userBlobs.size(); i < count; ++i) { - final BlobMetadata blobMetadata = userBlobs.valueAt(i); + mBlobsMap.entrySet().removeIf(entry -> { + final BlobMetadata blobMetadata = entry.getValue(); + blobMetadata.removeDataForUser(userId); + if (blobMetadata.shouldBeDeleted(true /* respectLeaseWaitTime */)) { deleteBlobLocked(blobMetadata); + return true; } - } + return false; + }); if (LOGV) { Slog.v(TAG, "Removed blobs data in user " + userId); } @@ -1114,22 +1103,19 @@ public class BlobStoreManagerService extends SystemService { } // Cleanup any stale blobs. - for (int i = 0, userCount = mBlobsMap.size(); i < userCount; ++i) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = mBlobsMap.valueAt(i); - userBlobs.entrySet().removeIf(entry -> { - final BlobMetadata blobMetadata = entry.getValue(); + mBlobsMap.entrySet().removeIf(entry -> { + final BlobMetadata blobMetadata = entry.getValue(); - // Remove expired leases - blobMetadata.removeExpiredLeases(); + // Remove expired leases + blobMetadata.removeExpiredLeases(); - if (blobMetadata.shouldBeDeleted(true /* respectLeaseWaitTime */)) { - deleteBlobLocked(blobMetadata); - deletedBlobIds.add(blobMetadata.getBlobId()); - return true; - } - return false; - }); - } + if (blobMetadata.shouldBeDeleted(true /* respectLeaseWaitTime */)) { + deleteBlobLocked(blobMetadata); + deletedBlobIds.add(blobMetadata.getBlobId()); + return true; + } + return false; + }); writeBlobsInfoAsync(); // Cleanup any stale sessions. @@ -1195,34 +1181,34 @@ public class BlobStoreManagerService extends SystemService { void runClearAllBlobs(@UserIdInt int userId) { synchronized (mBlobsLock) { - for (int i = 0, userCount = mBlobsMap.size(); i < userCount; ++i) { - final int blobUserId = mBlobsMap.keyAt(i); - if (userId != UserHandle.USER_ALL && userId != blobUserId) { - continue; + mBlobsMap.entrySet().removeIf(entry -> { + final BlobMetadata blobMetadata = entry.getValue(); + if (userId == UserHandle.USER_ALL) { + mActiveBlobIds.remove(blobMetadata.getBlobId()); + return true; } - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = mBlobsMap.valueAt(i); - for (int j = 0, blobsCount = userBlobs.size(); j < blobsCount; ++j) { - mActiveBlobIds.remove(userBlobs.valueAt(j).getBlobId()); + blobMetadata.removeDataForUser(userId); + if (blobMetadata.shouldBeDeleted(false /* respectLeaseWaitTime */)) { + mActiveBlobIds.remove(blobMetadata.getBlobId()); + return true; } - } - if (userId == UserHandle.USER_ALL) { - mBlobsMap.clear(); - } else { - mBlobsMap.remove(userId); - } + return false; + }); writeBlobsInfoAsync(); } } void deleteBlob(@NonNull BlobHandle blobHandle, @UserIdInt int userId) { synchronized (mBlobsLock) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = getUserBlobsLocked(userId); - final BlobMetadata blobMetadata = userBlobs.get(blobHandle); + final BlobMetadata blobMetadata = mBlobsMap.get(blobHandle); if (blobMetadata == null) { return; } - deleteBlobLocked(blobMetadata); - userBlobs.remove(blobHandle); + blobMetadata.removeDataForUser(userId); + if (blobMetadata.shouldBeDeleted(false /* respectLeaseWaitTime */)) { + deleteBlobLocked(blobMetadata); + mBlobsMap.remove(blobHandle); + } writeBlobsInfoAsync(); } } @@ -1235,11 +1221,12 @@ public class BlobStoreManagerService extends SystemService { boolean isBlobAvailable(long blobId, int userId) { synchronized (mBlobsLock) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = getUserBlobsLocked(userId); - for (BlobMetadata blobMetadata : userBlobs.values()) { - if (blobMetadata.getBlobId() == blobId) { - return true; + for (int i = 0, blobCount = mBlobsMap.size(); i < blobCount; ++i) { + final BlobMetadata blobMetadata = mBlobsMap.valueAt(i); + if (blobMetadata.getBlobId() != blobId) { + continue; } + return blobMetadata.hasACommitterInUser(userId); } return false; } @@ -1274,27 +1261,22 @@ public class BlobStoreManagerService extends SystemService { @GuardedBy("mBlobsLock") private void dumpBlobsLocked(IndentingPrintWriter fout, DumpArgs dumpArgs) { - for (int i = 0, userCount = mBlobsMap.size(); i < userCount; ++i) { - final int userId = mBlobsMap.keyAt(i); - if (!dumpArgs.shouldDumpUser(userId)) { + fout.println("List of blobs (" + mBlobsMap.size() + "):"); + fout.increaseIndent(); + for (int i = 0, blobCount = mBlobsMap.size(); i < blobCount; ++i) { + final BlobMetadata blobMetadata = mBlobsMap.valueAt(i); + if (!dumpArgs.shouldDumpBlob(blobMetadata.getBlobId())) { continue; } - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = mBlobsMap.valueAt(i); - fout.println("List of blobs in user #" - + userId + " (" + userBlobs.size() + "):"); + fout.println("Blob #" + blobMetadata.getBlobId()); fout.increaseIndent(); - for (int j = 0, blobsCount = userBlobs.size(); j < blobsCount; ++j) { - final BlobMetadata blobMetadata = userBlobs.valueAt(j); - if (!dumpArgs.shouldDumpBlob(blobMetadata.getBlobId())) { - continue; - } - fout.println("Blob #" + blobMetadata.getBlobId()); - fout.increaseIndent(); - blobMetadata.dump(fout, dumpArgs); - fout.decreaseIndent(); - } + blobMetadata.dump(fout, dumpArgs); fout.decreaseIndent(); } + if (mBlobsMap.isEmpty()) { + fout.println("<empty>"); + } + fout.decreaseIndent(); } private class BlobStorageStatsAugmenter implements StorageStatsAugmenter { @@ -1308,13 +1290,12 @@ public class BlobStoreManagerService extends SystemService { } }, userId); - forEachBlobInUser(blobMetadata -> { - if (blobMetadata.isALeasee(packageName)) { - if (!blobMetadata.hasOtherLeasees(packageName) || !callerHasStatsPermission) { - blobsDataSize.getAndAdd(blobMetadata.getSize()); - } + forEachBlob(blobMetadata -> { + if (blobMetadata.shouldAttributeToLeasee(packageName, userId, + callerHasStatsPermission)) { + blobsDataSize.getAndAdd(blobMetadata.getSize()); } - }, userId); + }); stats.dataSize += blobsDataSize.get(); } @@ -1330,13 +1311,12 @@ public class BlobStoreManagerService extends SystemService { } }, userId); - forEachBlobInUser(blobMetadata -> { - if (blobMetadata.isALeasee(uid)) { - if (!blobMetadata.hasOtherLeasees(uid) || !callerHasStatsPermission) { - blobsDataSize.getAndAdd(blobMetadata.getSize()); - } + forEachBlob(blobMetadata -> { + if (blobMetadata.shouldAttributeToLeasee(uid, + callerHasStatsPermission)) { + blobsDataSize.getAndAdd(blobMetadata.getSize()); } - }, userId); + }); stats.dataSize += blobsDataSize.get(); } @@ -1352,13 +1332,26 @@ public class BlobStoreManagerService extends SystemService { } } - private void forEachBlobInUser(Consumer<BlobMetadata> consumer, int userId) { - synchronized (mBlobsLock) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = getUserBlobsLocked(userId); - for (int i = 0, count = userBlobs.size(); i < count; ++i) { - final BlobMetadata blobMetadata = userBlobs.valueAt(i); - consumer.accept(blobMetadata); - } + private void forEachBlob(Consumer<BlobMetadata> consumer) { + synchronized (mBlobsMap) { + forEachBlobLocked(consumer); + } + } + + @GuardedBy("mBlobsMap") + private void forEachBlobLocked(Consumer<BlobMetadata> consumer) { + for (int blobIdx = 0, count = mBlobsMap.size(); blobIdx < count; ++blobIdx) { + final BlobMetadata blobMetadata = mBlobsMap.valueAt(blobIdx); + consumer.accept(blobMetadata); + } + } + + @GuardedBy("mBlobsMap") + private void forEachBlobLocked(BiConsumer<BlobHandle, BlobMetadata> consumer) { + for (int blobIdx = 0, count = mBlobsMap.size(); blobIdx < count; ++blobIdx) { + final BlobHandle blobHandle = mBlobsMap.keyAt(blobIdx); + final BlobMetadata blobMetadata = mBlobsMap.valueAt(blobIdx); + consumer.accept(blobHandle, blobMetadata); } } @@ -1886,15 +1879,7 @@ public class BlobStoreManagerService extends SystemService { } private int pullBlobData(int atomTag, List<StatsEvent> data) { - synchronized (mBlobsLock) { - for (int i = 0, userCount = mBlobsMap.size(); i < userCount; ++i) { - final ArrayMap<BlobHandle, BlobMetadata> userBlobs = mBlobsMap.valueAt(i); - for (int j = 0, blobsCount = userBlobs.size(); j < blobsCount; ++j) { - final BlobMetadata blob = userBlobs.valueAt(j); - data.add(blob.dumpAsStatsEvent(atomTag)); - } - } - } + forEachBlob(blobMetadata -> data.add(blobMetadata.dumpAsStatsEvent(atomTag))); return StatsManager.PULL_SUCCESS; } diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java index 2c3f682a46e0..3f0032fe537e 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java @@ -56,12 +56,12 @@ import android.os.storage.StorageManager; import android.system.ErrnoException; import android.system.Os; import android.util.ExceptionUtils; +import android.util.IndentingPrintWriter; import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; import com.android.server.blob.BlobStoreManagerService.DumpArgs; 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 8b9eca6f31dc..d72f565be4a0 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -21,6 +21,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; @@ -67,15 +68,18 @@ import android.os.WorkSource; import android.provider.DeviceConfig; import android.text.format.DateUtils; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.IndentingPrintWriter; import android.util.Log; import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; +import android.util.SparseSetArray; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import com.android.internal.R; +import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IBatteryStats; import com.android.internal.util.ArrayUtils; @@ -316,6 +320,9 @@ public class JobSchedulerService extends com.android.server.SystemService */ final ArrayMap<String, Boolean> mDebuggableApps = new ArrayMap<>(); + /** Cached mapping of UIDs (for all users) to a list of packages in the UID. */ + private final SparseSetArray<String> mUidToPackageCache = new SparseSetArray<>(); + /** * Named indices into standby bucket arrays, for clarity in referring to * specific buckets' bookkeeping. @@ -785,12 +792,20 @@ public class JobSchedulerService extends com.android.server.SystemService } else { Slog.w(TAG, "PACKAGE_CHANGED for " + pkgName + " / uid " + pkgUid); } + } else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) { + if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { + final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); + synchronized (mLock) { + mUidToPackageCache.remove(uid); + } + } } else if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) { int uidRemoved = intent.getIntExtra(Intent.EXTRA_UID, -1); if (DEBUG) { Slog.d(TAG, "Removing jobs for uid: " + uidRemoved); } synchronized (mLock) { + mUidToPackageCache.remove(uidRemoved); // There's no guarantee that the process has been stopped by the time we // get here, but since this is generally a user-initiated action, it should // be fine to just put USER instead of UNINSTALL or DISABLED. @@ -815,6 +830,7 @@ public class JobSchedulerService extends com.android.server.SystemService Slog.d(TAG, "Removing jobs for user: " + userId); } synchronized (mLock) { + mUidToPackageCache.clear(); cancelJobsForUserLocked(userId); for (int c = 0; c < mControllers.size(); ++c) { mControllers.get(c).onUserRemovedLocked(userId); @@ -904,6 +920,27 @@ public class JobSchedulerService extends com.android.server.SystemService return WorkSource.isChainedBatteryAttributionEnabled(getContext()); } + @Nullable + @GuardedBy("mLock") + public ArraySet<String> getPackagesForUidLocked(final int uid) { + ArraySet<String> packages = mUidToPackageCache.get(uid); + if (packages == null) { + try { + String[] pkgs = AppGlobals.getPackageManager() + .getPackagesForUid(uid); + if (pkgs != null) { + for (String pkg : pkgs) { + mUidToPackageCache.add(uid, pkg); + } + packages = mUidToPackageCache.get(uid); + } + } catch (RemoteException e) { + // Shouldn't happen. + } + } + return packages; + } + @Override public void onUserUnlocked(@NonNull TargetUser user) { synchronized (mLock) { @@ -1484,6 +1521,7 @@ public class JobSchedulerService extends com.android.server.SystemService // Register br for package removals and user removals. final IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); filter.addAction(Intent.ACTION_PACKAGE_CHANGED); filter.addAction(Intent.ACTION_PACKAGE_RESTARTED); filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART); @@ -3285,6 +3323,26 @@ public class JobSchedulerService extends com.android.server.SystemService pw.decreaseIndent(); } + boolean uidMapPrinted = false; + for (int i = 0; i < mUidToPackageCache.size(); ++i) { + final int uid = mUidToPackageCache.keyAt(i); + if (filterUid != -1 && filterUid != uid) { + continue; + } + if (!uidMapPrinted) { + uidMapPrinted = true; + pw.println(); + pw.println("Cached UID->package map:"); + pw.increaseIndent(); + } + pw.print(uid); + pw.print(": "); + pw.println(mUidToPackageCache.get(uid)); + } + if (uidMapPrinted) { + pw.decreaseIndent(); + } + boolean backingPrinted = false; for (int i = 0; i < mBackingUpUids.size(); i++) { int uid = mBackingUpUids.keyAt(i); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java index 081163bdbe79..500735b0b299 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java @@ -83,6 +83,7 @@ public final class ConnectivityController extends RestrictingController implemen * instance. */ private static final long MIN_STATS_UPDATE_INTERVAL_MS = 30_000L; + private static final long MIN_ADJUST_CALLBACK_INTERVAL_MS = 1_000L; private static final int UNBYPASSABLE_BG_BLOCKED_REASONS = ~ConnectivityManager.BLOCKED_REASON_NONE; @@ -210,6 +211,7 @@ public final class ConnectivityController extends RestrictingController implemen * is only done in {@link #maybeAdjustRegisteredCallbacksLocked()} and may sometimes be stale. */ private final List<UidStats> mSortedStats = new ArrayList<>(); + private long mLastCallbackAdjustmentTimeElapsed; private static final int MSG_ADJUST_CALLBACKS = 0; @@ -479,11 +481,15 @@ public final class ConnectivityController extends RestrictingController implemen @GuardedBy("mLock") @Override public void onAppRemovedLocked(String pkgName, int uid) { - mTrackedJobs.delete(uid); - UidStats uidStats = mUidStats.removeReturnOld(uid); - unregisterDefaultNetworkCallbackLocked(uid, sElapsedRealtimeClock.millis()); - mSortedStats.remove(uidStats); - registerPendingUidCallbacksLocked(); + if (mService.getPackagesForUidLocked(uid) == null) { + // All packages in the UID have been removed. It's safe to remove things based on + // UID alone. + mTrackedJobs.delete(uid); + UidStats uidStats = mUidStats.removeReturnOld(uid); + unregisterDefaultNetworkCallbackLocked(uid, sElapsedRealtimeClock.millis()); + mSortedStats.remove(uidStats); + registerPendingUidCallbacksLocked(); + } } @GuardedBy("mLock") @@ -689,7 +695,11 @@ public final class ConnectivityController extends RestrictingController implemen } private void postAdjustCallbacks() { - mHandler.obtainMessage(MSG_ADJUST_CALLBACKS).sendToTarget(); + postAdjustCallbacks(0); + } + + private void postAdjustCallbacks(long delayMs) { + mHandler.sendEmptyMessageDelayed(MSG_ADJUST_CALLBACKS, delayMs); } @GuardedBy("mLock") @@ -704,6 +714,12 @@ public final class ConnectivityController extends RestrictingController implemen } final long nowElapsed = sElapsedRealtimeClock.millis(); + if (nowElapsed - mLastCallbackAdjustmentTimeElapsed < MIN_ADJUST_CALLBACK_INTERVAL_MS) { + postAdjustCallbacks(MIN_ADJUST_CALLBACK_INTERVAL_MS); + return; + } + + mLastCallbackAdjustmentTimeElapsed = nowElapsed; mSortedStats.clear(); for (int u = 0; u < mUidStats.size(); ++u) { @@ -725,17 +741,23 @@ public final class ConnectivityController extends RestrictingController implemen for (int j = 0; j < jobs.size(); ++j) { JobStatus job = jobs.valueAt(j); - us.earliestEnqueueTime = Math.min(us.earliestEnqueueTime, job.enqueueTime); if (wouldBeReadyWithConstraintLocked(job, JobStatus.CONSTRAINT_CONNECTIVITY)) { us.numReadyWithConnectivity++; if (isNetworkAvailable(job)) { us.numRequestedNetworkAvailable++; } + // Only use the enqueue time of jobs that would be ready to prevent apps + // from gaming the system (eg. by scheduling a job that requires all + // constraints and has a minimum latency of 6 months to always have the + // earliest enqueue time). + us.earliestEnqueueTime = Math.min(us.earliestEnqueueTime, job.enqueueTime); + if (job.shouldTreatAsExpeditedJob() || job.startedAsExpeditedJob) { + us.earliestEJEnqueueTime = + Math.min(us.earliestEJEnqueueTime, job.enqueueTime); + } } if (job.shouldTreatAsExpeditedJob() || job.startedAsExpeditedJob) { us.numEJs++; - us.earliestEJEnqueueTime = - Math.min(us.earliestEJEnqueueTime, job.enqueueTime); } else { us.numRegular++; } @@ -916,7 +938,10 @@ public final class ConnectivityController extends RestrictingController implemen UidDefaultNetworkCallback defaultNetworkCallback = mCurrentDefaultNetworkCallbacks.get(jobs.valueAt(0).getSourceUid()); if (defaultNetworkCallback == null) { - maybeRegisterDefaultNetworkCallbackLocked(jobs.valueAt(0)); + // This method is only called via a network callback object. That means something + // changed about a general network characteristic (since we wouldn't be in this + // situation if called from a UID_specific callback). The general network callback + // will handle adjusting the per-UID callbacks, so nothing left to do here. return false; } @@ -1096,8 +1121,13 @@ public final class ConnectivityController extends RestrictingController implemen synchronized (mLock) { if (Objects.equals(mDefaultNetwork, network)) { mDefaultNetwork = null; + updateTrackedJobsLocked(mUid, network); + // Add a delay in case onAvailable()+onBlockedStatusChanged is called for a + // new network. If this onLost was called because the network is completely + // gone, the delay will hel make sure we don't have a short burst of adjusting + // callback calls. + postAdjustCallbacks(1000); } - updateTrackedJobsLocked(mUid, network); } } diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java index 158a0b9d9a5d..d4ce43732864 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java @@ -340,9 +340,6 @@ public final class QuotaController extends StateController { /** List of UIDs currently in the foreground. */ private final SparseBooleanArray mForegroundUids = new SparseBooleanArray(); - /** Cached mapping of UIDs (for all users) to a list of packages in the UID. */ - private final SparseSetArray<String> mUidToPackageCache = new SparseSetArray<>(); - /** * List of jobs that started while the UID was in the TOP state. There will be no more than * 16 ({@link JobSchedulerService#MAX_JOB_CONTEXTS_COUNT}) running at once, so an ArraySet is @@ -449,22 +446,6 @@ public final class QuotaController extends StateController { } } - private final BroadcastReceiver mPackageAddedReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (intent == null) { - return; - } - if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { - return; - } - final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); - synchronized (mLock) { - mUidToPackageCache.remove(uid); - } - } - }; - /** * The rolling window size for each standby bucket. Within each window, an app will have 10 * minutes to run its jobs. @@ -611,9 +592,6 @@ public final class QuotaController extends StateController { mBackgroundJobsController = backgroundJobsController; mConnectivityController = connectivityController; - final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); - mContext.registerReceiverAsUser(mPackageAddedReceiver, UserHandle.ALL, filter, null, null); - // Set up the app standby bucketing tracker AppStandbyInternal appStandby = LocalServices.getService(AppStandbyInternal.class); appStandby.addListener(new StandbyTracker()); @@ -730,13 +708,15 @@ public final class QuotaController extends StateController { return; } clearAppStatsLocked(UserHandle.getUserId(uid), packageName); - mForegroundUids.delete(uid); - mUidToPackageCache.remove(uid); - mTempAllowlistCache.delete(uid); - mTempAllowlistGraceCache.delete(uid); - mTopAppCache.delete(uid); - mTopAppTrackers.delete(uid); - mTopAppGraceCache.delete(uid); + if (mService.getPackagesForUidLocked(uid) == null) { + // All packages in the UID have been removed. It's safe to remove things based on + // UID alone. + mForegroundUids.delete(uid); + mTempAllowlistCache.delete(uid); + mTempAllowlistGraceCache.delete(uid); + mTopAppCache.delete(uid); + mTopAppGraceCache.delete(uid); + } } @Override @@ -754,8 +734,8 @@ public final class QuotaController extends StateController { mInQuotaAlarmListener.removeAlarmsLocked(userId); mExecutionStatsCache.delete(userId); mEJStats.delete(userId); - mUidToPackageCache.clear(); mSystemInstallers.remove(userId); + mTopAppTrackers.delete(userId); } /** Drop all historical stats and stop tracking any active sessions for the specified app. */ @@ -780,6 +760,7 @@ public final class QuotaController extends StateController { mInQuotaAlarmListener.removeAlarmLocked(userId, packageName); mExecutionStatsCache.delete(userId, packageName); mEJStats.delete(userId, packageName); + mTopAppTrackers.delete(userId, packageName); } private void cacheInstallerPackagesLocked(int userId) { @@ -2450,7 +2431,7 @@ public final class QuotaController extends StateController { synchronized (mLock) { final long nowElapsed = sElapsedRealtimeClock.millis(); mTempAllowlistCache.put(uid, true); - final ArraySet<String> packages = getPackagesForUidLocked(uid); + final ArraySet<String> packages = mService.getPackagesForUidLocked(uid); if (packages != null) { final int userId = UserHandle.getUserId(uid); for (int i = packages.size() - 1; i >= 0; --i) { @@ -2505,26 +2486,6 @@ public final class QuotaController extends StateController { // getRemainingEJExecutionTimeLocked(). } - @Nullable - private ArraySet<String> getPackagesForUidLocked(final int uid) { - ArraySet<String> packages = mUidToPackageCache.get(uid); - if (packages == null) { - try { - String[] pkgs = AppGlobals.getPackageManager() - .getPackagesForUid(uid); - if (pkgs != null) { - for (String pkg : pkgs) { - mUidToPackageCache.add(uid, pkg); - } - packages = mUidToPackageCache.get(uid); - } - } catch (RemoteException e) { - // Shouldn't happen. - } - } - return packages; - } - private class QcHandler extends Handler { QcHandler(Looper looper) { @@ -2655,7 +2616,8 @@ public final class QuotaController extends StateController { // Update Timers first. if (mPkgTimers.indexOfKey(userId) >= 0 || mEJPkgTimers.indexOfKey(userId) >= 0) { - final ArraySet<String> packages = getPackagesForUidLocked(uid); + final ArraySet<String> packages = + mService.getPackagesForUidLocked(uid); if (packages != null) { for (int i = packages.size() - 1; i >= 0; --i) { Timer t = mEJPkgTimers.get(userId, packages.valueAt(i)); @@ -2740,7 +2702,7 @@ public final class QuotaController extends StateController { } mTempAllowlistGraceCache.delete(uid); mTopAppGraceCache.delete(uid); - final ArraySet<String> packages = getPackagesForUidLocked(uid); + final ArraySet<String> packages = mService.getPackagesForUidLocked(uid); if (packages != null) { final int userId = UserHandle.getUserId(uid); for (int i = packages.size() - 1; i >= 0; --i) { @@ -4109,17 +4071,6 @@ public final class QuotaController extends StateController { pw.println(mTempAllowlistGraceCache.toString()); pw.println(); - pw.println("Cached UID->package map:"); - pw.increaseIndent(); - for (int i = 0; i < mUidToPackageCache.size(); ++i) { - final int uid = mUidToPackageCache.keyAt(i); - pw.print(uid); - pw.print(": "); - pw.println(mUidToPackageCache.get(uid)); - } - pw.decreaseIndent(); - pw.println(); - pw.println("Special apps:"); pw.increaseIndent(); pw.print("System installers", mSystemInstallers.toString()); @@ -4278,22 +4229,6 @@ public final class QuotaController extends StateController { mForegroundUids.keyAt(i)); } - for (int i = 0; i < mUidToPackageCache.size(); ++i) { - final long upToken = proto.start( - StateControllerProto.QuotaController.UID_TO_PACKAGE_CACHE); - - final int uid = mUidToPackageCache.keyAt(i); - ArraySet<String> packages = mUidToPackageCache.get(uid); - - proto.write(StateControllerProto.QuotaController.UidPackageMapping.UID, uid); - for (int j = 0; j < packages.size(); ++j) { - proto.write(StateControllerProto.QuotaController.UidPackageMapping.PACKAGE_NAMES, - packages.valueAt(j)); - } - - proto.end(upToken); - } - mTrackedJobs.forEach((jobs) -> { for (int j = 0; j < jobs.size(); j++) { final JobStatus js = jobs.valueAt(j); diff --git a/boot/hiddenapi/OWNERS b/boot/hiddenapi/OWNERS index 5d869fc12ebd..74a3dc05f0da 100644 --- a/boot/hiddenapi/OWNERS +++ b/boot/hiddenapi/OWNERS @@ -1,7 +1,5 @@ # compat-team@ for changes to hiddenapi files -andreionea@google.com -mathewi@google.com -satayev@google.com +file:tools/platform-compat:/OWNERS # Escalations: per-file hiddenapi-* = bdc@google.com, narayan@google.com diff --git a/core/api/current.txt b/core/api/current.txt index 6823f65dd624..4b12d54c5a57 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -5666,6 +5666,7 @@ package android.app { field public static final String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents"; field public static final String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri"; field public static final String EXTRA_BIG_TEXT = "android.bigText"; + field public static final String EXTRA_CALL_IS_VIDEO = "android.callIsVideo"; field public static final String EXTRA_CALL_PERSON = "android.callPerson"; field public static final String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID"; field public static final String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID"; @@ -5972,6 +5973,7 @@ package android.app { method @NonNull public static android.app.Notification.CallStyle forScreeningCall(@NonNull android.app.Person, @NonNull android.app.PendingIntent, @NonNull android.app.PendingIntent); method @NonNull public android.app.Notification.CallStyle setAnswerButtonColorHint(@ColorInt int); method @NonNull public android.app.Notification.CallStyle setDeclineButtonColorHint(@ColorInt int); + method @NonNull public android.app.Notification.CallStyle setIsVideo(boolean); method @NonNull public android.app.Notification.CallStyle setVerificationIcon(@Nullable android.graphics.drawable.Icon); method @NonNull public android.app.Notification.CallStyle setVerificationText(@Nullable CharSequence); } @@ -7130,7 +7132,7 @@ package android.app.admin { method public int getGlobalPrivateDnsMode(@NonNull android.content.ComponentName); method @NonNull public java.util.List<byte[]> getInstalledCaCerts(@Nullable android.content.ComponentName); method @Nullable public java.util.List<java.lang.String> getKeepUninstalledPackages(@Nullable android.content.ComponentName); - method @NonNull public java.util.Set<java.util.Set<java.lang.String>> getKeyPairGrants(@NonNull String); + method @NonNull public java.util.Map<java.lang.Integer,java.util.Set<java.lang.String>> getKeyPairGrants(@NonNull String); method public int getKeyguardDisabledFeatures(@Nullable android.content.ComponentName); method public int getLockTaskFeatures(@NonNull android.content.ComponentName); method @NonNull public String[] getLockTaskPackages(@NonNull android.content.ComponentName); @@ -11089,7 +11091,6 @@ package android.content { field public static final String ACTION_PACKAGE_CHANGED = "android.intent.action.PACKAGE_CHANGED"; field public static final String ACTION_PACKAGE_DATA_CLEARED = "android.intent.action.PACKAGE_DATA_CLEARED"; field public static final String ACTION_PACKAGE_FIRST_LAUNCH = "android.intent.action.PACKAGE_FIRST_LAUNCH"; - field public static final String ACTION_PACKAGE_FULLY_LOADED = "android.intent.action.PACKAGE_FULLY_LOADED"; field public static final String ACTION_PACKAGE_FULLY_REMOVED = "android.intent.action.PACKAGE_FULLY_REMOVED"; field @Deprecated public static final String ACTION_PACKAGE_INSTALL = "android.intent.action.PACKAGE_INSTALL"; field public static final String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION"; @@ -25216,6 +25217,7 @@ package android.media.session { method public float getPlaybackSpeed(); method public long getPosition(); method public int getState(); + method public boolean isActive(); method public void writeToParcel(android.os.Parcel, int); field public static final long ACTION_FAST_FORWARD = 64L; // 0x40L field public static final long ACTION_PAUSE = 2L; // 0x2L diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index b1e448b7dd77..2497827e93f8 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -161,10 +161,6 @@ package android.media.session { method public void onVolumeChanged(@NonNull android.media.session.MediaSession.Token, int); } - public final class PlaybackState implements android.os.Parcelable { - method public boolean isActiveState(); - } - } package android.net { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index d42f07d6b070..199d77a232e9 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -371,6 +371,7 @@ package android { field public static final int config_systemAudioIntelligence; field public static final int config_systemAutomotiveCluster; field public static final int config_systemAutomotiveProjection; + field public static final int config_systemCompanionDeviceProvider; field public static final int config_systemContacts; field public static final int config_systemGallery = 17039399; // 0x1040027 field public static final int config_systemNotificationIntelligence; @@ -961,6 +962,9 @@ package android.app.admin { field public static final String EXTRA_PROVISIONING_SUPPORT_URL = "android.app.extra.PROVISIONING_SUPPORT_URL"; field public static final String EXTRA_PROVISIONING_TRIGGER = "android.app.extra.PROVISIONING_TRIGGER"; field public static final String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION"; + field public static final int FLAG_SUPPORTED_MODES_DEVICE_OWNER = 4; // 0x4 + field public static final int FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED = 1; // 0x1 + field public static final int FLAG_SUPPORTED_MODES_PERSONALLY_OWNED = 2; // 0x2 field public static final int PROVISIONING_TRIGGER_CLOUD_ENROLLMENT = 1; // 0x1 field public static final int PROVISIONING_TRIGGER_MANAGED_ACCOUNT = 4; // 0x4 field @Deprecated public static final int PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER = 3; // 0x3 @@ -975,10 +979,6 @@ package android.app.admin { field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3 field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1 field public static final int STATE_USER_UNMANAGED = 0; // 0x0 - field public static final int SUPPORTED_MODES_DEVICE_OWNER = 4; // 0x4 - field public static final int SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED = 3; // 0x3 - field public static final int SUPPORTED_MODES_ORGANIZATION_OWNED = 1; // 0x1 - field public static final int SUPPORTED_MODES_PERSONALLY_OWNED = 2; // 0x2 } public final class SystemUpdatePolicy implements android.os.Parcelable { @@ -1850,7 +1850,7 @@ package android.app.usage { public final class UsageStats implements android.os.Parcelable { method public int getAppLaunchCount(); - method public long getLastTimeComponentUsed(); + method public long getLastTimeAnyComponentUsed(); } public final class UsageStatsManager { @@ -1948,6 +1948,8 @@ package android.bluetooth { } public static interface BluetoothAdapter.OobDataCallback { + method public void onError(int); + method public void onOobData(int, @Nullable android.bluetooth.OobData); } public final class BluetoothDevice implements android.os.Parcelable { @@ -2934,7 +2936,7 @@ package android.content.pm.verify.domain { public final class DomainVerificationManager { method @Nullable @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public android.content.pm.verify.domain.DomainVerificationInfo getDomainVerificationInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public java.util.List<android.content.pm.verify.domain.DomainOwner> getOwnersForDomain(@NonNull String); + method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public java.util.SortedSet<android.content.pm.verify.domain.DomainOwner> getOwnersForDomain(@NonNull String); method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List<java.lang.String> queryValidVerificationPackageNames(); method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationLinkHandlingAllowed(@NonNull String, boolean) throws android.content.pm.PackageManager.NameNotFoundException; method @CheckResult @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public int setDomainVerificationStatus(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, int) throws android.content.pm.PackageManager.NameNotFoundException; @@ -8966,7 +8968,7 @@ package android.printservice.recommendation { package android.provider { public class CallLog { - method @RequiresPermission(allOf={android.Manifest.permission.WRITE_CALL_LOG, android.Manifest.permission.INTERACT_ACROSS_USERS}) public static void storeCallComposerPictureAsUser(@NonNull android.content.Context, @Nullable android.os.UserHandle, @NonNull java.io.InputStream, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.net.Uri,android.provider.CallLog.CallComposerLoggingException>); + method @RequiresPermission(allOf={android.Manifest.permission.WRITE_CALL_LOG, android.Manifest.permission.INTERACT_ACROSS_USERS}) public static void storeCallComposerPicture(@NonNull android.content.Context, @NonNull java.io.InputStream, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.net.Uri,android.provider.CallLog.CallComposerLoggingException>); } public static class CallLog.CallComposerLoggingException extends java.lang.Throwable { @@ -13626,7 +13628,6 @@ package android.telephony.ims { method public int describeContents(); method @Nullable public String getCallIdParameter(); method @NonNull public byte[] getContent(); - method @Deprecated @NonNull public byte[] getEncodedMessage(); method @NonNull public String getHeaderSection(); method @NonNull public String getStartLine(); method @NonNull public String getViaBranchParameter(); diff --git a/core/api/test-current.txt b/core/api/test-current.txt index d59e4f8e9c05..20e91873a7e0 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -263,10 +263,12 @@ package android.app { public class BroadcastOptions { ctor public BroadcastOptions(@NonNull android.os.Bundle); + method public int getMaxManifestReceiverApiLevel(); method public long getTemporaryAppAllowlistDuration(); method @Nullable public String getTemporaryAppAllowlistReason(); method public int getTemporaryAppAllowlistReasonCode(); method public int getTemporaryAppAllowlistType(); + method public void setMaxManifestReceiverApiLevel(int); } public class DownloadManager { diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index db42803ac9f9..a24555f79a1c 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4272,7 +4272,8 @@ public class ActivityManager { try { getService().broadcastIntentWithFeature( null, null, intent, null, null, Activity.RESULT_OK, null, null, - null /*permission*/, appOp, null, false, true, userId); + null /*requiredPermissions*/, null /*excludedPermissions*/, appOp, null, false, + true, userId); } catch (RemoteException ex) { } } diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java index 9da2581e449f..bd7162c1bf3b 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -250,6 +250,7 @@ public class BroadcastOptions { * them. This only applies to receivers declared in the app's AndroidManifest.xml. * @hide */ + @TestApi @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public void setMaxManifestReceiverApiLevel(int apiLevel) { mMaxManifestReceiverApiLevel = apiLevel; @@ -259,6 +260,7 @@ public class BroadcastOptions { * Return {@link #setMaxManifestReceiverApiLevel}. * @hide */ + @TestApi @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public int getMaxManifestReceiverApiLevel() { return mMaxManifestReceiverApiLevel; diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f7ea3815d567..9753b6748c78 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1176,8 +1176,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, - false, getUserId()); + null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/, + AppOpsManager.OP_NONE, null, false, false, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1194,7 +1194,8 @@ class ContextImpl extends Context { ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, - AppOpsManager.OP_NONE, null, false, false, getUserId()); + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false, + getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1209,7 +1210,8 @@ class ContextImpl extends Context { ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, - AppOpsManager.OP_NONE, null, false, false, getUserId()); + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false, + getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1224,7 +1226,24 @@ class ContextImpl extends Context { ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, - AppOpsManager.OP_NONE, null, false, false, user.getIdentifier()); + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false, + user.getIdentifier()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @Override + public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions, + String[] excludedPermissions) { + warnIfCallingFromSystemProcess(); + String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); + try { + intent.prepareToLeaveProcess(this); + ActivityManager.getService().broadcastIntentWithFeature( + mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, + null, Activity.RESULT_OK, null, null, receiverPermissions, excludedPermissions, + AppOpsManager.OP_NONE, null, false, false, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1241,7 +1260,8 @@ class ContextImpl extends Context { ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, - AppOpsManager.OP_NONE, options, false, false, getUserId()); + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false, + getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1257,8 +1277,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, - false, getUserId()); + null, Activity.RESULT_OK, null, null, receiverPermissions, + null /*excludedPermissions=*/, appOp, null, false, false, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1275,7 +1295,8 @@ class ContextImpl extends Context { ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, - AppOpsManager.OP_NONE, null, true, false, getUserId()); + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, false, + getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1337,8 +1358,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - rd, initialCode, initialData, initialExtras, receiverPermissions, appOp, - options, true, false, getUserId()); + rd, initialCode, initialData, initialExtras, receiverPermissions, + null /*excludedPermissions=*/, appOp, options, true, false, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1351,8 +1372,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, - false, user.getIdentifier()); + null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/, + AppOpsManager.OP_NONE, null, false, false, user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1375,7 +1396,8 @@ class ContextImpl extends Context { ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, - AppOpsManager.OP_NONE, options, false, false, user.getIdentifier()); + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false, + user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1391,8 +1413,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, - false, user.getIdentifier()); + null, Activity.RESULT_OK, null, null, receiverPermissions, + null /*excludedPermissions=*/, appOp, null, false, false, user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1442,8 +1464,9 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - rd, initialCode, initialData, initialExtras, receiverPermissions, appOp, - options, true, false, user.getIdentifier()); + rd, initialCode, initialData, initialExtras, receiverPermissions, + null /*excludedPermissions=*/, appOp, options, true, false, + user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1483,8 +1506,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, - true, getUserId()); + null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/, + AppOpsManager.OP_NONE, null, false, true, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1522,8 +1545,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, options, - false, true, getUserId()); + null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/, + AppOpsManager.OP_NONE, options, false, true, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1558,8 +1581,9 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - rd, initialCode, initialData, initialExtras, null, AppOpsManager.OP_NONE, null, - true, true, getUserId()); + rd, initialCode, initialData, initialExtras, null, + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, true, + getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1590,8 +1614,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, - true, user.getIdentifier()); + null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/, + AppOpsManager.OP_NONE, null, false, true, user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1605,8 +1629,8 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, options, - false, true, user.getIdentifier()); + null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/, + AppOpsManager.OP_NONE, options, false, true, user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1640,8 +1664,9 @@ class ContextImpl extends Context { intent.prepareToLeaveProcess(this); ActivityManager.getService().broadcastIntentWithFeature( mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType, - rd, initialCode, initialData, initialExtras, null, AppOpsManager.OP_NONE, null, - true, true, user.getIdentifier()); + rd, initialCode, initialData, initialExtras, null, + null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, true, + user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index f9279da172a0..89d90a3b9d6f 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -137,7 +137,7 @@ interface IActivityManager { int appOp, in Bundle options, boolean serialized, boolean sticky, int userId); int broadcastIntentWithFeature(in IApplicationThread caller, in String callingFeatureId, in Intent intent, in String resolvedType, in IIntentReceiver resultTo, int resultCode, - in String resultData, in Bundle map, in String[] requiredPermissions, + in String resultData, in Bundle map, in String[] requiredPermissions, in String[] excludePermissions, int appOp, in Bundle options, boolean serialized, boolean sticky, int userId); void unbroadcastIntent(in IApplicationThread caller, in Intent intent, int userId); @UnsupportedAppUsage diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index a60f1ca3cdcd..7ce0c7060b05 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1388,6 +1388,12 @@ public class Notification implements Parcelable public static final String EXTRA_CALL_TYPE = "android.callType"; /** + * {@link #extras} key: whether the {@link android.app.Notification.CallStyle} notification + * is for a call that will activate video when answered. This extra is a boolean. + */ + public static final String EXTRA_CALL_IS_VIDEO = "android.callIsVideo"; + + /** * {@link #extras} key: the person to be displayed as calling for the * {@link android.app.Notification.CallStyle} notification. This extra is a {@link Person}. */ @@ -5110,6 +5116,7 @@ public class Notification implements Parcelable TemplateBindResult result) { p.headerless(resId == getBaseLayoutResource() || resId == getHeadsUpBaseLayoutResource() + || resId == getMessagingLayoutResource() || resId == R.layout.notification_template_material_media); RemoteViews contentView = new BuilderRemoteViews(mContext.getApplicationInfo(), resId); @@ -6308,7 +6315,7 @@ public class Notification implements Parcelable * Gets the theme's background color */ private @ColorInt int getDefaultBackgroundColor() { - return obtainThemeColor(R.attr.colorBackground, + return obtainThemeColor(R.attr.colorSurface, mInNightMode ? Color.BLACK : Color.WHITE); } @@ -6635,6 +6642,10 @@ public class Notification implements Parcelable return R.layout.notification_template_material_messaging; } + private int getBigMessagingLayoutResource() { + return R.layout.notification_template_material_big_messaging; + } + private int getConversationLayoutResource() { return R.layout.notification_template_material_conversation; } @@ -8145,12 +8156,14 @@ public class Notification implements Parcelable */ @Override public RemoteViews makeContentView(boolean increasedHeight) { + // All messaging templates contain the actions ArrayList<Action> originalActions = mBuilder.mActions; - mBuilder.mActions = new ArrayList<>(); - RemoteViews remoteViews = makeMessagingView(true /* isCollapsed */, - false /* hideLargeIcon */); - mBuilder.mActions = originalActions; - return remoteViews; + try { + mBuilder.mActions = new ArrayList<>(); + return makeMessagingView(StandardTemplateParams.VIEW_TYPE_NORMAL); + } finally { + mBuilder.mActions = originalActions; + } } /** @@ -8236,18 +8249,24 @@ public class Notification implements Parcelable */ @Override public RemoteViews makeBigContentView() { - return makeMessagingView(false /* isCollapsed */, true /* hideLargeIcon */); + return makeMessagingView(StandardTemplateParams.VIEW_TYPE_BIG); } /** * Create a messaging layout. * - * @param isCollapsed Should this use the collapsed layout - * @param hideRightIcons Should the reply affordance be shown at the end of the notification + * @param viewType one of StandardTemplateParams.VIEW_TYPE_NORMAL, VIEW_TYPE_BIG, + * VIEW_TYPE_HEADS_UP * @return the created remoteView. */ @NonNull - private RemoteViews makeMessagingView(boolean isCollapsed, boolean hideRightIcons) { + private RemoteViews makeMessagingView(int viewType) { + boolean isCollapsed = viewType != StandardTemplateParams.VIEW_TYPE_BIG; + boolean hideRightIcons = viewType != StandardTemplateParams.VIEW_TYPE_NORMAL; + boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY; + boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT; + boolean isHeaderless = !isConversationLayout && isCollapsed; + CharSequence conversationTitle = !TextUtils.isEmpty(super.mBigContentTitle) ? super.mBigContentTitle : mConversationTitle; @@ -8265,23 +8284,26 @@ public class Notification implements Parcelable } else { isOneToOne = !isGroupConversation(); } - boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY; - boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT; + if (isHeaderless && isOneToOne && TextUtils.isEmpty(conversationTitle)) { + conversationTitle = getOtherPersonName(); + } + Icon largeIcon = mBuilder.mN.mLargeIcon; TemplateBindResult bindResult = new TemplateBindResult(); StandardTemplateParams p = mBuilder.mParams.reset() - .viewType(isCollapsed ? StandardTemplateParams.VIEW_TYPE_NORMAL - : StandardTemplateParams.VIEW_TYPE_BIG) + .viewType(viewType) .highlightExpander(isConversationLayout) .hideProgress(true) - .title(conversationTitle) + .title(isHeaderless ? conversationTitle : null) .text(null) .hideLargeIcon(hideRightIcons || isOneToOne) - .headerTextSecondary(conversationTitle); + .headerTextSecondary(isHeaderless ? null : conversationTitle); RemoteViews contentView = mBuilder.applyStandardTemplateWithActions( isConversationLayout ? mBuilder.getConversationLayoutResource() - : mBuilder.getMessagingLayoutResource(), + : isCollapsed + ? mBuilder.getMessagingLayoutResource() + : mBuilder.getBigMessagingLayoutResource(), p, bindResult); if (isConversationLayout) { @@ -8290,14 +8312,6 @@ public class Notification implements Parcelable } addExtras(mBuilder.mN.extras); - if (!isConversationLayout) { - // also update the end margin if there is an image - // NOTE: This template doesn't support moving this icon to the left, so we don't - // need to fully apply the MarginSet - contentView.setViewLayoutMargin(R.id.notification_messaging, RemoteViews.MARGIN_END, - bindResult.mHeadingExtraMarginSet.getDpValue(), - TypedValue.COMPLEX_UNIT_DIP); - } contentView.setInt(R.id.status_bar_latest_event_content, "setLayoutColor", mBuilder.getSmallIconColor(p)); contentView.setInt(R.id.status_bar_latest_event_content, "setSenderTextColor", @@ -8323,6 +8337,10 @@ public class Notification implements Parcelable contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsImportantConversation", isImportantConversation); } + if (isHeaderless) { + // Collapsed legacy messaging style has a 1-line limit. + contentView.setInt(R.id.notification_messaging, "setMaxDisplayedLines", 1); + } contentView.setIcon(R.id.status_bar_latest_event_content, "setLargeIcon", largeIcon); contentView.setBundle(R.id.status_bar_latest_event_content, "setData", @@ -8330,6 +8348,22 @@ public class Notification implements Parcelable return contentView; } + private CharSequence getKey(Person person) { + return person == null ? null + : person.getKey() == null ? person.getName() : person.getKey(); + } + + private CharSequence getOtherPersonName() { + CharSequence userKey = getKey(mUser); + for (int i = mMessages.size() - 1; i >= 0; i--) { + Person sender = mMessages.get(i).getSenderPerson(); + if (sender != null && !TextUtils.equals(userKey, getKey(sender))) { + return sender.getName(); + } + } + return null; + } + private boolean hasOnlyWhiteSpaceSenders() { for (int i = 0; i < mMessages.size(); i++) { Message m = mMessages.get(i); @@ -8364,12 +8398,7 @@ public class Notification implements Parcelable */ @Override public RemoteViews makeHeadsUpContentView(boolean increasedHeight) { - RemoteViews remoteViews = makeMessagingView(true /* isCollapsed */, - true /* hideLargeIcon */); - if (mConversationType == CONVERSATION_TYPE_LEGACY) { - remoteViews.setInt(R.id.notification_messaging, "setMaxDisplayedLines", 1); - } - return remoteViews; + return makeMessagingView(StandardTemplateParams.VIEW_TYPE_HEADS_UP); } public static final class Message { @@ -9146,6 +9175,7 @@ public class Notification implements Parcelable private PendingIntent mAnswerIntent; private PendingIntent mDeclineIntent; private PendingIntent mHangUpIntent; + private boolean mIsVideo; private Integer mAnswerButtonColor; private Integer mDeclineButtonColor; private Icon mVerificationIcon; @@ -9238,6 +9268,16 @@ public class Notification implements Parcelable } /** + * Sets whether the call is a video call, which may affect the icons or text used on the + * required action buttons. + */ + @NonNull + public CallStyle setIsVideo(boolean isVideo) { + mIsVideo = isVideo; + return this; + } + + /** * Optional icon to be displayed with {@link #setVerificationText(CharSequence) text} * as a verification status of the caller. */ @@ -9365,8 +9405,10 @@ public class Notification implements Parcelable @Nullable private Action makeAnswerAction() { - return mAnswerIntent == null ? null : makeAction(R.drawable.ic_call_answer, - R.string.call_notification_answer_action, + return mAnswerIntent == null ? null : makeAction( + mIsVideo ? R.drawable.ic_call_answer_video : R.drawable.ic_call_answer, + mIsVideo ? R.string.call_notification_answer_video_action + : R.string.call_notification_answer_action, mAnswerButtonColor, R.color.call_notification_answer_color, mAnswerIntent); } @@ -9545,6 +9587,7 @@ public class Notification implements Parcelable public void addExtras(Bundle extras) { super.addExtras(extras); extras.putInt(EXTRA_CALL_TYPE, mCallType); + extras.putBoolean(EXTRA_CALL_IS_VIDEO, mIsVideo); extras.putParcelable(EXTRA_CALL_PERSON, mPerson); if (mVerificationIcon != null) { extras.putParcelable(EXTRA_VERIFICATION_ICON, mVerificationIcon); @@ -9587,6 +9630,7 @@ public class Notification implements Parcelable protected void restoreFromExtras(Bundle extras) { super.restoreFromExtras(extras); mCallType = extras.getInt(EXTRA_CALL_TYPE); + mIsVideo = extras.getBoolean(EXTRA_CALL_IS_VIDEO); mPerson = extras.getParcelable(EXTRA_CALL_PERSON); mVerificationIcon = extras.getParcelable(EXTRA_VERIFICATION_ICON); mVerificationText = extras.getCharSequence(EXTRA_VERIFICATION_TEXT); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7af9482b0010..4dc044208a9f 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -119,6 +119,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -1214,15 +1215,14 @@ public class DevicePolicyManager { public @interface ProvisioningTrigger {} /** - * Possible values for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES}. + * Flags for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES}. * * @hide */ - @IntDef(prefix = { "SUPPORTED_MODES_" }, value = { - SUPPORTED_MODES_ORGANIZATION_OWNED, - SUPPORTED_MODES_PERSONALLY_OWNED, - SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED, - SUPPORTED_MODES_DEVICE_OWNER + @IntDef(flag = true, prefix = { "FLAG_SUPPORTED_MODES_" }, value = { + FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED, + FLAG_SUPPORTED_MODES_PERSONALLY_OWNED, + FLAG_SUPPORTED_MODES_DEVICE_OWNER }) @Retention(RetentionPolicy.SOURCE) public @interface ProvisioningConfiguration {} @@ -1307,7 +1307,7 @@ public class DevicePolicyManager { public static final int PROVISIONING_TRIGGER_MANAGED_ACCOUNT = 4; /** - * A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that provisioning is + * Flag for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that provisioning is * organization-owned. * * <p>Using this value indicates the admin app can only be provisioned in either a @@ -1316,55 +1316,48 @@ public class DevicePolicyManager { * #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link * #PROVISIONING_MODE_MANAGED_PROFILE} and {@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE}. * - * <p>Also, if this value is set, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity + * <p>Also, if this flag is set, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity * will not receive the {@link #EXTRA_PROVISIONING_IMEI} and {@link * #EXTRA_PROVISIONING_SERIAL_NUMBER} extras. * + * <p>This flag can be combined with {@link #FLAG_SUPPORTED_MODES_PERSONALLY_OWNED}. In + * that case, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity will have + * the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link + * #PROVISIONING_MODE_MANAGED_PROFILE}, {@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE} and + * {@link #PROVISIONING_MODE_MANAGED_PROFILE_ON_PERSONAL_DEVICE}. + * * @hide */ @SystemApi - public static final int SUPPORTED_MODES_ORGANIZATION_OWNED = 1; + public static final int FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED = 1; /** - * A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that provisioning is - * personally-owned. + * Flag for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that provisioning + * is personally-owned. * - * <p>Using this value will cause the admin app's {@link #ACTION_GET_PROVISIONING_MODE} + * <p>Using this flag will cause the admin app's {@link #ACTION_GET_PROVISIONING_MODE} * activity to have the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra * contain only {@link #PROVISIONING_MODE_MANAGED_PROFILE}. * - * @hide - */ - @SystemApi - public static final int SUPPORTED_MODES_PERSONALLY_OWNED = 2; - - /** - * A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that provisioning could - * be organization-owned or personally-owned. - * - * <p>Using this value will cause the admin app's {@link #ACTION_GET_PROVISIONING_MODE} - * activity to have the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra - * contain {@link + * <p>This flag can be combined with {@link #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED}. In + * that case, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity will have the + * {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link * #PROVISIONING_MODE_MANAGED_PROFILE}, {@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE} and * {@link #PROVISIONING_MODE_MANAGED_PROFILE_ON_PERSONAL_DEVICE}. * - * <p>Also, if this value is set, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity - * will not receive the {@link #EXTRA_PROVISIONING_IMEI} and {@link - * #EXTRA_PROVISIONING_SERIAL_NUMBER} extras. - * * @hide */ @SystemApi - public static final int SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED = 3; + public static final int FLAG_SUPPORTED_MODES_PERSONALLY_OWNED = 1 << 1; /** - * A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that the only supported - * provisioning mode is device owner. + * Flag for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that the only + * supported provisioning mode is device owner. * * @hide */ @SystemApi - public static final int SUPPORTED_MODES_DEVICE_OWNER = 4; + public static final int FLAG_SUPPORTED_MODES_DEVICE_OWNER = 1 << 2; /** * This MIME type is used for starting the device owner provisioning. @@ -2637,7 +2630,7 @@ public class DevicePolicyManager { * An integer extra indication what provisioning modes should be available for the admin app * to pick. * - * <p>The default value is {@link #SUPPORTED_MODES_ORGANIZATION_OWNED}. + * <p>The default value is {@link #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED}. * * <p>The value of this extra will determine the contents of the {@link * #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array that is passed to the admin app as an @@ -2648,13 +2641,21 @@ public class DevicePolicyManager { * #ACTION_GET_PROVISIONING_MODE} activity via the {@link #EXTRA_PROVISIONING_IMEI} and {@link * #EXTRA_PROVISIONING_SERIAL_NUMBER} respectively. * + * <p>The allowed flag combinations are: + * <ul> + * <li>{@link #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED}</li> + * <li>{@link #FLAG_SUPPORTED_MODES_PERSONALLY_OWNED}</li> + * <li>{@link #FLAG_SUPPORTED_MODES_DEVICE_OWNER}</li> + * <li>{@link #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED} + * | {@link #FLAG_SUPPORTED_MODES_PERSONALLY_OWNED}</li> + * </ul> + * * <p>This extra is only respected when provided alongside the {@link * #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} intent action. * - * @see #SUPPORTED_MODES_ORGANIZATION_OWNED - * @see #SUPPORTED_MODES_PERSONALLY_OWNED - * @see #SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED - * @see #SUPPORTED_MODES_DEVICE_OWNER + * @see #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED + * @see #FLAG_SUPPORTED_MODES_PERSONALLY_OWNED + * @see #FLAG_SUPPORTED_MODES_DEVICE_OWNER * @hide */ @SystemApi @@ -6460,12 +6461,14 @@ public class DevicePolicyManager { * to a given KeyChain key. * * Key are granted on a per-UID basis, so if several apps share the same UID, granting access to - * one of them automatically grants it to others. This method returns a set of sets of package - * names, where each internal set contains all packages sharing the same UID. Grantee packages - * that don't share UID with other packages are represented by singleton sets. + * one of them automatically grants it to others. This method returns a map containing one entry + * per grantee UID. Entries have UIDs as keys and sets of corresponding package names as values. + * In particular, grantee packages that don't share UID with other packages are represented by + * entries having singleton sets as values. * * @param alias The alias of the key to grant access to. - * @return package names of apps that have access to a given key, grouped by UIDs + * @return apps that have access to a given key, arranged in a map from UID to sets of + * package names. * * @throws SecurityException if the caller is not a device owner, a profile owner or * delegated certificate chooser. @@ -6473,26 +6476,11 @@ public class DevicePolicyManager { * * @see #grantKeyPairToApp(ComponentName, String, String) */ - public @NonNull Set<Set<String>> getKeyPairGrants(@NonNull String alias) { + public @NonNull Map<Integer, Set<String>> getKeyPairGrants(@NonNull String alias) { throwIfParentInstance("getKeyPairGrants"); try { - // Set of sets is flattened into a null-separated list. - final List<String> flattened = - mService.getKeyPairGrants(mContext.getPackageName(), alias); - final Set<Set<String>> result = new HashSet<>(); - Set<String> pkgsForOneUid = new HashSet<>(); - for (final String pkg : flattened) { - if (pkg == null) { - result.add(pkgsForOneUid); - pkgsForOneUid = new HashSet<>(); - } else { - pkgsForOneUid.add(pkg); - } - } - if (!pkgsForOneUid.isEmpty()) { - result.add(pkgsForOneUid); - } - return result; + // The result is wrapped into intermediate parcelable representation. + return mService.getKeyPairGrants(mContext.getPackageName(), alias).getPackagesByUid(); } catch (RemoteException e) { e.rethrowFromSystemServer(); } diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 05b0be4c5813..8e86f6545f23 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -20,6 +20,7 @@ package android.app.admin; import android.app.admin.NetworkEvent; import android.app.IApplicationThread; import android.app.IServiceConnection; +import android.app.admin.ParcelableGranteeMap; import android.app.admin.StartInstallingUpdateCallback; import android.app.admin.SystemUpdateInfo; import android.app.admin.SystemUpdatePolicy; @@ -485,7 +486,7 @@ interface IDevicePolicyManager { boolean startViewCalendarEventInManagedProfile(String packageName, long eventId, long start, long end, boolean allDay, int flags); boolean setKeyGrantForApp(in ComponentName admin, String callerPackage, String alias, String packageName, boolean hasGrant); - List<String> getKeyPairGrants(in String callerPackage, in String alias); + ParcelableGranteeMap getKeyPairGrants(in String callerPackage, in String alias); boolean setKeyGrantToWifiAuth(String callerPackage, String alias, boolean hasGrant); boolean isKeyPairGrantedToWifiAuth(String callerPackage, String alias); diff --git a/core/java/android/app/admin/ParcelableGranteeMap.aidl b/core/java/android/app/admin/ParcelableGranteeMap.aidl new file mode 100644 index 000000000000..cd15b4901472 --- /dev/null +++ b/core/java/android/app/admin/ParcelableGranteeMap.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.admin; + +parcelable ParcelableGranteeMap;
\ No newline at end of file diff --git a/core/java/android/app/admin/ParcelableGranteeMap.java b/core/java/android/app/admin/ParcelableGranteeMap.java new file mode 100644 index 000000000000..be348ad067c9 --- /dev/null +++ b/core/java/android/app/admin/ParcelableGranteeMap.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.admin; + +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.ArrayMap; +import android.util.ArraySet; + +import java.util.Map; +import java.util.Set; + +/** + * Class for marshalling keypair grantees for a given KeyChain key via Binder. + * + * @hide + */ +public class ParcelableGranteeMap implements Parcelable { + + private final Map<Integer, Set<String>> mPackagesByUid; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mPackagesByUid.size()); + for (final Map.Entry<Integer, Set<String>> uidEntry : mPackagesByUid.entrySet()) { + dest.writeInt(uidEntry.getKey()); + dest.writeStringArray(uidEntry.getValue().toArray(new String[0])); + } + } + + public static final @NonNull Parcelable.Creator<ParcelableGranteeMap> CREATOR = + new Parcelable.Creator<ParcelableGranteeMap>() { + @Override + public ParcelableGranteeMap createFromParcel(Parcel source) { + final Map<Integer, Set<String>> packagesByUid = new ArrayMap<>(); + final int numUids = source.readInt(); + for (int i = 0; i < numUids; i++) { + final int uid = source.readInt(); + final String[] pkgs = source.readStringArray(); + packagesByUid.put(uid, new ArraySet<>(pkgs)); + } + return new ParcelableGranteeMap(packagesByUid); + } + + @Override + public ParcelableGranteeMap[] newArray(int size) { + return new ParcelableGranteeMap[size]; + } + }; + + /** + * Creates an instance holding a reference (not a copy) to the given map. + */ + public ParcelableGranteeMap(@NonNull Map<Integer, Set<String>> packagesByUid) { + mPackagesByUid = packagesByUid; + } + + /** + * Returns a reference (not a copy) to the stored map. + */ + @NonNull + public Map<Integer, Set<String>> getPackagesByUid() { + return mPackagesByUid; + } +} diff --git a/core/java/android/app/usage/IUsageStatsManager.aidl b/core/java/android/app/usage/IUsageStatsManager.aidl index 2a50e0de2145..eb4c624be0b2 100644 --- a/core/java/android/app/usage/IUsageStatsManager.aidl +++ b/core/java/android/app/usage/IUsageStatsManager.aidl @@ -65,6 +65,7 @@ interface IUsageStatsManager { void reportPastUsageStart(in IBinder activity, String token, long timeAgoMs, String callingPackage); void reportUsageStop(in IBinder activity, String token, String callingPackage); + void reportUserInteraction(String packageName, int userId); int getUsageSource(); void forceUsageSourceSettingRead(); long getLastTimeAnyComponentUsed(String packageName); diff --git a/core/java/android/app/usage/UsageStats.java b/core/java/android/app/usage/UsageStats.java index ef921728c616..cda463408955 100644 --- a/core/java/android/app/usage/UsageStats.java +++ b/core/java/android/app/usage/UsageStats.java @@ -30,6 +30,7 @@ import static android.app.usage.UsageEvents.Event.FOREGROUND_SERVICE_STOP; import static android.app.usage.UsageEvents.Event.ROLLOVER_FOREGROUND_SERVICE; import static android.app.usage.UsageEvents.Event.USER_INTERACTION; +import android.annotation.CurrentTimeMillisLong; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; @@ -277,13 +278,15 @@ public final class UsageStats implements Parcelable { /** * Get the last time this package's component was used by a client package, measured in - * milliseconds since the epoch. Note that component usage is only reported in certain cases - * (e.g. broadcast receiver, service, content provider). + * milliseconds since the epoch. Note that component usage is only reported for component + * bindings (e.g. broadcast receiver, service, content provider) and only when such a binding + * would cause an app to leave the stopped state. * See {@link UsageEvents.Event#APP_COMPONENT_USED} * @hide */ @SystemApi - public long getLastTimeComponentUsed() { + @CurrentTimeMillisLong + public long getLastTimeAnyComponentUsed() { return mLastTimeComponentUsed; } diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 542473a3d2a9..e8175c709d85 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -982,6 +982,20 @@ public final class UsageStatsManager { } /** + * Reports user interaction with a given package in the given user. + * + * <p><em>This method is only for use by the system</em> + * @hide + */ + public void reportUserInteraction(@NonNull String packageName, int userId) { + try { + mService.reportUserInteraction(packageName, userId); + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } + } + + /** * Report usage associated with a particular {@code token} has started. Tokens are app defined * strings used to represent usage of in-app features. Apps with the {@link * android.Manifest.permission#OBSERVE_APP_USAGE} permission can register time limit observers diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 79fd8072f9f0..236185e2a28d 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -3095,8 +3095,6 @@ public final class BluetoothAdapter { * * @param transport - whether the {@link OobData} is generated for LE or Classic. * @param oobData - data generated in the host stack(LE) or controller (Classic) - * - * @hide */ void onOobData(@Transport int transport, @Nullable OobData oobData); @@ -3104,8 +3102,6 @@ public final class BluetoothAdapter { * Provides feedback when things don't go as expected. * * @param errorCode - the code descibing the type of error that occurred. - * - * @hide */ void onError(@OobError int errorCode); } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 09ac8103c526..318913f3bec0 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2208,6 +2208,17 @@ public abstract class Context { } /** + * Like {@link #sendBroadcastMultiplePermissions(Intent, String[])}, but also allows + * specification of a list of excluded permissions. This allows sending a broadcast to an + * app that has the permissions in `receiverPermissions` but not `excludedPermissions`. + * @hide + */ + public void sendBroadcastMultiplePermissions(@NonNull Intent intent, + @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) { + throw new RuntimeException("Not implemented. Must override in a subclass."); + } + + /** * Broadcast the given intent to all interested BroadcastReceivers, allowing * an array of required permissions to be enforced. This call is asynchronous; it returns * immediately, and you will continue executing while the receivers are run. No results are diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 8936d0c47a58..dddcbea63872 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -493,6 +493,13 @@ public class ContextWrapper extends Context { /** @hide */ @Override + public void sendBroadcastMultiplePermissions(@NonNull Intent intent, + @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) { + mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions); + } + + /** @hide */ + @Override public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user, String[] receiverPermissions) { mBase.sendBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions); diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 9ad017c5f9c6..f8d407db07a5 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2871,6 +2871,7 @@ public class Intent implements Parcelable, Cloneable { * </ul> * * <p class="note">This is a protected intent that can only be sent by the system. + * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_PACKAGE_FULLY_LOADED = diff --git a/core/java/android/content/pm/AppSearchShortcutInfo.java b/core/java/android/content/pm/AppSearchShortcutInfo.java index 6d5829c175b5..eb50924579f6 100644 --- a/core/java/android/content/pm/AppSearchShortcutInfo.java +++ b/core/java/android/content/pm/AppSearchShortcutInfo.java @@ -52,7 +52,7 @@ public class AppSearchShortcutInfo extends GenericDocument { /** The name of the schema type for {@link ShortcutInfo} documents.*/ public static final String SCHEMA_TYPE = "Shortcut"; - public static final int SCHEMA_VERSION = 1; + public static final int SCHEMA_VERSION = 2; public static final String KEY_ACTIVITY = "activity"; public static final String KEY_SHORT_LABEL = "shortLabel"; diff --git a/core/java/android/content/pm/verify/domain/DomainVerificationManager.java b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java index 33920c676170..adc668f8fa02 100644 --- a/core/java/android/content/pm/verify/domain/DomainVerificationManager.java +++ b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java @@ -34,6 +34,8 @@ import com.android.internal.util.CollectionUtils; import java.util.List; import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import java.util.UUID; /** @@ -346,17 +348,22 @@ public final class DomainVerificationManager { * an Intent with that domain. That will be decided by the set of apps which * are the highest priority level, ignoring all lower priority levels. * - * By default the list will be returned ordered from lowest to highest - * priority. + * The set will be ordered from lowest to highest priority. * * @hide */ @SystemApi @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) - public List<DomainOwner> getOwnersForDomain(@NonNull String domain) { + public SortedSet<DomainOwner> getOwnersForDomain(@NonNull String domain) { try { - return mDomainVerificationManager.getOwnersForDomain(domain, mContext.getUserId()); + final List<DomainOwner> orderedList = mDomainVerificationManager.getOwnersForDomain( + domain, mContext.getUserId()); + SortedSet<DomainOwner> set = new TreeSet<>( + (first, second) -> Integer.compare(orderedList.indexOf(first), + orderedList.indexOf(second))); + set.addAll(orderedList); + return set; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java index 75db3820f5e7..d7c6fa1822b9 100644 --- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java +++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java @@ -79,7 +79,12 @@ public final class VcnGatewayConnectionConfig { @VisibleForTesting(visibility = Visibility.PRIVATE) static final int MIN_MTU_V6 = 1280; - private static final Set<Integer> ALLOWED_CAPABILITIES; + /** + * The set of allowed capabilities for exposed capabilities. + * + * @hide + */ + public static final Set<Integer> ALLOWED_CAPABILITIES; static { Set<Integer> allowedCaps = new ArraySet<>(); diff --git a/core/java/android/os/BatteryConsumer.java b/core/java/android/os/BatteryConsumer.java index 033148379041..ba63ba4521df 100644 --- a/core/java/android/os/BatteryConsumer.java +++ b/core/java/android/os/BatteryConsumer.java @@ -36,7 +36,7 @@ public abstract class BatteryConsumer { * @hide */ @IntDef(prefix = {"POWER_COMPONENT_"}, value = { - POWER_COMPONENT_USAGE, + POWER_COMPONENT_SCREEN, POWER_COMPONENT_CPU, POWER_COMPONENT_BLUETOOTH, POWER_COMPONENT_CAMERA, @@ -49,14 +49,16 @@ public abstract class BatteryConsumer { POWER_COMPONENT_GNSS, POWER_COMPONENT_WIFI, POWER_COMPONENT_WAKELOCK, - POWER_COMPONENT_SCREEN, + POWER_COMPONENT_MEMORY, + POWER_COMPONENT_PHONE, + POWER_COMPONENT_IDLE, POWER_COMPONENT_REATTRIBUTED_TO_OTHER_CONSUMERS, }) @Retention(RetentionPolicy.SOURCE) public static @interface PowerComponent { } - public static final int POWER_COMPONENT_USAGE = 0; + public static final int POWER_COMPONENT_SCREEN = 0; public static final int POWER_COMPONENT_CPU = 1; public static final int POWER_COMPONENT_BLUETOOTH = 2; public static final int POWER_COMPONENT_CAMERA = 3; @@ -69,13 +71,15 @@ public abstract class BatteryConsumer { public static final int POWER_COMPONENT_GNSS = 10; public static final int POWER_COMPONENT_WIFI = 11; public static final int POWER_COMPONENT_WAKELOCK = 12; - public static final int POWER_COMPONENT_SCREEN = 13; + public static final int POWER_COMPONENT_MEMORY = 13; + public static final int POWER_COMPONENT_PHONE = 13; + public static final int POWER_COMPONENT_IDLE = 15; // Power that is re-attributed to other battery consumers. For example, for System Server // this represents the power attributed to apps requesting system services. // The value should be negative or zero. - public static final int POWER_COMPONENT_REATTRIBUTED_TO_OTHER_CONSUMERS = 14; + public static final int POWER_COMPONENT_REATTRIBUTED_TO_OTHER_CONSUMERS = 16; - public static final int POWER_COMPONENT_COUNT = 15; + public static final int POWER_COMPONENT_COUNT = 17; public static final int FIRST_CUSTOM_POWER_COMPONENT_ID = 1000; public static final int LAST_CUSTOM_POWER_COMPONENT_ID = 9999; @@ -87,7 +91,7 @@ public abstract class BatteryConsumer { * @hide */ @IntDef(prefix = {"TIME_COMPONENT_"}, value = { - TIME_COMPONENT_USAGE, + TIME_COMPONENT_SCREEN, TIME_COMPONENT_CPU, TIME_COMPONENT_CPU_FOREGROUND, TIME_COMPONENT_BLUETOOTH, @@ -98,13 +102,15 @@ public abstract class BatteryConsumer { TIME_COMPONENT_GNSS, TIME_COMPONENT_WIFI, TIME_COMPONENT_WAKELOCK, - TIME_COMPONENT_SCREEN, + TIME_COMPONENT_MEMORY, + TIME_COMPONENT_PHONE, + TIME_COMPONENT_IDLE, }) @Retention(RetentionPolicy.SOURCE) public static @interface TimeComponent { } - public static final int TIME_COMPONENT_USAGE = 0; + public static final int TIME_COMPONENT_SCREEN = 0; public static final int TIME_COMPONENT_CPU = 1; public static final int TIME_COMPONENT_CPU_FOREGROUND = 2; public static final int TIME_COMPONENT_BLUETOOTH = 3; @@ -117,9 +123,11 @@ public abstract class BatteryConsumer { public static final int TIME_COMPONENT_GNSS = 10; public static final int TIME_COMPONENT_WIFI = 11; public static final int TIME_COMPONENT_WAKELOCK = 12; - public static final int TIME_COMPONENT_SCREEN = 13; + public static final int TIME_COMPONENT_MEMORY = 13; + public static final int TIME_COMPONENT_PHONE = 14; + public static final int TIME_COMPONENT_IDLE = 15; - public static final int TIME_COMPONENT_COUNT = 14; + public static final int TIME_COMPONENT_COUNT = 16; public static final int FIRST_CUSTOM_TIME_COMPONENT_ID = 1000; public static final int LAST_CUSTOM_TIME_COMPONENT_ID = 9999; @@ -148,7 +156,7 @@ public abstract class BatteryConsumer { */ public static final int POWER_MODEL_MEASURED_ENERGY = 1; - private final PowerComponents mPowerComponents; + protected final PowerComponents mPowerComponents; protected BatteryConsumer(@NonNull PowerComponents powerComponents) { mPowerComponents = powerComponents; @@ -192,6 +200,23 @@ public abstract class BatteryConsumer { return mPowerComponents.getConsumedPowerForCustomComponent(componentId); } + public int getCustomPowerComponentCount() { + return mPowerComponents.getCustomPowerComponentCount(); + } + + void setCustomPowerComponentNames(String[] customPowerComponentNames) { + mPowerComponents.setCustomPowerComponentNames(customPowerComponentNames); + } + + /** + * Returns the name of the specified power component. + * + * @param componentId The ID of the custom power component. + */ + public String getCustomPowerComponentName(int componentId) { + return mPowerComponents.getCustomPowerComponentName(componentId); + } + /** * Returns the amount of time since BatteryStats reset used by the specified component, e.g. * CPU, WiFi etc. @@ -222,9 +247,9 @@ public abstract class BatteryConsumer { protected abstract static class BaseBuilder<T extends BaseBuilder<?>> { final PowerComponents.Builder mPowerComponentsBuilder; - public BaseBuilder(int customPowerComponentCount, int customTimeComponentCount, - boolean includePowerModels) { - mPowerComponentsBuilder = new PowerComponents.Builder(customPowerComponentCount, + public BaseBuilder(@NonNull String[] customPowerComponentNames, + int customTimeComponentCount, boolean includePowerModels) { + mPowerComponentsBuilder = new PowerComponents.Builder(customPowerComponentNames, customTimeComponentCount, includePowerModels); } diff --git a/core/java/android/os/BatteryUsageStats.java b/core/java/android/os/BatteryUsageStats.java index f2887748f460..8ea59ce37018 100644 --- a/core/java/android/os/BatteryUsageStats.java +++ b/core/java/android/os/BatteryUsageStats.java @@ -39,9 +39,10 @@ public final class BatteryUsageStats implements Parcelable { private final double mDischargedPowerUpperBound; private final long mBatteryTimeRemainingMs; private final long mChargeTimeRemainingMs; - private final ArrayList<UidBatteryConsumer> mUidBatteryConsumers; - private final ArrayList<SystemBatteryConsumer> mSystemBatteryConsumers; - private final ArrayList<UserBatteryConsumer> mUserBatteryConsumers; + private final String[] mCustomPowerComponentNames; + private final List<UidBatteryConsumer> mUidBatteryConsumers; + private final List<SystemBatteryConsumer> mSystemBatteryConsumers; + private final List<UserBatteryConsumer> mUserBatteryConsumers; private final Parcel mHistoryBuffer; private final List<BatteryStats.HistoryTag> mHistoryTagPool; @@ -54,6 +55,7 @@ public final class BatteryUsageStats implements Parcelable { mHistoryTagPool = builder.mHistoryTagPool; mBatteryTimeRemainingMs = builder.mBatteryTimeRemainingMs; mChargeTimeRemainingMs = builder.mChargeTimeRemainingMs; + mCustomPowerComponentNames = builder.mCustomPowerComponentNames; double totalPower = 0; @@ -182,12 +184,31 @@ public final class BatteryUsageStats implements Parcelable { mDischargedPowerUpperBound = source.readDouble(); mBatteryTimeRemainingMs = source.readLong(); mChargeTimeRemainingMs = source.readLong(); - mUidBatteryConsumers = new ArrayList<>(); - source.readParcelableList(mUidBatteryConsumers, getClass().getClassLoader()); - mSystemBatteryConsumers = new ArrayList<>(); - source.readParcelableList(mSystemBatteryConsumers, getClass().getClassLoader()); - mUserBatteryConsumers = new ArrayList<>(); - source.readParcelableList(mUserBatteryConsumers, getClass().getClassLoader()); + mCustomPowerComponentNames = source.readStringArray(); + int uidCount = source.readInt(); + mUidBatteryConsumers = new ArrayList<>(uidCount); + for (int i = 0; i < uidCount; i++) { + final UidBatteryConsumer consumer = + UidBatteryConsumer.CREATOR.createFromParcel(source); + consumer.setCustomPowerComponentNames(mCustomPowerComponentNames); + mUidBatteryConsumers.add(consumer); + } + int sysCount = source.readInt(); + mSystemBatteryConsumers = new ArrayList<>(sysCount); + for (int i = 0; i < sysCount; i++) { + final SystemBatteryConsumer consumer = + SystemBatteryConsumer.CREATOR.createFromParcel(source); + consumer.setCustomPowerComponentNames(mCustomPowerComponentNames); + mSystemBatteryConsumers.add(consumer); + } + int userCount = source.readInt(); + mUserBatteryConsumers = new ArrayList<>(userCount); + for (int i = 0; i < userCount; i++) { + final UserBatteryConsumer consumer = + UserBatteryConsumer.CREATOR.createFromParcel(source); + consumer.setCustomPowerComponentNames(mCustomPowerComponentNames); + mUserBatteryConsumers.add(consumer); + } if (source.readBoolean()) { mHistoryBuffer = Parcel.obtain(); mHistoryBuffer.setDataSize(0); @@ -222,9 +243,19 @@ public final class BatteryUsageStats implements Parcelable { dest.writeDouble(mDischargedPowerUpperBound); dest.writeLong(mBatteryTimeRemainingMs); dest.writeLong(mChargeTimeRemainingMs); - dest.writeParcelableList(mUidBatteryConsumers, flags); - dest.writeParcelableList(mSystemBatteryConsumers, flags); - dest.writeParcelableList(mUserBatteryConsumers, flags); + dest.writeStringArray(mCustomPowerComponentNames); + dest.writeInt(mUidBatteryConsumers.size()); + for (int i = mUidBatteryConsumers.size() - 1; i >= 0; i--) { + mUidBatteryConsumers.get(i).writeToParcel(dest, flags); + } + dest.writeInt(mSystemBatteryConsumers.size()); + for (int i = mSystemBatteryConsumers.size() - 1; i >= 0; i--) { + mSystemBatteryConsumers.get(i).writeToParcel(dest, flags); + } + dest.writeInt(mUserBatteryConsumers.size()); + for (int i = mUserBatteryConsumers.size() - 1; i >= 0; i--) { + mUserBatteryConsumers.get(i).writeToParcel(dest, flags); + } if (mHistoryBuffer != null) { dest.writeBoolean(true); @@ -259,7 +290,8 @@ public final class BatteryUsageStats implements Parcelable { * Builder for BatteryUsageStats. */ public static final class Builder { - private final int mCustomPowerComponentCount; + @NonNull + private final String[] mCustomPowerComponentNames; private final int mCustomTimeComponentCount; private final boolean mIncludePowerModels; private long mStatsStartTimestampMs; @@ -277,13 +309,13 @@ public final class BatteryUsageStats implements Parcelable { private Parcel mHistoryBuffer; private List<BatteryStats.HistoryTag> mHistoryTagPool; - public Builder(int customPowerComponentCount, int customTimeComponentCount) { - this(customPowerComponentCount, customTimeComponentCount, false); + public Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount) { + this(customPowerComponentNames, customTimeComponentCount, false); } - public Builder(int customPowerComponentCount, int customTimeComponentCount, + public Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount, boolean includePowerModels) { - mCustomPowerComponentCount = customPowerComponentCount; + mCustomPowerComponentNames = customPowerComponentNames; mCustomTimeComponentCount = customTimeComponentCount; mIncludePowerModels = includePowerModels; } @@ -366,7 +398,7 @@ public final class BatteryUsageStats implements Parcelable { int uid = batteryStatsUid.getUid(); UidBatteryConsumer.Builder builder = mUidBatteryConsumerBuilders.get(uid); if (builder == null) { - builder = new UidBatteryConsumer.Builder(mCustomPowerComponentCount, + builder = new UidBatteryConsumer.Builder(mCustomPowerComponentNames, mCustomTimeComponentCount, mIncludePowerModels, batteryStatsUid); mUidBatteryConsumerBuilders.put(uid, builder); } @@ -382,7 +414,7 @@ public final class BatteryUsageStats implements Parcelable { @SystemBatteryConsumer.DrainType int drainType) { SystemBatteryConsumer.Builder builder = mSystemBatteryConsumerBuilders.get(drainType); if (builder == null) { - builder = new SystemBatteryConsumer.Builder(mCustomPowerComponentCount, + builder = new SystemBatteryConsumer.Builder(mCustomPowerComponentNames, mCustomTimeComponentCount, mIncludePowerModels, drainType); mSystemBatteryConsumerBuilders.put(drainType, builder); } @@ -397,7 +429,7 @@ public final class BatteryUsageStats implements Parcelable { public UserBatteryConsumer.Builder getOrCreateUserBatteryConsumerBuilder(int userId) { UserBatteryConsumer.Builder builder = mUserBatteryConsumerBuilders.get(userId); if (builder == null) { - builder = new UserBatteryConsumer.Builder(mCustomPowerComponentCount, + builder = new UserBatteryConsumer.Builder(mCustomPowerComponentNames, mCustomTimeComponentCount, mIncludePowerModels, userId); mUserBatteryConsumerBuilders.put(userId, builder); } diff --git a/core/java/android/os/PowerComponents.java b/core/java/android/os/PowerComponents.java index 238f4518b7d3..a0a41f4d6630 100644 --- a/core/java/android/os/PowerComponents.java +++ b/core/java/android/os/PowerComponents.java @@ -26,7 +26,7 @@ import android.annotation.NonNull; class PowerComponents { private static final int CUSTOM_POWER_COMPONENT_OFFSET = BatteryConsumer.POWER_COMPONENT_COUNT - BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID; - public static final int CUSTOM_TIME_COMPONENT_OFFSET = BatteryConsumer.TIME_COMPONENT_COUNT + private static final int CUSTOM_TIME_COMPONENT_OFFSET = BatteryConsumer.TIME_COMPONENT_COUNT - BatteryConsumer.FIRST_CUSTOM_TIME_COMPONENT_ID; private final double mTotalConsumedPowerMah; @@ -34,9 +34,12 @@ class PowerComponents { private final long[] mTimeComponentsMs; private final int mCustomPowerComponentCount; private final byte[] mPowerModels; + // Not written to Parcel and must be explicitly restored during the parent object's unparceling + private String[] mCustomPowerComponentNames; PowerComponents(@NonNull Builder builder) { - mCustomPowerComponentCount = builder.mCustomPowerComponentCount; + mCustomPowerComponentNames = builder.mCustomPowerComponentNames; + mCustomPowerComponentCount = mCustomPowerComponentNames.length; mPowerComponentsMah = builder.mPowerComponentsMah; mTimeComponentsMs = builder.mTimeComponentsMs; mTotalConsumedPowerMah = builder.getTotalPower(); @@ -117,6 +120,26 @@ class PowerComponents { } } + void setCustomPowerComponentNames(String[] customPowerComponentNames) { + mCustomPowerComponentNames = customPowerComponentNames; + } + + public String getCustomPowerComponentName(int componentId) { + if (componentId >= BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + && componentId < BatteryConsumer.LAST_CUSTOM_POWER_COMPONENT_ID) { + try { + return mCustomPowerComponentNames[componentId + - BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID]; + } catch (ArrayIndexOutOfBoundsException e) { + throw new IllegalArgumentException( + "Unsupported custom power component ID: " + componentId); + } + } else { + throw new IllegalArgumentException( + "Unsupported custom power component ID: " + componentId); + } + } + @BatteryConsumer.PowerModel int getPowerModel(@BatteryConsumer.PowerComponent int component) { if (mPowerModels == null) { @@ -164,20 +187,37 @@ class PowerComponents { } } + public int getCustomPowerComponentCount() { + return mCustomPowerComponentCount; + } + + /** + * Returns the largest usage duration among all time components. + */ + public long getMaxComponentUsageDurationMillis() { + long max = 0; + for (int i = mTimeComponentsMs.length - 1; i >= 0; i--) { + if (mTimeComponentsMs[i] > max) { + max = mTimeComponentsMs[i]; + } + } + return max; + } + /** * Builder for PowerComponents. */ static final class Builder { private final double[] mPowerComponentsMah; - private final int mCustomPowerComponentCount; + private final String[] mCustomPowerComponentNames; private final long[] mTimeComponentsMs; private final byte[] mPowerModels; - Builder(int customPowerComponentCount, int customTimeComponentCount, + Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount, boolean includePowerModels) { - mCustomPowerComponentCount = customPowerComponentCount; + mCustomPowerComponentNames = customPowerComponentNames; int powerComponentCount = - BatteryConsumer.POWER_COMPONENT_COUNT + customPowerComponentCount; + BatteryConsumer.POWER_COMPONENT_COUNT + mCustomPowerComponentNames.length; mPowerComponentsMah = new double[powerComponentCount]; mTimeComponentsMs = new long[BatteryConsumer.TIME_COMPONENT_COUNT + customTimeComponentCount]; @@ -285,10 +325,10 @@ class PowerComponents { } public void addPowerAndDuration(Builder other) { - for (int i = 0; i < mPowerComponentsMah.length; i++) { + for (int i = mPowerComponentsMah.length - 1; i >= 0; i--) { mPowerComponentsMah[i] += other.mPowerComponentsMah[i]; } - for (int i = 0; i < mTimeComponentsMs.length; i++) { + for (int i = mTimeComponentsMs.length - 1; i >= 0; i--) { mTimeComponentsMs[i] += other.mTimeComponentsMs[i]; } } diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index a42448c261d4..b474d7c95996 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -169,8 +169,9 @@ public class RecoverySystem { public @interface ResumeOnRebootRebootErrorCode {} /** - * The preparation of resume on reboot succeeds. Don't expose it because a successful reboot - * should just reboot the device. + * The preparation of resume on reboot succeeds. + * + * <p> Don't expose it because a successful reboot should just reboot the device. * @hide */ public static final int RESUME_ON_REBOOT_REBOOT_ERROR_NONE = 0; diff --git a/core/java/android/os/SystemBatteryConsumer.java b/core/java/android/os/SystemBatteryConsumer.java index e973e4c1044e..1327978ad0ba 100644 --- a/core/java/android/os/SystemBatteryConsumer.java +++ b/core/java/android/os/SystemBatteryConsumer.java @@ -104,6 +104,13 @@ public class SystemBatteryConsumer extends BatteryConsumer implements Parcelable } /** + * Returns the amount of time this consumer was operating. + */ + public long getUsageDurationMillis() { + return mPowerComponents.getMaxComponentUsageDurationMillis(); + } + + /** * Writes the contents into a Parcel. */ @Override @@ -140,9 +147,9 @@ public class SystemBatteryConsumer extends BatteryConsumer implements Parcelable private double mPowerConsumedByAppsMah; private List<UidBatteryConsumer.Builder> mUidBatteryConsumers; - Builder(int customPowerComponentCount, int customTimeComponentCount, + Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount, boolean includePowerModels, @DrainType int drainType) { - super(customPowerComponentCount, customTimeComponentCount, includePowerModels); + super(customPowerComponentNames, customTimeComponentCount, includePowerModels); mDrainType = drainType; } diff --git a/core/java/android/os/UidBatteryConsumer.java b/core/java/android/os/UidBatteryConsumer.java index 87c263b3dd38..92e960344f3e 100644 --- a/core/java/android/os/UidBatteryConsumer.java +++ b/core/java/android/os/UidBatteryConsumer.java @@ -139,9 +139,9 @@ public final class UidBatteryConsumer extends BatteryConsumer implements Parcela public long mTimeInBackgroundMs; private boolean mExcludeFromBatteryUsageStats; - public Builder(int customPowerComponentCount, int customTimeComponentCount, + public Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount, boolean includePowerModels, @NonNull BatteryStats.Uid batteryStatsUid) { - super(customPowerComponentCount, customTimeComponentCount, includePowerModels); + super(customPowerComponentNames, customTimeComponentCount, includePowerModels); mBatteryStatsUid = batteryStatsUid; mUid = batteryStatsUid.getUid(); } diff --git a/core/java/android/os/UserBatteryConsumer.java b/core/java/android/os/UserBatteryConsumer.java index 78322088a3a4..de0a707fb656 100644 --- a/core/java/android/os/UserBatteryConsumer.java +++ b/core/java/android/os/UserBatteryConsumer.java @@ -77,9 +77,9 @@ public class UserBatteryConsumer extends BatteryConsumer implements Parcelable { private final int mUserId; private List<UidBatteryConsumer.Builder> mUidBatteryConsumers; - Builder(int customPowerComponentCount, int customTimeComponentCount, + Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount, boolean includePowerModels, int userId) { - super(customPowerComponentCount, customTimeComponentCount, includePowerModels); + super(customPowerComponentNames, customTimeComponentCount, includePowerModels); mUserId = userId; } diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 9bfd75ef2170..51f19ebee987 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -22,10 +22,10 @@ import android.annotation.CallbackExecutor; import android.annotation.IntDef; import android.annotation.LongDef; import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.annotation.UserHandleAware; import android.compat.annotation.UnsupportedAppUsage; import android.content.ContentProvider; import android.content.ContentResolver; @@ -129,7 +129,7 @@ public class CallLog { public static final int ERROR_STORAGE_FULL = 2; /** - * Indicates that the {@link InputStream} passed to {@link #storeCallComposerPictureAsUser} + * Indicates that the {@link InputStream} passed to {@link #storeCallComposerPicture} * was closed. * * The caller should retry if this error is encountered, and be sure to not close the stream @@ -195,9 +195,8 @@ public class CallLog { * The caller is responsible for closing the {@link InputStream} after the callback indicating * success or failure. * - * @param context An instance of {@link Context}. - * @param user The user for whom the picture is stored. If {@code null}, the picture will be - * stored for all users. + * @param context An instance of {@link Context}. The picture will be stored to the user + * corresponding to {@link Context#getUser()}. * @param input An input stream from which the picture to store should be read. The input data * must be decodeable as either a JPEG, PNG, or GIF image. * @param executor The {@link Executor} on which to perform the file transfer operation and @@ -207,12 +206,12 @@ public class CallLog { * @hide */ @SystemApi + @UserHandleAware @RequiresPermission(allOf = { Manifest.permission.WRITE_CALL_LOG, Manifest.permission.INTERACT_ACROSS_USERS }) - public static void storeCallComposerPictureAsUser(@NonNull Context context, - @Nullable UserHandle user, + public static void storeCallComposerPicture(@NonNull Context context, @NonNull InputStream input, @CallbackExecutor @NonNull Executor executor, @NonNull OutcomeReceiver<Uri, CallComposerLoggingException> callback) { @@ -246,12 +245,13 @@ public class CallLog { byte[] picData = tmpOut.toByteArray(); UserManager userManager = context.getSystemService(UserManager.class); + UserHandle user = context.getUser(); // Nasty casework for the shadow calllog begins... // First see if we're just inserting for one user. If so, insert into the shadow // based on whether that user is unlocked. UserHandle realUser = UserHandle.CURRENT.equals(user) ? android.os.Process.myUserHandle() : user; - if (realUser != null) { + if (realUser != UserHandle.ALL) { Uri baseUri = userManager.isUserUnlocked(realUser) ? CALL_COMPOSER_PICTURE_URI : SHADOW_CALL_COMPOSER_PICTURE_URI; Uri pictureInsertionUri = ContentProvider.maybeAddUserId(baseUri, @@ -625,7 +625,7 @@ public class CallLog { } /** - * @param pictureUri {@link Uri} returned from {@link #storeCallComposerPictureAsUser}. + * @param pictureUri {@link Uri} returned from {@link #storeCallComposerPicture}. * Associates that stored picture with this call in the log. */ public @NonNull AddCallParametersBuilder setPictureUri(@NonNull Uri pictureUri) { diff --git a/core/java/android/uwb/UwbManager.java b/core/java/android/uwb/UwbManager.java index bed77e664337..95024b38575b 100644 --- a/core/java/android/uwb/UwbManager.java +++ b/core/java/android/uwb/UwbManager.java @@ -24,9 +24,7 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.content.AttributionSource; import android.content.Context; -import android.content.ContextParams; import android.os.CancellationSignal; import android.os.IBinder; import android.os.PersistableBundle; @@ -49,7 +47,7 @@ import java.util.concurrent.Executor; @SystemApi @SystemService(Context.UWB_SERVICE) public final class UwbManager { - private static final String SERVICE_NAME = "uwb"; + private static final String SERVICE_NAME = Context.UWB_SERVICE; private final Context mContext; private final IUwbAdapter mUwbAdapter; diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index 7b3a8a64fc37..0a3963d782b1 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -177,8 +177,14 @@ public final class Choreographer { private boolean mCallbacksRunning; @UnsupportedAppUsage private long mLastFrameTimeNanos; - @UnsupportedAppUsage + + /** DO NOT USE since this will not updated when screen refresh changes. */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, + publicAlternatives = "Use {@link android.view.Display#getRefreshRate} instead") + @Deprecated private long mFrameIntervalNanos; + private long mLastFrameIntervalNanos; + private boolean mDebugPrintNextFrameTimeDelta; private int mFPSDivisor = 1; private DisplayEventReceiver.VsyncEventData mLastVsyncEventData = @@ -392,7 +398,9 @@ public final class Choreographer { * @hide */ public long getFrameIntervalNanos() { - return mFrameIntervalNanos; + synchronized (mLock) { + return mLastFrameIntervalNanos; + } } void dump(String prefix, PrintWriter writer) { @@ -688,6 +696,7 @@ public final class Choreographer { void doFrame(long frameTimeNanos, int frame, DisplayEventReceiver.VsyncEventData vsyncEventData) { final long startNanos; + final long frameIntervalNanos = vsyncEventData.frameInterval; synchronized (mLock) { if (!mFrameScheduled) { return; // no work to do @@ -702,17 +711,17 @@ public final class Choreographer { long intendedFrameTimeNanos = frameTimeNanos; startNanos = System.nanoTime(); final long jitterNanos = startNanos - frameTimeNanos; - if (jitterNanos >= mFrameIntervalNanos) { - final long skippedFrames = jitterNanos / mFrameIntervalNanos; + if (jitterNanos >= frameIntervalNanos) { + final long skippedFrames = jitterNanos / frameIntervalNanos; if (skippedFrames >= SKIPPED_FRAME_WARNING_LIMIT) { Log.i(TAG, "Skipped " + skippedFrames + " frames! " + "The application may be doing too much work on its main thread."); } - final long lastFrameOffset = jitterNanos % mFrameIntervalNanos; + final long lastFrameOffset = jitterNanos % frameIntervalNanos; if (DEBUG_JANK) { Log.d(TAG, "Missed vsync by " + (jitterNanos * 0.000001f) + " ms " + "which is more than the frame interval of " - + (mFrameIntervalNanos * 0.000001f) + " ms! " + + (frameIntervalNanos * 0.000001f) + " ms! " + "Skipping " + skippedFrames + " frames and setting frame " + "time to " + (lastFrameOffset * 0.000001f) + " ms in the past."); } @@ -730,16 +739,17 @@ public final class Choreographer { if (mFPSDivisor > 1) { long timeSinceVsync = frameTimeNanos - mLastFrameTimeNanos; - if (timeSinceVsync < (mFrameIntervalNanos * mFPSDivisor) && timeSinceVsync > 0) { + if (timeSinceVsync < (frameIntervalNanos * mFPSDivisor) && timeSinceVsync > 0) { scheduleVsyncLocked(); return; } } mFrameInfo.setVsync(intendedFrameTimeNanos, frameTimeNanos, vsyncEventData.id, - vsyncEventData.frameDeadline, startNanos); + vsyncEventData.frameDeadline, startNanos, vsyncEventData.frameInterval); mFrameScheduled = false; mLastFrameTimeNanos = frameTimeNanos; + mLastFrameIntervalNanos = frameIntervalNanos; mLastVsyncEventData = vsyncEventData; } @@ -751,16 +761,17 @@ public final class Choreographer { AnimationUtils.lockAnimationClock(frameTimeNanos / TimeUtils.NANOS_PER_MS); mFrameInfo.markInputHandlingStart(); - doCallbacks(Choreographer.CALLBACK_INPUT, frameTimeNanos); + doCallbacks(Choreographer.CALLBACK_INPUT, frameTimeNanos, frameIntervalNanos); mFrameInfo.markAnimationsStart(); - doCallbacks(Choreographer.CALLBACK_ANIMATION, frameTimeNanos); - doCallbacks(Choreographer.CALLBACK_INSETS_ANIMATION, frameTimeNanos); + doCallbacks(Choreographer.CALLBACK_ANIMATION, frameTimeNanos, frameIntervalNanos); + doCallbacks(Choreographer.CALLBACK_INSETS_ANIMATION, frameTimeNanos, + frameIntervalNanos); mFrameInfo.markPerformTraversalsStart(); - doCallbacks(Choreographer.CALLBACK_TRAVERSAL, frameTimeNanos); + doCallbacks(Choreographer.CALLBACK_TRAVERSAL, frameTimeNanos, frameIntervalNanos); - doCallbacks(Choreographer.CALLBACK_COMMIT, frameTimeNanos); + doCallbacks(Choreographer.CALLBACK_COMMIT, frameTimeNanos, frameIntervalNanos); } finally { AnimationUtils.unlockAnimationClock(); Trace.traceEnd(Trace.TRACE_TAG_VIEW); @@ -774,7 +785,7 @@ public final class Choreographer { } } - void doCallbacks(int callbackType, long frameTimeNanos) { + void doCallbacks(int callbackType, long frameTimeNanos, long frameIntervalNanos) { CallbackRecord callbacks; synchronized (mLock) { // We use "now" to determine when callbacks become due because it's possible @@ -799,13 +810,13 @@ public final class Choreographer { if (callbackType == Choreographer.CALLBACK_COMMIT) { final long jitterNanos = now - frameTimeNanos; Trace.traceCounter(Trace.TRACE_TAG_VIEW, "jitterNanos", (int) jitterNanos); - if (jitterNanos >= 2 * mFrameIntervalNanos) { - final long lastFrameOffset = jitterNanos % mFrameIntervalNanos - + mFrameIntervalNanos; + if (jitterNanos >= 2 * frameIntervalNanos) { + final long lastFrameOffset = jitterNanos % frameIntervalNanos + + frameIntervalNanos; if (DEBUG_JANK) { Log.d(TAG, "Commit callback delayed by " + (jitterNanos * 0.000001f) + " ms which is more than twice the frame interval of " - + (mFrameIntervalNanos * 0.000001f) + " ms! " + + (frameIntervalNanos * 0.000001f) + " ms! " + "Setting frame time to " + (lastFrameOffset * 0.000001f) + " ms in the past."); mDebugPrintNextFrameTimeDelta = true; diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index e6cd25275ca2..5c086328bda7 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -26,7 +26,6 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import dalvik.annotation.optimization.FastNative; -import dalvik.system.CloseGuard; import java.lang.ref.WeakReference; @@ -73,8 +72,6 @@ public abstract class DisplayEventReceiver { private static final String TAG = "DisplayEventReceiver"; - private final CloseGuard mCloseGuard = CloseGuard.get(); - @UnsupportedAppUsage private long mReceiverPtr; @@ -114,8 +111,6 @@ public abstract class DisplayEventReceiver { mMessageQueue = looper.getQueue(); mReceiverPtr = nativeInit(new WeakReference<DisplayEventReceiver>(this), mMessageQueue, vsyncSource, eventRegistration); - - mCloseGuard.open("dispose"); } @Override @@ -135,13 +130,6 @@ public abstract class DisplayEventReceiver { } private void dispose(boolean finalized) { - if (mCloseGuard != null) { - if (finalized) { - mCloseGuard.warnIfOpen(); - } - mCloseGuard.close(); - } - if (mReceiverPtr != 0) { nativeDispose(mReceiverPtr); mReceiverPtr = 0; @@ -158,14 +146,23 @@ public abstract class DisplayEventReceiver { // allotted for the frame to be completed. public final long frameDeadline; - VsyncEventData(long id, long frameDeadline) { + /** + * The current interval between frames in ns. This will be used to align + * {@link FrameInfo#VSYNC} to the current vsync in case Choreographer callback was heavily + * delayed by the app. + */ + public final long frameInterval; + + VsyncEventData(long id, long frameDeadline, long frameInterval) { this.id = id; this.frameDeadline = frameDeadline; + this.frameInterval = frameInterval; } VsyncEventData() { this.id = FrameInfo.INVALID_VSYNC_ID; this.frameDeadline = Long.MAX_VALUE; + this.frameInterval = -1; } } @@ -259,9 +256,9 @@ public abstract class DisplayEventReceiver { // Called from native code. @SuppressWarnings("unused") private void dispatchVsync(long timestampNanos, long physicalDisplayId, int frame, - long frameTimelineVsyncId, long frameDeadline) { + long frameTimelineVsyncId, long frameDeadline, long frameInterval) { onVsync(timestampNanos, physicalDisplayId, frame, - new VsyncEventData(frameTimelineVsyncId, frameDeadline)); + new VsyncEventData(frameTimelineVsyncId, frameDeadline, frameInterval)); } // Called from native code. diff --git a/core/java/android/view/FrameMetrics.java b/core/java/android/view/FrameMetrics.java index 9cdf91a55c39..f6d525c10cc9 100644 --- a/core/java/android/view/FrameMetrics.java +++ b/core/java/android/view/FrameMetrics.java @@ -243,18 +243,19 @@ public final class FrameMetrics { int DRAW_START = 8; int FRAME_DEADLINE = 9; int FRAME_START_TIME = 10; - int SYNC_QUEUED = 11; - int SYNC_START = 12; - int ISSUE_DRAW_COMMANDS_START = 13; - int SWAP_BUFFERS = 14; - int FRAME_COMPLETED = 15; - int DEQUEUE_BUFFER_DURATION = 16; - int QUEUE_BUFFER_DURATION = 17; - int GPU_COMPLETED = 18; - int SWAP_BUFFERS_COMPLETED = 19; - int DISPLAY_PRESENT_TIME = 20; + int FRAME_INTERVAL = 11; + int SYNC_QUEUED = 12; + int SYNC_START = 13; + int ISSUE_DRAW_COMMANDS_START = 14; + int SWAP_BUFFERS = 15; + int FRAME_COMPLETED = 16; + int DEQUEUE_BUFFER_DURATION = 17; + int QUEUE_BUFFER_DURATION = 18; + int GPU_COMPLETED = 19; + int SWAP_BUFFERS_COMPLETED = 20; + int DISPLAY_PRESENT_TIME = 21; - int FRAME_STATS_COUNT = 21; // must always be last and in sync with + int FRAME_STATS_COUNT = 22; // must always be last and in sync with // FrameInfoIndex::NumIndexes in libs/hwui/FrameInfo.h } diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 85a4f2035901..21f75d419a5e 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -104,6 +104,7 @@ public final class SurfaceControl implements Parcelable { private static native void nativeApplyTransaction(long transactionObj, boolean sync); private static native void nativeMergeTransaction(long transactionObj, long otherTransactionObj); + private static native void nativeClearTransaction(long transactionObj); private static native void nativeSetAnimationTransaction(long transactionObj); private static native void nativeSetEarlyWakeupStart(long transactionObj); private static native void nativeSetEarlyWakeupEnd(long transactionObj); @@ -185,8 +186,6 @@ public final class SurfaceControl implements Parcelable { private static native void nativeSetGameContentType(IBinder displayToken, boolean on); private static native void nativeSetDisplayPowerMode( IBinder displayToken, int mode); - private static native void nativeDeferTransactionUntil(long transactionObj, long nativeObject, - long barrierObject, long frame); private static native void nativeReparent(long transactionObj, long nativeObject, long newParentNativeObject); @@ -2604,6 +2603,19 @@ public final class SurfaceControl implements Parcelable { } /** + * Clear the transaction object, without applying it. + * + * @hide + */ + public void clear() { + mResizedSurfaces.clear(); + mReparentedSurfaces.clear(); + if (mNativeObject != 0) { + nativeClearTransaction(mNativeObject); + } + } + + /** * Release the native transaction object, without applying it. */ @Override @@ -3028,21 +3040,6 @@ public final class SurfaceControl implements Parcelable { } /** - * @hide - */ - @UnsupportedAppUsage - public Transaction deferTransactionUntil(SurfaceControl sc, SurfaceControl barrier, - long frameNumber) { - if (frameNumber < 0) { - return this; - } - checkPreconditions(sc); - nativeDeferTransactionUntil(mNativeObject, sc.mNativeObject, barrier.mNativeObject, - frameNumber); - return this; - } - - /** * Re-parents a given layer to a new parent. Children inherit transform (position, scaling) * crop, visibility, and Z-ordering from their parents, as if the children were pixels within the * parent Surface. @@ -3428,10 +3425,14 @@ public final class SurfaceControl implements Parcelable { public void writeToParcel(@NonNull Parcel dest, @WriteFlags int flags) { if (mNativeObject == 0) { dest.writeInt(0); - } else { - dest.writeInt(1); + return; } + + dest.writeInt(1); nativeWriteTransactionToParcel(mNativeObject, dest); + if ((flags & Parcelable.PARCELABLE_WRITE_RETURN_VALUE) != 0) { + nativeClearTransaction(mNativeObject); + } } private void readFromParcel(Parcel in) { diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 8348a5c65fea..76eb882b6f53 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -723,6 +723,13 @@ public final class ViewRootImpl implements ViewParent, private boolean mNextDrawUseBlastSync = false; /** + * Wait for the blast sync transaction complete callback before drawing and queuing up more + * frames. This will prevent out of order buffers submissions when WM has requested to + * synchronize with the client. + */ + private boolean mWaitForBlastSyncComplete = false; + + /** * Keeps track of whether a traverse was triggered while the UI thread was paused. This can * occur when the client is waiting on another process to submit the transaction that * contains the buffer. The UI thread needs to wait on the callback before it can submit @@ -1193,7 +1200,8 @@ public final class ViewRootImpl implements ViewParent, Looper.myLooper()); if (mAttachInfo.mThreadedRenderer != null) { - InputMetricsListener listener = new InputMetricsListener(); + InputMetricsListener listener = + new InputMetricsListener(mInputEventReceiver); mHardwareRendererObserver = new HardwareRendererObserver( listener, listener.data, mHandler, true /*waitForPresentTime*/); mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver); @@ -1389,9 +1397,6 @@ public final class ViewRootImpl implements ViewParent, if (mAttachInfo.mThreadedRenderer != null) { mAttachInfo.mHardwareAccelerated = mAttachInfo.mHardwareAccelerationRequested = true; - if (mHardwareRendererObserver != null) { - mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver); - } } } } @@ -2463,7 +2468,7 @@ public final class ViewRootImpl implements ViewParent, // // When the callback is invoked, it will trigger a traversal request if // mRequestedTraverseWhilePaused is set so there's no need to attempt a retry here. - if (mNextDrawUseBlastSync) { + if (mWaitForBlastSyncComplete) { if (DEBUG_BLAST) { Log.w(mTag, "Can't perform draw while waiting for a transaction complete"); } @@ -3244,10 +3249,6 @@ public final class ViewRootImpl implements ViewParent, pendingDrawFinished(); } } - - // We were unable to draw this traversal. Unset this flag since we'll block without - // ever being able to draw again - mNextDrawUseBlastSync = false; } if (mAttachInfo.mContentCaptureEvents != null) { @@ -3905,7 +3906,10 @@ public final class ViewRootImpl implements ViewParent, mDrawsNeededToReport = 0; mWindowSession.finishDrawing(mWindow, mSurfaceChangedTransaction); } catch (RemoteException e) { - // Have fun! + Log.e(mTag, "Unable to report draw finished", e); + mSurfaceChangedTransaction.apply(); + } finally { + mSurfaceChangedTransaction.clear(); } } @@ -3990,7 +3994,7 @@ public final class ViewRootImpl implements ViewParent, + " reportNextDraw=" + reportNextDraw + " hasBlurUpdates=" + hasBlurUpdates); } - + mWaitForBlastSyncComplete = nextDrawUseBlastSync; final BackgroundBlurDrawable.BlurRegion[] blurRegionsForFrame = needsCallbackForBlur ? mBlurRegionAggregator.getBlurRegionsCopyForRT() : null; @@ -4025,6 +4029,7 @@ public final class ViewRootImpl implements ViewParent, } mHandler.postAtFrontOfQueue(() -> { mNextDrawUseBlastSync = false; + mWaitForBlastSyncComplete = false; if (DEBUG_BLAST) { Log.d(mTag, "Scheduling a traversal=" + mRequestedTraverseWhilePaused + " due to a previous skipped traversal."); @@ -8079,9 +8084,6 @@ public final class ViewRootImpl implements ViewParent, ThreadedRenderer hardwareRenderer = mAttachInfo.mThreadedRenderer; if (hardwareRenderer != null) { - if (mHardwareRendererObserver != null) { - hardwareRenderer.removeObserver(mHardwareRendererObserver); - } if (mView != null) { hardwareRenderer.destroyHardwareResources(mView); } @@ -8583,12 +8585,18 @@ public final class ViewRootImpl implements ViewParent, super.dispose(); } } - private WindowInputEventReceiver mInputEventReceiver; + WindowInputEventReceiver mInputEventReceiver; final class InputMetricsListener implements HardwareRendererObserver.OnFrameMetricsAvailableListener { public long[] data = new long[FrameMetrics.Index.FRAME_STATS_COUNT]; + private InputEventReceiver mReceiver; + + InputMetricsListener(InputEventReceiver receiver) { + mReceiver = receiver; + } + @Override public void onFrameMetricsAvailable(int dropCountSinceLastInvocation) { final int inputEventId = (int) data[FrameMetrics.Index.INPUT_EVENT_ID]; @@ -8601,11 +8609,6 @@ public final class ViewRootImpl implements ViewParent, // available, we cannot compute end-to-end input latency metrics. return; } - final long gpuCompletedTime = data[FrameMetrics.Index.GPU_COMPLETED]; - if (mInputEventReceiver == null) { - return; - } - mInputEventReceiver.reportTimeline(inputEventId, gpuCompletedTime, presentTime); } } HardwareRendererObserver mHardwareRendererObserver; diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 6edd07178ed3..616910ab09ca 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2230,9 +2230,7 @@ public final class InputMethodManager { public void removeImeSurface(IBinder windowToken) { synchronized (mH) { try { - final Completable.Void value = Completable.createVoid(); - mService.removeImeSurfaceFromWindow(windowToken, ResultCallbacks.of(value)); - Completable.getResult(value); + mService.removeImeSurfaceFromWindowAsync(windowToken); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/view/textclassifier/TextClassifierEvent.java b/core/java/android/view/textclassifier/TextClassifierEvent.java index db8801150f0d..90667cf54f93 100644 --- a/core/java/android/view/textclassifier/TextClassifierEvent.java +++ b/core/java/android/view/textclassifier/TextClassifierEvent.java @@ -86,7 +86,8 @@ public abstract class TextClassifierEvent implements Parcelable { TYPE_ACTIONS_SHOWN, TYPE_LINK_CLICKED, TYPE_OVERTYPE, TYPE_COPY_ACTION, TYPE_PASTE_ACTION, TYPE_CUT_ACTION, TYPE_SHARE_ACTION, TYPE_SMART_ACTION, TYPE_SELECTION_DRAG, TYPE_SELECTION_DESTROYED, TYPE_OTHER_ACTION, TYPE_SELECT_ALL, - TYPE_SELECTION_RESET, TYPE_MANUAL_REPLY, TYPE_ACTIONS_GENERATED, TYPE_LINKS_GENERATED}) + TYPE_SELECTION_RESET, TYPE_MANUAL_REPLY, TYPE_ACTIONS_GENERATED, TYPE_LINKS_GENERATED, + TYPE_READ_CLIPBOARD}) public @interface Type { // For custom event types, use range 1,000,000+. } @@ -135,6 +136,13 @@ public abstract class TextClassifierEvent implements Parcelable { public static final int TYPE_ACTIONS_GENERATED = 20; /** Some text links were generated.*/ public static final int TYPE_LINKS_GENERATED = 21; + /** + * Read a clipboard. + * TODO: Make this public. + * + * @hide + */ + public static final int TYPE_READ_CLIPBOARD = 22; @Category private final int mEventCategory; diff --git a/core/java/android/view/translation/UiTranslationController.java b/core/java/android/view/translation/UiTranslationController.java index f4fdf35fb50f..c09e8bde7417 100644 --- a/core/java/android/view/translation/UiTranslationController.java +++ b/core/java/android/view/translation/UiTranslationController.java @@ -302,6 +302,11 @@ public class UiTranslationController { } final LongSparseArray<ViewTranslationResponse> virtualChildResponse = translatedResult.valueAt(i); + if (DEBUG) { + // TODO(b/182433547): remove before S release + Log.v(TAG, "onVirtualViewTranslationCompleted: receive " + + virtualChildResponse + " for AutofillId " + autofillId); + } mActivity.runOnUiThread(() -> { if (view.getViewTranslationCallback() == null) { if (DEBUG) { @@ -341,8 +346,13 @@ public class UiTranslationController { } for (int i = 0; i < resultCount; i++) { final ViewTranslationResponse response = translatedResult.valueAt(i); + if (DEBUG) { + // TODO(b/182433547): remove before S release + Log.v(TAG, "onTranslationCompleted: response= " + response); + } final AutofillId autofillId = response.getAutofillId(); if (autofillId == null) { + Log.w(TAG, "No AutofillId is set in ViewTranslationResponse:" + response); continue; } final View view = mViews.get(autofillId).get(); @@ -394,6 +404,9 @@ public class UiTranslationController { final TranslationRequest request = new TranslationRequest.Builder() .setViewTranslationRequests(requests) .build(); + if (DEBUG) { + Log.d(TAG, "sendTranslationRequest: request= " + request); + } translator.requestUiTranslate(request, (r) -> r.run(), this::onTranslationCompleted); } @@ -508,10 +521,17 @@ public class UiTranslationController { private void runForEachView(BiConsumer<View, ViewTranslationCallback> action) { synchronized (mLock) { final ArrayMap<AutofillId, WeakReference<View>> views = new ArrayMap<>(mViews); + if (views.size() == 0) { + Log.w(TAG, "No views can be excuted for runForEachView."); + } mActivity.runOnUiThread(() -> { final int viewCounts = views.size(); for (int i = 0; i < viewCounts; i++) { final View view = views.valueAt(i).get(); + if (DEBUG) { + // TODO(b/182433547): remove before S release + Log.d(TAG, "runForEachView: view= " + view); + } if (view == null || view.getViewTranslationCallback() == null) { if (DEBUG) { Log.d(TAG, "View was gone or ViewTranslationCallback for autofillid " diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 50fca043d4e0..95a3dc788803 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -104,25 +104,31 @@ public class EdgeEffect { /** * The velocity threshold before the spring animation is considered settled. - * The idea here is that velocity should be less than 1 pixel per frame (~16ms). + * The idea here is that velocity should be less than 0.1 pixel per second. */ - private static final double VELOCITY_THRESHOLD = 1.0 / 0.016; + private static final double VELOCITY_THRESHOLD = 0.1; /** * The value threshold before the spring animation is considered close enough to - * the destination to be settled. This should be around 1 pixel. + * the destination to be settled. This should be around 0.01 pixel. */ - private static final double VALUE_THRESHOLD = 1; + private static final double VALUE_THRESHOLD = 0.01; /** * The natural frequency of the stretch spring. */ - private static final double NATURAL_FREQUENCY = 17.55; + private static final double NATURAL_FREQUENCY = 24.657; /** * The damping ratio of the stretch spring. */ - private static final double DAMPING_RATIO = 0.92; + private static final double DAMPING_RATIO = 0.98; + + /** + * The variation of the velocity for the stretch effect when it meets the bound. + * if value is > 1, it will accentuate the absorption of the movement. + */ + private static final float ON_ABSORB_VELOCITY_ADJUSTMENT = 13f; /** @hide */ @IntDef({TYPE_GLOW, TYPE_STRETCH}) @@ -130,9 +136,9 @@ public class EdgeEffect { public @interface EdgeEffectType { } - private static final float LINEAR_STRETCH_INTENSITY = 0.06f; + private static final float LINEAR_STRETCH_INTENSITY = 0.016f; - private static final float EXP_STRETCH_INTENSITY = 0.06f; + private static final float EXP_STRETCH_INTENSITY = 0.016f; private static final float SCROLL_DIST_AFFECTED_BY_EXP_STRETCH = 0.33f; @@ -460,7 +466,7 @@ public class EdgeEffect { public void onAbsorb(int velocity) { if (mEdgeEffectType == TYPE_STRETCH) { mState = STATE_RECEDE; - mVelocity = velocity; + mVelocity = velocity * ON_ABSORB_VELOCITY_ADJUSTMENT; mDistance = 0; mStartTime = AnimationUtils.currentAnimationTimeMillis(); } else { @@ -782,8 +788,8 @@ public class EdgeEffect { * considered at rest or false if it is still animating. */ private boolean isAtEquilibrium() { - double displacement = mDistance * mHeight * LINEAR_STRETCH_INTENSITY; // in pixels - double velocity = mVelocity * LINEAR_STRETCH_INTENSITY; + double displacement = mDistance * mHeight; // in pixels + double velocity = mVelocity; return Math.abs(velocity) < VELOCITY_THRESHOLD && Math.abs(displacement) < VALUE_THRESHOLD; } diff --git a/core/java/android/widget/TextViewTranslationCallback.java b/core/java/android/widget/TextViewTranslationCallback.java index 296d93c88554..a479b8ac4760 100644 --- a/core/java/android/widget/TextViewTranslationCallback.java +++ b/core/java/android/widget/TextViewTranslationCallback.java @@ -17,6 +17,7 @@ package android.widget; import android.annotation.NonNull; +import android.os.Build; import android.text.method.TranslationTransformationMethod; import android.util.Log; import android.view.View; @@ -34,7 +35,10 @@ public class TextViewTranslationCallback implements ViewTranslationCallback { private static final String TAG = "TextViewTranslationCallback"; - private static final boolean DEBUG = Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG); + // TODO(b/182433547): remove Build.IS_DEBUGGABLE before ship. Enable the logging in debug build + // to help the debug during the development phase + private static final boolean DEBUG = Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG) + || Build.IS_DEBUGGABLE; private TranslationTransformationMethod mTranslationTransformation; diff --git a/core/java/com/android/internal/app/ConfirmUserCreationActivity.java b/core/java/com/android/internal/app/ConfirmUserCreationActivity.java index 03da9bc939ec..0047f43b5258 100644 --- a/core/java/com/android/internal/app/ConfirmUserCreationActivity.java +++ b/core/java/com/android/internal/app/ConfirmUserCreationActivity.java @@ -16,6 +16,8 @@ package com.android.internal.app; +import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import android.accounts.Account; import android.accounts.AccountManager; import android.content.DialogInterface; @@ -53,6 +55,8 @@ public class ConfirmUserCreationActivity extends AlertActivity public void onCreate(Bundle icicle) { super.onCreate(icicle); + getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); + Intent intent = getIntent(); mUserName = intent.getStringExtra(UserManager.EXTRA_USER_NAME); mAccountName = intent.getStringExtra(UserManager.EXTRA_USER_ACCOUNT_NAME); diff --git a/core/java/com/android/internal/app/SuspendedAppActivity.java b/core/java/com/android/internal/app/SuspendedAppActivity.java index 86f29a8f07ef..84354d90b5f3 100644 --- a/core/java/com/android/internal/app/SuspendedAppActivity.java +++ b/core/java/com/android/internal/app/SuspendedAppActivity.java @@ -27,8 +27,12 @@ import android.annotation.Nullable; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.KeyguardManager; +import android.app.usage.UsageStatsManager; +import android.content.BroadcastReceiver; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.IntentFilter; import android.content.IntentSender; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; @@ -64,9 +68,26 @@ public class SuspendedAppActivity extends AlertActivity private int mNeutralButtonAction; private int mUserId; private PackageManager mPm; + private UsageStatsManager mUsm; private Resources mSuspendingAppResources; private SuspendDialogInfo mSuppliedDialogInfo; private Bundle mOptions; + private BroadcastReceiver mUnsuspendReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_PACKAGES_UNSUSPENDED.equals(intent.getAction())) { + final String[] unsuspended = intent.getStringArrayExtra( + Intent.EXTRA_CHANGED_PACKAGE_LIST); + if (ArrayUtils.contains(unsuspended, mSuspendedPackage)) { + if (!isFinishing()) { + Slog.w(TAG, "Package " + mSuspendedPackage + + " got unsuspended while the dialog was visible. Finishing."); + SuspendedAppActivity.this.finish(); + } + } + } + } + }; private CharSequence getAppLabel(String packageName) { try { @@ -183,6 +204,7 @@ public class SuspendedAppActivity extends AlertActivity public void onCreate(Bundle icicle) { super.onCreate(icicle); mPm = getPackageManager(); + mUsm = getSystemService(UsageStatsManager.class); getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); final Intent intent = getIntent(); @@ -222,6 +244,16 @@ public class SuspendedAppActivity extends AlertActivity requestDismissKeyguardIfNeeded(ap.mMessage); setupAlert(); + + final IntentFilter unsuspendFilter = new IntentFilter(Intent.ACTION_PACKAGES_UNSUSPENDED); + registerReceiverAsUser(mUnsuspendReceiver, UserHandle.of(mUserId), unsuspendFilter, null, + null); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + unregisterReceiver(mUnsuspendReceiver); } private void requestDismissKeyguardIfNeeded(CharSequence dismissMessage) { @@ -292,6 +324,7 @@ public class SuspendedAppActivity extends AlertActivity } break; } + mUsm.reportUserInteraction(mSuspendingPackage, mUserId); finish(); } diff --git a/core/java/com/android/internal/os/AmbientDisplayPowerCalculator.java b/core/java/com/android/internal/os/AmbientDisplayPowerCalculator.java index 2f4958223270..aa416c568dbc 100644 --- a/core/java/com/android/internal/os/AmbientDisplayPowerCalculator.java +++ b/core/java/com/android/internal/os/AmbientDisplayPowerCalculator.java @@ -52,8 +52,8 @@ public class AmbientDisplayPowerCalculator extends PowerCalculator { measuredEnergyUC, mPowerEstimator, durationMs); builder.getOrCreateSystemBatteryConsumerBuilder( SystemBatteryConsumer.DRAIN_TYPE_AMBIENT_DISPLAY) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, powerMah, powerModel) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE, durationMs); + .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, powerMah, powerModel) + .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_SCREEN, durationMs); } /** diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index ac72d290b8b2..cb1900f300c0 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -40,6 +40,7 @@ import android.net.INetworkStatsService; import android.net.NetworkStats; import android.net.Uri; import android.net.wifi.WifiManager; +import android.os.BatteryConsumer; import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Binder; @@ -160,7 +161,7 @@ public class BatteryStatsImpl extends BatteryStats { private static final int MAGIC = 0xBA757475; // 'BATSTATS' // Current on-disk Parcel version - static final int VERSION = 196; + static final int VERSION = 197; // The maximum number of names wakelocks we will keep track of // per uid; once the limit is reached, we batch the remaining wakelocks @@ -6947,6 +6948,22 @@ public class BatteryStatsImpl extends BatteryStats { return mGlobalMeasuredEnergyStats.getAccumulatedCustomBucketCharges(); } + /** + * Returns the names of custom power components. + */ + public @NonNull String[] getCustomPowerComponentNames() { + if (mGlobalMeasuredEnergyStats == null) { + return new String[0]; + } + final String[] names = mGlobalMeasuredEnergyStats.getCustomBucketNames(); + for (int i = 0; i < names.length; i++) { + if (TextUtils.isEmpty(names[i])) { + names[i] = "CUSTOM_" + BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + i; + } + } + return names; + } + @Override public long getStartClockTime() { final long currentTimeMs = System.currentTimeMillis(); if ((currentTimeMs > MILLISECONDS_IN_YEAR @@ -14379,17 +14396,18 @@ public class BatteryStatsImpl extends BatteryStats { mConstants.startObserving(context.getContentResolver()); registerUsbStateReceiver(context); } + /** * Initialize the measured charge stats data structures. * * @param supportedStandardBuckets boolean array indicating which {@link StandardPowerBucket}s - * are currently supported. - * If null, none are supported (regardless of numCustomBuckets). - * @param numCustomBuckets number of custom (OTHER) EnergyConsumers on this device + * are currently supported. If null, none are supported + * (regardless of customBucketNames). + * @param customBucketNames names of custom (OTHER) EnergyConsumers on this device */ @GuardedBy("this") public void initMeasuredEnergyStatsLocked(@Nullable boolean[] supportedStandardBuckets, - int numCustomBuckets) { + String[] customBucketNames) { boolean supportedBucketMismatch = false; mScreenStateAtLastEnergyMeasurement = mScreenState; @@ -14401,10 +14419,10 @@ public class BatteryStatsImpl extends BatteryStats { } else { if (mGlobalMeasuredEnergyStats == null) { mGlobalMeasuredEnergyStats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); } else { supportedBucketMismatch = !mGlobalMeasuredEnergyStats.isSupportEqualTo( - supportedStandardBuckets, numCustomBuckets); + supportedStandardBuckets, customBucketNames); } if (supportedStandardBuckets[MeasuredEnergyStats.POWER_BUCKET_BLUETOOTH]) { @@ -14423,7 +14441,7 @@ public class BatteryStatsImpl extends BatteryStats { if (supportedBucketMismatch) { mGlobalMeasuredEnergyStats = supportedStandardBuckets == null - ? null : new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + ? null : new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); // Supported power buckets changed since last boot. // Existing data is no longer reliable. resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime()); diff --git a/core/java/com/android/internal/os/BatteryUsageStatsProvider.java b/core/java/com/android/internal/os/BatteryUsageStatsProvider.java index 49c564b8a737..c3986c27e4ba 100644 --- a/core/java/com/android/internal/os/BatteryUsageStatsProvider.java +++ b/core/java/com/android/internal/os/BatteryUsageStatsProvider.java @@ -123,11 +123,7 @@ public class BatteryUsageStatsProvider { final long realtimeUs = mStats.mClocks.elapsedRealtime() * 1000; final long uptimeUs = mStats.mClocks.uptimeMillis() * 1000; - final long[] customMeasuredChargesUC = - mStats.getCustomConsumerMeasuredBatteryConsumptionUC(); - final int customPowerComponentCount = customMeasuredChargesUC != null - ? customMeasuredChargesUC.length - : 0; + final String[] customPowerComponentNames = mStats.getCustomPowerComponentNames(); // TODO(b/174186358): read extra time component number from configuration final int customTimeComponentCount = 0; @@ -136,7 +132,7 @@ public class BatteryUsageStatsProvider { & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS) != 0; final BatteryUsageStats.Builder batteryUsageStatsBuilder = new BatteryUsageStats.Builder( - customPowerComponentCount, customTimeComponentCount, includePowerModels); + customPowerComponentNames, customTimeComponentCount, includePowerModels); batteryUsageStatsBuilder.setStatsStartTimestamp(mStats.getStartClockTime()); SparseArray<? extends BatteryStats.Uid> uidStats = mStats.getUidStats(); diff --git a/core/java/com/android/internal/os/BinderLatencyObserver.java b/core/java/com/android/internal/os/BinderLatencyObserver.java index 59cc66d79bce..4ca59be4877a 100644 --- a/core/java/com/android/internal/os/BinderLatencyObserver.java +++ b/core/java/com/android/internal/os/BinderLatencyObserver.java @@ -16,22 +16,37 @@ package com.android.internal.os; +import static com.android.internal.os.BinderLatencyProto.Dims.SYSTEM_SERVER; + import android.annotation.Nullable; import android.os.Binder; +import android.os.Handler; +import android.os.Looper; import android.os.SystemClock; import android.util.ArrayMap; import android.util.Slog; +import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BinderInternal.CallSession; +import com.android.internal.os.BinderLatencyProto.ApiStats; +import com.android.internal.os.BinderLatencyProto.Dims; +import com.android.internal.os.BinderLatencyProto.RepeatedApiStats; +import com.android.internal.util.FrameworkStatsLog; import java.util.Random; /** Collects statistics about Binder call latency per calling API and method. */ public class BinderLatencyObserver { private static final String TAG = "BinderLatencyObserver"; + private static final int MAX_ATOM_SIZE_BYTES = 4064; + // Be conservative and leave 1K space for the last histogram so we don't go over the size limit. + private static final int LAST_HISTOGRAM_BUFFER_SIZE_BYTES = 1000; + + // Latency observer parameters. public static final int PERIODIC_SAMPLING_INTERVAL_DEFAULT = 10; + public static final int STATSD_PUSH_INTERVAL_MINUTES_DEFAULT = 360; // Histogram buckets parameters. public static final int BUCKET_COUNT_DEFAULT = 100; @@ -50,20 +65,124 @@ public class BinderLatencyObserver { private int mFirstBucketSize = FIRST_BUCKET_SIZE_DEFAULT; private float mBucketScaleFactor = BUCKET_SCALE_FACTOR_DEFAULT; + private int mStatsdPushIntervalMinutes = STATSD_PUSH_INTERVAL_MINUTES_DEFAULT; + private final Random mRandom; private BinderLatencyBuckets mLatencyBuckets; + private final Handler mLatencyObserverHandler; + + private Runnable mLatencyObserverRunnable = new Runnable() { + @Override + public void run() { + // Schedule the next push. + noteLatencyDelayed(); + + ArrayMap<LatencyDims, int[]> histogramMap; + synchronized (mLock) { + // Copy the histograms map so we don't use the lock for longer than needed. + histogramMap = new ArrayMap<>(mLatencyHistograms); + mLatencyHistograms.clear(); + } + + BinderTransactionNameResolver resolver = new BinderTransactionNameResolver(); + ProtoOutputStream proto = new ProtoOutputStream(); + int histogramsWritten = 0; + + for (LatencyDims dims : histogramMap.keySet()) { + // Start a new atom if the next histogram risks going over the atom size limit. + if (proto.getRawSize() + LAST_HISTOGRAM_BUFFER_SIZE_BYTES > getMaxAtomSizeBytes()) { + if (histogramsWritten > 0) { + writeAtomToStatsd(proto); + } + proto = new ProtoOutputStream(); + histogramsWritten = 0; + } + + String transactionName = resolver.getMethodName( + dims.getBinderClass(), dims.getTransactionCode()); + fillApiStatsProto(proto, dims, transactionName, histogramMap.get(dims)); + histogramsWritten++; + } + // Push the final atom. + if (histogramsWritten > 0) { + writeAtomToStatsd(proto); + } + } + }; + + private void fillApiStatsProto( + ProtoOutputStream proto, LatencyDims dims, String transactionName, int[] histogram) { + // Find the part of the histogram to write. + int firstNonEmptyBucket = 0; + for (int i = 0; i < mBucketCount; i++) { + if (histogram[i] != 0) { + firstNonEmptyBucket = i; + break; + } + } + int lastNonEmptyBucket = mBucketCount - 1; + for (int i = mBucketCount - 1; i >= 0; i--) { + if (histogram[i] != 0) { + lastNonEmptyBucket = i; + break; + } + } + + // Start a new ApiStats proto. + long apiStatsToken = proto.start(RepeatedApiStats.API_STATS); + + // Write the dims. + long dimsToken = proto.start(ApiStats.DIMS); + proto.write(Dims.PROCESS_SOURCE, SYSTEM_SERVER); + proto.write(Dims.SERVICE_CLASS_NAME, dims.getBinderClass().getName()); + proto.write(Dims.SERVICE_METHOD_NAME, transactionName); + proto.end(dimsToken); + + // Write the histogram. + proto.write(ApiStats.FIRST_BUCKET_INDEX, firstNonEmptyBucket); + for (int i = firstNonEmptyBucket; i <= lastNonEmptyBucket; i++) { + proto.write(ApiStats.BUCKETS, histogram[i]); + } + + proto.end(apiStatsToken); + } + + protected int getMaxAtomSizeBytes() { + return MAX_ATOM_SIZE_BYTES; + } + + protected void writeAtomToStatsd(ProtoOutputStream atom) { + FrameworkStatsLog.write( + FrameworkStatsLog.BINDER_LATENCY_REPORTED, + atom.getBytes(), + mPeriodicSamplingInterval, + 1); + } + + private void noteLatencyDelayed() { + mLatencyObserverHandler.removeCallbacks(mLatencyObserverRunnable); + mLatencyObserverHandler.postDelayed(mLatencyObserverRunnable, + mStatsdPushIntervalMinutes * 60 * 1000); + } + /** Injector for {@link BinderLatencyObserver}. */ public static class Injector { public Random getRandomGenerator() { return new Random(); } + + public Handler getHandler() { + return new Handler(Looper.getMainLooper()); + } } public BinderLatencyObserver(Injector injector) { mRandom = injector.getRandomGenerator(); + mLatencyObserverHandler = injector.getHandler(); mLatencyBuckets = new BinderLatencyBuckets( mBucketCount, mFirstBucketSize, mBucketScaleFactor); + noteLatencyDelayed(); } /** Should be called when a Binder call completes, will store latency data. */ @@ -73,7 +192,8 @@ public class BinderLatencyObserver { } LatencyDims dims = new LatencyDims(s.binderClass, s.transactionCode); - long callDuration = getElapsedRealtimeMicro() - s.timeStarted; + long elapsedTimeMicro = getElapsedRealtimeMicro(); + long callDuration = elapsedTimeMicro - s.timeStarted; // Find the bucket this sample should go to. int bucketIdx = mLatencyBuckets.sampleToBucket( @@ -117,6 +237,22 @@ public class BinderLatencyObserver { } } + /** Updates the statsd push interval. */ + public void setPushInterval(int pushIntervalMinutes) { + if (pushIntervalMinutes <= 0) { + Slog.w(TAG, "Ignored invalid push interval (value must be positive): " + + pushIntervalMinutes); + return; + } + + synchronized (mLock) { + if (pushIntervalMinutes != mStatsdPushIntervalMinutes) { + mStatsdPushIntervalMinutes = pushIntervalMinutes; + reset(); + } + } + } + /** Updates the histogram buckets parameters. */ public void setHistogramBucketsParams( int bucketCount, int firstBucketSize, float bucketScaleFactor) { @@ -138,6 +274,7 @@ public class BinderLatencyObserver { synchronized (mLock) { mLatencyHistograms.clear(); } + noteLatencyDelayed(); } /** Container for binder latency information. */ @@ -187,4 +324,9 @@ public class BinderLatencyObserver { public ArrayMap<LatencyDims, int[]> getLatencyHistograms() { return mLatencyHistograms; } + + @VisibleForTesting + public Runnable getStatsdPushRunnable() { + return mLatencyObserverRunnable; + } } diff --git a/core/java/com/android/internal/os/IdlePowerCalculator.java b/core/java/com/android/internal/os/IdlePowerCalculator.java index 4a4991bd3966..5cb54bd7fbc9 100644 --- a/core/java/com/android/internal/os/IdlePowerCalculator.java +++ b/core/java/com/android/internal/os/IdlePowerCalculator.java @@ -54,8 +54,8 @@ public class IdlePowerCalculator extends PowerCalculator { BatteryStats.STATS_SINCE_CHARGED); if (mPowerMah != 0) { builder.getOrCreateSystemBatteryConsumerBuilder(SystemBatteryConsumer.DRAIN_TYPE_IDLE) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, mPowerMah) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE, mDurationMs); + .setConsumedPower(BatteryConsumer.POWER_COMPONENT_IDLE, mPowerMah) + .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_IDLE, mDurationMs); } } diff --git a/core/java/com/android/internal/os/MemoryPowerCalculator.java b/core/java/com/android/internal/os/MemoryPowerCalculator.java index 21dcce9fb64f..9ec40c6f6eed 100644 --- a/core/java/com/android/internal/os/MemoryPowerCalculator.java +++ b/core/java/com/android/internal/os/MemoryPowerCalculator.java @@ -32,8 +32,8 @@ public class MemoryPowerCalculator extends PowerCalculator { final double powerMah = calculatePower(batteryStats, rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED); builder.getOrCreateSystemBatteryConsumerBuilder(SystemBatteryConsumer.DRAIN_TYPE_MEMORY) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE, durationMs) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, powerMah); + .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_MEMORY, durationMs) + .setConsumedPower(BatteryConsumer.POWER_COMPONENT_MEMORY, powerMah); } @Override diff --git a/core/java/com/android/internal/os/PhonePowerCalculator.java b/core/java/com/android/internal/os/PhonePowerCalculator.java index 362ca0761b2c..6f279d99a5c9 100644 --- a/core/java/com/android/internal/os/PhonePowerCalculator.java +++ b/core/java/com/android/internal/os/PhonePowerCalculator.java @@ -45,8 +45,8 @@ public class PhonePowerCalculator extends PowerCalculator { final double phoneOnPower = mPowerEstimator.calculatePower(phoneOnTimeMs); if (phoneOnPower != 0) { builder.getOrCreateSystemBatteryConsumerBuilder(SystemBatteryConsumer.DRAIN_TYPE_PHONE) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, phoneOnPower) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE, phoneOnTimeMs); + .setConsumedPower(BatteryConsumer.POWER_COMPONENT_PHONE, phoneOnPower) + .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_PHONE, phoneOnTimeMs); } } diff --git a/core/java/com/android/internal/os/ScreenPowerCalculator.java b/core/java/com/android/internal/os/ScreenPowerCalculator.java index 0267def918c2..0743c897a91f 100644 --- a/core/java/com/android/internal/os/ScreenPowerCalculator.java +++ b/core/java/com/android/internal/os/ScreenPowerCalculator.java @@ -96,9 +96,9 @@ public class ScreenPowerCalculator extends PowerCalculator { } builder.getOrCreateSystemBatteryConsumerBuilder(SystemBatteryConsumer.DRAIN_TYPE_SCREEN) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE, + .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_SCREEN, totalPowerAndDuration.durationMs) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, + .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, Math.max(totalPowerAndDuration.powerMah, totalAppPower), powerModel) .setPowerConsumedByApps(totalAppPower); } diff --git a/core/java/com/android/internal/power/MeasuredEnergyStats.java b/core/java/com/android/internal/power/MeasuredEnergyStats.java index 00a0627d068c..3153071fd75d 100644 --- a/core/java/com/android/internal/power/MeasuredEnergyStats.java +++ b/core/java/com/android/internal/power/MeasuredEnergyStats.java @@ -23,6 +23,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Parcel; +import android.text.TextUtils; import android.util.DebugUtils; import android.util.Slog; import android.view.Display; @@ -88,13 +89,15 @@ public class MeasuredEnergyStats { */ private final long[] mAccumulatedChargeMicroCoulomb; + private final String[] mCustomBucketNames; + /** * Creates a MeasuredEnergyStats set to support the provided power buckets. * supportedStandardBuckets must be of size {@link #NUMBER_STANDARD_POWER_BUCKETS}. * numCustomBuckets >= 0 is the number of (non-standard) custom power buckets on the device. */ - public MeasuredEnergyStats(boolean[] supportedStandardBuckets, int numCustomBuckets) { - final int numTotalBuckets = NUMBER_STANDARD_POWER_BUCKETS + numCustomBuckets; + public MeasuredEnergyStats(boolean[] supportedStandardBuckets, String[] customBucketNames) { + final int numTotalBuckets = NUMBER_STANDARD_POWER_BUCKETS + customBucketNames.length; mAccumulatedChargeMicroCoulomb = new long[numTotalBuckets]; // Initialize to all zeros where supported, otherwise POWER_DATA_UNAVAILABLE. // All custom buckets are, by definition, supported, so their values stay at 0. @@ -103,6 +106,7 @@ public class MeasuredEnergyStats { mAccumulatedChargeMicroCoulomb[stdBucket] = POWER_DATA_UNAVAILABLE; } } + mCustomBucketNames = customBucketNames; } /** @@ -119,6 +123,7 @@ public class MeasuredEnergyStats { mAccumulatedChargeMicroCoulomb[stdBucket] = POWER_DATA_UNAVAILABLE; } } + mCustomBucketNames = template.getCustomBucketNames(); } /** @@ -135,6 +140,7 @@ public class MeasuredEnergyStats { */ private MeasuredEnergyStats(int numIndices) { mAccumulatedChargeMicroCoulomb = new long[numIndices]; + mCustomBucketNames = new String[0]; } /** Construct from parcel. */ @@ -142,12 +148,14 @@ public class MeasuredEnergyStats { final int size = in.readInt(); mAccumulatedChargeMicroCoulomb = new long[size]; in.readLongArray(mAccumulatedChargeMicroCoulomb); + mCustomBucketNames = in.readStringArray(); } /** Write to parcel */ public void writeToParcel(Parcel out) { out.writeInt(mAccumulatedChargeMicroCoulomb.length); out.writeLongArray(mAccumulatedChargeMicroCoulomb); + out.writeStringArray(mCustomBucketNames); } /** @@ -294,7 +302,7 @@ public class MeasuredEnergyStats { final int numCustomBuckets = arraySize - NUMBER_STANDARD_POWER_BUCKETS; final MeasuredEnergyStats stats = new MeasuredEnergyStats( - new boolean[NUMBER_STANDARD_POWER_BUCKETS], numCustomBuckets); + new boolean[NUMBER_STANDARD_POWER_BUCKETS], new String[numCustomBuckets]); stats.readSummaryFromParcel(in, true); return stats; } @@ -406,12 +414,12 @@ public class MeasuredEnergyStats { /** Check if the supported power buckets are precisely those given. */ public boolean isSupportEqualTo( - @NonNull boolean[] queriedStandardBuckets, int numCustomBuckets) { + @NonNull boolean[] queriedStandardBuckets, String[] customBucketNames) { final int numBuckets = getNumberOfIndices(); // TODO(b/178504428): Detect whether custom buckets have changed qualitatively, not just // quantitatively, and treat as mismatch if so. - if (numBuckets != NUMBER_STANDARD_POWER_BUCKETS + numCustomBuckets) { + if (numBuckets != NUMBER_STANDARD_POWER_BUCKETS + customBucketNames.length) { return false; } for (int stdBucket = 0; stdBucket < NUMBER_STANDARD_POWER_BUCKETS; stdBucket++) { @@ -422,6 +430,10 @@ public class MeasuredEnergyStats { return true; } + public String[] getCustomBucketNames() { + return mCustomBucketNames; + } + /** Dump debug data. */ public void dump(PrintWriter pw) { pw.print(" "); @@ -443,11 +455,16 @@ public class MeasuredEnergyStats { * If the index is a standard bucket, returns its name; otherwise returns its prefixed custom * bucket number. */ - private static String getBucketName(int index) { + private String getBucketName(int index) { if (isValidStandardBucket(index)) { return DebugUtils.valueToString(MeasuredEnergyStats.class, "POWER_BUCKET_", index); } - return "CUSTOM_" + indexToCustomBucket(index); + final int customBucket = indexToCustomBucket(index); + StringBuilder name = new StringBuilder().append("CUSTOM_").append(customBucket); + if (mCustomBucketNames != null && !TextUtils.isEmpty(mCustomBucketNames[customBucket])) { + name.append('(').append(mCustomBucketNames[customBucket]).append(')'); + } + return name.toString(); } /** Get the number of custom power buckets on this device. */ diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 50bbfc5ccb08..fd13c26b05b2 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -89,8 +89,7 @@ interface IInputMethodManager { /** Remove the IME surface. Requires INTERNAL_SYSTEM_WINDOW permission. */ oneway void removeImeSurface(in IVoidResultCallback resultCallback); /** Remove the IME surface. Requires passing the currently focused window. */ - oneway void removeImeSurfaceFromWindow(in IBinder windowToken, - in IVoidResultCallback resultCallback); + oneway void removeImeSurfaceFromWindowAsync(in IBinder windowToken); oneway void startProtoDump(in byte[] protoDump, int source, String where, in IVoidResultCallback resultCallback); oneway void isImeTraceEnabled(in IBooleanResultCallback resultCallback); diff --git a/core/java/com/android/internal/view/ScrollCaptureViewHelper.java b/core/java/com/android/internal/view/ScrollCaptureViewHelper.java index 9829d0b7ae8d..356cd6b5c9fc 100644 --- a/core/java/com/android/internal/view/ScrollCaptureViewHelper.java +++ b/core/java/com/android/internal/view/ScrollCaptureViewHelper.java @@ -19,8 +19,14 @@ package com.android.internal.view; import android.annotation.NonNull; import android.graphics.Rect; import android.view.View; +import android.view.ViewGroup; -interface ScrollCaptureViewHelper<V extends View> { +/** + * Provides view-specific handling to ScrollCaptureViewSupport. + * + * @param <V> the View subclass + */ +public interface ScrollCaptureViewHelper<V extends View> { int UP = -1; int DOWN = 1; @@ -73,9 +79,12 @@ interface ScrollCaptureViewHelper<V extends View> { * @param view the view being captured */ @NonNull default Rect onComputeScrollBounds(@NonNull V view) { - return new Rect(view.getPaddingLeft(), view.getPaddingTop(), - view.getWidth() - view.getPaddingRight(), - view.getHeight() - view.getPaddingBottom()); + Rect bounds = new Rect(0, 0, view.getWidth(), view.getHeight()); + if (view instanceof ViewGroup && ((ViewGroup) view).getClipToPadding()) { + bounds.inset(view.getPaddingLeft(), view.getPaddingTop(), + view.getPaddingRight(), view.getPaddingBottom()); + } + return bounds; } /** diff --git a/core/java/com/android/internal/widget/ConversationLayout.java b/core/java/com/android/internal/widget/ConversationLayout.java index 8ecc80946141..bab4e93bdd9a 100644 --- a/core/java/com/android/internal/widget/ConversationLayout.java +++ b/core/java/com/android/internal/widget/ConversationLayout.java @@ -64,6 +64,7 @@ import com.android.internal.R; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.function.Consumer; @@ -530,13 +531,7 @@ public class ConversationLayout extends FrameLayout mConversationText.setText(conversationText); // Update if the groups can hide the sender if they are first (applies to 1:1 conversations) // This needs to happen after all of the above o update all of the groups - for (int i = mGroups.size() - 1; i >= 0; i--) { - MessagingGroup messagingGroup = mGroups.get(i); - CharSequence messageSender = messagingGroup.getSenderName(); - boolean canHide = mIsOneToOne - && TextUtils.equals(conversationText, messageSender); - messagingGroup.setCanHideSenderIfFirst(canHide); - } + mPeopleHelper.maybeHideFirstSenderName(mGroups, mIsOneToOne, conversationText); updateAppName(); updateIconPositionAndSize(); updateImageMessages(); @@ -779,35 +774,7 @@ public class ConversationLayout extends FrameLayout private void updateTitleAndNamesDisplay() { // Map of unique names to their prefix - ArrayMap<CharSequence, String> uniqueNames = new ArrayMap<>(); - // Map of single-character string prefix to the only name which uses it, or null if multiple - ArrayMap<String, CharSequence> uniqueCharacters = new ArrayMap<>(); - for (int i = 0; i < mGroups.size(); i++) { - MessagingGroup group = mGroups.get(i); - CharSequence senderName = group.getSenderName(); - if (!group.needsGeneratedAvatar() || TextUtils.isEmpty(senderName)) { - continue; - } - if (!uniqueNames.containsKey(senderName)) { - String charPrefix = mPeopleHelper.findNamePrefix(senderName, null); - if (charPrefix == null) { - continue; - } - if (uniqueCharacters.containsKey(charPrefix)) { - // this character was already used, lets make it more unique. We first need to - // resolve the existing character if it exists - CharSequence existingName = uniqueCharacters.get(charPrefix); - if (existingName != null) { - uniqueNames.put(existingName, mPeopleHelper.findNameSplit(existingName)); - uniqueCharacters.put(charPrefix, null); - } - uniqueNames.put(senderName, mPeopleHelper.findNameSplit(senderName)); - } else { - uniqueNames.put(senderName, charPrefix); - uniqueCharacters.put(charPrefix, senderName); - } - } - } + Map<CharSequence, String> uniqueNames = mPeopleHelper.mapUniqueNamesToPrefix(mGroups); // Now that we have the correct symbols, let's look what we have cached ArrayMap<CharSequence, Icon> cachedAvatars = new ArrayMap<>(); diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index a0e50be93410..db4e6734c848 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -933,19 +933,6 @@ public class LockPatternUtils { } /** - * Generate a hash for the given password. To avoid brute force attacks, we use a salted hash. - * Not the most secure, but it is at least a second level of protection. First level is that - * the file is in a location only readable by the system process. - * - * @param password the gesture pattern. - * - * @return the hash of the pattern in a byte array. - */ - public String legacyPasswordToHash(byte[] password, int userId) { - return LockscreenCredential.legacyPasswordToHash(password, getSalt(userId).getBytes()); - } - - /** * Returns the credential type of the user, can be one of {@link #CREDENTIAL_TYPE_NONE}, * {@link #CREDENTIAL_TYPE_PATTERN}, {@link #CREDENTIAL_TYPE_PIN} and * {@link #CREDENTIAL_TYPE_PASSWORD} diff --git a/core/java/com/android/internal/widget/LockSettingsInternal.java b/core/java/com/android/internal/widget/LockSettingsInternal.java index f5df3abad658..940979d7cd1f 100644 --- a/core/java/com/android/internal/widget/LockSettingsInternal.java +++ b/core/java/com/android/internal/widget/LockSettingsInternal.java @@ -16,15 +16,41 @@ package com.android.internal.widget; +import android.annotation.IntDef; import android.annotation.Nullable; import android.app.admin.PasswordMetrics; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * LockSettingsService local system service interface. * * @hide Only for use within the system server. */ public abstract class LockSettingsInternal { + /** ErrorCode for armRebootEscrow failures. **/ + @IntDef(prefix = {"ARM_REBOOT_ERROR_"}, value = { + ARM_REBOOT_ERROR_NONE, + ARM_REBOOT_ERROR_UNSPECIFIED, + ARM_REBOOT_ERROR_ESCROW_NOT_READY, + ARM_REBOOT_ERROR_NO_PROVIDER, + ARM_REBOOT_ERROR_PROVIDER_MISMATCH, + ARM_REBOOT_ERROR_NO_ESCROW_KEY, + ARM_REBOOT_ERROR_KEYSTORE_FAILURE, + ARM_REBOOT_ERROR_STORE_ESCROW_KEY, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ArmRebootEscrowErrorCode {} + + public static final int ARM_REBOOT_ERROR_NONE = 0; + public static final int ARM_REBOOT_ERROR_UNSPECIFIED = 1; + public static final int ARM_REBOOT_ERROR_ESCROW_NOT_READY = 2; + public static final int ARM_REBOOT_ERROR_NO_PROVIDER = 3; + public static final int ARM_REBOOT_ERROR_PROVIDER_MISMATCH = 4; + public static final int ARM_REBOOT_ERROR_NO_ESCROW_KEY = 5; + public static final int ARM_REBOOT_ERROR_KEYSTORE_FAILURE = 6; + public static final int ARM_REBOOT_ERROR_STORE_ESCROW_KEY = 7; + // TODO(b/183140900) split store escrow key errors into detailed ones. /** * Create an escrow token for the current user, which can later be used to unlock FBE @@ -104,9 +130,9 @@ public abstract class LockSettingsInternal { * Should be called immediately before rebooting for an update. This depends on {@link * #prepareRebootEscrow()} having been called and the escrow completing. * - * @return true if the arming worked + * @return ARM_ERROR_NONE if the arming worked */ - public abstract boolean armRebootEscrow(); + public abstract @ArmRebootEscrowErrorCode int armRebootEscrow(); /** diff --git a/core/java/com/android/internal/widget/MessagingGroup.java b/core/java/com/android/internal/widget/MessagingGroup.java index f312d1d4f25d..f30b8442dc35 100644 --- a/core/java/com/android/internal/widget/MessagingGroup.java +++ b/core/java/com/android/internal/widget/MessagingGroup.java @@ -24,6 +24,7 @@ import android.annotation.StyleRes; import android.app.Person; import android.content.Context; import android.content.res.ColorStateList; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; @@ -109,7 +110,10 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou private boolean mIsInConversation = true; private ViewGroup mMessagingIconContainer; private int mConversationContentStart; - private int mNonConversationMarginEnd; + private int mNonConversationContentStart; + private int mNonConversationPaddingStart; + private int mConversationAvatarSize; + private int mNonConversationAvatarSize; private int mNotificationTextMarginTop; public MessagingGroup(@NonNull Context context) { @@ -141,16 +145,21 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou mMessagingIconContainer = findViewById(R.id.message_icon_container); mContentContainer = findViewById(R.id.messaging_group_content_container); mSendingSpinnerContainer = findViewById(R.id.messaging_group_sending_progress_container); - DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); + Resources res = getResources(); + DisplayMetrics displayMetrics = res.getDisplayMetrics(); mDisplaySize.x = displayMetrics.widthPixels; mDisplaySize.y = displayMetrics.heightPixels; - mSenderTextPaddingSingleLine = getResources().getDimensionPixelSize( + mSenderTextPaddingSingleLine = res.getDimensionPixelSize( R.dimen.messaging_group_singleline_sender_padding_end); - mConversationContentStart = getResources().getDimensionPixelSize( - R.dimen.conversation_content_start); - mNonConversationMarginEnd = getResources().getDimensionPixelSize( - R.dimen.messaging_layout_margin_end); - mNotificationTextMarginTop = getResources().getDimensionPixelSize( + mConversationContentStart = res.getDimensionPixelSize(R.dimen.conversation_content_start); + mNonConversationContentStart = res.getDimensionPixelSize( + R.dimen.notification_content_margin_start); + mNonConversationPaddingStart = res.getDimensionPixelSize( + R.dimen.messaging_layout_icon_padding_start); + mConversationAvatarSize = res.getDimensionPixelSize(R.dimen.messaging_avatar_size); + mNonConversationAvatarSize = res.getDimensionPixelSize( + R.dimen.notification_icon_circle_size); + mNotificationTextMarginTop = res.getDimensionPixelSize( R.dimen.notification_text_margin_top); } @@ -696,10 +705,18 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou mIsInConversation = isInConversation; MarginLayoutParams layoutParams = (MarginLayoutParams) mMessagingIconContainer.getLayoutParams(); - layoutParams.width = mIsInConversation ? mConversationContentStart - : ViewPager.LayoutParams.WRAP_CONTENT; - layoutParams.setMarginEnd(mIsInConversation ? 0 : mNonConversationMarginEnd); + layoutParams.width = mIsInConversation + ? mConversationContentStart + : mNonConversationContentStart; mMessagingIconContainer.setLayoutParams(layoutParams); + int imagePaddingStart = isInConversation ? 0 : mNonConversationPaddingStart; + mMessagingIconContainer.setPaddingRelative(imagePaddingStart, 0, 0, 0); + + ViewGroup.LayoutParams avatarLayoutParams = mAvatarView.getLayoutParams(); + int size = mIsInConversation ? mConversationAvatarSize : mNonConversationAvatarSize; + avatarLayoutParams.height = size; + avatarLayoutParams.width = size; + mAvatarView.setLayoutParams(avatarLayoutParams); } } diff --git a/core/java/com/android/internal/widget/MessagingLayout.java b/core/java/com/android/internal/widget/MessagingLayout.java index 27cd6e13d86c..e1602a981920 100644 --- a/core/java/com/android/internal/widget/MessagingLayout.java +++ b/core/java/com/android/internal/widget/MessagingLayout.java @@ -16,7 +16,7 @@ package com.android.internal.widget; -import static com.android.internal.widget.MessagingGroup.IMAGE_DISPLAY_LOCATION_AT_END; +import static com.android.internal.widget.MessagingGroup.IMAGE_DISPLAY_LOCATION_EXTERNAL; import static com.android.internal.widget.MessagingGroup.IMAGE_DISPLAY_LOCATION_INLINE; import android.annotation.AttrRes; @@ -27,10 +27,6 @@ import android.app.Notification; import android.app.Person; import android.app.RemoteInputHistoryItem; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Icon; import android.os.Bundle; @@ -40,21 +36,22 @@ import android.util.ArrayMap; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.RemotableViewMethod; +import android.view.View; +import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.RemoteViews; -import android.widget.TextView; import com.android.internal.R; -import com.android.internal.graphics.ColorUtils; import com.android.internal.util.ContrastColorUtil; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.function.Consumer; -import java.util.regex.Pattern; /** * A custom-built layout for the Notification.MessagingStyle allows dynamic addition and removal @@ -65,15 +62,6 @@ public class MessagingLayout extends FrameLayout implements ImageMessageConsumer, IMessagingLayout { private static final float COLOR_SHIFT_AMOUNT = 60; - /** - * Pattren for filter some ingonable characters. - * p{Z} for any kind of whitespace or invisible separator. - * p{C} for any kind of punctuation character. - */ - private static final Pattern IGNORABLE_CHAR_PATTERN - = Pattern.compile("[\\p{C}\\p{Z}]"); - private static final Pattern SPECIAL_CHAR_PATTERN - = Pattern.compile ("[!@#$%&*()_+=|<>?{}\\[\\]~-]"); private static final Consumer<MessagingMessage> REMOVE_MESSAGE = MessagingMessage::removeMessage; public static final Interpolator LINEAR_OUT_SLOW_IN = new PathInterpolator(0f, 0f, 0.2f, 1f); @@ -81,26 +69,26 @@ public class MessagingLayout extends FrameLayout public static final Interpolator FAST_OUT_SLOW_IN = new PathInterpolator(0.4f, 0f, 0.2f, 1f); public static final OnLayoutChangeListener MESSAGING_PROPERTY_ANIMATOR = new MessagingPropertyAnimator(); + private final PeopleHelper mPeopleHelper = new PeopleHelper(); private List<MessagingMessage> mMessages = new ArrayList<>(); private List<MessagingMessage> mHistoricMessages = new ArrayList<>(); private MessagingLinearLayout mMessagingLinearLayout; private boolean mShowHistoricMessages; private ArrayList<MessagingGroup> mGroups = new ArrayList<>(); - private TextView mTitleView; + private MessagingLinearLayout mImageMessageContainer; + private ImageView mRightIconView; + private Rect mMessagingClipRect; private int mLayoutColor; private int mSenderTextColor; private int mMessageTextColor; - private int mAvatarSize; - private Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private Paint mTextPaint = new Paint(); - private CharSequence mConversationTitle; private Icon mAvatarReplacement; private boolean mIsOneToOne; private ArrayList<MessagingGroup> mAddedGroups = new ArrayList<>(); private Person mUser; private CharSequence mNameReplacement; - private boolean mDisplayImagesAtEnd; + private boolean mIsCollapsed; private ImageResolver mImageResolver; + private CharSequence mConversationTitle; public MessagingLayout(@NonNull Context context) { super(context); @@ -123,17 +111,16 @@ public class MessagingLayout extends FrameLayout @Override protected void onFinishInflate() { super.onFinishInflate(); + mPeopleHelper.init(getContext()); mMessagingLinearLayout = findViewById(R.id.notification_messaging); + mImageMessageContainer = findViewById(R.id.conversation_image_message_container); + mRightIconView = findViewById(R.id.right_icon); // We still want to clip, but only on the top, since views can temporarily out of bounds // during transitions. DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); int size = Math.max(displayMetrics.widthPixels, displayMetrics.heightPixels); - Rect rect = new Rect(0, 0, size, size); - mMessagingLinearLayout.setClipBounds(rect); - mTitleView = findViewById(R.id.title); - mAvatarSize = getResources().getDimensionPixelSize(R.dimen.messaging_avatar_size); - mTextPaint.setTextAlign(Paint.Align.CENTER); - mTextPaint.setAntiAlias(true); + mMessagingClipRect = new Rect(0, 0, size, size); + setMessagingClippingDisabled(false); } @RemotableViewMethod @@ -153,7 +140,7 @@ public class MessagingLayout extends FrameLayout */ @RemotableViewMethod public void setIsCollapsed(boolean isCollapsed) { - mDisplayImagesAtEnd = isCollapsed; + mIsCollapsed = isCollapsed; } @RemotableViewMethod @@ -168,7 +155,7 @@ public class MessagingLayout extends FrameLayout */ @RemotableViewMethod public void setConversationTitle(CharSequence conversationTitle) { - // Unused + mConversationTitle = conversationTitle; } @RemotableViewMethod @@ -180,11 +167,6 @@ public class MessagingLayout extends FrameLayout List<Notification.MessagingStyle.Message> newHistoricMessages = Notification.MessagingStyle.Message.getMessagesFromBundleArray(histMessages); setUser(extras.getParcelable(Notification.EXTRA_MESSAGING_PERSON)); - mConversationTitle = null; - TextView headerText = findViewById(R.id.header_text); - if (headerText != null) { - mConversationTitle = headerText.getText(); - } RemoteInputHistoryItem[] history = (RemoteInputHistoryItem[]) extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); addRemoteInputHistoryToMessages(newMessages, history); @@ -238,6 +220,41 @@ public class MessagingLayout extends FrameLayout updateHistoricMessageVisibility(); updateTitleAndNamesDisplay(); + // after groups are finalized, hide the first sender name if it's showing as the title + mPeopleHelper.maybeHideFirstSenderName(mGroups, mIsOneToOne, mConversationTitle); + updateImageMessages(); + } + + private void updateImageMessages() { + View newMessage = null; + if (mImageMessageContainer == null) { + return; + } + if (mIsCollapsed && !mGroups.isEmpty()) { + // When collapsed, we're displaying the image message in a dedicated container + // on the right of the layout instead of inline. Let's add the isolated image there + MessagingGroup messagingGroup = mGroups.get(mGroups.size() - 1); + MessagingImageMessage isolatedMessage = messagingGroup.getIsolatedMessage(); + if (isolatedMessage != null) { + newMessage = isolatedMessage.getView(); + } + } + // Remove all messages that don't belong into the image layout + View previousMessage = mImageMessageContainer.getChildAt(0); + if (previousMessage != newMessage) { + mImageMessageContainer.removeView(previousMessage); + if (newMessage != null) { + mImageMessageContainer.addView(newMessage); + } + } + mImageMessageContainer.setVisibility(newMessage != null ? VISIBLE : GONE); + + // When showing an image message, do not show the large icon. Removing the drawable + // prevents it from being shown in the left_icon view (by the grouping util). + if (newMessage != null && mRightIconView != null && mRightIconView.getDrawable() != null) { + mRightIconView.setImageDrawable(null); + mRightIconView.setVisibility(GONE); + } } private void removeGroups(ArrayList<MessagingGroup> oldGroups) { @@ -266,34 +283,7 @@ public class MessagingLayout extends FrameLayout } private void updateTitleAndNamesDisplay() { - ArrayMap<CharSequence, String> uniqueNames = new ArrayMap<>(); - ArrayMap<Character, CharSequence> uniqueCharacters = new ArrayMap<>(); - for (int i = 0; i < mGroups.size(); i++) { - MessagingGroup group = mGroups.get(i); - CharSequence senderName = group.getSenderName(); - if (!group.needsGeneratedAvatar() || TextUtils.isEmpty(senderName)) { - continue; - } - if (!uniqueNames.containsKey(senderName)) { - // Only use visible characters to get uniqueNames - String pureSenderName = IGNORABLE_CHAR_PATTERN - .matcher(senderName).replaceAll("" /* replacement */); - char c = pureSenderName.charAt(0); - if (uniqueCharacters.containsKey(c)) { - // this character was already used, lets make it more unique. We first need to - // resolve the existing character if it exists - CharSequence existingName = uniqueCharacters.get(c); - if (existingName != null) { - uniqueNames.put(existingName, findNameSplit((String) existingName)); - uniqueCharacters.put(c, null); - } - uniqueNames.put(senderName, findNameSplit((String) senderName)); - } else { - uniqueNames.put(senderName, Character.toString(c)); - uniqueCharacters.put(c, pureSenderName); - } - } - } + Map<CharSequence, String> uniqueNames = mPeopleHelper.mapUniqueNamesToPrefix(mGroups); // Now that we have the correct symbols, let's look what we have cached ArrayMap<CharSequence, Icon> cachedAvatars = new ArrayMap<>(); @@ -337,26 +327,7 @@ public class MessagingLayout extends FrameLayout } public Icon createAvatarSymbol(CharSequence senderName, String symbol, int layoutColor) { - if (symbol.isEmpty() || TextUtils.isDigitsOnly(symbol) || - SPECIAL_CHAR_PATTERN.matcher(symbol).find()) { - Icon avatarIcon = Icon.createWithResource(getContext(), - com.android.internal.R.drawable.messaging_user); - avatarIcon.setTint(findColor(senderName, layoutColor)); - return avatarIcon; - } else { - Bitmap bitmap = Bitmap.createBitmap(mAvatarSize, mAvatarSize, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - float radius = mAvatarSize / 2.0f; - int color = findColor(senderName, layoutColor); - mPaint.setColor(color); - canvas.drawCircle(radius, radius, radius, mPaint); - boolean needDarkText = ColorUtils.calculateLuminance(color) > 0.5f; - mTextPaint.setColor(needDarkText ? Color.BLACK : Color.WHITE); - mTextPaint.setTextSize(symbol.length() == 1 ? mAvatarSize * 0.5f : mAvatarSize * 0.3f); - int yPos = (int) (radius - ((mTextPaint.descent() + mTextPaint.ascent()) / 2)); - canvas.drawText(symbol, radius, yPos, mTextPaint); - return Icon.createWithBitmap(bitmap); - } + return mPeopleHelper.createAvatarSymbol(senderName, symbol, layoutColor); } private int findColor(CharSequence senderName, int layoutColor) { @@ -449,8 +420,8 @@ public class MessagingLayout extends FrameLayout newGroup = MessagingGroup.createGroup(mMessagingLinearLayout); mAddedGroups.add(newGroup); } - newGroup.setImageDisplayLocation(mDisplayImagesAtEnd - ? IMAGE_DISPLAY_LOCATION_AT_END + newGroup.setImageDisplayLocation(mIsCollapsed + ? IMAGE_DISPLAY_LOCATION_EXTERNAL : IMAGE_DISPLAY_LOCATION_INLINE); newGroup.setIsInConversation(false); newGroup.setLayoutColor(mLayoutColor); @@ -460,6 +431,8 @@ public class MessagingLayout extends FrameLayout if (sender != mUser && mNameReplacement != null) { nameOverride = mNameReplacement; } + newGroup.setSingleLine(mIsCollapsed); + newGroup.setShowingAvatar(!mIsCollapsed); newGroup.setSender(sender, nameOverride); newGroup.setSending(groupIndex == (groups.size() - 1) && showSpinner); mGroups.add(newGroup); @@ -600,12 +573,17 @@ public class MessagingLayout extends FrameLayout return mMessagingLinearLayout; } + @Nullable + public ViewGroup getImageMessageContainer() { + return mImageMessageContainer; + } + public ArrayList<MessagingGroup> getMessagingGroups() { return mGroups; } @Override public void setMessagingClippingDisabled(boolean clippingDisabled) { - // Don't do anything, this is only used for the ConversationLayout + mMessagingLinearLayout.setClipBounds(clippingDisabled ? null : mMessagingClipRect); } } diff --git a/core/java/com/android/internal/widget/NotificationExpandButton.java b/core/java/com/android/internal/widget/NotificationExpandButton.java index 7a8ead6b33f1..de3b6a4dacb2 100644 --- a/core/java/com/android/internal/widget/NotificationExpandButton.java +++ b/core/java/com/android/internal/widget/NotificationExpandButton.java @@ -165,15 +165,23 @@ public class NotificationExpandButton extends FrameLayout { private void updateColors() { if (shouldShowNumber() && !mDisallowColor) { - mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor)); + if (mHighlightPillColor != 0) { + mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor)); + } mPillView.setBackgroundTintMode(PorterDuff.Mode.SRC_IN); mIconView.setColorFilter(mHighlightTextColor, PorterDuff.Mode.SRC_IN); - mNumberView.setTextColor(mHighlightTextColor); + if (mHighlightTextColor != 0) { + mNumberView.setTextColor(mHighlightTextColor); + } } else { - mPillView.setBackgroundTintList(ColorStateList.valueOf(mDefaultPillColor)); + if (mDefaultPillColor != 0) { + mPillView.setBackgroundTintList(ColorStateList.valueOf(mDefaultPillColor)); + } mPillView.setBackgroundTintMode(PorterDuff.Mode.SRC_IN); mIconView.setColorFilter(mDefaultTextColor, PorterDuff.Mode.SRC_IN); - mNumberView.setTextColor(mDefaultTextColor); + if (mDefaultTextColor != 0) { + mNumberView.setTextColor(mDefaultTextColor); + } } } diff --git a/core/java/com/android/internal/widget/PeopleHelper.java b/core/java/com/android/internal/widget/PeopleHelper.java index 77f4c8f6bede..85cedc362b99 100644 --- a/core/java/com/android/internal/widget/PeopleHelper.java +++ b/core/java/com/android/internal/widget/PeopleHelper.java @@ -21,6 +21,7 @@ import static com.android.internal.widget.MessagingPropertyAnimator.ALPHA_OUT; import android.annotation.ColorInt; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -28,12 +29,15 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Icon; import android.text.TextUtils; +import android.util.ArrayMap; import android.view.View; import com.android.internal.R; import com.android.internal.graphics.ColorUtils; import com.android.internal.util.ContrastColorUtil; +import java.util.List; +import java.util.Map; import java.util.regex.Pattern; /** @@ -176,4 +180,58 @@ public class PeopleHelper { } return findNamePrefix(name, ""); } + + /** + * Creates a mapping of the unique sender names in the groups to the string 1- or 2-character + * prefix strings for the names, which are extracted as the initials, and should be used for + * generating the avatar. Senders not requiring a generated avatar, or with an empty name are + * omitted. + */ + public Map<CharSequence, String> mapUniqueNamesToPrefix(List<MessagingGroup> groups) { + // Map of unique names to their prefix + ArrayMap<CharSequence, String> uniqueNames = new ArrayMap<>(); + // Map of single-character string prefix to the only name which uses it, or null if multiple + ArrayMap<String, CharSequence> uniqueCharacters = new ArrayMap<>(); + for (int i = 0; i < groups.size(); i++) { + MessagingGroup group = groups.get(i); + CharSequence senderName = group.getSenderName(); + if (!group.needsGeneratedAvatar() || TextUtils.isEmpty(senderName)) { + continue; + } + if (!uniqueNames.containsKey(senderName)) { + String charPrefix = findNamePrefix(senderName, null); + if (charPrefix == null) { + continue; + } + if (uniqueCharacters.containsKey(charPrefix)) { + // this character was already used, lets make it more unique. We first need to + // resolve the existing character if it exists + CharSequence existingName = uniqueCharacters.get(charPrefix); + if (existingName != null) { + uniqueNames.put(existingName, findNameSplit(existingName)); + uniqueCharacters.put(charPrefix, null); + } + uniqueNames.put(senderName, findNameSplit(senderName)); + } else { + uniqueNames.put(senderName, charPrefix); + uniqueCharacters.put(charPrefix, senderName); + } + } + } + return uniqueNames; + } + + /** + * Update whether the groups can hide the sender if they are first + * (happens only for 1:1 conversations where the given title matches the sender's name) + */ + public void maybeHideFirstSenderName(@NonNull List<MessagingGroup> groups, + boolean isOneToOne, @Nullable CharSequence conversationTitle) { + for (int i = groups.size() - 1; i >= 0; i--) { + MessagingGroup messagingGroup = groups.get(i); + CharSequence messageSender = messagingGroup.getSenderName(); + boolean canHide = isOneToOne && TextUtils.equals(conversationTitle, messageSender); + messagingGroup.setCanHideSenderIfFirst(canHide); + } + } } diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp index 8977b97fc541..ce772cf9faff 100644 --- a/core/jni/android_view_DisplayEventReceiver.cpp +++ b/core/jni/android_view_DisplayEventReceiver.cpp @@ -107,7 +107,7 @@ void NativeDisplayEventReceiver::dispatchVsync(nsecs_t timestamp, PhysicalDispla ALOGV("receiver %p ~ Invoking vsync handler.", this); env->CallVoidMethod(receiverObj.get(), gDisplayEventReceiverClassInfo.dispatchVsync, timestamp, displayId.value, count, vsyncEventData.id, - vsyncEventData.deadlineTimestamp); + vsyncEventData.deadlineTimestamp, vsyncEventData.frameInterval); ALOGV("receiver %p ~ Returned from vsync handler.", this); } @@ -239,7 +239,7 @@ int register_android_view_DisplayEventReceiver(JNIEnv* env) { gDisplayEventReceiverClassInfo.dispatchVsync = GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz, "dispatchVsync", - "(JJIJJ)V"); + "(JJIJJJ)V"); gDisplayEventReceiverClassInfo.dispatchHotplug = GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz, "dispatchHotplug", "(JJZ)V"); gDisplayEventReceiverClassInfo.dispatchModeChanged = diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 906367b1fa94..ffba628f73ab 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -1443,14 +1443,6 @@ static jboolean nativeGetAnimationFrameStats(JNIEnv* env, jclass clazz, jobject return JNI_TRUE; } -static void nativeDeferTransactionUntil(JNIEnv* env, jclass clazz, jlong transactionObj, - jlong nativeObject, jlong barrierObject, jlong frameNumber) { - sp<SurfaceControl> ctrl = reinterpret_cast<SurfaceControl*>(nativeObject); - sp<SurfaceControl> barrier = reinterpret_cast<SurfaceControl*>(barrierObject); - auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); - transaction->deferTransactionUntil_legacy(ctrl, barrier, frameNumber); -} - static void nativeReparent(JNIEnv* env, jclass clazz, jlong transactionObj, jlong nativeObject, jlong newParentObject) { @@ -1570,6 +1562,13 @@ static void nativeWriteTransactionToParcel(JNIEnv* env, jclass clazz, jlong nati reinterpret_cast<SurfaceComposerClient::Transaction *>(nativeObject); if (self != nullptr) { self->writeToParcel(parcel); + } +} + +static void nativeClearTransaction(JNIEnv* env, jclass clazz, jlong nativeObject) { + SurfaceComposerClient::Transaction* const self = + reinterpret_cast<SurfaceComposerClient::Transaction*>(nativeObject); + if (self != nullptr) { self->clear(); } } @@ -1856,8 +1855,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeSetDisplayPowerMode }, {"nativeGetProtectedContentSupport", "()Z", (void*)nativeGetProtectedContentSupport }, - {"nativeDeferTransactionUntil", "(JJJJ)V", - (void*)nativeDeferTransactionUntil }, {"nativeReparent", "(JJJ)V", (void*)nativeReparent }, {"nativeCaptureDisplay", @@ -1890,6 +1887,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeReadTransactionFromParcel }, {"nativeWriteTransactionToParcel", "(JLandroid/os/Parcel;)V", (void*)nativeWriteTransactionToParcel }, + {"nativeClearTransaction", "(J)V", + (void*)nativeClearTransaction }, {"nativeMirrorSurface", "(J)J", (void*)nativeMirrorSurface }, {"nativeSetGlobalShadowSettings", "([F[FFFF)V", diff --git a/core/proto/android/internal/binder_latency.proto b/core/proto/android/internal/binder_latency.proto new file mode 100644 index 000000000000..e32c3e3441c5 --- /dev/null +++ b/core/proto/android/internal/binder_latency.proto @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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 com.android.internal.os; + +option java_outer_classname = "BinderLatencyProto"; + +/** + * RepeatedApiStats proto from atoms.proto, duplicated here so that it's + * accessible in the build. + * Must be kept in sync with the version in atoms.proto. + */ + +message RepeatedApiStats { + repeated ApiStats api_stats = 1; +} + +message Dims { + enum ProcessSource { + UNKNOWN_PROCESS_SOURCE = 0; + SYSTEM_SERVER = 1; + TELEPHONY = 2; + } + + enum ServiceClassName { + UNKNOWN_CLASS = 0; + } + enum ServiceMethodName { + UNKNOWN_METHOD = 0; + } + + // Required. + optional ProcessSource process_source = 1; + + // The class name of the API making the call to Binder. Enum value + // is preferred as uses much less data to store. + // This field does not contain PII. + oneof service_class { + ServiceClassName service_class_name_as_enum = 2; + string service_class_name = 3; + } + + // Method name of the API call. It can also be a transaction code if we + // cannot resolve it to a name. See Binder#getTransactionName. Enum value + // is preferred as uses much less data to store. + // This field does not contain PII. + oneof service_method { + ServiceMethodName service_method_name_as_enum = 4; + string service_method_name = 5; + } +} + +message ApiStats { + // required. + optional Dims dims = 1; + + // Indicates the first bucket that had any data. Allows omitting any empty + // buckets at the start of the bucket list and thus save on data size. + optional int32 first_bucket_index = 2; + // Stores the count of samples for each bucket. The number of buckets and + // their sizes are controlled server side with a flag. + repeated int32 buckets = 3; +}
\ No newline at end of file diff --git a/core/res/res/drawable/ic_call_answer_video.xml b/core/res/res/drawable/ic_call_answer_video.xml new file mode 100644 index 000000000000..77c889234dd0 --- /dev/null +++ b/core/res/res/drawable/ic_call_answer_video.xml @@ -0,0 +1,27 @@ +<!-- + Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT 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="20" + android:viewportHeight="20" + android:tint="?android:attr/colorControlNormal" + android:autoMirrored="true"> + <path + android:fillColor="#FF000000" + android:pathData="M15,8v8H5V8h10m1,-2H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 + 1,-0.45 1,-1v-3.5l4,4v-11l-4,4V7c0,-0.55 -0.45,-1 -1,-1z"/> +</vector>
\ No newline at end of file diff --git a/core/res/res/layout/notification_expand_button.xml b/core/res/res/layout/notification_expand_button.xml index b969fa49bcc7..e752431ce75f 100644 --- a/core/res/res/layout/notification_expand_button.xml +++ b/core/res/res/layout/notification_expand_button.xml @@ -22,7 +22,6 @@ android:layout_gravity="top|end" android:contentDescription="@string/expand_button_content_description_collapsed" android:padding="16dp" - android:visibility="gone" > <LinearLayout @@ -40,6 +39,7 @@ android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:gravity="center_vertical" android:paddingStart="8dp" + android:visibility="gone" /> <ImageView diff --git a/core/res/res/layout/notification_template_conversation_header.xml b/core/res/res/layout/notification_template_conversation_header.xml index e01d8035fe35..389637eb2517 100644 --- a/core/res/res/layout/notification_template_conversation_header.xml +++ b/core/res/res/layout/notification_template_conversation_header.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingTop="16dp" + android:paddingTop="20dp" > <TextView @@ -42,8 +42,6 @@ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" - android:layout_gravity="center" - android:paddingTop="1sp" android:singleLine="true" android:visibility="gone" /> @@ -54,10 +52,8 @@ android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" - android:paddingTop="1sp" android:singleLine="true" android:visibility="gone" /> @@ -70,8 +66,6 @@ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" - android:layout_gravity="center" - android:paddingTop="1sp" android:singleLine="true" android:visibility="gone" /> @@ -81,9 +75,7 @@ android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" - android:paddingTop="1sp" android:showRelative="true" android:singleLine="true" android:visibility="gone" @@ -93,7 +85,6 @@ android:id="@+id/chronometer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout="@layout/notification_template_part_chronometer" android:visibility="gone" @@ -107,8 +98,6 @@ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" - android:layout_gravity="center" - android:paddingTop="1sp" android:singleLine="true" android:visibility="gone" /> @@ -117,9 +106,8 @@ android:id="@+id/verification_icon" android:layout_width="@dimen/notification_verification_icon_size" android:layout_height="@dimen/notification_verification_icon_size" - android:layout_gravity="center" android:layout_marginStart="4dp" - android:paddingTop="2dp" + android:baseline="10dp" android:scaleType="fitCenter" android:src="@drawable/ic_notifications_alerted" android:visibility="gone" @@ -130,9 +118,7 @@ android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" - android:paddingTop="1sp" android:showRelative="true" android:singleLine="true" android:visibility="gone" @@ -142,11 +128,10 @@ android:id="@+id/feedback" android:layout_width="@dimen/notification_feedback_size" android:layout_height="@dimen/notification_feedback_size" - android:layout_gravity="center" android:layout_marginStart="@dimen/notification_header_separating_margin" android:background="?android:selectableItemBackgroundBorderless" android:contentDescription="@string/notification_feedback_indicator" - android:paddingTop="2dp" + android:baseline="13dp" android:scaleType="fitCenter" android:src="@drawable/ic_feedback_indicator" android:visibility="gone" @@ -157,21 +142,19 @@ android:layout_width="@dimen/notification_phishing_alert_size" android:layout_height="@dimen/notification_phishing_alert_size" android:layout_marginStart="4dp" - android:paddingTop="2dp" + android:baseline="10dp" android:scaleType="fitCenter" android:src="@drawable/ic_dialog_alert_material" android:visibility="gone" android:contentDescription="@string/notification_phishing_alert_content_description" /> - <ImageView android:id="@+id/profile_badge" android:layout_width="@dimen/notification_badge_size" android:layout_height="@dimen/notification_badge_size" - android:layout_gravity="center" android:layout_marginStart="4dp" - android:paddingTop="2dp" + android:baseline="10dp" android:scaleType="fitCenter" android:visibility="gone" android:contentDescription="@string/notification_work_profile_content_description" @@ -181,10 +164,9 @@ android:id="@+id/alerted_icon" android:layout_width="@dimen/notification_alerted_size" android:layout_height="@dimen/notification_alerted_size" - android:layout_gravity="center" android:layout_marginStart="4dp" + android:baseline="10dp" android:contentDescription="@string/notification_alerted_content_description" - android:paddingTop="2dp" android:scaleType="fitCenter" android:src="@drawable/ic_notifications_alerted" android:visibility="gone" diff --git a/core/res/res/layout/notification_template_conversation_icon_container.xml b/core/res/res/layout/notification_template_conversation_icon_container.xml index e9ec7ce77deb..a88ff0d104a6 100644 --- a/core/res/res/layout/notification_template_conversation_icon_container.xml +++ b/core/res/res/layout/notification_template_conversation_icon_container.xml @@ -23,8 +23,8 @@ android:gravity="start|top" android:clipChildren="false" android:clipToPadding="false" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="20dp" + android:paddingBottom="16dp" android:importantForAccessibility="no" > diff --git a/core/res/res/layout/notification_template_material_big_messaging.xml b/core/res/res/layout/notification_template_material_big_messaging.xml new file mode 100644 index 000000000000..01c37b7515e9 --- /dev/null +++ b/core/res/res/layout/notification_template_material_big_messaging.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT 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.internal.widget.MessagingLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/status_bar_latest_event_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipToPadding="false" + android:clipChildren="false" + android:tag="messaging" + > + <include layout="@layout/notification_template_header"/> + <com.android.internal.widget.RemeasuringLinearLayout + android:id="@+id/notification_action_list_margin_target" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:layout_marginTop="@dimen/notification_content_margin_top" + android:clipChildren="false" + android:orientation="vertical"> + + <com.android.internal.widget.RemeasuringLinearLayout + android:id="@+id/notification_main_column" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:layout_weight="1" + android:layout_marginEnd="@dimen/notification_content_margin_end" + android:orientation="vertical" + android:clipChildren="false" + > + <com.android.internal.widget.MessagingLinearLayout + android:id="@+id/notification_messaging" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:spacing="@dimen/notification_messaging_spacing" /> + </com.android.internal.widget.RemeasuringLinearLayout> + <include layout="@layout/notification_template_smart_reply_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginStart="@dimen/notification_content_margin_start" + android:layout_marginEnd="@dimen/notification_content_margin_end" /> + <include layout="@layout/notification_material_action_list" /> + </com.android.internal.widget.RemeasuringLinearLayout> + <include layout="@layout/notification_template_right_icon" /> +</com.android.internal.widget.MessagingLayout> diff --git a/core/res/res/layout/notification_template_material_call.xml b/core/res/res/layout/notification_template_material_call.xml index 5d9e761842d8..1b3bd2673a7a 100644 --- a/core/res/res/layout/notification_template_material_call.xml +++ b/core/res/res/layout/notification_template_material_call.xml @@ -29,7 +29,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="80dp" + android:layout_height="88dp" android:orientation="horizontal" > diff --git a/core/res/res/layout/notification_template_material_heads_up_base.xml b/core/res/res/layout/notification_template_material_heads_up_base.xml index d55499130dcc..a0d19b409cea 100644 --- a/core/res/res/layout/notification_template_material_heads_up_base.xml +++ b/core/res/res/layout/notification_template_material_heads_up_base.xml @@ -38,7 +38,7 @@ <com.android.internal.widget.RemeasuringLinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="-12dp" + android:layout_marginTop="-20dp" android:clipChildren="false" android:orientation="vertical" > diff --git a/core/res/res/layout/notification_template_material_messaging.xml b/core/res/res/layout/notification_template_material_messaging.xml index c3fd249d3ad5..3564f9755a5d 100644 --- a/core/res/res/layout/notification_template_material_messaging.xml +++ b/core/res/res/layout/notification_template_material_messaging.xml @@ -22,32 +22,186 @@ android:clipChildren="false" android:tag="messaging" > - <include layout="@layout/notification_template_header"/> - <com.android.internal.widget.RemeasuringLinearLayout - android:id="@+id/notification_action_list_margin_target" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:layout_marginTop="@dimen/notification_content_margin_top" - android:clipToPadding="false" - android:orientation="vertical"> - <com.android.internal.widget.RemeasuringLinearLayout - android:id="@+id/notification_main_column" + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:orientation="vertical" + > + + + <com.android.internal.widget.NotificationMaxHeightFrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="top" - android:layout_weight="1" - android:layout_marginStart="@dimen/notification_content_margin_start" - android:layout_marginEnd="@dimen/notification_content_margin_end" - android:orientation="vertical" + android:minHeight="@dimen/notification_min_height" + android:clipChildren="false" > - <com.android.internal.widget.MessagingLinearLayout - android:id="@+id/notification_messaging" + + <ImageView + android:id="@+id/left_icon" + android:layout_width="@dimen/notification_left_icon_size" + android:layout_height="@dimen/notification_left_icon_size" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="@dimen/notification_left_icon_start" + android:background="@drawable/notification_large_icon_outline" + android:clipToOutline="true" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + android:visibility="gone" + /> + + <com.android.internal.widget.CachingIconView + android:id="@+id/icon" + android:layout_width="@dimen/notification_icon_circle_size" + android:layout_height="@dimen/notification_icon_circle_size" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="@dimen/notification_icon_circle_start" + android:background="@drawable/notification_icon_circle" + android:padding="@dimen/notification_icon_circle_padding" + /> + + <FrameLayout + android:id="@+id/alternate_expand_target" + android:layout_width="@dimen/notification_content_margin_start" + android:layout_height="match_parent" + android:layout_gravity="start" + android:importantForAccessibility="no" + /> + + <!-- + NOTE: to make the expansion animation of id/notification_messaging happen vertically, + its X positioning must be the left edge of the notification, so instead of putting the + layout_marginStart on the id/notification_headerless_view_row, we put it on + id/notification_top_line, making the layout here just a bit different from the base. + --> + <LinearLayout + android:id="@+id/notification_headerless_view_row" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:spacing="@dimen/notification_messaging_spacing" /> - </com.android.internal.widget.RemeasuringLinearLayout> + android:layout_height="match_parent" + android:orientation="horizontal" + android:clipChildren="false" + > + + <!-- + NOTE: because messaging will always have 2 lines, this LinearLayout should NOT + have the id/notification_headerless_view_column, as that is used for modifying + vertical margins to accommodate the single-line state that base supports + --> + <LinearLayout + android:layout_width="0px" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:layout_marginBottom="@dimen/notification_headerless_margin_twoline" + android:layout_marginTop="@dimen/notification_headerless_margin_twoline" + android:clipChildren="false" + android:orientation="vertical" + > + + <NotificationTopLineView + android:id="@+id/notification_top_line" + android:layout_width="wrap_content" + android:layout_height="@dimen/notification_headerless_line_height" + android:layout_marginStart="@dimen/notification_content_margin_start" + android:clipChildren="false" + android:theme="@style/Theme.DeviceDefault.Notification" + > + + <!-- + NOTE: The notification_top_line_views layout contains the app_name_text. + In order to include the title view at the beginning, the Notification.Builder + has logic to hide that view whenever this title view is to be visible. + --> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/notification_header_separating_margin" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAlignment="viewStart" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" + /> + + <include layout="@layout/notification_top_line_views" /> + + </NotificationTopLineView> + + <LinearLayout + android:id="@+id/notification_main_column" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:clipChildren="false" + > + <com.android.internal.widget.MessagingLinearLayout + android:id="@+id/notification_messaging" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:spacing="@dimen/notification_messaging_spacing" /> + </LinearLayout> + + </LinearLayout> + + <!-- Images --> + <com.android.internal.widget.MessagingLinearLayout + android:id="@+id/conversation_image_message_container" + android:layout_width="@dimen/notification_right_icon_size" + android:layout_height="@dimen/notification_right_icon_size" + android:layout_gravity="center_vertical|end" + android:layout_marginTop="@dimen/notification_right_icon_headerless_margin" + android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin" + android:layout_marginStart="@dimen/notification_right_icon_content_margin" + android:forceHasOverlappingRendering="false" + android:spacing="0dp" + android:clipChildren="false" + android:visibility="gone" + /> + + <ImageView + android:id="@+id/right_icon" + android:layout_width="@dimen/notification_right_icon_size" + android:layout_height="@dimen/notification_right_icon_size" + android:layout_gravity="center_vertical|end" + android:layout_marginTop="@dimen/notification_right_icon_headerless_margin" + android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin" + android:layout_marginStart="@dimen/notification_right_icon_content_margin" + android:background="@drawable/notification_large_icon_outline" + android:clipToOutline="true" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + /> + + <FrameLayout + android:id="@+id/expand_button_touch_container" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="@dimen/notification_content_margin_end" + > + + <include layout="@layout/notification_expand_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|end" + /> + + </FrameLayout> + + </LinearLayout> + + </com.android.internal.widget.NotificationMaxHeightFrameLayout> + + <LinearLayout + android:id="@+id/notification_action_list_margin_target" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="-20dp" + android:clipChildren="false" + android:orientation="vertical"> <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -55,6 +209,6 @@ android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> <include layout="@layout/notification_material_action_list" /> - </com.android.internal.widget.RemeasuringLinearLayout> - <include layout="@layout/notification_template_right_icon" /> + </LinearLayout> +</LinearLayout> </com.android.internal.widget.MessagingLayout> diff --git a/core/res/res/layout/notification_top_line_views.xml b/core/res/res/layout/notification_top_line_views.xml index 88bcc4dc9e39..8284279be3a0 100644 --- a/core/res/res/layout/notification_top_line_views.xml +++ b/core/res/res/layout/notification_top_line_views.xml @@ -113,11 +113,10 @@ android:layout_width="@dimen/notification_feedback_size" android:layout_height="@dimen/notification_feedback_size" android:layout_marginStart="@dimen/notification_header_separating_margin" - android:layout_gravity="center" + android:baseline="13dp" android:scaleType="fitCenter" android:src="@drawable/ic_feedback_indicator" android:background="?android:selectableItemBackgroundBorderless" - android:paddingTop="2dp" android:visibility="gone" android:contentDescription="@string/notification_feedback_indicator" /> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index e4ea8fb284a8..906a7403298f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3721,13 +3721,6 @@ --> <string name="config_defaultWellbeingPackage" translatable="false"></string> - <!-- The package name for the companion provider app. - This package must be trusted, as it has the permissions to associate apps with devices - without a UI prompt. - Example: "com.google.android.gms" - --> - <string name="config_companionProviderPackage" translatable="false"></string> - <!-- The component name for the default system attention service. This service must be trusted, as it can be activated without explicit consent of the user. See android.attention.AttentionManagerService. @@ -4861,4 +4854,6 @@ <string name="config_systemTextIntelligence" translatable="false"></string> <!-- On-device intelligent processor for visual features. --> <string name="config_systemVisualIntelligence" translatable="false"></string> + <!-- On-device package for providing companion device associations. --> + <string name="config_systemCompanionDeviceProvider" translatable="false"></string> </resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index fc2645c7c88b..0e436e36b474 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -758,23 +758,23 @@ <dimen name="notification_grayscale_icon_max_size">256dp</dimen> <dimen name="messaging_avatar_size">36dp</dimen> - <dimen name="conversation_avatar_size">52dp</dimen> + <dimen name="conversation_avatar_size">48dp</dimen> <!-- start margin of the icon circle in the conversation's skin of the header --> <dimen name="conversation_icon_circle_start">28dp</dimen> <!-- Start of the content in the conversation template --> <dimen name="conversation_content_start">80dp</dimen> <!-- Height of the expand button in the conversation layout --> - <dimen name="conversation_expand_button_height">80dp</dimen> + <dimen name="conversation_expand_button_height">88dp</dimen> <!-- this is the margin between the Conversation image and the content --> <dimen name="conversation_image_start_margin">12dp</dimen> <!-- Side margins of the conversation badge in relation to the conversation icon --> - <dimen name="conversation_badge_side_margin">36dp</dimen> + <dimen name="conversation_badge_side_margin">32dp</dimen> <!-- size of the notification badge when applied to the conversation icon --> <dimen name="conversation_icon_size_badged">20dp</dimen> <!-- size of the conversation avatar in an expanded group --> <dimen name="conversation_avatar_size_group_expanded">@dimen/messaging_avatar_size</dimen> <!-- size of the face pile icons --> - <dimen name="conversation_face_pile_avatar_size">@dimen/messaging_avatar_size</dimen> + <dimen name="conversation_face_pile_avatar_size">32dp</dimen> <!-- size of the face pile icons when the group is expanded --> <dimen name="conversation_face_pile_avatar_size_group_expanded">25dp</dimen> <!-- Side margins of the conversation badge in relation to the conversation icon when the group is expanded--> @@ -795,7 +795,7 @@ <dimen name="importance_ring_size">20dp</dimen> <!-- The top padding of the conversation icon container in the regular state--> - <dimen name="conversation_icon_container_top_padding">12dp</dimen> + <dimen name="conversation_icon_container_top_padding">20dp</dimen> <!-- The top padding of the conversation icon container when the avatar is small--> <dimen name="conversation_icon_container_top_padding_small_avatar">9dp</dimen> @@ -803,8 +803,8 @@ <!-- The padding of the conversation header when expanded. This is calculated from the expand button size + notification_content_margin_end --> <dimen name="conversation_header_expanded_padding_end">38dp</dimen> - <!-- margin at the end of messaging group icons when not conversations --> - <dimen name="messaging_layout_margin_end">12dp</dimen> + <!-- extra padding at the start of the icons when not conversations to keep them horizontally aligned with the notification icon --> + <dimen name="messaging_layout_icon_padding_start">4dp</dimen> <!-- Padding between text and sender when singleline --> <dimen name="messaging_group_singleline_sender_padding_end">4dp</dimen> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 89adc8ca6913..f6a67d2ae710 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3225,6 +3225,8 @@ <public name="config_systemVisualIntelligence" /> <!-- @hide @SystemApi --> <public name="config_systemActivityRecognizer" /> + <!-- @hide @SystemApi --> + <public name="config_systemCompanionDeviceProvider"/> </staging-public-group> <staging-public-group type="id" first-id="0x01020055"> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 3208dff1d9f6..8d07ae254ee1 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5151,6 +5151,8 @@ <!-- Action text to be displayed for the "answer" action of an incoming call [CHAR LIMIT=13] --> <string name="call_notification_answer_action">Answer</string> + <!-- Action text to be displayed for the "answer" action of an incoming VIDEO call [CHAR LIMIT=13] --> + <string name="call_notification_answer_video_action">Video</string> <!-- Action text to be displayed for the "decline" action of an incoming call [CHAR LIMIT=13] --> <string name="call_notification_decline_action">Decline</string> <!-- Action text to be displayed for the "hang up" action of an ongoing call [CHAR LIMIT=13] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 4bb323661d33..34dcaa0c78b2 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3015,6 +3015,7 @@ <java-symbol type="layout" name="app_anr_dialog" /> <java-symbol type="layout" name="notification_template_material_messaging" /> + <java-symbol type="layout" name="notification_template_material_big_messaging" /> <java-symbol type="id" name="aerr_wait" /> @@ -3115,6 +3116,7 @@ <java-symbol type="layout" name="notification_template_material_call" /> <java-symbol type="layout" name="notification_template_material_big_call" /> <java-symbol type="string" name="call_notification_answer_action" /> + <java-symbol type="string" name="call_notification_answer_video_action" /> <java-symbol type="string" name="call_notification_decline_action" /> <java-symbol type="string" name="call_notification_hang_up_action" /> <java-symbol type="string" name="call_notification_incoming_text" /> @@ -3124,6 +3126,7 @@ <java-symbol type="color" name="call_notification_answer_color"/> <java-symbol type="dimen" name="call_notification_collapsible_indent"/> <java-symbol type="drawable" name="ic_call_answer" /> + <java-symbol type="drawable" name="ic_call_answer_video" /> <java-symbol type="drawable" name="ic_call_decline" /> <java-symbol type="id" name="verification_divider" /> <java-symbol type="id" name="verification_icon" /> @@ -3537,7 +3540,6 @@ <java-symbol type="string" name="notification_channel_do_not_disturb" /> <java-symbol type="string" name="notification_channel_accessibility_magnification" /> <java-symbol type="string" name="notification_channel_accessibility_security_policy" /> - <java-symbol type="string" name="config_companionProviderPackage" /> <java-symbol type="string" name="config_defaultAutofillService" /> <java-symbol type="string" name="config_defaultOnDeviceSpeechRecognitionService" /> <java-symbol type="string" name="config_defaultTextClassifierPackage" /> @@ -3646,6 +3648,7 @@ <java-symbol type="id" name="bubble_button" /> <java-symbol type="id" name="snooze_button" /> <java-symbol type="dimen" name="text_size_body_2_material" /> + <java-symbol type="dimen" name="notification_icon_circle_size" /> <java-symbol type="dimen" name="messaging_avatar_size" /> <java-symbol type="dimen" name="messaging_group_sending_progress_size" /> <java-symbol type="dimen" name="messaging_image_rounding" /> @@ -4062,7 +4065,7 @@ <java-symbol type="dimen" name="conversation_badge_side_margin_group_expanded_face_pile" /> <java-symbol type="dimen" name="conversation_content_start" /> <java-symbol type="dimen" name="expanded_group_conversation_message_padding" /> - <java-symbol type="dimen" name="messaging_layout_margin_end" /> + <java-symbol type="dimen" name="messaging_layout_icon_padding_start" /> <java-symbol type="dimen" name="conversation_header_expanded_padding_end" /> <java-symbol type="dimen" name="conversation_icon_container_top_padding" /> <java-symbol type="dimen" name="conversation_icon_container_top_padding_small_avatar" /> @@ -4336,4 +4339,6 @@ <java-symbol type="drawable" name="ic_accessibility_24dp" /> <java-symbol type="string" name="view_and_control_notification_title" /> <java-symbol type="string" name="view_and_control_notification_content" /> + + <java-symbol type="layout" name="notification_expand_button"/> </resources> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_amp_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_amp_24.xml new file mode 100644 index 000000000000..1f5731821c94 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_amp_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="#d14d2c"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11.17,19.5h-0.83l0.82,-5.83 -4.18,0.01 5.85,-9.17h0.83l-0.84,5.84h4.17l-5.82,9.15z"/> +</vector> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_calculate_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_calculate_24.xml new file mode 100644 index 000000000000..70aac32227c4 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_calculate_24.xml @@ -0,0 +1,25 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="#269e5c"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"/> + <path + android:fillColor="@android:color/white" + android:pathData="M6.25,7.72h5v1.5h-5z"/> + <path + android:fillColor="@android:color/white" + android:pathData="M13,15.75h5v1.5h-5z"/> + <path + android:fillColor="@android:color/white" + android:pathData="M13,13.25h5v1.5h-5z"/> + <path + android:fillColor="@android:color/white" + android:pathData="M8,18l1.5,0l0,-2l2,0l0,-1.5l-2,0l0,-2l-1.5,0l0,2l-2,0l0,1.5l2,0z"/> + <path + android:fillColor="@android:color/white" + android:pathData="M14.09,10.95l1.41,-1.41l1.41,1.41l1.06,-1.06l-1.41,-1.42l1.41,-1.41l-1.06,-1.06l-1.41,1.41l-1.41,-1.41l-1.06,1.06l1.41,1.41l-1.41,1.42z"/> +</vector> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_custom_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_custom_24.xml new file mode 100644 index 000000000000..39f9689d2ec4 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_custom_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="#d14d2c"> + <path + android:fillColor="@android:color/white" + android:pathData="M22,9L22,7h-2L20,5c0,-1.1 -0.9,-2 -2,-2L4,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2h2v-2h-2L20,9h2zM18,19L4,19L4,5h14v14zM6,13h5v4L6,17v-4zM12,7h4v3h-4L12,7zM6,7h5v5L6,12L6,7zM12,11h4v6h-4v-6z"/> +</vector> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_timer_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_timer_24.xml new file mode 100644 index 000000000000..9cae545e165b --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_timer_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M15,3L9,3L9,1h6v2zM11,14h2L13,8h-2v6zM21,13.01c0,4.97 -4.02,9 -9,9s-9,-4.03 -9,-9 4.03,-9 9,-9c2.12,0 4.07,0.74 5.62,1.98l1.42,-1.42c0.51,0.42 0.98,0.9 1.41,1.41L19.03,7.4C20.26,8.93 21,10.89 21,13.01zM19,13.01c0,-3.87 -3.13,-7 -7,-7s-7,3.13 -7,7 3.13,7 7,7 7,-3.13 7,-7z"/> +</vector> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml index 1ced825adf31..98fc581f3420 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml @@ -25,6 +25,13 @@ android:paddingTop="8dp" android:paddingBottom="8dp"> + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginEnd="8dp"/> + <TextView android:id="@+id/title" android:layout_width="0dp" @@ -34,16 +41,18 @@ <TextView android:id="@+id/amount" - android:layout_width="0dp" - android:layout_weight="0.7" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="8dp" android:gravity="right" + android:maxLines="1" android:textAppearance="@style/TextAppearanceBody"/> <TextView android:id="@+id/percent" - android:layout_width="64dp" + android:layout_width="76dp" android:layout_height="wrap_content" android:gravity="right" + android:maxLines="1" android:textAppearance="@style/TextAppearanceBody"/> </LinearLayout> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml index e58a08fd362c..24d193c49219 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml @@ -43,10 +43,40 @@ android:paddingEnd="10dp"> <include layout="@layout/battery_consumer_info_layout"/> - </LinearLayout> + </androidx.cardview.widget.CardView> + + <LinearLayout + android:id="@+id/headings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="2dp" + android:paddingBottom="4dp"> + <FrameLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1"/> + <TextView + android:layout_width="100dp" + android:layout_height="wrap_content" + android:gravity="end" + android:paddingEnd="10dp" + android:text="Total"/> + <TextView + android:layout_width="100dp" + android:layout_height="wrap_content" + android:gravity="end" + android:paddingEnd="30dp" + android:text="Apps"/> + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@android:color/darker_gray"/> + <androidx.recyclerview.widget.RecyclerView android:id="@+id/battery_consumer_data_view" android:layout_width="match_parent" diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml new file mode 100644 index 000000000000..2dbe48b6edc0 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT 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> + <color name="battery_consumer_bg_power_profile">#ffffff</color> + <color name="battery_consumer_bg_measured_energy">#fff5eb</color> +</resources> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java index 78569bdb4adc..f7d7098b1726 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java @@ -18,32 +18,21 @@ package com.android.frameworks.core.batterystatsviewer; import android.content.Context; import android.os.BatteryConsumer; -import android.os.BatteryStats; import android.os.BatteryUsageStats; -import android.os.Process; import android.os.SystemBatteryConsumer; import android.os.UidBatteryConsumer; import android.os.UserHandle; - -import com.android.internal.os.BatterySipper; -import com.android.internal.os.BatteryStatsHelper; +import android.util.DebugUtils; import java.util.ArrayList; import java.util.List; public class BatteryConsumerData { - private static final String PACKAGE_CALENDAR_PROVIDER = "com.android.providers.calendar"; - private static final String PACKAGE_MEDIA_PROVIDER = "com.android.providers.media"; - private static final String PACKAGE_SYSTEMUI = "com.android.systemui"; - private static final String[] PACKAGES_SYSTEM = {PACKAGE_MEDIA_PROVIDER, - PACKAGE_CALENDAR_PROVIDER, PACKAGE_SYSTEMUI}; - - // Unit conversion: - // mAh = uC * (1/1000)(milli/micro) * (1/3600)(hours/second) - private static final double UC_2_MAH = (1.0 / 1000) * (1.0 / 3600); enum EntryType { - POWER, + POWER_MODELED, + POWER_MEASURED, + POWER_CUSTOM, DURATION, } @@ -52,268 +41,155 @@ public class BatteryConsumerData { public EntryType entryType; public double value; public double total; + public boolean isSystemBatteryConsumer; } private final BatteryConsumerInfoHelper.BatteryConsumerInfo mBatteryConsumerInfo; private final List<Entry> mEntries = new ArrayList<>(); - public BatteryConsumerData(Context context, BatteryStatsHelper batteryStatsHelper, + public BatteryConsumerData(Context context, List<BatteryUsageStats> batteryUsageStatsList, String batteryConsumerId) { BatteryUsageStats batteryUsageStats = batteryUsageStatsList.get(0); - BatteryUsageStats powerProfileModeledUsageStats = batteryUsageStatsList.get(1); - List<BatterySipper> usageList = batteryStatsHelper.getUsageList(); - BatteryStats batteryStats = batteryStatsHelper.getStats(); - - double totalPowerMah = 0; - double totalSmearedPowerMah = 0; - double totalPowerExcludeSystemMah = 0; - double totalScreenPower = 0; - double totalProportionalSmearMah = 0; - double totalCpuPowerMah = 0; - double totalSystemServiceCpuPowerMah = 0; - double totalUsagePowerMah = 0; - double totalWakeLockPowerMah = 0; - double totalMobileRadioPowerMah = 0; - double totalWifiPowerMah = 0; - double totalBluetoothPowerMah = 0; - double totalGpsPowerMah = 0; - double totalCameraPowerMah = 0; - double totalFlashlightPowerMah = 0; - double totalSensorPowerMah = 0; - double totalAudioPowerMah = 0; - double totalVideoPowerMah = 0; + BatteryUsageStats modeledBatteryUsageStats = batteryUsageStatsList.get(1); - long totalCpuTimeMs = 0; - long totalCpuFgTimeMs = 0; - long totalWakeLockTimeMs = 0; - long totalWifiRunningTimeMs = 0; - long totalBluetoothRunningTimeMs = 0; - long totalGpsTimeMs = 0; - long totalCameraTimeMs = 0; - long totalFlashlightTimeMs = 0; - long totalAudioTimeMs = 0; - long totalVideoTimeMs = 0; + BatteryConsumer requestedBatteryConsumer = getRequestedBatteryConsumer(batteryUsageStats, + batteryConsumerId); + BatteryConsumer requestedModeledBatteryConsumer = getRequestedBatteryConsumer( + modeledBatteryUsageStats, batteryConsumerId); - BatterySipper requestedBatterySipper = null; - for (BatterySipper sipper : usageList) { - if (sipper.drainType == BatterySipper.DrainType.SCREEN) { - totalScreenPower = sipper.sumPower(); - } - - if (batteryConsumerId(sipper).equals(batteryConsumerId)) { - requestedBatterySipper = sipper; - } - - totalPowerMah += sipper.sumPower(); - totalSmearedPowerMah += sipper.totalSmearedPowerMah; - totalProportionalSmearMah += sipper.proportionalSmearMah; + if (requestedBatteryConsumer == null || requestedModeledBatteryConsumer == null) { + mBatteryConsumerInfo = null; + return; + } - if (!isSystemSipper(sipper)) { - totalPowerExcludeSystemMah += sipper.totalSmearedPowerMah; + mBatteryConsumerInfo = BatteryConsumerInfoHelper.makeBatteryConsumerInfo( + context.getPackageManager(), requestedBatteryConsumer); + + double[] totalPowerByComponentMah = new double[BatteryConsumer.POWER_COMPONENT_COUNT]; + double[] totalModeledPowerByComponentMah = + new double[BatteryConsumer.POWER_COMPONENT_COUNT]; + long[] totalDurationByComponentMs = new long[BatteryConsumer.TIME_COMPONENT_COUNT]; + final int customComponentCount = + requestedBatteryConsumer.getCustomPowerComponentCount(); + double[] totalCustomPowerByComponentMah = new double[customComponentCount]; + + computeTotalPower(batteryUsageStats, totalPowerByComponentMah); + computeTotalPower(modeledBatteryUsageStats, totalModeledPowerByComponentMah); + computeTotalPowerForCustomComponent(batteryUsageStats, totalCustomPowerByComponentMah); + computeTotalDuration(batteryUsageStats, totalDurationByComponentMs); + + for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { + final String metricTitle = getPowerMetricTitle(component); + final int powerModel = requestedBatteryConsumer.getPowerModel(component); + if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE) { + addEntry(metricTitle, EntryType.POWER_MODELED, + requestedBatteryConsumer.getConsumedPower(component), + totalPowerByComponentMah[component], + mBatteryConsumerInfo.isSystemBatteryConsumer); + } else { + addEntry(metricTitle + " (measured)", EntryType.POWER_MEASURED, + requestedBatteryConsumer.getConsumedPower(component), + totalPowerByComponentMah[component], + mBatteryConsumerInfo.isSystemBatteryConsumer); + addEntry(metricTitle + " (modeled)", EntryType.POWER_MODELED, + requestedModeledBatteryConsumer.getConsumedPower(component), + totalModeledPowerByComponentMah[component], + mBatteryConsumerInfo.isSystemBatteryConsumer); } + } - totalCpuPowerMah += sipper.cpuPowerMah; - totalSystemServiceCpuPowerMah += sipper.systemServiceCpuPowerMah; - totalUsagePowerMah += sipper.usagePowerMah; - totalWakeLockPowerMah += sipper.wakeLockPowerMah; - totalMobileRadioPowerMah += sipper.mobileRadioPowerMah; - totalWifiPowerMah += sipper.wifiPowerMah; - totalBluetoothPowerMah += sipper.bluetoothPowerMah; - totalGpsPowerMah += sipper.gpsPowerMah; - totalCameraPowerMah += sipper.cameraPowerMah; - totalFlashlightPowerMah += sipper.flashlightPowerMah; - totalSensorPowerMah += sipper.sensorPowerMah; - totalAudioPowerMah += sipper.audioPowerMah; - totalVideoPowerMah += sipper.videoPowerMah; - - totalCpuTimeMs += sipper.cpuTimeMs; - totalCpuFgTimeMs += sipper.cpuFgTimeMs; - totalWakeLockTimeMs += sipper.wakeLockTimeMs; - totalWifiRunningTimeMs += sipper.wifiRunningTimeMs; - totalBluetoothRunningTimeMs += sipper.bluetoothRunningTimeMs; - totalGpsTimeMs += sipper.gpsTimeMs; - totalCameraTimeMs += sipper.cameraTimeMs; - totalFlashlightTimeMs += sipper.flashlightTimeMs; - totalAudioTimeMs += sipper.audioTimeMs; - totalVideoTimeMs += sipper.videoTimeMs; + for (int component = 0; component < customComponentCount; component++) { + final String name = requestedBatteryConsumer.getCustomPowerComponentName( + BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component); + addEntry(name + " (custom)", EntryType.POWER_CUSTOM, + requestedBatteryConsumer.getConsumedPowerForCustomComponent( + BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component), + totalCustomPowerByComponentMah[component], + mBatteryConsumerInfo.isSystemBatteryConsumer); } - BatteryConsumer requestedBatteryConsumer = null; + for (int component = 0; component < BatteryConsumer.TIME_COMPONENT_COUNT; component++) { + final String metricTitle = getTimeMetricTitle(component); + addEntry(metricTitle, EntryType.DURATION, + requestedBatteryConsumer.getUsageDurationMillis(component), + totalDurationByComponentMs[component], + mBatteryConsumerInfo.isSystemBatteryConsumer); + } + } + private BatteryConsumer getRequestedBatteryConsumer(BatteryUsageStats batteryUsageStats, + String batteryConsumerId) { for (BatteryConsumer consumer : batteryUsageStats.getUidBatteryConsumers()) { if (batteryConsumerId(consumer).equals(batteryConsumerId)) { - requestedBatteryConsumer = consumer; + return consumer; } } - - double totalModeledCpuPowerMah = 0; - BatteryConsumer requestedBatteryConsumerPowerProfileModeled = null; - for (BatteryConsumer consumer : powerProfileModeledUsageStats.getUidBatteryConsumers()) { + for (BatteryConsumer consumer : batteryUsageStats.getSystemBatteryConsumers()) { if (batteryConsumerId(consumer).equals(batteryConsumerId)) { - requestedBatteryConsumerPowerProfileModeled = consumer; + return consumer; } - - totalModeledCpuPowerMah += consumer.getConsumedPower( - BatteryConsumer.POWER_COMPONENT_CPU); } + return null; + } - if (requestedBatterySipper == null) { - mBatteryConsumerInfo = null; - return; - } + static String getPowerMetricTitle(int componentId) { + final String componentName = DebugUtils.constantToString(BatteryConsumer.class, + "POWER_COMPONENT_", componentId); + return componentName.charAt(0) + componentName.substring(1).toLowerCase().replace('_', ' ') + + " power"; + } + + static String getTimeMetricTitle(int componentId) { + final String componentName = DebugUtils.constantToString(BatteryConsumer.class, + "TIME_COMPONENT_", componentId); + return componentName.charAt(0) + componentName.substring(1).toLowerCase().replace('_', ' ') + + " time"; + } - if (requestedBatteryConsumer == null) { - for (BatteryConsumer consumer : batteryUsageStats.getSystemBatteryConsumers()) { - if (batteryConsumerId(consumer).equals(batteryConsumerId)) { - requestedBatteryConsumer = consumer; - break; - } + private void computeTotalPower(BatteryUsageStats batteryUsageStats, + double[] powerByComponentMah) { + for (BatteryConsumer consumer : batteryUsageStats.getUidBatteryConsumers()) { + for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; + component++) { + powerByComponentMah[component] += consumer.getConsumedPower(component); } } + } - mBatteryConsumerInfo = BatteryConsumerInfoHelper.makeBatteryConsumerInfo( - context.getPackageManager(), requestedBatterySipper); - long totalScreenMeasuredChargeUC = - batteryStats.getScreenOnMeasuredBatteryConsumptionUC(); - long uidScreenMeasuredChargeUC = - requestedBatterySipper.uidObj.getScreenOnMeasuredBatteryConsumptionUC(); - - addEntry("Total power", EntryType.POWER, - requestedBatterySipper.totalSmearedPowerMah, totalSmearedPowerMah); - maybeAddMeasuredEnergyEntry(requestedBatterySipper.drainType, batteryStats); - - addEntry("... excluding system", EntryType.POWER, - requestedBatterySipper.totalSmearedPowerMah, totalPowerExcludeSystemMah); - addEntry("Screen, smeared", EntryType.POWER, - requestedBatterySipper.screenPowerMah, totalScreenPower); - if (uidScreenMeasuredChargeUC != BatteryStats.POWER_DATA_UNAVAILABLE - && totalScreenMeasuredChargeUC != BatteryStats.POWER_DATA_UNAVAILABLE) { - final double measuredCharge = UC_2_MAH * uidScreenMeasuredChargeUC; - final double totalMeasuredCharge = UC_2_MAH * totalScreenMeasuredChargeUC; - addEntry("Screen, measured", EntryType.POWER, - measuredCharge, totalMeasuredCharge); - } - addEntry("Other, smeared", EntryType.POWER, - requestedBatterySipper.proportionalSmearMah, totalProportionalSmearMah); - addEntry("Excluding smeared", EntryType.POWER, - requestedBatterySipper.totalPowerMah, totalPowerMah); - if (requestedBatteryConsumer != null) { - addEntry("CPU", EntryType.POWER, - requestedBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU), - totalCpuPowerMah); - if (requestedBatteryConsumerPowerProfileModeled != null) { - addEntry("CPU (modeled)", EntryType.POWER, - requestedBatteryConsumerPowerProfileModeled.getConsumedPower( - BatteryConsumer.POWER_COMPONENT_CPU), - totalModeledCpuPowerMah); + private void computeTotalDuration(BatteryUsageStats batteryUsageStats, + long[] durationByComponentMs) { + for (BatteryConsumer consumer : batteryUsageStats.getUidBatteryConsumers()) { + for (int component = 0; component < BatteryConsumer.TIME_COMPONENT_COUNT; + component++) { + durationByComponentMs[component] += consumer.getUsageDurationMillis(component); } - } else { - addEntry("CPU (sipper)", EntryType.POWER, - requestedBatterySipper.cpuPowerMah, totalCpuPowerMah); } - addEntry("System services", EntryType.POWER, - requestedBatterySipper.systemServiceCpuPowerMah, totalSystemServiceCpuPowerMah); - if (requestedBatteryConsumer != null) { - addEntry("Usage", EntryType.POWER, - requestedBatteryConsumer.getConsumedPower( - BatteryConsumer.POWER_COMPONENT_USAGE), totalUsagePowerMah); - } else { - addEntry("Usage (sipper)", EntryType.POWER, - requestedBatterySipper.usagePowerMah, totalUsagePowerMah); - } - addEntry("Wake lock", EntryType.POWER, - requestedBatterySipper.wakeLockPowerMah, totalWakeLockPowerMah); - addEntry("Mobile radio", EntryType.POWER, - requestedBatterySipper.mobileRadioPowerMah, totalMobileRadioPowerMah); - addEntry("WiFi", EntryType.POWER, - requestedBatterySipper.wifiPowerMah, totalWifiPowerMah); - addEntry("Bluetooth", EntryType.POWER, - requestedBatterySipper.bluetoothPowerMah, totalBluetoothPowerMah); - addEntry("GPS", EntryType.POWER, - requestedBatterySipper.gpsPowerMah, totalGpsPowerMah); - addEntry("Camera", EntryType.POWER, - requestedBatterySipper.cameraPowerMah, totalCameraPowerMah); - addEntry("Flashlight", EntryType.POWER, - requestedBatterySipper.flashlightPowerMah, totalFlashlightPowerMah); - addEntry("Sensors", EntryType.POWER, - requestedBatterySipper.sensorPowerMah, totalSensorPowerMah); - addEntry("Audio", EntryType.POWER, - requestedBatterySipper.audioPowerMah, totalAudioPowerMah); - addEntry("Video", EntryType.POWER, - requestedBatterySipper.videoPowerMah, totalVideoPowerMah); - - addEntry("CPU time", EntryType.DURATION, - requestedBatterySipper.cpuTimeMs, totalCpuTimeMs); - addEntry("CPU foreground time", EntryType.DURATION, - requestedBatterySipper.cpuFgTimeMs, totalCpuFgTimeMs); - addEntry("Wake lock time", EntryType.DURATION, - requestedBatterySipper.wakeLockTimeMs, totalWakeLockTimeMs); - addEntry("WiFi running time", EntryType.DURATION, - requestedBatterySipper.wifiRunningTimeMs, totalWifiRunningTimeMs); - addEntry("Bluetooth time", EntryType.DURATION, - requestedBatterySipper.bluetoothRunningTimeMs, totalBluetoothRunningTimeMs); - addEntry("GPS time", EntryType.DURATION, - requestedBatterySipper.gpsTimeMs, totalGpsTimeMs); - addEntry("Camera time", EntryType.DURATION, - requestedBatterySipper.cameraTimeMs, totalCameraTimeMs); - addEntry("Flashlight time", EntryType.DURATION, - requestedBatterySipper.flashlightTimeMs, totalFlashlightTimeMs); - addEntry("Audio time", EntryType.DURATION, - requestedBatterySipper.audioTimeMs, totalAudioTimeMs); - addEntry("Video time", EntryType.DURATION, - requestedBatterySipper.videoTimeMs, totalVideoTimeMs); } - private boolean isSystemSipper(BatterySipper sipper) { - final int uid = sipper.uidObj == null ? -1 : sipper.getUid(); - if (uid >= Process.ROOT_UID && uid < Process.FIRST_APPLICATION_UID) { - return true; - } else if (sipper.mPackages != null) { - for (final String packageName : sipper.mPackages) { - for (final String systemPackage : PACKAGES_SYSTEM) { - if (systemPackage.equals(packageName)) { - return true; - } - } + private void computeTotalPowerForCustomComponent( + BatteryUsageStats batteryUsageStats, double[] powerByComponentMah) { + for (BatteryConsumer consumer : batteryUsageStats.getUidBatteryConsumers()) { + final int customComponentCount = consumer.getCustomPowerComponentCount(); + for (int component = 0; + component < Math.min(customComponentCount, powerByComponentMah.length); + component++) { + powerByComponentMah[component] += consumer.getConsumedPowerForCustomComponent( + BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component); } } - - return false; } - private void addEntry(String title, EntryType entryType, double amount, double totalAmount) { + private void addEntry(String title, EntryType entryType, double amount, double totalAmount, + boolean isSystemBatteryConsumer) { Entry entry = new Entry(); entry.title = title; entry.entryType = entryType; entry.value = amount; entry.total = totalAmount; + entry.isSystemBatteryConsumer = isSystemBatteryConsumer; mEntries.add(entry); } - private void maybeAddMeasuredEnergyEntry(BatterySipper.DrainType drainType, - BatteryStats batteryStats) { - switch (drainType) { - case AMBIENT_DISPLAY: - final long totalDozeMeasuredChargeUC = - batteryStats.getScreenDozeMeasuredBatteryConsumptionUC(); - if (totalDozeMeasuredChargeUC != BatteryStats.POWER_DATA_UNAVAILABLE) { - final double measuredCharge = UC_2_MAH * totalDozeMeasuredChargeUC; - addEntry("Measured ambient display power", EntryType.POWER, measuredCharge, - measuredCharge); - } - break; - case SCREEN: - final long totalScreenMeasuredChargeUC = - batteryStats.getScreenOnMeasuredBatteryConsumptionUC(); - if (totalScreenMeasuredChargeUC != BatteryStats.POWER_DATA_UNAVAILABLE) { - final double measuredCharge = UC_2_MAH * totalScreenMeasuredChargeUC; - addEntry("Measured screen power", EntryType.POWER, measuredCharge, - measuredCharge); - } - break; - } - } - public BatteryConsumerInfoHelper.BatteryConsumerInfo getBatteryConsumerInfo() { return mBatteryConsumerInfo; } @@ -322,13 +198,9 @@ public class BatteryConsumerData { return mEntries; } - public static String batteryConsumerId(BatterySipper sipper) { - return sipper.drainType + "|" + sipper.userId + "|" + sipper.getUid(); - } - public static String batteryConsumerId(BatteryConsumer consumer) { if (consumer instanceof UidBatteryConsumer) { - return BatterySipper.DrainType.APP + "|" + return "APP|" + UserHandle.getUserId(((UidBatteryConsumer) consumer).getUid()) + "|" + ((UidBatteryConsumer) consumer).getUid(); } else if (consumer instanceof SystemBatteryConsumer) { diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java index 8ee6c604cb3e..6288e0b886d1 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java @@ -18,14 +18,14 @@ package com.android.frameworks.core.batterystatsviewer; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.os.BatteryConsumer; import android.os.Process; +import android.os.SystemBatteryConsumer; +import android.os.UidBatteryConsumer; +import android.util.DebugUtils; import androidx.annotation.NonNull; -import com.android.internal.os.BatterySipper; - -import java.util.Locale; - class BatteryConsumerInfoHelper { private static final String SYSTEM_SERVER_PACKAGE_NAME = "android"; @@ -37,111 +37,79 @@ class BatteryConsumerInfoHelper { public ApplicationInfo iconInfo; public CharSequence packages; public CharSequence details; + public boolean isSystemBatteryConsumer; } @NonNull public static BatteryConsumerInfo makeBatteryConsumerInfo(PackageManager packageManager, - @NonNull BatterySipper sipper) { + @NonNull BatteryConsumer batteryConsumer) { BatteryConsumerInfo info = new BatteryConsumerInfo(); - info.id = BatteryConsumerData.batteryConsumerId(sipper); - sipper.sumPower(); - info.powerMah = sipper.totalSmearedPowerMah; - switch (sipper.drainType) { - case APP: { - int uid = sipper.getUid(); - info.details = String.format("UID: %d", uid); - String packageWithHighestDrain = sipper.packageWithHighestDrain; - if (uid == Process.ROOT_UID) { - info.label = "<root>"; - } else { - String[] packages = packageManager.getPackagesForUid(uid); - String primaryPackageName = null; - if (uid == Process.SYSTEM_UID) { - primaryPackageName = SYSTEM_SERVER_PACKAGE_NAME; - } else if (packages != null) { - for (String name : packages) { - primaryPackageName = name; - if (name.equals(packageWithHighestDrain)) { - break; - } + info.id = BatteryConsumerData.batteryConsumerId(batteryConsumer); + info.powerMah = batteryConsumer.getConsumedPower(); + + if (batteryConsumer instanceof UidBatteryConsumer) { + final UidBatteryConsumer uidBatteryConsumer = (UidBatteryConsumer) batteryConsumer; + int uid = uidBatteryConsumer.getUid(); + info.details = String.format("UID: %d", uid); + String packageWithHighestDrain = uidBatteryConsumer.getPackageWithHighestDrain(); + if (uid == Process.ROOT_UID) { + info.label = "<root>"; + } else { + String[] packages = packageManager.getPackagesForUid(uid); + String primaryPackageName = null; + if (uid == Process.SYSTEM_UID) { + primaryPackageName = SYSTEM_SERVER_PACKAGE_NAME; + } else if (packages != null) { + for (String name : packages) { + primaryPackageName = name; + if (name.equals(packageWithHighestDrain)) { + break; } } + } - if (primaryPackageName != null) { - try { - ApplicationInfo applicationInfo = - packageManager.getApplicationInfo(primaryPackageName, 0); - info.label = applicationInfo.loadLabel(packageManager); - info.iconInfo = applicationInfo; - } catch (PackageManager.NameNotFoundException e) { - info.label = primaryPackageName; - } - } else if (packageWithHighestDrain != null) { - info.label = packageWithHighestDrain; + if (primaryPackageName != null) { + try { + ApplicationInfo applicationInfo = + packageManager.getApplicationInfo(primaryPackageName, 0); + info.label = applicationInfo.loadLabel(packageManager); + info.iconInfo = applicationInfo; + } catch (PackageManager.NameNotFoundException e) { + info.label = primaryPackageName; } + } else if (packageWithHighestDrain != null) { + info.label = packageWithHighestDrain; + } - if (packages != null && packages.length > 0) { - StringBuilder sb = new StringBuilder(); - if (primaryPackageName != null) { - sb.append(primaryPackageName); + if (packages != null && packages.length > 0) { + StringBuilder sb = new StringBuilder(); + if (primaryPackageName != null) { + sb.append(primaryPackageName); + } + for (String packageName : packages) { + if (packageName.equals(primaryPackageName)) { + continue; } - for (String packageName : packages) { - if (packageName.equals(primaryPackageName)) { - continue; - } - if (sb.length() != 0) { - sb.append(", "); - } - sb.append(packageName); + if (sb.length() != 0) { + sb.append(", "); } - - info.packages = sb; + sb.append(packageName); } + + info.packages = sb; } - break; } - case USER: - info.label = "User"; - info.details = String.format(Locale.getDefault(), "User ID: %d", sipper.userId); - break; - case AMBIENT_DISPLAY: - info.label = "Ambient display"; - break; - case BLUETOOTH: - info.label = "Bluetooth"; - break; - case CAMERA: - info.label = "Camera"; - break; - case CELL: - info.label = "Cell"; - break; - case FLASHLIGHT: - info.label = "Flashlight"; - break; - case IDLE: - info.label = "Idle"; - break; - case MEMORY: - info.label = "Memory"; - break; - case OVERCOUNTED: - info.label = "Overcounted"; - break; - case PHONE: - info.label = "Phone"; - break; - case SCREEN: - info.label = "Screen"; - break; - case UNACCOUNTED: - info.label = "Unaccounted"; - break; - case WIFI: - info.label = "WiFi"; - break; + } else if (batteryConsumer instanceof SystemBatteryConsumer) { + final SystemBatteryConsumer systemBatteryConsumer = + (SystemBatteryConsumer) batteryConsumer; + final int drainType = systemBatteryConsumer.getDrainType(); + String name = DebugUtils.constantToString(SystemBatteryConsumer.class, "DRAIN_TYPE_", + drainType); + info.label = name.charAt(0) + name.substring(1).toLowerCase().replace('_', ' '); + info.isSystemBatteryConsumer = true; } + // Default the app icon to System Server. This includes root, dex2oat and other UIDs. if (info.iconInfo == null) { try { diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerFragment.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerFragment.java index bb11fd598511..49220877d31e 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerFragment.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerFragment.java @@ -18,10 +18,11 @@ package com.android.frameworks.core.batterystatsviewer; import android.content.Context; import android.content.pm.PackageManager; -import android.os.BatteryStats; +import android.os.BatteryStatsManager; +import android.os.BatteryUsageStats; import android.os.Bundle; -import android.os.UserHandle; -import android.os.UserManager; +import android.os.SystemBatteryConsumer; +import android.os.UidBatteryConsumer; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -37,8 +38,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.frameworks.core.batterystatsviewer.BatteryConsumerInfoHelper.BatteryConsumerInfo; -import com.android.internal.os.BatterySipper; -import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoaderCompat; import java.util.ArrayList; @@ -99,44 +98,39 @@ public class BatteryConsumerPickerFragment extends Fragment { private static class BatteryConsumerListLoader extends AsyncLoaderCompat<List<BatteryConsumerInfo>> { - private final BatteryStatsHelper mStatsHelper; private final int mPickerType; - private final UserManager mUserManager; + private final BatteryStatsManager mBatteryStatsManager; private final PackageManager mPackageManager; BatteryConsumerListLoader(Context context, int pickerType) { super(context); - mUserManager = context.getSystemService(UserManager.class); - mStatsHelper = new BatteryStatsHelper(context, false /* collectBatteryBroadcast */); + mBatteryStatsManager = context.getSystemService(BatteryStatsManager.class); mPickerType = pickerType; - mStatsHelper.create((Bundle) null); - mStatsHelper.clearStats(); mPackageManager = context.getPackageManager(); } @Override public List<BatteryConsumerInfo> loadInBackground() { - List<BatteryConsumerInfo> batteryConsumerList = new ArrayList<>(); + final BatteryUsageStats batteryUsageStats = mBatteryStatsManager.getBatteryUsageStats(); - mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, UserHandle.myUserId()); - - final List<BatterySipper> usageList = mStatsHelper.getUsageList(); - for (BatterySipper sipper : usageList) { - switch (mPickerType) { - case PICKER_TYPE_APP: - if (sipper.drainType != BatterySipper.DrainType.APP) { - continue; - } - break; - case PICKER_TYPE_DRAIN: - default: - if (sipper.drainType == BatterySipper.DrainType.APP) { - continue; - } - } - - batteryConsumerList.add( - BatteryConsumerInfoHelper.makeBatteryConsumerInfo(mPackageManager, sipper)); + List<BatteryConsumerInfo> batteryConsumerList = new ArrayList<>(); + switch (mPickerType) { + case PICKER_TYPE_APP: + for (UidBatteryConsumer consumer : batteryUsageStats.getUidBatteryConsumers()) { + batteryConsumerList.add( + BatteryConsumerInfoHelper.makeBatteryConsumerInfo(mPackageManager, + consumer)); + } + break; + case PICKER_TYPE_DRAIN: + default: + for (SystemBatteryConsumer consumer : + batteryUsageStats.getSystemBatteryConsumers()) { + batteryConsumerList.add( + BatteryConsumerInfoHelper.makeBatteryConsumerInfo(mPackageManager, + consumer)); + } + break; } batteryConsumerList.sort( diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java index 4ead8eef5684..74d3fb336f40 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java @@ -18,13 +18,10 @@ package com.android.frameworks.core.batterystatsviewer; import android.content.Context; import android.content.SharedPreferences; -import android.os.BatteryStats; import android.os.BatteryStatsManager; import android.os.BatteryUsageStats; import android.os.BatteryUsageStatsQuery; import android.os.Bundle; -import android.os.UserHandle; -import android.os.UserManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -41,7 +38,6 @@ import androidx.loader.content.Loader; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoaderCompat; import java.util.Collections; @@ -50,24 +46,24 @@ import java.util.Locale; public class BatteryStatsViewerActivity extends ComponentActivity { private static final int BATTERY_STATS_REFRESH_RATE_MILLIS = 60 * 1000; - public static final String PREF_SELECTED_BATTERY_CONSUMER = "batteryConsumerId"; - public static final int LOADER_BATTERY_STATS_HELPER = 0; - public static final int LOADER_BATTERY_USAGE_STATS = 1; + private static final int MILLIS_IN_MINUTE = 60000; + private static final String PREF_SELECTED_BATTERY_CONSUMER = "batteryConsumerId"; + private static final int LOADER_BATTERY_USAGE_STATS = 1; private BatteryStatsDataAdapter mBatteryStatsDataAdapter; - private Runnable mBatteryStatsRefresh = this::periodicBatteryStatsRefresh; + private final Runnable mBatteryStatsRefresh = this::periodicBatteryStatsRefresh; private SharedPreferences mSharedPref; private String mBatteryConsumerId; private TextView mTitleView; private TextView mDetailsView; private ImageView mIconView; private TextView mPackagesView; + private View mHeadingsView; private RecyclerView mBatteryConsumerDataView; private View mLoadingView; private View mEmptyView; - private ActivityResultLauncher<Void> mStartAppPicker = registerForActivityResult( + private final ActivityResultLauncher<Void> mStartAppPicker = registerForActivityResult( BatteryConsumerPickerActivity.CONTRACT, this::onApplicationSelected); - private BatteryStatsHelper mBatteryStatsHelper; private List<BatteryUsageStats> mBatteryUsageStats; @Override @@ -85,6 +81,7 @@ public class BatteryStatsViewerActivity extends ComponentActivity { mDetailsView = findViewById(R.id.details); mIconView = findViewById(android.R.id.icon); mPackagesView = findViewById(R.id.packages); + mHeadingsView = findViewById(R.id.headings); mBatteryConsumerDataView = findViewById(R.id.battery_consumer_data_view); mBatteryConsumerDataView.setLayoutManager(new LinearLayoutManager(this)); @@ -139,55 +136,10 @@ public class BatteryStatsViewerActivity extends ComponentActivity { private void loadBatteryStats() { LoaderManager loaderManager = LoaderManager.getInstance(this); - loaderManager.restartLoader(LOADER_BATTERY_STATS_HELPER, null, - new BatteryStatsHelperLoaderCallbacks()); loaderManager.restartLoader(LOADER_BATTERY_USAGE_STATS, null, new BatteryUsageStatsLoaderCallbacks()); } - private static class BatteryStatsHelperLoader extends AsyncLoaderCompat<BatteryStatsHelper> { - private final BatteryStatsHelper mBatteryStatsHelper; - private final UserManager mUserManager; - - BatteryStatsHelperLoader(Context context) { - super(context); - mUserManager = context.getSystemService(UserManager.class); - mBatteryStatsHelper = new BatteryStatsHelper(context, - false /* collectBatteryBroadcast */); - mBatteryStatsHelper.create((Bundle) null); - mBatteryStatsHelper.clearStats(); - } - - @Override - public BatteryStatsHelper loadInBackground() { - mBatteryStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, - UserHandle.myUserId()); - return mBatteryStatsHelper; - } - - @Override - protected void onDiscardResult(BatteryStatsHelper result) { - } - } - - private class BatteryStatsHelperLoaderCallbacks implements LoaderCallbacks<BatteryStatsHelper> { - @NonNull - @Override - public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) { - return new BatteryStatsHelperLoader(BatteryStatsViewerActivity.this); - } - - @Override - public void onLoadFinished(@NonNull Loader<BatteryStatsHelper> loader, - BatteryStatsHelper batteryStatsHelper) { - onBatteryStatsHelperLoaded(batteryStatsHelper); - } - - @Override - public void onLoaderReset(@NonNull Loader<BatteryStatsHelper> loader) { - } - } - private static class BatteryUsageStatsLoader extends AsyncLoaderCompat<List<BatteryUsageStats>> { private final BatteryStatsManager mBatteryStatsManager; @@ -200,10 +152,13 @@ public class BatteryStatsViewerActivity extends ComponentActivity { @Override public List<BatteryUsageStats> loadInBackground() { final BatteryUsageStatsQuery queryDefault = - new BatteryUsageStatsQuery.Builder().build(); + new BatteryUsageStatsQuery.Builder() + .includePowerModels() + .build(); final BatteryUsageStatsQuery queryPowerProfileModeledOnly = new BatteryUsageStatsQuery.Builder() .powerProfileModeledOnly() + .includePowerModels() .build(); return mBatteryStatsManager.getBatteryUsageStats( List.of(queryDefault, queryPowerProfileModeledOnly)); @@ -233,22 +188,13 @@ public class BatteryStatsViewerActivity extends ComponentActivity { } } - public void onBatteryStatsHelperLoaded(BatteryStatsHelper batteryStatsHelper) { - mBatteryStatsHelper = batteryStatsHelper; - onBatteryStatsDataLoaded(); - } - private void onBatteryUsageStatsLoaded(List<BatteryUsageStats> batteryUsageStats) { mBatteryUsageStats = batteryUsageStats; onBatteryStatsDataLoaded(); } public void onBatteryStatsDataLoaded() { - if (mBatteryStatsHelper == null || mBatteryUsageStats == null) { - return; - } - - BatteryConsumerData batteryConsumerData = new BatteryConsumerData(this, mBatteryStatsHelper, + BatteryConsumerData batteryConsumerData = new BatteryConsumerData(this, mBatteryUsageStats, mBatteryConsumerId); BatteryConsumerInfoHelper.BatteryConsumerInfo @@ -256,6 +202,7 @@ public class BatteryStatsViewerActivity extends ComponentActivity { if (batteryConsumerInfo == null) { mTitleView.setText("Battery consumer not found"); mPackagesView.setVisibility(View.GONE); + mHeadingsView.setVisibility(View.GONE); } else { mTitleView.setText(batteryConsumerInfo.label); if (batteryConsumerInfo.details != null) { @@ -273,6 +220,12 @@ public class BatteryStatsViewerActivity extends ComponentActivity { } else { mPackagesView.setVisibility(View.GONE); } + + if (batteryConsumerInfo.isSystemBatteryConsumer) { + mHeadingsView.setVisibility(View.VISIBLE); + } else { + mHeadingsView.setVisibility(View.GONE); + } } mBatteryStatsDataAdapter.setEntries(batteryConsumerData.getEntries()); @@ -290,6 +243,7 @@ public class BatteryStatsViewerActivity extends ComponentActivity { private static class BatteryStatsDataAdapter extends RecyclerView.Adapter<BatteryStatsDataAdapter.ViewHolder> { public static class ViewHolder extends RecyclerView.ViewHolder { + public ImageView iconImageView; public TextView titleTextView; public TextView amountTextView; public TextView percentTextView; @@ -297,6 +251,7 @@ public class BatteryStatsViewerActivity extends ComponentActivity { ViewHolder(View itemView) { super(itemView); + iconImageView = itemView.findViewById(R.id.icon); titleTextView = itemView.findViewById(R.id.title); amountTextView = itemView.findViewById(R.id.amount); percentTextView = itemView.findViewById(R.id.percent); @@ -328,21 +283,56 @@ public class BatteryStatsViewerActivity extends ComponentActivity { public void onBindViewHolder(@NonNull ViewHolder viewHolder, int position) { BatteryConsumerData.Entry entry = mEntries.get(position); switch (entry.entryType) { - case POWER: + case POWER_MODELED: viewHolder.titleTextView.setText(entry.title); viewHolder.amountTextView.setText( String.format(Locale.getDefault(), "%.1f mAh", entry.value)); + viewHolder.iconImageView.setImageResource(R.drawable.gm_calculate_24); + viewHolder.itemView.setBackgroundResource( + R.color.battery_consumer_bg_power_profile); break; - case DURATION: + case POWER_MEASURED: viewHolder.titleTextView.setText(entry.title); viewHolder.amountTextView.setText( - String.format(Locale.getDefault(), "%,d ms", (long) entry.value)); + String.format(Locale.getDefault(), "%.1f mAh", entry.value)); + viewHolder.iconImageView.setImageResource(R.drawable.gm_amp_24); + viewHolder.itemView.setBackgroundResource( + R.color.battery_consumer_bg_measured_energy); + break; + case POWER_CUSTOM: + viewHolder.titleTextView.setText(entry.title); + viewHolder.amountTextView.setText( + String.format(Locale.getDefault(), "%.1f mAh", entry.value)); + viewHolder.iconImageView.setImageResource(R.drawable.gm_custom_24); + viewHolder.itemView.setBackgroundResource( + R.color.battery_consumer_bg_measured_energy); + break; + case DURATION: + viewHolder.titleTextView.setText(entry.title); + final long durationMs = (long) entry.value; + CharSequence text; + if (durationMs < MILLIS_IN_MINUTE) { + text = String.format(Locale.getDefault(), "%,d ms", durationMs); + } else { + text = String.format(Locale.getDefault(), "%,d m %d s", + durationMs / MILLIS_IN_MINUTE, + (durationMs % MILLIS_IN_MINUTE) / 1000); + } + + viewHolder.amountTextView.setText(text); + viewHolder.iconImageView.setImageResource(R.drawable.gm_timer_24); + viewHolder.itemView.setBackground(null); break; } - double proportion = entry.total != 0 ? entry.value * 100 / entry.total : 0; - viewHolder.percentTextView.setText(String.format(Locale.getDefault(), "%.1f%%", - proportion)); + double proportion; + if (entry.isSystemBatteryConsumer) { + proportion = entry.value != 0 ? entry.total * 100 / entry.value : 0; + } else { + proportion = entry.total != 0 ? entry.value * 100 / entry.total : 0; + } + viewHolder.percentTextView.setText( + String.format(Locale.getDefault(), "%.1f%%", proportion)); } } } diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java index e5da41c7c113..2e2e6bd07539 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java @@ -86,7 +86,6 @@ import java.util.function.Consumer; @RunWith(AndroidJUnit4.class) @MediumTest @Presubmit -@FlakyTest(detail = "Promote once confirmed non-flaky") public class ActivityThreadTest { private static final int TIMEOUT_SEC = 10; @@ -352,8 +351,9 @@ public class ActivityThreadTest { final Rect bounds = activity.getWindowManager().getCurrentWindowMetrics().getBounds(); assertEquals(activityConfigPortrait.windowConfiguration.getBounds(), bounds); - // Ensure that Activity#onConfigurationChanged() is only called once. - assertEquals(numOfConfig + 1, activity.mNumOfConfigChanges); + // Ensure that Activity#onConfigurationChanged() not be called because the changes in + // WindowConfiguration shouldn't be reported. + assertEquals(numOfConfig, activity.mNumOfConfigChanges); } @Test @@ -379,7 +379,7 @@ public class ActivityThreadTest { Configuration config = new Configuration(); config.seq = BASE_SEQ + 1; - config.smallestScreenWidthDp = 100; + config.orientation = ORIENTATION_LANDSCAPE; appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); // Wait until the main thread is performing the configuration change for the configuration @@ -389,17 +389,17 @@ public class ActivityThreadTest { config = new Configuration(); config.seq = BASE_SEQ + 2; - config.smallestScreenWidthDp = 200; + config.orientation = ORIENTATION_PORTRAIT; appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); config = new Configuration(); config.seq = BASE_SEQ + 3; - config.smallestScreenWidthDp = 300; + config.orientation = ORIENTATION_LANDSCAPE; appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); config = new Configuration(); config.seq = BASE_SEQ + 4; - config.smallestScreenWidthDp = 400; + config.orientation = ORIENTATION_PORTRAIT; appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); activity.mConfigLatch.countDown(); @@ -411,7 +411,7 @@ public class ActivityThreadTest { // Only two more configuration changes: one with seq BASE_SEQ + 1; another with seq // BASE_SEQ + 4. Configurations scheduled in between should be dropped. assertEquals(numOfConfig + 2, activity.mNumOfConfigChanges); - assertEquals(400, activity.mConfig.smallestScreenWidthDp); + assertEquals(ORIENTATION_PORTRAIT, activity.mConfig.orientation); } @Test @@ -515,6 +515,7 @@ public class ActivityThreadTest { } @Test + @FlakyTest(bugId = 176134235) public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() { final TestActivity activity = mActivityTestRule.launchActivity(new Intent()); diff --git a/core/tests/coretests/src/com/android/internal/os/AmbientDisplayPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/AmbientDisplayPowerCalculatorTest.java index cf47efddddd9..c63ec45ed5a9 100644 --- a/core/tests/coretests/src/com/android/internal/os/AmbientDisplayPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/AmbientDisplayPowerCalculatorTest.java @@ -65,12 +65,12 @@ public class AmbientDisplayPowerCalculatorTest { SystemBatteryConsumer consumer = mStatsRule.getSystemBatteryConsumer( SystemBatteryConsumer.DRAIN_TYPE_AMBIENT_DISPLAY); - assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) + assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_SCREEN)) .isEqualTo(90 * MINUTE_IN_MS); // 100,000,00 uC / 1000 (micro-/milli-) / 360 (seconds/hour) = 27.777778 mAh - assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(27.777778); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(BatteryConsumer.POWER_MODEL_MEASURED_ENERGY); } @@ -91,11 +91,11 @@ public class AmbientDisplayPowerCalculatorTest { SystemBatteryConsumer consumer = mStatsRule.getSystemBatteryConsumer( SystemBatteryConsumer.DRAIN_TYPE_AMBIENT_DISPLAY); - assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) + assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_SCREEN)) .isEqualTo(90 * MINUTE_IN_MS); - assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(15.0); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } } diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java index 1e614c480bde..3a6f7b8a1618 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java @@ -109,11 +109,11 @@ public class BatteryUsageStatsRule implements TestRule { } /** Call only after setting the power profile information. */ - public BatteryUsageStatsRule initMeasuredEnergyStatsLocked(int numCustom) { + public BatteryUsageStatsRule initMeasuredEnergyStatsLocked() { final boolean[] supportedStandardBuckets = new boolean[MeasuredEnergyStats.NUMBER_STANDARD_POWER_BUCKETS]; Arrays.fill(supportedStandardBuckets, true); - mBatteryStats.initMeasuredEnergyStatsLocked(supportedStandardBuckets, numCustom); + mBatteryStats.initMeasuredEnergyStatsLocked(supportedStandardBuckets, new String[0]); mBatteryStats.informThatAllExternalStatsAreFlushed(); return this; } @@ -167,15 +167,11 @@ public class BatteryUsageStatsRule implements TestRule { } BatteryUsageStats apply(BatteryUsageStatsQuery query, PowerCalculator... calculators) { - final long[] customMeasuredEnergiesMicroJoules = - mBatteryStats.getCustomConsumerMeasuredBatteryConsumptionUC(); - final int customMeasuredEnergiesCount = customMeasuredEnergiesMicroJoules != null - ? customMeasuredEnergiesMicroJoules.length - : 0; + final String[] customPowerComponentNames = mBatteryStats.getCustomPowerComponentNames(); final boolean includePowerModels = (query.getFlags() & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS) != 0; BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder( - customMeasuredEnergiesCount, 0, includePowerModels); + customPowerComponentNames, 0, includePowerModels); SparseArray<? extends BatteryStats.Uid> uidStats = mBatteryStats.getUidStats(); for (int i = 0; i < uidStats.size(); i++) { builder.getOrCreateUidBatteryConsumerBuilder(uidStats.valueAt(i)); diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java index 60df9688b5a4..b25359970c5a 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java @@ -66,17 +66,18 @@ public class BatteryUsageStatsTest { final MockBatteryStatsImpl batteryStats = new MockBatteryStatsImpl(clocks); final BatteryStatsImpl.Uid batteryStatsUid = batteryStats.getUidStatsLocked(2000); - final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(1, 1) - .setDischargePercentage(20) - .setDischargedPowerRange(1000, 2000) - .setStatsStartTimestamp(1000); + final BatteryUsageStats.Builder builder = + new BatteryUsageStats.Builder(new String[]{"FOO"}, 1) + .setDischargePercentage(20) + .setDischargedPowerRange(1000, 2000) + .setStatsStartTimestamp(1000); builder.getOrCreateUidBatteryConsumerBuilder(batteryStatsUid) .setPackageWithHighestDrain("foo") .setTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND, 1000) .setTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND, 2000) .setConsumedPower( - BatteryConsumer.POWER_COMPONENT_USAGE, 300) + BatteryConsumer.POWER_COMPONENT_SCREEN, 300) .setConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, 400) .setConsumedPowerForCustomComponent( @@ -122,7 +123,7 @@ public class BatteryUsageStatsTest { assertThat(uidBatteryConsumer.getTimeInStateMs( UidBatteryConsumer.STATE_BACKGROUND)).isEqualTo(2000); assertThat(uidBatteryConsumer.getConsumedPower( - BatteryConsumer.POWER_COMPONENT_USAGE)).isEqualTo(300); + BatteryConsumer.POWER_COMPONENT_SCREEN)).isEqualTo(300); assertThat(uidBatteryConsumer.getConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU)).isEqualTo(400); assertThat(uidBatteryConsumer.getConsumedPowerForCustomComponent( @@ -134,6 +135,9 @@ public class BatteryUsageStatsTest { assertThat(uidBatteryConsumer.getUsageDurationForCustomComponentMillis( BatteryConsumer.FIRST_CUSTOM_TIME_COMPONENT_ID)).isEqualTo(800); assertThat(uidBatteryConsumer.getConsumedPower()).isEqualTo(1200); + assertThat(uidBatteryConsumer.getCustomPowerComponentCount()).isEqualTo(1); + assertThat(uidBatteryConsumer.getCustomPowerComponentName( + BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID)).isEqualTo("FOO"); } else { fail("Unexpected UID " + uidBatteryConsumer.getUid()); } @@ -153,6 +157,11 @@ public class BatteryUsageStatsTest { BatteryConsumer.FIRST_CUSTOM_TIME_COMPONENT_ID)).isEqualTo(10400); assertThat(systemBatteryConsumer.getConsumedPower()).isEqualTo(20300); assertThat(systemBatteryConsumer.getPowerConsumedByApps()).isEqualTo(20000); + assertThat(systemBatteryConsumer.getUsageDurationMillis()) + .isEqualTo(10400); // max + assertThat(systemBatteryConsumer.getCustomPowerComponentCount()).isEqualTo(1); + assertThat(systemBatteryConsumer.getCustomPowerComponentName( + BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID)).isEqualTo("FOO"); } else { fail("Unexpected drain type " + systemBatteryConsumer.getDrainType()); } diff --git a/core/tests/coretests/src/com/android/internal/os/BinderLatencyObserverTest.java b/core/tests/coretests/src/com/android/internal/os/BinderLatencyObserverTest.java index f65fb9583d6c..bf87683593e7 100644 --- a/core/tests/coretests/src/com/android/internal/os/BinderLatencyObserverTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BinderLatencyObserverTest.java @@ -16,6 +16,8 @@ package com.android.internal.os; +import static com.android.internal.os.BinderLatencyProto.Dims.SYSTEM_SERVER; + import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; @@ -23,16 +25,21 @@ import static org.junit.Assert.assertEquals; import android.os.Binder; import android.platform.test.annotations.Presubmit; import android.util.ArrayMap; +import android.util.proto.ProtoOutputStream; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.BinderInternal.CallSession; import com.android.internal.os.BinderLatencyObserver.LatencyDims; +import com.android.internal.os.BinderLatencyProto.ApiStats; +import com.android.internal.os.BinderLatencyProto.Dims; +import com.android.internal.os.BinderLatencyProto.RepeatedApiStats; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; import java.util.Arrays; import java.util.Random; @@ -49,11 +56,17 @@ public class BinderLatencyObserverTest { CallSession callSession = new CallSession(); callSession.binderClass = binder.getClass(); callSession.transactionCode = 1; + + blo.setElapsedTime(2); blo.callEnded(callSession); + blo.setElapsedTime(4); blo.callEnded(callSession); + blo.setElapsedTime(6); blo.callEnded(callSession); callSession.transactionCode = 2; + blo.setElapsedTime(8); blo.callEnded(callSession); + blo.setElapsedTime(10); blo.callEnded(callSession); ArrayMap<LatencyDims, int[]> latencyHistograms = blo.getLatencyHistograms(); @@ -74,8 +87,10 @@ public class BinderLatencyObserverTest { CallSession callSession = new CallSession(); callSession.binderClass = binder.getClass(); callSession.transactionCode = 1; + blo.setElapsedTime(2); blo.callEnded(callSession); callSession.transactionCode = 2; + blo.setElapsedTime(4); blo.callEnded(callSession); ArrayMap<LatencyDims, int[]> latencyHistograms = blo.getLatencyHistograms(); @@ -89,13 +104,13 @@ public class BinderLatencyObserverTest { @Test public void testTooCallLengthOverflow() { TestBinderLatencyObserver blo = new TestBinderLatencyObserver(); - blo.setElapsedTime(2L + (long) Integer.MAX_VALUE); blo.setHistogramBucketsParams(5, 5, 1.125f); Binder binder = new Binder(); CallSession callSession = new CallSession(); callSession.binderClass = binder.getClass(); callSession.transactionCode = 1; + blo.setElapsedTime(2L + (long) Integer.MAX_VALUE); blo.callEnded(callSession); // The long call should be capped to maxint (to not overflow) and placed in the last bucket. @@ -114,6 +129,7 @@ public class BinderLatencyObserverTest { CallSession callSession = new CallSession(); callSession.binderClass = binder.getClass(); callSession.transactionCode = 1; + blo.setElapsedTime(2); blo.callEnded(callSession); LatencyDims dims = new LatencyDims(binder.getClass(), 1); @@ -122,14 +138,111 @@ public class BinderLatencyObserverTest { assertThat(blo.getLatencyHistograms().get(dims)) .asList().containsExactly(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); // Try to add another sample. + blo.setElapsedTime(2); blo.callEnded(callSession); // Make sure the buckets don't overflow. assertThat(blo.getLatencyHistograms().get(dims)) .asList().containsExactly(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); } + @Test + public void testSingleAtomPush() { + TestBinderLatencyObserver blo = new TestBinderLatencyObserver(); + + Binder binder = new Binder(); + CallSession callSession = new CallSession(); + callSession.binderClass = binder.getClass(); + callSession.transactionCode = 1; + blo.setElapsedTime(7); + blo.callEnded(callSession); + blo.callEnded(callSession); + blo.setElapsedTime(8); + blo.callEnded(callSession); + + // Trigger the statsd push. + blo.getStatsdPushRunnable().run(); + + ProtoOutputStream expectedProto = new ProtoOutputStream(); + long apiStatsToken = expectedProto.start(RepeatedApiStats.API_STATS); + long dimsToken = expectedProto.start(ApiStats.DIMS); + expectedProto.write(Dims.PROCESS_SOURCE, SYSTEM_SERVER); + expectedProto.write(Dims.SERVICE_CLASS_NAME, binder.getClass().getName()); + expectedProto.write(Dims.SERVICE_METHOD_NAME, "1"); + expectedProto.end(dimsToken); + expectedProto.write(ApiStats.FIRST_BUCKET_INDEX, 3); + expectedProto.write(ApiStats.BUCKETS, 2); + expectedProto.write(ApiStats.BUCKETS, 1); + expectedProto.end(apiStatsToken); + + assertThat(blo.getWrittenAtoms()) + .containsExactly(Arrays.toString(expectedProto.getBytes())); + } + + @Test + public void testMultipleAtomPush() { + TestBinderLatencyObserver blo = new TestBinderLatencyObserver(); + + BinderTransactionNameResolver resolver = new BinderTransactionNameResolver(); + + + Binder binder = new Binder(); + CallSession callSession = new CallSession(); + callSession.binderClass = binder.getClass(); + callSession.transactionCode = 1; + blo.setElapsedTime(1); + blo.callEnded(callSession); + callSession.transactionCode = 2; + blo.setElapsedTime(5); + blo.callEnded(callSession); + callSession.transactionCode = 3; + blo.callEnded(callSession); + + // Trigger the statsd push. + blo.getStatsdPushRunnable().run(); + + ProtoOutputStream expectedProto1 = new ProtoOutputStream(); + long apiStatsToken = expectedProto1.start(RepeatedApiStats.API_STATS); + long dimsToken = expectedProto1.start(ApiStats.DIMS); + expectedProto1.write(Dims.PROCESS_SOURCE, SYSTEM_SERVER); + expectedProto1.write(Dims.SERVICE_CLASS_NAME, binder.getClass().getName()); + expectedProto1.write(Dims.SERVICE_METHOD_NAME, "1"); + expectedProto1.end(dimsToken); + expectedProto1.write(ApiStats.FIRST_BUCKET_INDEX, 0); + expectedProto1.write(ApiStats.BUCKETS, 1); + expectedProto1.end(apiStatsToken); + + apiStatsToken = expectedProto1.start(RepeatedApiStats.API_STATS); + dimsToken = expectedProto1.start(ApiStats.DIMS); + expectedProto1.write(Dims.PROCESS_SOURCE, SYSTEM_SERVER); + expectedProto1.write(Dims.SERVICE_CLASS_NAME, binder.getClass().getName()); + expectedProto1.write(Dims.SERVICE_METHOD_NAME, "2"); + expectedProto1.end(dimsToken); + expectedProto1.write(ApiStats.FIRST_BUCKET_INDEX, 1); + expectedProto1.write(ApiStats.BUCKETS, 1); + expectedProto1.end(apiStatsToken); + + ProtoOutputStream expectedProto2 = new ProtoOutputStream(); + apiStatsToken = expectedProto2.start(RepeatedApiStats.API_STATS); + dimsToken = expectedProto2.start(ApiStats.DIMS); + expectedProto2.write(Dims.PROCESS_SOURCE, SYSTEM_SERVER); + expectedProto2.write(Dims.SERVICE_CLASS_NAME, binder.getClass().getName()); + expectedProto2.write(Dims.SERVICE_METHOD_NAME, "3"); + expectedProto2.end(dimsToken); + expectedProto2.write(ApiStats.FIRST_BUCKET_INDEX, 1); + expectedProto2.write(ApiStats.BUCKETS, 1); + expectedProto2.end(apiStatsToken); + + // Each ApiStats is around ~60 bytes so only two should fit in an atom. + assertThat(blo.getWrittenAtoms()) + .containsExactly( + Arrays.toString(expectedProto1.getBytes()), + Arrays.toString(expectedProto2.getBytes())) + .inOrder(); + } + public static class TestBinderLatencyObserver extends BinderLatencyObserver { private long mElapsedTime = 0; + private ArrayList<String> mWrittenAtoms; TestBinderLatencyObserver() { // Make random generator not random. @@ -145,16 +258,30 @@ public class BinderLatencyObserverTest { } }); setSamplingInterval(1); + mWrittenAtoms = new ArrayList<>(); } @Override protected long getElapsedRealtimeMicro() { - mElapsedTime += 2; return mElapsedTime; } + @Override + protected int getMaxAtomSizeBytes() { + return 1100; + } + + @Override + protected void writeAtomToStatsd(ProtoOutputStream atom) { + mWrittenAtoms.add(Arrays.toString(atom.getBytes())); + } + public void setElapsedTime(long time) { mElapsedTime = time; } + + public ArrayList<String> getWrittenAtoms() { + return mWrittenAtoms; + } } } diff --git a/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java index 1a87c1084fe0..71cdb5fe17f0 100644 --- a/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java @@ -44,7 +44,7 @@ public class BluetoothPowerCalculatorTest { .setAveragePower(PowerProfile.POWER_BLUETOOTH_CONTROLLER_IDLE, 10.0) .setAveragePower(PowerProfile.POWER_BLUETOOTH_CONTROLLER_RX, 50.0) .setAveragePower(PowerProfile.POWER_BLUETOOTH_CONTROLLER_TX, 100.0) - .initMeasuredEnergyStatsLocked(0); + .initMeasuredEnergyStatsLocked(); @Test public void testTimerBasedModel() { diff --git a/core/tests/coretests/src/com/android/internal/os/CpuPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/CpuPowerCalculatorTest.java index 31abbc20a090..63af21dcdd93 100644 --- a/core/tests/coretests/src/com/android/internal/os/CpuPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/CpuPowerCalculatorTest.java @@ -96,7 +96,7 @@ public class CpuPowerCalculatorTest { .setKernelCpuUidUserSysTimeReader(mMockKernelCpuUidUserSysTimeReader) .setKernelCpuUidActiveTimeReader(mMockKerneCpuUidActiveTimeReader) .setSystemServerCpuThreadReader(mMockSystemServerCpuThreadReader) - .initMeasuredEnergyStatsLocked(supportedPowerBuckets, 0); + .initMeasuredEnergyStatsLocked(supportedPowerBuckets, new String[0]); } @Test diff --git a/core/tests/coretests/src/com/android/internal/os/GnssPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/GnssPowerCalculatorTest.java index 95c3b4ed8a40..aa066c36cd4b 100644 --- a/core/tests/coretests/src/com/android/internal/os/GnssPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/GnssPowerCalculatorTest.java @@ -42,7 +42,7 @@ public class GnssPowerCalculatorTest { .setAveragePower(PowerProfile.POWER_GPS_ON, 360.0) .setAveragePower(PowerProfile.POWER_GPS_SIGNAL_QUALITY_BASED, new double[] {720.0, 1440.0, 1800.0}) - .initMeasuredEnergyStatsLocked(0); + .initMeasuredEnergyStatsLocked(); @Test public void testTimerBasedModel() { diff --git a/core/tests/coretests/src/com/android/internal/os/IdlePowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/IdlePowerCalculatorTest.java index 781e72560279..a9800b7e6b75 100644 --- a/core/tests/coretests/src/com/android/internal/os/IdlePowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/IdlePowerCalculatorTest.java @@ -48,9 +48,9 @@ public class IdlePowerCalculatorTest { SystemBatteryConsumer consumer = mStatsRule.getSystemBatteryConsumer(SystemBatteryConsumer.DRAIN_TYPE_IDLE); - assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) + assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_IDLE)) .isEqualTo(3000); - assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_IDLE)) .isWithin(PRECISION).of(0.7); } } diff --git a/core/tests/coretests/src/com/android/internal/os/MemoryPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/MemoryPowerCalculatorTest.java index 8f21503a6d77..71dbcdbf7f46 100644 --- a/core/tests/coretests/src/com/android/internal/os/MemoryPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/MemoryPowerCalculatorTest.java @@ -55,9 +55,9 @@ public class MemoryPowerCalculatorTest { SystemBatteryConsumer consumer = mStatsRule.getSystemBatteryConsumer(SystemBatteryConsumer.DRAIN_TYPE_MEMORY); - assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) + assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_MEMORY)) .isEqualTo(3000); - assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MEMORY)) .isWithin(PRECISION).of(0.7); } } diff --git a/core/tests/coretests/src/com/android/internal/os/MobileRadioPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/MobileRadioPowerCalculatorTest.java index 3505e8c34027..5b84a1b320c7 100644 --- a/core/tests/coretests/src/com/android/internal/os/MobileRadioPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/MobileRadioPowerCalculatorTest.java @@ -57,7 +57,7 @@ public class MobileRadioPowerCalculatorTest { .setAveragePower(PowerProfile.POWER_MODEM_CONTROLLER_RX, 1440.0) .setAveragePower(PowerProfile.POWER_MODEM_CONTROLLER_TX, new double[] {720.0, 1080.0, 1440.0, 1800.0, 2160.0}) - .initMeasuredEnergyStatsLocked(0); + .initMeasuredEnergyStatsLocked(); @Test public void testCounterBasedModel() { diff --git a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java index 26adbe9e7c59..7a7d9f541328 100644 --- a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java +++ b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java @@ -51,7 +51,9 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { final boolean[] supportedStandardBuckets = new boolean[MeasuredEnergyStats.NUMBER_STANDARD_POWER_BUCKETS]; Arrays.fill(supportedStandardBuckets, true); - mGlobalMeasuredEnergyStats = new MeasuredEnergyStats(supportedStandardBuckets, 2); + final String[] customBucketNames = {"FOO", "BAR"}; + mGlobalMeasuredEnergyStats = + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); // A no-op handler. mHandler = new Handler(Looper.getMainLooper()) { diff --git a/core/tests/coretests/src/com/android/internal/os/ScreenPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/ScreenPowerCalculatorTest.java index 9cd6ea8a6a3b..7d829e44d9ec 100644 --- a/core/tests/coretests/src/com/android/internal/os/ScreenPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/ScreenPowerCalculatorTest.java @@ -84,13 +84,13 @@ public class ScreenPowerCalculatorTest { SystemBatteryConsumer consumer = mStatsRule.getSystemBatteryConsumer(SystemBatteryConsumer.DRAIN_TYPE_SCREEN); - assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) + assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_SCREEN)) .isEqualTo(80 * MINUTE_IN_MS); // 600000000 uAs * (1 mA / 1000 uA) * (1 h / 3600 s) = 166.66666 mAh - assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(166.66666); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(BatteryConsumer.POWER_MODEL_MEASURED_ENERGY); assertThat(consumer.getConsumedPower()) .isWithin(PRECISION).of(166.66666); @@ -153,11 +153,11 @@ public class ScreenPowerCalculatorTest { SystemBatteryConsumer consumer = mStatsRule.getSystemBatteryConsumer(SystemBatteryConsumer.DRAIN_TYPE_SCREEN); - assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) + assertThat(consumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_SCREEN)) .isEqualTo(80 * MINUTE_IN_MS); - assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(92.0); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_USAGE)) + assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); assertThat(consumer.getConsumedPower()) .isWithin(PRECISION).of(92.0); diff --git a/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java index 2e501dbe355e..9349bce2c383 100644 --- a/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java @@ -53,7 +53,7 @@ public class WifiPowerCalculatorTest { .setAveragePower(PowerProfile.POWER_WIFI_SCAN, 480.0) .setAveragePower(PowerProfile.POWER_WIFI_BATCHED_SCAN, 720.0) .setAveragePower(PowerProfile.POWER_WIFI_ACTIVE, 1080.0) - .initMeasuredEnergyStatsLocked(0); + .initMeasuredEnergyStatsLocked(); /** Sets up a batterystats object with pre-populated network values. */ private BatteryStatsImpl setupTestNetworkNumbers() { diff --git a/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java b/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java index ed6e27b199b9..f1edc871a56c 100644 --- a/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java @@ -23,6 +23,8 @@ import static com.android.internal.power.MeasuredEnergyStats.POWER_BUCKET_SCREEN import static com.android.internal.power.MeasuredEnergyStats.POWER_BUCKET_SCREEN_ON; import static com.android.internal.power.MeasuredEnergyStats.POWER_BUCKET_SCREEN_OTHER; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -49,13 +51,13 @@ public class MeasuredEnergyStatsTest { @Test public void testConstruction() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); for (int i = 0; i < NUMBER_STANDARD_POWER_BUCKETS; i++) { if (supportedStandardBuckets[i]) { @@ -66,21 +68,22 @@ public class MeasuredEnergyStatsTest { assertEquals(POWER_DATA_UNAVAILABLE, stats.getAccumulatedStandardBucketCharge(i)); } } - for (int i = 0; i < numCustomBuckets; i++) { + for (int i = 0; i < customBucketNames.length; i++) { assertEquals(0L, stats.getAccumulatedCustomBucketCharge(i)); } + assertThat(stats.getCustomBucketNames()).asList().containsExactly("A", "B"); } @Test public void testCreateFromTemplate() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -99,7 +102,7 @@ public class MeasuredEnergyStatsTest { newStats.getAccumulatedStandardBucketCharge(i)); } } - for (int i = 0; i < numCustomBuckets; i++) { + for (int i = 0; i < customBucketNames.length; i++) { assertEquals(0L, newStats.getAccumulatedCustomBucketCharge(i)); } } @@ -107,13 +110,13 @@ public class MeasuredEnergyStatsTest { @Test public void testReadWriteParcel() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -130,25 +133,25 @@ public class MeasuredEnergyStatsTest { assertEquals(stats.getAccumulatedStandardBucketCharge(i), newStats.getAccumulatedStandardBucketCharge(i)); } - for (int i = 0; i < numCustomBuckets; i++) { + for (int i = 0; i < customBucketNames.length; i++) { assertEquals(stats.getAccumulatedCustomBucketCharge(i), newStats.getAccumulatedCustomBucketCharge(i)); } assertEquals(POWER_DATA_UNAVAILABLE, - newStats.getAccumulatedCustomBucketCharge(numCustomBuckets + 1)); + newStats.getAccumulatedCustomBucketCharge(customBucketNames.length + 1)); parcel.recycle(); } @Test public void testCreateAndReadSummaryFromParcel() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -166,25 +169,25 @@ public class MeasuredEnergyStatsTest { assertEquals(stats.getAccumulatedStandardBucketCharge(i), newStats.getAccumulatedStandardBucketCharge(i)); } - for (int i = 0; i < numCustomBuckets; i++) { + for (int i = 0; i < customBucketNames.length; i++) { assertEquals(stats.getAccumulatedCustomBucketCharge(i), newStats.getAccumulatedCustomBucketCharge(i)); } assertEquals(POWER_DATA_UNAVAILABLE, - newStats.getAccumulatedCustomBucketCharge(numCustomBuckets + 1)); + newStats.getAccumulatedCustomBucketCharge(customBucketNames.length + 1)); parcel.recycle(); } @Test public void testCreateAndReadSummaryFromParcel_existingTemplate() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats template = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); template.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); template.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); template.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -205,7 +208,7 @@ public class MeasuredEnergyStatsTest { newsupportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = true; // switched false > true newsupportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = false; // switched true > false final MeasuredEnergyStats newTemplate = - new MeasuredEnergyStats(newsupportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(newsupportedStandardBuckets, customBucketNames); parcel.setDataPosition(0); final MeasuredEnergyStats newStats = @@ -225,23 +228,23 @@ public class MeasuredEnergyStatsTest { newStats.getAccumulatedStandardBucketCharge(i)); } } - for (int i = 0; i < numCustomBuckets; i++) { + for (int i = 0; i < customBucketNames.length; i++) { assertEquals(stats.getAccumulatedCustomBucketCharge(i), newStats.getAccumulatedCustomBucketCharge(i)); } assertEquals(POWER_DATA_UNAVAILABLE, - newStats.getAccumulatedCustomBucketCharge(numCustomBuckets + 1)); + newStats.getAccumulatedCustomBucketCharge(customBucketNames.length + 1)); parcel.recycle(); } @Test public void testCreateAndReadSummaryFromParcel_skipZero() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; Arrays.fill(supportedStandardBuckets, true); final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); // Accumulate charge in one bucket and one custom bucket, the rest should be zero stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 200); stats.updateCustomBucket(1, 60); @@ -298,13 +301,13 @@ public class MeasuredEnergyStatsTest { @Test public void testCreateAndReadSummaryFromParcel_nullTemplate() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -324,13 +327,13 @@ public class MeasuredEnergyStatsTest { @Test public void testCreateAndReadSummaryFromParcel_boring() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats template = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); template.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); template.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); template.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -348,7 +351,7 @@ public class MeasuredEnergyStatsTest { newSupportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = true; // switched false > true newSupportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = false; // switched true > false final MeasuredEnergyStats newTemplate = - new MeasuredEnergyStats(newSupportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(newSupportedStandardBuckets, customBucketNames); parcel.setDataPosition(0); final MeasuredEnergyStats newStats = @@ -362,13 +365,13 @@ public class MeasuredEnergyStatsTest { @Test public void testUpdateBucket() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); stats.updateStandardBucket(POWER_BUCKET_SCREEN_DOZE, 30); stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -389,7 +392,8 @@ public class MeasuredEnergyStatsTest { @Test public void testIsValidCustomBucket() { final MeasuredEnergyStats stats = - new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], 3); + new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], + new String[]{"A", "B", "C"}); assertFalse(stats.isValidCustomBucket(-1)); assertTrue(stats.isValidCustomBucket(0)); assertTrue(stats.isValidCustomBucket(1)); @@ -398,7 +402,7 @@ public class MeasuredEnergyStatsTest { assertFalse(stats.isValidCustomBucket(4)); final MeasuredEnergyStats boringStats = - new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], 0); + new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], new String[0]); assertFalse(boringStats.isValidCustomBucket(-1)); assertFalse(boringStats.isValidCustomBucket(0)); assertFalse(boringStats.isValidCustomBucket(1)); @@ -407,8 +411,8 @@ public class MeasuredEnergyStatsTest { @Test public void testGetAccumulatedCustomBucketCharges() { final MeasuredEnergyStats stats = - new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], 3); - + new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], + new String[]{"A", "B", "C"}); stats.updateCustomBucket(0, 50); stats.updateCustomBucket(1, 60); stats.updateCustomBucket(2, 13); @@ -425,7 +429,7 @@ public class MeasuredEnergyStatsTest { @Test public void testGetAccumulatedCustomBucketCharges_empty() { final MeasuredEnergyStats stats = - new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], 0); + new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], new String[0]); final long[] output = stats.getAccumulatedCustomBucketCharges(); assertEquals(0, output.length); @@ -433,22 +437,23 @@ public class MeasuredEnergyStatsTest { @Test public void testGetNumberCustomChargeBuckets() { - assertEquals(0, new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], 0) - .getNumberCustomPowerBuckets()); - assertEquals(3, new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], 3) - .getNumberCustomPowerBuckets()); + assertEquals(0, + new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], new String[0]) + .getNumberCustomPowerBuckets()); + assertEquals(3, new MeasuredEnergyStats(new boolean[NUMBER_STANDARD_POWER_BUCKETS], + new String[]{"A", "B", "C"}).getNumberCustomPowerBuckets()); } @Test public void testReset() { final boolean[] supportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS]; - final int numCustomBuckets = 2; + final String[] customBucketNames = {"A", "B"}; supportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true; supportedStandardBuckets[POWER_BUCKET_SCREEN_DOZE] = false; supportedStandardBuckets[POWER_BUCKET_SCREEN_OTHER] = true; final MeasuredEnergyStats stats = - new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets); + new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 10); stats.updateStandardBucket(POWER_BUCKET_SCREEN_ON, 5); stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 40); @@ -466,7 +471,7 @@ public class MeasuredEnergyStatsTest { assertEquals(POWER_DATA_UNAVAILABLE, stats.getAccumulatedStandardBucketCharge(i)); } } - for (int i = 0; i < numCustomBuckets; i++) { + for (int i = 0; i < customBucketNames.length; i++) { assertEquals(0, stats.getAccumulatedCustomBucketCharge(i)); } diff --git a/core/tests/coretests/src/com/android/internal/view/ScrollCaptureViewSupportTest.java b/core/tests/coretests/src/com/android/internal/view/ScrollCaptureViewSupportTest.java new file mode 100644 index 000000000000..cb72b2d0f012 --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/view/ScrollCaptureViewSupportTest.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.view; + +import static org.junit.Assert.assertEquals; + +import android.content.Context; +import android.graphics.Rect; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.test.platform.app.InstrumentationRegistry; + +import org.junit.Test; + +public class ScrollCaptureViewSupportTest { + + ScrollCaptureViewHelper<View> mViewHelper = new ScrollCaptureViewHelper<View>() { + @Override + public void onPrepareForStart(@NonNull View view, @NonNull Rect scrollBounds) { + } + + @NonNull + @Override + public ScrollResult onScrollRequested(@NonNull View view, @NonNull Rect scrollBounds, + @NonNull Rect requestRect) { + return new ScrollResult(); + } + + @Override + public void onPrepareForEnd(@NonNull View view) { + } + }; + + + /** + * Test scroll bounds are computed correctly. onComputeScrollBounds is currently a + * default interface method of ScrollCaptureViewHelper. + */ + @Test + public void testComputeScrollBounds() { + Context context = InstrumentationRegistry.getInstrumentation().getContext(); + + ViewGroup target = new ViewGroup(context) { + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + // n/a + } + }; + + target.setPadding(25, 50, 25, 50); + target.setLeftTopRightBottom(0, 0, 200, 200); + + + // clipToPadding == false: No effect + target.setClipToPadding(false); + Rect scrollBounds = mViewHelper.onComputeScrollBounds(target); + assertEquals("Computed scroll bounds are incorrect with clipToPadding=false", + new Rect(0, 0, 200, 200), scrollBounds); + + // clipToPadding == true: Inset by padding + target.setClipToPadding(true); + scrollBounds = mViewHelper.onComputeScrollBounds(target); + assertEquals("Computed scroll bounds are incorrect with clipToPadding=true", + new Rect(25, 50, 175, 150), scrollBounds); + } + +} diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 2fe8b285ed88..5f344267d71c 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -348,6 +348,8 @@ applications that come with the platform <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/> <permission name="android.permission.INSTALL_PACKAGES"/> <!-- Needed for test only --> + <permission name="android.permission.ACCESS_MTP"/> + <!-- Needed for test only --> <permission name="android.permission.INTERACT_ACROSS_PROFILES"/> <!-- Permission required to test onPermissionsChangedListener --> <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/> @@ -404,6 +406,7 @@ applications that come with the platform <permission name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION" /> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> <permission name="android.permission.USE_RESERVED_DISK"/> + <permission name="android.permission.UWB_PRIVILEGED"/> <permission name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"/> <permission name="android.permission.WRITE_MEDIA_STORAGE"/> <permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/> diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index fec78f070311..81f1021c6eab 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -1825,6 +1825,12 @@ "group": "WM_DEBUG_IME", "at": "com\/android\/server\/wm\/InsetsSourceProvider.java" }, + "35398067": { + "message": "goodToGo(): onAnimationStart, transit=%s, apps=%d, wallpapers=%d, nonApps=%d", + "level": "DEBUG", + "group": "WM_DEBUG_REMOTE_ANIMATIONS", + "at": "com\/android\/server\/wm\/RemoteAnimationController.java" + }, "38267433": { "message": "Attempted to reset replacing window on non-existing app token %s", "level": "WARN", diff --git a/graphics/java/android/graphics/FrameInfo.java b/graphics/java/android/graphics/FrameInfo.java index 786c03ba5150..b9393fff8896 100644 --- a/graphics/java/android/graphics/FrameInfo.java +++ b/graphics/java/android/graphics/FrameInfo.java @@ -90,19 +90,23 @@ public final class FrameInfo { // When frame actually started. public static final int FRAME_START_TIME = 10; + // Interval between two consecutive frames + public static final int FRAME_INTERVAL = 11; + // Must be the last one // This value must be in sync with `UI_THREAD_FRAME_INFO_SIZE` in FrameInfo.h - private static final int FRAME_INFO_SIZE = FRAME_START_TIME + 1; + private static final int FRAME_INFO_SIZE = FRAME_INTERVAL + 1; /** checkstyle */ public void setVsync(long intendedVsync, long usedVsync, long frameTimelineVsyncId, - long frameDeadline, long frameStartTime) { + long frameDeadline, long frameStartTime, long frameInterval) { frameInfo[FRAME_TIMELINE_VSYNC_ID] = frameTimelineVsyncId; frameInfo[INTENDED_VSYNC] = intendedVsync; frameInfo[VSYNC] = usedVsync; frameInfo[FLAGS] = 0; frameInfo[FRAME_DEADLINE] = frameDeadline; frameInfo[FRAME_START_TIME] = frameStartTime; + frameInfo[FRAME_INTERVAL] = frameInterval; } /** checkstyle */ diff --git a/graphics/java/android/graphics/HardwareRenderer.java b/graphics/java/android/graphics/HardwareRenderer.java index 7589435fc3b7..f3dba82287ab 100644 --- a/graphics/java/android/graphics/HardwareRenderer.java +++ b/graphics/java/android/graphics/HardwareRenderer.java @@ -367,7 +367,7 @@ public class HardwareRenderer { public @NonNull FrameRenderRequest setVsyncTime(long vsyncTime) { // TODO(b/168552873): populate vsync Id once available to Choreographer public API mFrameInfo.setVsync(vsyncTime, vsyncTime, FrameInfo.INVALID_VSYNC_ID, Long.MAX_VALUE, - vsyncTime); + vsyncTime, -1); mFrameInfo.addFlags(FrameInfo.FLAG_SURFACE_CANVAS); return this; } diff --git a/libs/WindowManager/Shell/res/drawable/pip_menu_background.xml b/libs/WindowManager/Shell/res/drawable/pip_menu_background.xml new file mode 100644 index 000000000000..29907a61b4cc --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/pip_menu_background.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#FF000000"/> + + <corners android:radius="@dimen/pip_corner_radius" /> +</shape>
\ No newline at end of file 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 11c146457844..dca598518432 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 @@ -739,14 +739,11 @@ public class BubbleController { return (isSummary && isSuppressedSummary) || isSuppressedBubble; } - private void removeSuppressedSummaryIfNecessary(String groupKey, Consumer<String> callback, - Executor callbackExecutor) { + private void removeSuppressedSummaryIfNecessary(String groupKey, Consumer<String> callback) { if (mBubbleData.isSummarySuppressed(groupKey)) { mBubbleData.removeSuppressedSummary(groupKey); if (callback != null) { - callbackExecutor.execute(() -> { - callback.accept(mBubbleData.getSummaryKey(groupKey)); - }); + callback.accept(mBubbleData.getSummaryKey(groupKey)); } } } @@ -1298,8 +1295,10 @@ public class BubbleController { public void removeSuppressedSummaryIfNecessary(String groupKey, Consumer<String> callback, Executor callbackExecutor) { mMainExecutor.execute(() -> { - BubbleController.this.removeSuppressedSummaryIfNecessary(groupKey, callback, - callbackExecutor); + Consumer<String> cb = callback != null + ? (key) -> callbackExecutor.execute(() -> callback.accept(key)) + : null; + BubbleController.this.removeSuppressedSummaryIfNecessary(groupKey, cb); }); } @@ -1340,10 +1339,13 @@ public class BubbleController { @Override public boolean handleDismissalInterception(BubbleEntry entry, - @Nullable List<BubbleEntry> children, IntConsumer removeCallback) { + @Nullable List<BubbleEntry> children, IntConsumer removeCallback, + Executor callbackExecutor) { + IntConsumer cb = removeCallback != null + ? (index) -> callbackExecutor.execute(() -> removeCallback.accept(index)) + : null; return mMainExecutor.executeBlockingForResult(() -> { - return BubbleController.this.handleDismissalInterception(entry, children, - removeCallback); + return BubbleController.this.handleDismissalInterception(entry, children, cb); }, Boolean.class); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java index 9fc8aef47064..1bfb61929297 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java @@ -140,7 +140,7 @@ public interface Bubbles { * @return true if we want to intercept the dismissal of the entry, else false. */ boolean handleDismissalInterception(BubbleEntry entry, @Nullable List<BubbleEntry> children, - IntConsumer removeCallback); + IntConsumer removeCallback, Executor callbackExecutor); /** Set the proxy to commnuicate with SysUi side components. */ void setSysuiProxy(SysuiProxy proxy); 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 5c3af3ee5330..8ac9a7a479db 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 @@ -37,6 +37,7 @@ import com.android.wm.shell.animation.Interpolators; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Objects; /** * Controller class of PiP animations (both from and to PiP mode). @@ -112,6 +113,7 @@ public class PipAnimationController { PipTransitionAnimator.ofAlpha(taskInfo, leash, destinationBounds, alphaStart, alphaEnd)); } else if (mCurrentAnimator.getAnimationType() == ANIM_TYPE_ALPHA + && Objects.equals(destinationBounds, mCurrentAnimator.getDestinationBounds()) && mCurrentAnimator.isRunning()) { mCurrentAnimator.updateEndValue(alphaEnd); } else { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java index 3af0ff0dfb36..d4f229cb3e09 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java @@ -216,7 +216,7 @@ public class PipMediaController { } ArrayList<RemoteAction> mediaActions = new ArrayList<>(); - boolean isPlaying = mMediaController.getPlaybackState().isActiveState(); + boolean isPlaying = mMediaController.getPlaybackState().isActive(); long actions = mMediaController.getPlaybackState().getActions(); // Prev action 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 e152633063be..e66be66c8ef4 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 @@ -99,9 +99,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, private enum State { UNDEFINED(0), TASK_APPEARED(1), - ENTERING_PIP(2), - ENTERED_PIP(3), - EXITING_PIP(4); + ENTRY_SCHEDULED(2), + ENTERING_PIP(3), + ENTERED_PIP(4), + EXITING_PIP(5); private final int mStateValue; @@ -265,6 +266,13 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } /** + * Returns whether the entry animation is waiting to be started. + */ + public boolean isEntryScheduled() { + return mState == State.ENTRY_SCHEDULED; + } + + /** * Registers a callback when a display change has been detected when we enter PiP. */ public void registerOnDisplayIdChangeCallback(IntConsumer onDisplayIdChangeCallback) { @@ -492,6 +500,19 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } } + /** + * Called when the display rotation handling is skipped (e.g. when rotation happens while in + * the middle of an entry transition). + */ + public void onDisplayRotationSkipped() { + if (isEntryScheduled()) { + // The PIP animation is scheduled to start with the previous orientation's bounds, + // re-calculate the entry bounds and restart the alpha animation. + final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds(); + enterPipWithAlphaAnimation(destinationBounds, mEnterAnimationDuration); + } + } + @VisibleForTesting void enterPipWithAlphaAnimation(Rect destinationBounds, long durationMs) { // If we are fading the PIP in, then we should move the pip to the final location as @@ -501,6 +522,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, mSurfaceControlTransactionFactory.getTransaction(); tx.setAlpha(mLeash, 0f); tx.apply(); + mState = State.ENTRY_SCHEDULED; applyEnterPipSyncTransaction(destinationBounds, () -> { mPipAnimationController .getAnimator(mTaskInfo, mLeash, destinationBounds, 0f, 1f) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index 62ae1d5d600c..f505e60de61e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java @@ -116,7 +116,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb int displayId, int fromRotation, int toRotation, WindowContainerTransaction t) -> { if (!mPipTaskOrganizer.isInPip() || mPipBoundsState.getDisplayLayout().rotation() == toRotation - || mPipTaskOrganizer.isDeferringEnterPipAnimation()) { + || mPipTaskOrganizer.isDeferringEnterPipAnimation() + || mPipTaskOrganizer.isEntryScheduled()) { // Skip if the same rotation has been set or we aren't in PIP or haven't actually // entered PIP yet. We still need to update the display layout in the bounds handler // in this case. @@ -124,6 +125,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb // do not forget to update the movement bounds as well. updateMovementBounds(mPipBoundsState.getNormalBounds(), true /* fromRotation */, false /* fromImeAdjustment */, false /* fromShelfAdjustment */, t); + mPipTaskOrganizer.onDisplayRotationSkipped(); return; } // If there is an animation running (ie. from a shelf offset), then ensure that we calculate diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java index 7e594a43a52f..3c25a13e94eb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java @@ -130,7 +130,11 @@ public class PipMenuView extends FrameLayout { mAccessibilityManager = context.getSystemService(AccessibilityManager.class); inflate(context, R.layout.pip_menu, this); - mBackgroundDrawable = new ColorDrawable(Color.BLACK); + final boolean enableCornerRadius = mContext.getResources() + .getBoolean(R.bool.config_pipEnableRoundCorner); + mBackgroundDrawable = enableCornerRadius + ? mContext.getDrawable(R.drawable.pip_menu_background) + : new ColorDrawable(Color.BLACK); mBackgroundDrawable.setAlpha(0); mViewRoot = findViewById(R.id.background); mViewRoot.setBackground(mBackgroundDrawable); diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt index 98ce2747d532..1f9ff4ab5638 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt @@ -89,6 +89,12 @@ class AppPairsTestCannotPairNonResizeableApps( @Test override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() + @FlakyTest + @Test + override fun navBarLayerIsAlwaysVisible() { + super.navBarLayerIsAlwaysVisible() + } + @Presubmit @Test fun appPairsDividerIsInvisible() = testSpec.appPairsDividerIsInvisible() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt index ef68ed630353..87ad8de98702 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt @@ -103,6 +103,12 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( } } + @FlakyTest + @Test + override fun navBarLayerIsAlwaysVisible() { + super.navBarLayerIsAlwaysVisible() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt index d341bb1e6aa9..a9881485a3c9 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt @@ -60,6 +60,12 @@ class RotateTwoLaunchedAppsInAppPairsMode( } } + @FlakyTest + @Test + override fun statusBarLayerIsAlwaysVisible() { + super.statusBarLayerIsAlwaysVisible() + } + @Presubmit @Test fun bothAppWindowsVisible() { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt index 3bf0296fee20..3396b90f3083 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt @@ -74,6 +74,12 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( @Test override fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible() + @FlakyTest + @Test + override fun statusBarLayerIsAlwaysVisible() { + super.statusBarLayerIsAlwaysVisible() + } + @Presubmit @Test fun bothAppWindowsVisible() { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsTransition.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsTransition.kt index 83853e61ab5e..512fd9a58ea8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsTransition.kt @@ -17,11 +17,13 @@ package com.android.wm.shell.flicker.apppairs import android.view.Surface +import androidx.test.filters.FlakyTest import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.wm.shell.flicker.helpers.SplitScreenHelper +import org.junit.Test abstract class RotateTwoLaunchedAppsTransition( testSpec: FlickerTestParameter @@ -49,4 +51,16 @@ abstract class RotateTwoLaunchedAppsTransition( } } } + + @FlakyTest + @Test + override fun navBarLayerIsAlwaysVisible() { + super.navBarLayerIsAlwaysVisible() + } + + @FlakyTest + @Test + override fun navBarLayerRotatesAndScales() { + super.navBarLayerRotatesAndScales() + } }
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt index bca257646e11..e50bde2eaeaa 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt @@ -23,7 +23,7 @@ import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory -import com.android.server.wm.flicker.WALLPAPER_TITLE +import com.android.server.wm.flicker.LAUNCHER_TITLE import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.launchSplitScreen import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible @@ -60,9 +60,9 @@ class EnterSplitScreenDockActivity( } override val ignoredWindows: List<String> - get() = listOf(LAUNCHER_PACKAGE_NAME, WALLPAPER_TITLE, LIVE_WALLPAPER_PACKAGE_NAME, + get() = listOf(LAUNCHER_PACKAGE_NAME, LIVE_WALLPAPER_PACKAGE_NAME, splitScreenApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME, - WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME) + WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME, *LAUNCHER_TITLE) @FlakyTest(bugId = 169271943) @Test diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt index 9717709852d4..64cc85340a38 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt @@ -84,7 +84,7 @@ class ExitLegacySplitScreenFromBottom( super.visibleLayersShownMoreThanOneConsecutiveEntry() } - @Presubmit + @FlakyTest @Test fun appWindowBecomesInVisible() = testSpec.appWindowBecomesInVisible(secondaryApp.defaultWindowName) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt index 3f714bb6b6c9..2e115518721f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt @@ -78,7 +78,7 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen( @Test fun dockedStackDividerIsInvisible() = testSpec.dockedStackDividerIsInvisible() - @Presubmit + @FlakyTest @Test fun layerBecomesInvisible() = testSpec.layerBecomesInvisible(splitScreenApp.defaultWindowName) @@ -87,7 +87,7 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen( override fun visibleLayersShownMoreThanOneConsecutiveEntry() = super.visibleLayersShownMoreThanOneConsecutiveEntry() - @Presubmit + @FlakyTest @Test fun appWindowBecomesInVisible() = testSpec.appWindowBecomesInVisible(splitScreenApp.defaultWindowName) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt index 72d6f569ab0c..39f4ce298ff5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt @@ -118,7 +118,7 @@ class LegacySplitScreenToLauncher( fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation) - @Presubmit + @FlakyTest @Test override fun visibleLayersShownMoreThanOneConsecutiveEntry() = super.visibleLayersShownMoreThanOneConsecutiveEntry() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt index 8f15e5088914..7cf30ec116eb 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt @@ -70,7 +70,7 @@ class OpenAppToLegacySplitScreen( override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = super.visibleWindowsShownMoreThanOneConsecutiveEntry() - @Presubmit + @FlakyTest @Test fun appWindowBecomesVisible() = testSpec.appWindowBecomesVisible(splitScreenApp.getPackage()) @@ -86,7 +86,7 @@ class OpenAppToLegacySplitScreen( @Test fun appPairsDividerBecomesVisible() = testSpec.appPairsDividerBecomesVisible() - @Presubmit + @FlakyTest @Test fun layerBecomesVisible() = testSpec.layerBecomesVisible(splitScreenApp.getPackage()) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt index c914adae2b7c..4a59c62ce5d1 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt @@ -92,7 +92,7 @@ class RotateOneLaunchedAppAndEnterSplitScreen( @Test fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun appWindowBecomesVisible() = testSpec.appWindowBecomesVisible(splitScreenApp.defaultWindowName) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt index ffb20a4bc99a..834821b4825e 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt @@ -89,7 +89,7 @@ class RotateOneLaunchedAppInSplitScreenMode( @Test fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun appWindowBecomesVisible() = testSpec.appWindowBecomesVisible(splitScreenApp.defaultWindowName) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt index 9c798d8ea661..db709a078b70 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt @@ -98,7 +98,7 @@ class RotateTwoLaunchedAppInSplitScreenMode( testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, testSpec.config.endRotation) - @Presubmit + @FlakyTest @Test fun appWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp.defaultWindowName) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt index cd20ddee04fc..2609258e48e0 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -54,7 +55,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { } } - @Presubmit + @FlakyTest @Test fun pipLayerBecomesVisible() { testSpec.assertLayers { @@ -62,7 +63,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { } } - @Presubmit + @FlakyTest @Test fun pipWindowBecomesVisible() { testSpec.assertWm { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt index 2beec2e8c1ed..33ddec376594 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt @@ -88,6 +88,12 @@ class EnterPipToOtherOrientationTest( @Test override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() + @FlakyTest + @Test + override fun noUncoveredRegions() { + super.noUncoveredRegions() + } + @Presubmit @Test fun pipAppWindowIsAlwaysOnTop() { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithDismissButtonTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithDismissButtonTest.kt index 0408421c72a5..f290b907d2d3 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithDismissButtonTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithDismissButtonTest.kt @@ -16,11 +16,13 @@ package com.android.wm.shell.flicker.pip +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized @@ -41,4 +43,16 @@ class PipCloseWithDismissButtonTest(testSpec: FlickerTestParameter) : PipCloseTr pipApp.closePipWindow(wmHelper) } } + + @FlakyTest + @Test + override fun pipLayerBecomesInvisible() { + super.pipLayerBecomesInvisible() + } + + @FlakyTest + @Test + override fun pipWindowBecomesInvisible() { + super.pipWindowBecomesInvisible() + } }
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithSwipeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithSwipeTest.kt index c7a1c9aac86b..444026208ec1 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithSwipeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithSwipeTest.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -67,11 +68,11 @@ class PipCloseWithSwipeTest(testSpec: FlickerTestParameter) : PipCloseTransition @Test override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible() - @Presubmit + @FlakyTest @Test override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible() - @Presubmit + @FlakyTest @Test override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt index 852ee4726080..0d686f514116 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -75,7 +76,7 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) override fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation, testSpec.config.endRotation, allStates = false) - @Presubmit + @FlakyTest @Test override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipToAppTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipToAppTest.kt index 6f17a2c57ffc..f7f658e52c52 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipToAppTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipToAppTest.kt @@ -16,7 +16,6 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -59,7 +58,7 @@ class PipToAppTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { } } - @Presubmit + @FlakyTest @Test fun appReplacesPipWindow() { testSpec.assertWm { @@ -69,7 +68,7 @@ class PipToAppTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { } } - @Presubmit + @FlakyTest @Test fun appReplacesPipLayer() { testSpec.assertLayers { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt index ad1ccbd10753..b4c75a6d1165 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt @@ -20,6 +20,7 @@ import android.app.Instrumentation import android.content.Intent import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerTestParameter @@ -167,11 +168,11 @@ abstract class PipTransition(protected val testSpec: FlickerTestParameter) { @Test open fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible() - @Presubmit + @FlakyTest @Test open fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible() - @Presubmit + @FlakyTest @Test open fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt index 9aab7f30e6f8..1e7d08bfc0ed 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt @@ -125,6 +125,12 @@ class SetRequestedOrientationWhilePinnedTest( } } + @FlakyTest + @Test + override fun noUncoveredRegions() { + super.noUncoveredRegions() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 9270901bcacd..f2c48bb8d2bc 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -653,6 +653,7 @@ cc_test { "tests/unit/EglManagerTests.cpp", "tests/unit/FatVectorTests.cpp", "tests/unit/GraphicsStatsServiceTests.cpp", + "tests/unit/JankTrackerTests.cpp", "tests/unit/LayerUpdateQueueTests.cpp", "tests/unit/LinearAllocatorTests.cpp", "tests/unit/MatrixTests.cpp", diff --git a/libs/hwui/FrameInfo.cpp b/libs/hwui/FrameInfo.cpp index 51fbf363f51c..fecf26906c04 100644 --- a/libs/hwui/FrameInfo.cpp +++ b/libs/hwui/FrameInfo.cpp @@ -21,16 +21,18 @@ namespace android { namespace uirenderer { const std::array FrameInfoNames{ - "Flags", "FrameTimelineVsyncId", "IntendedVsync", - "Vsync", "InputEventId", "HandleInputStart", - "AnimationStart", "PerformTraversalsStart", "DrawStart", - "FrameDeadline", "FrameStartTime", "SyncQueued", - "SyncStart", "IssueDrawCommandsStart", "SwapBuffers", - "FrameCompleted", "DequeueBufferDuration", "QueueBufferDuration", - "GpuCompleted", "SwapBuffersCompleted", "DisplayPresentTime", + "Flags", "FrameTimelineVsyncId", "IntendedVsync", + "Vsync", "InputEventId", "HandleInputStart", + "AnimationStart", "PerformTraversalsStart", "DrawStart", + "FrameDeadline", "FrameInterval", "FrameStartTime", + "SyncQueued", "SyncStart", "IssueDrawCommandsStart", + "SwapBuffers", "FrameCompleted", "DequeueBufferDuration", + "QueueBufferDuration", "GpuCompleted", "SwapBuffersCompleted", + "DisplayPresentTime", + }; -static_assert(static_cast<int>(FrameInfoIndex::NumIndexes) == 21, +static_assert(static_cast<int>(FrameInfoIndex::NumIndexes) == 22, "Must update value in FrameMetrics.java#FRAME_STATS_COUNT (and here)"); void FrameInfo::importUiThreadInfo(int64_t* info) { diff --git a/libs/hwui/FrameInfo.h b/libs/hwui/FrameInfo.h index 62ac4ca5fdad..2a134fa214e7 100644 --- a/libs/hwui/FrameInfo.h +++ b/libs/hwui/FrameInfo.h @@ -28,7 +28,7 @@ namespace android { namespace uirenderer { -static constexpr size_t UI_THREAD_FRAME_INFO_SIZE = 11; +static constexpr size_t UI_THREAD_FRAME_INFO_SIZE = 12; enum class FrameInfoIndex { Flags = 0, @@ -42,6 +42,7 @@ enum class FrameInfoIndex { DrawStart, FrameDeadline, FrameStartTime, + FrameInterval, // End of UI frame info SyncQueued, @@ -77,6 +78,9 @@ enum { class UiFrameInfoBuilder { public: static constexpr int64_t INVALID_VSYNC_ID = -1; + static constexpr int64_t UNKNOWN_DEADLINE = std::numeric_limits<int64_t>::max(); + static constexpr int64_t UNKNOWN_FRAME_INTERVAL = -1; + explicit UiFrameInfoBuilder(int64_t* buffer) : mBuffer(buffer) { memset(mBuffer, 0, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t)); @@ -89,7 +93,7 @@ public: } UiFrameInfoBuilder& setVsync(nsecs_t vsyncTime, nsecs_t intendedVsync, - int64_t vsyncId, int64_t frameDeadline) { + int64_t vsyncId, int64_t frameDeadline, nsecs_t frameInterval) { set(FrameInfoIndex::FrameTimelineVsyncId) = vsyncId; set(FrameInfoIndex::Vsync) = vsyncTime; set(FrameInfoIndex::IntendedVsync) = intendedVsync; @@ -100,6 +104,7 @@ public: set(FrameInfoIndex::PerformTraversalsStart) = vsyncTime; set(FrameInfoIndex::DrawStart) = vsyncTime; set(FrameInfoIndex::FrameDeadline) = frameDeadline; + set(FrameInfoIndex::FrameInterval) = frameInterval; return *this; } diff --git a/libs/hwui/FrameMetricsReporter.h b/libs/hwui/FrameMetricsReporter.h index 3f2dc1244085..0ac025fb01db 100644 --- a/libs/hwui/FrameMetricsReporter.h +++ b/libs/hwui/FrameMetricsReporter.h @@ -26,6 +26,7 @@ #include "FrameMetricsObserver.h" #include <string.h> +#include <mutex> namespace android { namespace uirenderer { diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp index 4eefe921fbe9..7702f9bba0e4 100644 --- a/libs/hwui/JankTracker.cpp +++ b/libs/hwui/JankTracker.cpp @@ -95,27 +95,18 @@ JankTracker::JankTracker(ProfileDataContainer* globalData) // SF will begin composition at VSYNC-app + offsetDelta. If we are triple // buffered, this is the expected time at which dequeueBuffer will // return due to the staggering of VSYNC-app & VSYNC-sf. - mDequeueTimeForgiveness = offsetDelta + 4_ms; + mDequeueTimeForgivenessLegacy = offsetDelta + 4_ms; } - setFrameInterval(frameIntervalNanos); + mFrameIntervalLegacy = frameIntervalNanos; } -void JankTracker::setFrameInterval(nsecs_t frameInterval) { - mFrameInterval = frameInterval; - - for (auto& comparison : COMPARISONS) { - mThresholds[comparison.type] = comparison.computeThreadshold(frameInterval); - } -} - -void JankTracker::finishFrame(const FrameInfo& frame) { - std::lock_guard lock(mDataMutex); - +void JankTracker::calculateLegacyJank(FrameInfo& frame) { // Fast-path for jank-free frames int64_t totalDuration = frame.duration(sFrameStart, FrameInfoIndex::SwapBuffersCompleted); - if (mDequeueTimeForgiveness && frame[FrameInfoIndex::DequeueBufferDuration] > 500_us) { - nsecs_t expectedDequeueDuration = mDequeueTimeForgiveness + frame[FrameInfoIndex::Vsync] - - frame[FrameInfoIndex::IssueDrawCommandsStart]; + if (mDequeueTimeForgivenessLegacy && frame[FrameInfoIndex::DequeueBufferDuration] > 500_us) { + nsecs_t expectedDequeueDuration = mDequeueTimeForgivenessLegacy + + frame[FrameInfoIndex::Vsync] + - frame[FrameInfoIndex::IssueDrawCommandsStart]; if (expectedDequeueDuration > 0) { // Forgive only up to the expected amount, but not more than // the actual time spent blocked. @@ -134,29 +125,29 @@ void JankTracker::finishFrame(const FrameInfo& frame) { frame[FrameInfoIndex::IntendedVsync], frame[FrameInfoIndex::GpuCompleted]); - mData->reportFrame(totalDuration); - (*mGlobalData)->reportFrame(totalDuration); // Only things like Surface.lockHardwareCanvas() are exempt from tracking if (CC_UNLIKELY(frame[FrameInfoIndex::Flags] & EXEMPT_FRAMES_FLAGS)) { return; } - if (totalDuration > mFrameInterval) { - mData->reportJank(); - (*mGlobalData)->reportJank(); + if (totalDuration > mFrameIntervalLegacy) { + mData->reportJankLegacy(); + (*mGlobalData)->reportJankLegacy(); } - if (mSwapDeadline < 0) { - mSwapDeadline = frame[FrameInfoIndex::IntendedVsync] + mFrameInterval; + if (mSwapDeadlineLegacy < 0) { + mSwapDeadlineLegacy = frame[FrameInfoIndex::IntendedVsync] + mFrameIntervalLegacy; } - bool isTripleBuffered = (mSwapDeadline - frame[FrameInfoIndex::IntendedVsync]) > (mFrameInterval * 0.1); + bool isTripleBuffered = (mSwapDeadlineLegacy - frame[FrameInfoIndex::IntendedVsync]) + > (mFrameIntervalLegacy * 0.1); - mSwapDeadline = std::max(mSwapDeadline + mFrameInterval, - frame[FrameInfoIndex::IntendedVsync] + mFrameInterval); + mSwapDeadlineLegacy = std::max(mSwapDeadlineLegacy + mFrameIntervalLegacy, + frame[FrameInfoIndex::IntendedVsync] + mFrameIntervalLegacy); // If we hit the deadline, cool! - if (frame[FrameInfoIndex::FrameCompleted] < mSwapDeadline || totalDuration < mFrameInterval) { + if (frame[FrameInfoIndex::FrameCompleted] < mSwapDeadlineLegacy + || totalDuration < mFrameIntervalLegacy) { if (isTripleBuffered) { mData->reportJankType(JankType::kHighInputLatency); (*mGlobalData)->reportJankType(JankType::kHighInputLatency); @@ -164,33 +155,116 @@ void JankTracker::finishFrame(const FrameInfo& frame) { return; } - mData->reportJankType(JankType::kMissedDeadline); - (*mGlobalData)->reportJankType(JankType::kMissedDeadline); + mData->reportJankType(JankType::kMissedDeadlineLegacy); + (*mGlobalData)->reportJankType(JankType::kMissedDeadlineLegacy); // Janked, reset the swap deadline nsecs_t jitterNanos = frame[FrameInfoIndex::FrameCompleted] - frame[FrameInfoIndex::Vsync]; - nsecs_t lastFrameOffset = jitterNanos % mFrameInterval; - mSwapDeadline = frame[FrameInfoIndex::FrameCompleted] - lastFrameOffset + mFrameInterval; + nsecs_t lastFrameOffset = jitterNanos % mFrameIntervalLegacy; + mSwapDeadlineLegacy = frame[FrameInfoIndex::FrameCompleted] + - lastFrameOffset + mFrameIntervalLegacy; +} - for (auto& comparison : COMPARISONS) { - int64_t delta = frame.duration(comparison.start, comparison.end); - if (delta >= mThresholds[comparison.type] && delta < IGNORE_EXCEEDING) { - mData->reportJankType(comparison.type); - (*mGlobalData)->reportJankType(comparison.type); - } +void JankTracker::finishFrame(FrameInfo& frame, std::unique_ptr<FrameMetricsReporter>& reporter) { + std::lock_guard lock(mDataMutex); + + calculateLegacyJank(frame); + + // Fast-path for jank-free frames + int64_t totalDuration = frame.duration(FrameInfoIndex::IntendedVsync, + FrameInfoIndex::FrameCompleted); + + LOG_ALWAYS_FATAL_IF(totalDuration <= 0, "Impossible totalDuration %" PRId64, totalDuration); + mData->reportFrame(totalDuration); + (*mGlobalData)->reportFrame(totalDuration); + + // Only things like Surface.lockHardwareCanvas() are exempt from tracking + if (CC_UNLIKELY(frame[FrameInfoIndex::Flags] & EXEMPT_FRAMES_FLAGS)) { + return; + } + + int64_t frameInterval = frame[FrameInfoIndex::FrameInterval]; + + // If we starter earlier than the intended frame start assuming an unstuffed scenario, it means + // that we are in a triple buffering situation. + bool isTripleBuffered = (mNextFrameStartUnstuffed - frame[FrameInfoIndex::IntendedVsync]) + > (frameInterval * 0.1); + + int64_t deadline = frame[FrameInfoIndex::FrameDeadline]; + + // If we are in triple buffering, we have enough buffers in queue to sustain a single frame + // drop without jank, so adjust the frame interval to the deadline. + if (isTripleBuffered) { + deadline += frameInterval; + frame.set(FrameInfoIndex::FrameDeadline) += frameInterval; } - // Log daveys since they are weird and we don't know what they are (b/70339576) - if (totalDuration >= 700_ms) { - static int sDaveyCount = 0; - std::stringstream ss; - ss << "Davey! duration=" << ns2ms(totalDuration) << "ms; "; - for (size_t i = 0; i < static_cast<size_t>(FrameInfoIndex::NumIndexes); i++) { - ss << FrameInfoNames[i] << "=" << frame[i] << ", "; + // If we hit the deadline, cool! + if (frame[FrameInfoIndex::GpuCompleted] < deadline) { + if (isTripleBuffered) { + mData->reportJankType(JankType::kHighInputLatency); + (*mGlobalData)->reportJankType(JankType::kHighInputLatency); + + // Buffer stuffing state gets carried over to next frame, unless there is a "pause" + mNextFrameStartUnstuffed += frameInterval; + } + } else { + mData->reportJankType(JankType::kMissedDeadline); + (*mGlobalData)->reportJankType(JankType::kMissedDeadline); + mData->reportJank(); + (*mGlobalData)->reportJank(); + + // Janked, store the adjust deadline to detect triple buffering in next frame correctly. + nsecs_t jitterNanos = frame[FrameInfoIndex::GpuCompleted] + - frame[FrameInfoIndex::Vsync]; + nsecs_t lastFrameOffset = jitterNanos % frameInterval; + + // Note the time when the next frame would start in an unstuffed situation. If it starts + // earlier, we are in a stuffed situation. + mNextFrameStartUnstuffed = frame[FrameInfoIndex::GpuCompleted] + - lastFrameOffset + frameInterval; + + recomputeThresholds(frameInterval); + for (auto& comparison : COMPARISONS) { + int64_t delta = frame.duration(comparison.start, comparison.end); + if (delta >= mThresholds[comparison.type] && delta < IGNORE_EXCEEDING) { + mData->reportJankType(comparison.type); + (*mGlobalData)->reportJankType(comparison.type); + } + } + + // Log daveys since they are weird and we don't know what they are (b/70339576) + if (totalDuration >= 700_ms) { + static int sDaveyCount = 0; + std::stringstream ss; + ss << "Davey! duration=" << ns2ms(totalDuration) << "ms; "; + for (size_t i = 0; i < static_cast<size_t>(FrameInfoIndex::NumIndexes); i++) { + ss << FrameInfoNames[i] << "=" << frame[i] << ", "; + } + ALOGI("%s", ss.str().c_str()); + // Just so we have something that counts up, the value is largely irrelevant + ATRACE_INT(ss.str().c_str(), ++sDaveyCount); } - ALOGI("%s", ss.str().c_str()); - // Just so we have something that counts up, the value is largely irrelevant - ATRACE_INT(ss.str().c_str(), ++sDaveyCount); + } + + int64_t totalGPUDrawTime = frame.gpuDrawTime(); + if (totalGPUDrawTime >= 0) { + mData->reportGPUFrame(totalGPUDrawTime); + (*mGlobalData)->reportGPUFrame(totalGPUDrawTime); + } + + if (CC_UNLIKELY(reporter.get() != nullptr)) { + reporter->reportFrameMetrics(frame.data(), false /* hasPresentTime */); + } +} + +void JankTracker::recomputeThresholds(int64_t frameBudget) { + if (mThresholdsFrameBudget == frameBudget) { + return; + } + mThresholdsFrameBudget = frameBudget; + for (auto& comparison : COMPARISONS) { + mThresholds[comparison.type] = comparison.computeThreadshold(frameBudget); } } @@ -243,14 +317,5 @@ void JankTracker::reset() { : FrameInfoIndex::IntendedVsync; } -void JankTracker::finishGpuDraw(const FrameInfo& frame) { - std::lock_guard lock(mDataMutex); - int64_t totalGPUDrawTime = frame.gpuDrawTime(); - if (totalGPUDrawTime >= 0) { - mData->reportGPUFrame(totalGPUDrawTime); - (*mGlobalData)->reportGPUFrame(totalGPUDrawTime); - } -} - } /* namespace uirenderer */ } /* namespace android */ diff --git a/libs/hwui/JankTracker.h b/libs/hwui/JankTracker.h index 096455372923..0d2574cb8640 100644 --- a/libs/hwui/JankTracker.h +++ b/libs/hwui/JankTracker.h @@ -17,6 +17,7 @@ #define JANKTRACKER_H_ #include "FrameInfo.h" +#include "FrameMetricsReporter.h" #include "ProfileData.h" #include "ProfileDataContainer.h" #include "renderthread/TimeLord.h" @@ -56,9 +57,11 @@ public: } FrameInfo* startFrame() { return &mFrames.next(); } - void finishFrame(const FrameInfo& frame); - void finishGpuDraw(const FrameInfo& frame); + void finishFrame(FrameInfo& frame, std::unique_ptr<FrameMetricsReporter>& reporter); + // Calculates the 'legacy' jank information, i.e. with outdated refresh rate information and + // without GPU completion or deadlined information. + void calculateLegacyJank(FrameInfo& frame); void dumpStats(int fd) { dumpData(fd, &mDescription, mData.get()); } void dumpFrames(int fd); void reset(); @@ -68,14 +71,16 @@ public: RingBuffer<FrameInfo, 120>& frames() { return mFrames; } private: - void setFrameInterval(nsecs_t frameIntervalNanos); - + void recomputeThresholds(int64_t frameInterval); static void dumpData(int fd, const ProfileDataDescription* description, const ProfileData* data); - std::array<int64_t, NUM_BUCKETS> mThresholds; - int64_t mFrameInterval; - nsecs_t mSwapDeadline = -1; + // Last frame budget for which mThresholds were computed. + int64_t mThresholdsFrameBudget GUARDED_BY(mDataMutex); + std::array<int64_t, NUM_BUCKETS> mThresholds GUARDED_BY(mDataMutex); + + int64_t mFrameIntervalLegacy; + nsecs_t mSwapDeadlineLegacy = -1; // The amount of time we will erase from the total duration to account // for SF vsync offsets with HWC2 blocking dequeueBuffers. // (Vsync + mDequeueBlockTolerance) is the point at which we expect @@ -83,7 +88,9 @@ private: // point in time by comparing to (IssueDrawCommandsStart + DequeueDuration) // This is only used if we are in pipelined mode and are using HWC2, // otherwise it's 0. - nsecs_t mDequeueTimeForgiveness = 0; + nsecs_t mDequeueTimeForgivenessLegacy = 0; + + nsecs_t mNextFrameStartUnstuffed GUARDED_BY(mDataMutex) = -1; ProfileDataContainer mData GUARDED_BY(mDataMutex); ProfileDataContainer* mGlobalData GUARDED_BY(mDataMutex); ProfileDataDescription mDescription; diff --git a/libs/hwui/ProfileData.cpp b/libs/hwui/ProfileData.cpp index a8e36e37905d..dd8439647fd3 100644 --- a/libs/hwui/ProfileData.cpp +++ b/libs/hwui/ProfileData.cpp @@ -24,7 +24,8 @@ namespace uirenderer { static const char* JANK_TYPE_NAMES[] = { "Missed Vsync", "High input latency", "Slow UI thread", - "Slow bitmap uploads", "Slow issue draw commands", "Frame deadline missed"}; + "Slow bitmap uploads", "Slow issue draw commands", "Frame deadline missed", + "Frame deadline missed (legacy)"}; // The bucketing algorithm controls so to speak // If a frame is <= to this it goes in bucket 0 @@ -94,6 +95,8 @@ void ProfileData::mergeWith(const ProfileData& other) { } mJankFrameCount >>= divider; mJankFrameCount += other.mJankFrameCount; + mJankLegacyFrameCount >>= divider; + mJankLegacyFrameCount += other.mJankLegacyFrameCount; mTotalFrameCount >>= divider; mTotalFrameCount += other.mTotalFrameCount; if (mStatStartTime > other.mStatStartTime || mStatStartTime == 0) { @@ -112,6 +115,9 @@ void ProfileData::dump(int fd) const { dprintf(fd, "\nJanky frames: %u (%.2f%%)", mJankFrameCount, mTotalFrameCount == 0 ? 0.0f : (float)mJankFrameCount / (float)mTotalFrameCount * 100.0f); + dprintf(fd, "\nJanky frames (legacy): %u (%.2f%%)", mJankLegacyFrameCount, mTotalFrameCount == 0 + ? 0.0f + : (float)mJankLegacyFrameCount / (float)mTotalFrameCount * 100.0f); dprintf(fd, "\n50th percentile: %ums", findPercentile(50)); dprintf(fd, "\n90th percentile: %ums", findPercentile(90)); dprintf(fd, "\n95th percentile: %ums", findPercentile(95)); @@ -158,6 +164,7 @@ void ProfileData::reset() { mSlowFrameCounts.fill(0); mTotalFrameCount = 0; mJankFrameCount = 0; + mJankLegacyFrameCount = 0; mStatStartTime = systemTime(SYSTEM_TIME_MONOTONIC); mPipelineType = Properties::getRenderPipelineType(); } diff --git a/libs/hwui/ProfileData.h b/libs/hwui/ProfileData.h index dd3ba661dd29..9be194c952e1 100644 --- a/libs/hwui/ProfileData.h +++ b/libs/hwui/ProfileData.h @@ -35,6 +35,7 @@ enum JankType { kSlowSync, kSlowRT, kMissedDeadline, + kMissedDeadlineLegacy, // must be last NUM_BUCKETS, @@ -60,10 +61,12 @@ public: void reportFrame(int64_t duration); void reportGPUFrame(int64_t duration); void reportJank() { mJankFrameCount++; } + void reportJankLegacy() { mJankLegacyFrameCount++; } void reportJankType(JankType type) { mJankTypeCounts[static_cast<int>(type)]++; } uint32_t totalFrameCount() const { return mTotalFrameCount; } uint32_t jankFrameCount() const { return mJankFrameCount; } + uint32_t jankLegacyFrameCount() const { return mJankLegacyFrameCount; } nsecs_t statsStartTime() const { return mStatStartTime; } uint32_t jankTypeCount(JankType type) const { return mJankTypeCounts[static_cast<int>(type)]; } RenderPipelineType pipelineType() const { return mPipelineType; } @@ -104,6 +107,7 @@ private: uint32_t mTotalFrameCount; uint32_t mJankFrameCount; + uint32_t mJankLegacyFrameCount; nsecs_t mStatStartTime; // true if HWUI renders with Vulkan pipeline diff --git a/libs/hwui/effects/StretchEffect.cpp b/libs/hwui/effects/StretchEffect.cpp index de14bebe5cbc..c2642d3fdb55 100644 --- a/libs/hwui/effects/StretchEffect.cpp +++ b/libs/hwui/effects/StretchEffect.cpp @@ -60,6 +60,14 @@ static const SkString stretchShader = SkString(R"( uniform float viewportWidth; // target height in pixels uniform float viewportHeight; // target width in pixels + // uInterpolationStrength is the intensity of the interpolation. + // if uInterpolationStrength is 0, then the stretch is constant for all the + // uStretchAffectedDist. if uInterpolationStrength is 1, then stretch intensity + // is interpolated based on the pixel position in the uStretchAffectedDist area; + // The closer we are from the scroll anchor point, the more it stretches, + // and the other way around. + uniform float uInterpolationStrength; + float easeInCubic(float t, float d) { float tmp = t * d; return tmp * tmp * tmp; @@ -70,10 +78,12 @@ static const SkString stretchShader = SkString(R"( float overscroll, float uStretchAffectedDist, float uInverseStretchAffectedDist, - float distanceStretched + float distanceStretched, + float interpolationStrength ) { float offsetPos = uStretchAffectedDist - inPos; - float posBasedVariation = easeInCubic(offsetPos, uInverseStretchAffectedDist); + float posBasedVariation = mix( + 1. ,easeInCubic(offsetPos, uInverseStretchAffectedDist), interpolationStrength); float stretchIntensity = overscroll * posBasedVariation; return distanceStretched - (offsetPos / (1. + stretchIntensity)); } @@ -84,10 +94,12 @@ static const SkString stretchShader = SkString(R"( float reverseStretchDist, float uStretchAffectedDist, float uInverseStretchAffectedDist, - float distanceStretched + float distanceStretched, + float interpolationStrength ) { float offsetPos = inPos - reverseStretchDist; - float posBasedVariation = easeInCubic(offsetPos, uInverseStretchAffectedDist); + float posBasedVariation = mix( + 1. ,easeInCubic(offsetPos, uInverseStretchAffectedDist), interpolationStrength); float stretchIntensity = (-overscroll) * posBasedVariation; return 1 - (distanceStretched - (offsetPos / (1. + stretchIntensity))); } @@ -101,7 +113,8 @@ static const SkString stretchShader = SkString(R"( float uStretchAffectedDist, float uInverseStretchAffectedDist, float distanceStretched, - float distanceDiff + float distanceDiff, + float interpolationStrength ) { float outPos = inPos; if (overscroll > 0) { @@ -111,7 +124,8 @@ static const SkString stretchShader = SkString(R"( overscroll, uStretchAffectedDist, uInverseStretchAffectedDist, - distanceStretched + distanceStretched, + interpolationStrength ); } else if (inPos >= distanceStretched) { outPos = distanceDiff + inPos; @@ -126,7 +140,8 @@ static const SkString stretchShader = SkString(R"( stretchAffectedDist, uStretchAffectedDist, uInverseStretchAffectedDist, - distanceStretched + distanceStretched, + interpolationStrength ); } else if (inPos < stretchAffectedDist) { outPos = -distanceDiff + inPos; @@ -153,7 +168,8 @@ static const SkString stretchShader = SkString(R"( uStretchAffectedDistX, uInverseDistanceStretchedX, uDistanceStretchedX, - uDistDiffX + uDistDiffX, + uInterpolationStrength ); outV = computeOverscroll( inV, @@ -161,7 +177,8 @@ static const SkString stretchShader = SkString(R"( uStretchAffectedDistY, uInverseDistanceStretchedY, uDistanceStretchedY, - uDistDiffY + uDistDiffY, + uInterpolationStrength ); coord.x = outU * viewportWidth; coord.y = outV * viewportHeight; @@ -170,6 +187,7 @@ static const SkString stretchShader = SkString(R"( static const float ZERO = 0.f; static const float CONTENT_DISTANCE_STRETCHED = 1.f; +static const float INTERPOLATION_STRENGTH_VALUE = 0.7f; sk_sp<SkShader> StretchEffect::getShader(const sk_sp<SkImage>& snapshotImage) const { if (isEmpty()) { @@ -197,6 +215,7 @@ sk_sp<SkShader> StretchEffect::getShader(const sk_sp<SkImage>& snapshotImage) co mBuilder->child("uContentTexture") = snapshotImage->makeShader( SkTileMode::kClamp, SkTileMode::kClamp, SkSamplingOptions(SkFilterMode::kLinear)); + mBuilder->uniform("uInterpolationStrength").set(&INTERPOLATION_STRENGTH_VALUE, 1); mBuilder->uniform("uStretchAffectedDistX").set(&CONTENT_DISTANCE_STRETCHED, 1); mBuilder->uniform("uStretchAffectedDistY").set(&CONTENT_DISTANCE_STRETCHED, 1); mBuilder->uniform("uDistanceStretchedX").set(&distanceStretchedX, 1); diff --git a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp index bd1da985a33e..d85954116dd1 100644 --- a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp +++ b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp @@ -605,7 +605,8 @@ static jobject android_view_ThreadedRenderer_createHardwareBitmapFromRenderNode( nsecs_t vsync = systemTime(SYSTEM_TIME_MONOTONIC); UiFrameInfoBuilder(proxy.frameInfo()) .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, - std::numeric_limits<int64_t>::max()) + UiFrameInfoBuilder::UNKNOWN_DEADLINE, + UiFrameInfoBuilder::UNKNOWN_FRAME_INTERVAL) .addFlag(FrameInfoFlags::SurfaceCanvas); proxy.syncAndDrawFrame(); } diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index aedb5c28dc3e..24821888e2eb 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -473,6 +473,9 @@ void CanvasContext::draw() { return; } + mCurrentFrameInfo->set(FrameInfoIndex::FrameInterval) = + mRenderThread.timeLord().frameIntervalNanos(); + mCurrentFrameInfo->markIssueDrawCommandsStart(); Frame frame = mRenderPipeline->getFrame(); @@ -591,25 +594,13 @@ void CanvasContext::draw() { mCurrentFrameInfo->markFrameCompleted(); mCurrentFrameInfo->set(FrameInfoIndex::GpuCompleted) = mCurrentFrameInfo->get(FrameInfoIndex::FrameCompleted); - finishFrame(mCurrentFrameInfo); + mJankTracker.finishFrame(*mCurrentFrameInfo, mFrameMetricsReporter); } } mRenderThread.cacheManager().onFrameCompleted(); } -void CanvasContext::finishFrame(FrameInfo* frameInfo) { - // TODO (b/169858044): Consolidate this into a single call. - mJankTracker.finishFrame(*frameInfo); - mJankTracker.finishGpuDraw(*frameInfo); - - // TODO (b/169858044): Move this into JankTracker to adjust deadline when queue is - // double-stuffed. - if (CC_UNLIKELY(mFrameMetricsReporter.get() != nullptr)) { - mFrameMetricsReporter->reportFrameMetrics(frameInfo->data(), false /*hasPresentTime*/); - } -} - void CanvasContext::reportMetricsWithPresentTime() { if (mFrameMetricsReporter == nullptr) { return; @@ -667,15 +658,19 @@ void CanvasContext::onSurfaceStatsAvailable(void* context, ASurfaceControl* cont if (gpuCompleteTime == -1) { gpuCompleteTime = frameInfo->get(FrameInfoIndex::SwapBuffersCompleted); } - if (gpuCompleteTime < frameInfo->get(FrameInfoIndex::SwapBuffers)) { - // TODO (b/180488606): Investigate why this can happen for first frames. - ALOGW("Impossible GPU complete time swapBuffers=%" PRIi64 " gpuComplete=%" PRIi64, - frameInfo->get(FrameInfoIndex::SwapBuffers), gpuCompleteTime); + if (gpuCompleteTime < frameInfo->get(FrameInfoIndex::IssueDrawCommandsStart)) { + // On Vulkan the GPU commands are flushed to the GPU during IssueDrawCommands rather + // than after SwapBuffers. So if the GPU signals before issue draw commands, then + // something probably went wrong. Anything after that could just be expected + // pipeline differences + ALOGW("Impossible GPU complete time issueCommandsStart=%" PRIi64 + " gpuComplete=%" PRIi64, + frameInfo->get(FrameInfoIndex::IssueDrawCommandsStart), gpuCompleteTime); gpuCompleteTime = frameInfo->get(FrameInfoIndex::SwapBuffersCompleted); } frameInfo->set(FrameInfoIndex::FrameCompleted) = gpuCompleteTime; frameInfo->set(FrameInfoIndex::GpuCompleted) = gpuCompleteTime; - instance->finishFrame(frameInfo); + instance->mJankTracker.finishFrame(*frameInfo, instance->mFrameMetricsReporter); } } @@ -704,10 +699,11 @@ void CanvasContext::prepareAndDraw(RenderNode* node) { nsecs_t vsync = mRenderThread.timeLord().computeFrameTimeNanos(); int64_t vsyncId = mRenderThread.timeLord().lastVsyncId(); int64_t frameDeadline = mRenderThread.timeLord().lastFrameDeadline(); + int64_t frameInterval = mRenderThread.timeLord().frameIntervalNanos(); int64_t frameInfo[UI_THREAD_FRAME_INFO_SIZE]; UiFrameInfoBuilder(frameInfo) .addFlag(FrameInfoFlags::RTAnimation) - .setVsync(vsync, vsync, vsyncId, frameDeadline); + .setVsync(vsync, vsync, vsyncId, frameDeadline, frameInterval); TreeInfo info(TreeInfo::MODE_RT_ONLY, *this); prepareTree(info, frameInfo, systemTime(SYSTEM_TIME_MONOTONIC), node); diff --git a/libs/hwui/renderthread/DrawFrameTask.cpp b/libs/hwui/renderthread/DrawFrameTask.cpp index 7a38a3bc9c05..cb92aa191073 100644 --- a/libs/hwui/renderthread/DrawFrameTask.cpp +++ b/libs/hwui/renderthread/DrawFrameTask.cpp @@ -161,7 +161,9 @@ bool DrawFrameTask::syncFrameState(TreeInfo& info) { int64_t intendedVsync = mFrameInfo[static_cast<int>(FrameInfoIndex::IntendedVsync)]; int64_t vsyncId = mFrameInfo[static_cast<int>(FrameInfoIndex::FrameTimelineVsyncId)]; int64_t frameDeadline = mFrameInfo[static_cast<int>(FrameInfoIndex::FrameDeadline)]; - mRenderThread->timeLord().vsyncReceived(vsync, intendedVsync, vsyncId, frameDeadline); + int64_t frameInterval = mFrameInfo[static_cast<int>(FrameInfoIndex::FrameInterval)]; + mRenderThread->timeLord().vsyncReceived(vsync, intendedVsync, vsyncId, frameDeadline, + frameInterval); bool canDraw = mContext->makeCurrent(); mContext->unpinImages(); diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 79b938841bc2..682baa60a207 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -87,9 +87,10 @@ void RenderThread::frameCallback(int64_t frameTimeNanos, void* data) { RenderThread* rt = reinterpret_cast<RenderThread*>(data); int64_t vsyncId = AChoreographer_getVsyncId(rt->mChoreographer); int64_t frameDeadline = AChoreographer_getFrameDeadline(rt->mChoreographer); + int64_t frameInterval = AChoreographer_getFrameInterval(rt->mChoreographer); rt->mVsyncRequested = false; - if (rt->timeLord().vsyncReceived(frameTimeNanos, frameTimeNanos, vsyncId, frameDeadline) && - !rt->mFrameCallbackTaskPending) { + if (rt->timeLord().vsyncReceived(frameTimeNanos, frameTimeNanos, vsyncId, frameDeadline, + frameInterval) && !rt->mFrameCallbackTaskPending) { ATRACE_NAME("queue mFrameCallbackTask"); rt->mFrameCallbackTaskPending = true; nsecs_t runAt = (frameTimeNanos + rt->mDispatchFrameDelay); diff --git a/libs/hwui/renderthread/TimeLord.cpp b/libs/hwui/renderthread/TimeLord.cpp index abb633028363..406066c92bab 100644 --- a/libs/hwui/renderthread/TimeLord.cpp +++ b/libs/hwui/renderthread/TimeLord.cpp @@ -27,11 +27,14 @@ TimeLord::TimeLord() : mFrameIntervalNanos(milliseconds_to_nanoseconds(16)), mFrameDeadline(std::numeric_limits<int64_t>::max()){} bool TimeLord::vsyncReceived(nsecs_t vsync, nsecs_t intendedVsync, int64_t vsyncId, - int64_t frameDeadline) { + int64_t frameDeadline, nsecs_t frameInterval) { if (intendedVsync > mFrameIntendedTimeNanos) { mFrameIntendedTimeNanos = intendedVsync; mFrameVsyncId = vsyncId; mFrameDeadline = frameDeadline; + if (frameInterval > 0) { + mFrameIntervalNanos = frameInterval; + } } if (vsync > mFrameTimeNanos) { diff --git a/libs/hwui/renderthread/TimeLord.h b/libs/hwui/renderthread/TimeLord.h index fa05c030fa0f..8cd6733c1cde 100644 --- a/libs/hwui/renderthread/TimeLord.h +++ b/libs/hwui/renderthread/TimeLord.h @@ -33,7 +33,7 @@ public: // returns true if the vsync is newer, false if it was rejected for staleness bool vsyncReceived(nsecs_t vsync, nsecs_t indendedVsync, int64_t vsyncId, - int64_t frameDeadline); + int64_t frameDeadline, nsecs_t frameInterval); nsecs_t latestVsync() { return mFrameTimeNanos; } nsecs_t computeFrameTimeNanos(); int64_t lastVsyncId() const { return mFrameVsyncId; } diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp index 8c7d2612f39b..13ac3671c9c7 100644 --- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp +++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp @@ -146,7 +146,9 @@ void run(const TestScene::Info& info, const TestScene::Options& opts, testContext.waitForVsync(); nsecs_t vsync = systemTime(SYSTEM_TIME_MONOTONIC); UiFrameInfoBuilder(proxy->frameInfo()) - .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, std::numeric_limits<int64_t>::max()); + .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, + UiFrameInfoBuilder::UNKNOWN_DEADLINE, + UiFrameInfoBuilder::UNKNOWN_FRAME_INTERVAL); proxy->syncAndDrawFrame(); } @@ -162,7 +164,9 @@ void run(const TestScene::Info& info, const TestScene::Options& opts, { ATRACE_NAME("UI-Draw Frame"); UiFrameInfoBuilder(proxy->frameInfo()) - .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, std::numeric_limits<int64_t>::max()); + .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, + UiFrameInfoBuilder::UNKNOWN_DEADLINE, + UiFrameInfoBuilder::UNKNOWN_FRAME_INTERVAL); scene->doFrame(i); proxy->syncAndDrawFrame(); } diff --git a/libs/hwui/tests/scripts/skp-capture.sh b/libs/hwui/tests/scripts/skp-capture.sh index 4b46fbf86818..0749a8dcebcb 100755 --- a/libs/hwui/tests/scripts/skp-capture.sh +++ b/libs/hwui/tests/scripts/skp-capture.sh @@ -76,8 +76,8 @@ banner '...WAITING FOR APP INTERACTION...' # so we continue to show the "waiting for app interaction" message as long as the app still requires # interaction to draw more frames. adb_test_file_nonzero() { - # grab first byte of `du` output - X="$(adb shell "du \"$1\" 2> /dev/null | dd bs=1 count=1 2> /dev/null")" + # grab first byte of `wc -c` output + X="$(adb shell "wc -c \"$1\" 2> /dev/null | dd bs=1 count=1 2> /dev/null")" test "$X" && test "$X" -ne 0 } timeout=$(( $(date +%s) + $phase1_timeout_seconds)) diff --git a/libs/hwui/tests/unit/JankTrackerTests.cpp b/libs/hwui/tests/unit/JankTrackerTests.cpp new file mode 100644 index 000000000000..f467ebf5d888 --- /dev/null +++ b/libs/hwui/tests/unit/JankTrackerTests.cpp @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <gtest/gtest.h> +#include <gmock/gmock.h> + +#include <JankTracker.h> +#include <utils/TimeUtils.h> + +using namespace android; +using namespace android::uirenderer; + +class TestFrameMetricsObserver : public FrameMetricsObserver { +public: + void notify(const int64_t*) {} +}; + +TEST(JankTracker, noJank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr<FrameMetricsReporter> reporter = std::make_unique<FrameMetricsReporter>(); + + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 115_ms; + info->set(FrameInfoIndex::FrameCompleted) = 115_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 116_ms; + info->set(FrameInfoIndex::Vsync) = 117_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 129_ms; + info->set(FrameInfoIndex::GpuCompleted) = 131_ms; + info->set(FrameInfoIndex::FrameCompleted) = 131_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 136_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(2, container.get()->totalFrameCount()); + ASSERT_EQ(0, container.get()->jankFrameCount()); +} + + +TEST(JankTracker, jank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr<FrameMetricsReporter> reporter = std::make_unique<FrameMetricsReporter>(); + + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->totalFrameCount()); + ASSERT_EQ(1, container.get()->jankFrameCount()); +} + +TEST(JankTracker, legacyJankButNoRealJank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr<FrameMetricsReporter> reporter = std::make_unique<FrameMetricsReporter>(); + + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 117_ms; + info->set(FrameInfoIndex::GpuCompleted) = 118_ms; + info->set(FrameInfoIndex::FrameCompleted) = 118_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->totalFrameCount()); + ASSERT_EQ(0, container.get()->jankFrameCount()); + ASSERT_EQ(1, container.get()->jankLegacyFrameCount()); +} + +TEST(JankTracker, doubleStuffed) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr<FrameMetricsReporter> reporter = std::make_unique<FrameMetricsReporter>(); + + // First frame janks + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->jankFrameCount()); + + // Second frame is long, but doesn't jank because double-stuffed. + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 116_ms; + info->set(FrameInfoIndex::Vsync) = 122_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 129_ms; + info->set(FrameInfoIndex::GpuCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 136_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(2, container.get()->totalFrameCount()); + ASSERT_EQ(1, container.get()->jankFrameCount()); +} + +TEST(JankTracker, doubleStuffedThenPauseThenJank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr<FrameMetricsReporter> reporter = std::make_unique<FrameMetricsReporter>(); + + // First frame janks + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->jankFrameCount()); + + // Second frame is long, but doesn't jank because double-stuffed. + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 116_ms; + info->set(FrameInfoIndex::Vsync) = 122_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 129_ms; + info->set(FrameInfoIndex::GpuCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 136_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->jankFrameCount()); + + // Thirdframe is long and skips one frame some double stuffed logic gets reset + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 148_ms; + info->set(FrameInfoIndex::Vsync) = 148_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 160_ms; + info->set(FrameInfoIndex::GpuCompleted) = 169_ms; + info->set(FrameInfoIndex::FrameCompleted) = 169_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 168_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(3, container.get()->totalFrameCount()); + ASSERT_EQ(2, container.get()->jankFrameCount()); +}
\ No newline at end of file diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index 864350e25929..3a19b136b06e 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -2495,7 +2495,10 @@ public final class MediaDrm implements AutoCloseable { * The default security level is defined as the highest security level * supported on the device. * - * @param mime The mime type of the media data + * @param mime The mime type of the media data. Please use {@link + * #isCryptoSchemeSupported(UUID, String)} to query mime type support separately; + * for unsupported mime types the return value of {@link + * #requiresSecureDecoder(String)} is crypto scheme dependent. */ public boolean requiresSecureDecoder(@NonNull String mime) { return requiresSecureDecoder(mime, getMaxSecurityLevel()); @@ -2505,7 +2508,10 @@ public final class MediaDrm implements AutoCloseable { * Query if the crypto scheme requires the use of a secure decoder * to decode data of the given mime type at the given security level. * - * @param mime The mime type of the media data + * @param mime The mime type of the media data. Please use {@link + * #isCryptoSchemeSupported(UUID, String, int)} to query mime type support + * separately; for unsupported mime types the return value of {@link + * #requiresSecureDecoder(String, int)} is crypto scheme dependent. * @param level a security level between {@link #SECURITY_LEVEL_SW_SECURE_CRYPTO} * and {@link #SECURITY_LEVEL_HW_SECURE_ALL}. Otherwise the special value * {@link #getMaxSecurityLevel()} is also permitted; diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java index e7d30ebba4b1..9eacc74843f9 100644 --- a/media/java/android/media/session/PlaybackState.java +++ b/media/java/android/media/session/PlaybackState.java @@ -19,7 +19,6 @@ import android.annotation.DrawableRes; import android.annotation.IntDef; import android.annotation.LongDef; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -493,15 +492,26 @@ public final class PlaybackState implements Parcelable { /** * Returns whether this is considered as an active playback state. - * @hide + * <p> + * The playback state is considered as an active if the state is one of the following: + * <ul> + * <li>{@link #STATE_BUFFERING}</li> + * <li>{@link #STATE_CONNECTING}</li> + * <li>{@link #STATE_FAST_FORWARDING}</li> + * <li>{@link #STATE_PLAYING}</li> + * <li>{@link #STATE_REWINDING}</li> + * <li>{@link #STATE_SKIPPING_TO_NEXT}</li> + * <li>{@link #STATE_SKIPPING_TO_PREVIOUS}</li> + * <li>{@link #STATE_SKIPPING_TO_QUEUE_ITEM}</li> + * </ul> */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) - public boolean isActiveState() { + public boolean isActive() { switch (mState) { case PlaybackState.STATE_FAST_FORWARDING: case PlaybackState.STATE_REWINDING: case PlaybackState.STATE_SKIPPING_TO_PREVIOUS: case PlaybackState.STATE_SKIPPING_TO_NEXT: + case PlaybackState.STATE_SKIPPING_TO_QUEUE_ITEM: case PlaybackState.STATE_BUFFERING: case PlaybackState.STATE_CONNECTING: case PlaybackState.STATE_PLAYING: diff --git a/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java b/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java index ba83a44d0d6c..efd336377114 100644 --- a/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java +++ b/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java @@ -22,6 +22,7 @@ import static android.net.NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.net.NetworkCapabilities.RedactionType; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -45,7 +46,7 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable { public final String sessionId; @Override - public long getApplicableRedactions() { + public @RedactionType long getApplicableRedactions() { return REDACT_FOR_NETWORK_SETTINGS; } @@ -53,7 +54,7 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable { * Create a copy of a {@link VpnTransportInfo} with the sessionId redacted if necessary. */ @NonNull - public VpnTransportInfo makeCopy(long redactions) { + public VpnTransportInfo makeCopy(@RedactionType long redactions) { return new VpnTransportInfo(type, ((redactions & REDACT_FOR_NETWORK_SETTINGS) != 0) ? null : sessionId); } diff --git a/packages/PackageInstaller/res/values-fa/strings.xml b/packages/PackageInstaller/res/values-fa/strings.xml index fbb437ed6be4..0ec6acfe0831 100644 --- a/packages/PackageInstaller/res/values-fa/strings.xml +++ b/packages/PackageInstaller/res/values-fa/strings.xml @@ -46,7 +46,7 @@ <string name="out_of_space_dlg_text" msgid="8727714096031856231">"<xliff:g id="APP_NAME">%1$s</xliff:g> نصب نمیشود. مقداری از فضا را آزاد و دوباره امتحان کنید."</string> <string name="app_not_found_dlg_title" msgid="5107924008597470285">"برنامه یافت نشد"</string> <string name="app_not_found_dlg_text" msgid="5219983779377811611">"برنامه در فهرست برنامههای نصبشده یافت نشد."</string> - <string name="user_is_not_allowed_dlg_title" msgid="6915293433252210232">"مجاز نیست"</string> + <string name="user_is_not_allowed_dlg_title" msgid="6915293433252210232">"مجاز نبودن"</string> <string name="user_is_not_allowed_dlg_text" msgid="3468447791330611681">"کاربر کنونی مجاز به انجام این حذف نصب نیست."</string> <string name="generic_error_dlg_title" msgid="5863195085927067752">"خطا"</string> <string name="generic_error_dlg_text" msgid="5287861443265795232">"برنامه را نمیتوان حذف نصب کرد."</string> diff --git a/packages/PackageInstaller/res/values-ne/strings.xml b/packages/PackageInstaller/res/values-ne/strings.xml index 1f378c5dad08..5509c1c23842 100644 --- a/packages/PackageInstaller/res/values-ne/strings.xml +++ b/packages/PackageInstaller/res/values-ne/strings.xml @@ -18,17 +18,14 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="7488448184431507488">"प्याकेज स्थापनाकर्ता"</string> <string name="install" msgid="711829760615509273">"स्थापना गर्नु…"</string> - <!-- no translation found for update (3932142540719227615) --> - <skip /> + <string name="update" msgid="3932142540719227615">"अपडेट गर्नुहोस्"</string> <string name="done" msgid="6632441120016885253">"सम्पन्न भयो"</string> <string name="cancel" msgid="1018267193425558088">"रद्द गर्नुहोस्"</string> <string name="installing" msgid="4921993079741206516">"स्थापना गर्दै…"</string> <string name="installing_app" msgid="1165095864863849422">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> स्थापना गर्दै…"</string> <string name="install_done" msgid="5987363587661783896">"एप स्थापना गरियो।"</string> - <!-- no translation found for install_confirm_question (7663733664476363311) --> - <skip /> - <!-- no translation found for install_confirm_question_update (3348888852318388584) --> - <skip /> + <string name="install_confirm_question" msgid="7663733664476363311">"तपाईं यो एप इन्स्टल गर्न चाहनुहुन्छ?"</string> + <string name="install_confirm_question_update" msgid="3348888852318388584">"तपाईं यो एप अपडेट गर्न चाहनुहुन्छ?"</string> <string name="install_failed" msgid="5777824004474125469">"एप स्थापना गरिएन।"</string> <string name="install_failed_blocked" msgid="8512284352994752094">"यो प्याकेज स्थापना गर्ने क्रममा अवरोध गरियो।"</string> <string name="install_failed_conflict" msgid="3493184212162521426">"प्याकेजका रूपमा स्थापना नगरिएको एप विद्यमान प्याकेजसँग मेल खाँदैन।"</string> @@ -83,12 +80,9 @@ <string name="wear_not_allowed_dlg_text" msgid="704615521550939237">"Wear मा स्थापना/स्थापना रद्द गर्ने कारबाहीहरू समर्थित छैनन्।"</string> <string name="message_staging" msgid="8032722385658438567">"एप स्थापना गर्न तयारी गर्दै…"</string> <string name="app_name_unknown" msgid="6881210203354323926">"अज्ञात"</string> - <!-- no translation found for untrusted_external_source_warning (7067510047443133095) --> - <skip /> - <!-- no translation found for untrusted_external_source_warning (7057271609532508035) --> - <skip /> - <!-- no translation found for untrusted_external_source_warning (8444191224459138919) --> - <skip /> + <string name="untrusted_external_source_warning" product="tablet" msgid="7067510047443133095">"तपाईंको सुरक्षार्थ हाल तपाईंको ट्याब्लेटमा यो स्रोतबाट अज्ञात एपहरू इन्स्टल गर्ने अनुमति दिइएको छैन। तपाईं सेटिङमा गई यो कुरा परिवर्तन गर्न सक्नुहुन्छ।"</string> + <string name="untrusted_external_source_warning" product="tv" msgid="7057271609532508035">"तपाईंको सुरक्षार्थ हाल तपाईंको टिभीमा यो स्रोतबाट अज्ञात एपहरू इन्स्टल गर्ने अनुमति दिइएको छैन। तपाईं सेटिङमा गई यो कुरा परिवर्तन गर्न सक्नुहुन्छ।"</string> + <string name="untrusted_external_source_warning" product="default" msgid="8444191224459138919">"तपाईंको सुरक्षार्थ हाल तपाईंको फोनमा यो स्रोतबाट अज्ञात एपहरू इन्स्टल गर्ने अनुमति दिइएको छैन। तपाईं सेटिङमा गई यो कुरा परिवर्तन गर्न सक्नुहुन्छ।"</string> <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"तपाईंको फोन तथा व्यक्तिगत डेटा अज्ञात एपहरूबाट हुने आक्रमणको चपेटामा पर्ने बढी जोखिममा हुन्छन्। यो एप स्थापना गरेर तपाईं यसको प्रयोगबाट तपाईंको फोनमा हुन सक्ने क्षति वा डेटाको नोक्सानीका लागि स्वयं जिम्मेवार हुने कुरामा सहमत हुनुहुन्छ।"</string> <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"तपाईंको ट्याब्लेट तथा व्यक्तिगत डेटा अज्ञात एपहरूबाट हुने आक्रमणको चपेटामा पर्ने बढी जोखिममा हुन्छन्। यो एप स्थापना गरेर तपाईं यसको प्रयोगबाट तपाईंको ट्याब्लेटमा हुन सक्ने क्षति वा डेटाको नोक्सानीका लागि स्वयं जिम्मेवार हुने कुरामा सहमत हुनुहुन्छ।"</string> <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"तपाईंको टिभी तथा व्यक्तिगत डेटा अज्ञात एपहरूबाट हुने आक्रमणको चपेटामा पर्ने बढी जोखिममा हुन्छन्। यो एप स्थापना गरेर तपाईं यसको प्रयोगबाट तपाईंको टिभी मा हुन सक्ने क्षति वा डेटाको नोक्सानीका लागि स्वयं जिम्मेवार हुने कुरामा सहमत हुनुहुन्छ।"</string> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 91667c4e88c7..6440d2a53f84 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -16,7 +16,6 @@ package com.android.providers.settings; -import static android.os.Process.INVALID_UID; import static android.os.Process.ROOT_UID; import static android.os.Process.SHELL_UID; import static android.os.Process.SYSTEM_UID; @@ -364,6 +363,11 @@ public class SettingsProvider extends ContentProvider { mHandler = new Handler(mHandlerThread.getLooper()); mSettingsRegistry = new SettingsRegistry(); } + SettingsState.cacheSystemPackageNamesAndSystemSignature(getContext()); + synchronized (mLock) { + mSettingsRegistry.migrateAllLegacySettingsIfNeededLocked(); + mSettingsRegistry.syncSsaidTableOnStartLocked(); + } mHandler.post(() -> { registerBroadcastReceivers(); startWatchingUserRestrictionChanges(); @@ -2499,8 +2503,6 @@ public class SettingsProvider extends ContentProvider { mHandler = new MyHandler(getContext().getMainLooper()); mGenerationRegistry = new GenerationRegistry(mLock); mBackupManager = new BackupManager(getContext()); - migrateAllLegacySettingsIfNeeded(); - syncSsaidTableOnStart(); } private void generateUserKeyLocked(int userId) { @@ -2587,38 +2589,36 @@ public class SettingsProvider extends ContentProvider { return getSettingLocked(SETTINGS_TYPE_SSAID, userId, uid); } - public void syncSsaidTableOnStart() { - synchronized (mLock) { - // Verify that each user's packages and ssaid's are in sync. - for (UserInfo user : mUserManager.getAliveUsers()) { - // Get all uids for the user's packages. - final List<PackageInfo> packages; - try { - packages = mPackageManager.getInstalledPackages( + private void syncSsaidTableOnStartLocked() { + // Verify that each user's packages and ssaid's are in sync. + for (UserInfo user : mUserManager.getAliveUsers()) { + // Get all uids for the user's packages. + final List<PackageInfo> packages; + try { + packages = mPackageManager.getInstalledPackages( PackageManager.MATCH_UNINSTALLED_PACKAGES, user.id).getList(); - } catch (RemoteException e) { - throw new IllegalStateException("Package manager not available"); - } - final Set<String> appUids = new HashSet<>(); - for (PackageInfo info : packages) { - appUids.add(Integer.toString(info.applicationInfo.uid)); - } + } catch (RemoteException e) { + throw new IllegalStateException("Package manager not available"); + } + final Set<String> appUids = new HashSet<>(); + for (PackageInfo info : packages) { + appUids.add(Integer.toString(info.applicationInfo.uid)); + } - // Get all uids currently stored in the user's ssaid table. - final Set<String> ssaidUids = new HashSet<>( - getSettingsNamesLocked(SETTINGS_TYPE_SSAID, user.id)); - ssaidUids.remove(SSAID_USER_KEY); + // Get all uids currently stored in the user's ssaid table. + final Set<String> ssaidUids = new HashSet<>( + getSettingsNamesLocked(SETTINGS_TYPE_SSAID, user.id)); + ssaidUids.remove(SSAID_USER_KEY); - // Perform a set difference for the appUids and ssaidUids. - ssaidUids.removeAll(appUids); + // Perform a set difference for the appUids and ssaidUids. + ssaidUids.removeAll(appUids); - // If there are ssaidUids left over they need to be removed from the table. - final SettingsState ssaidSettings = getSettingsLocked(SETTINGS_TYPE_SSAID, - user.id); - for (String uid : ssaidUids) { - ssaidSettings.deleteSettingLocked(uid); - } + // If there are ssaidUids left over they need to be removed from the table. + final SettingsState ssaidSettings = getSettingsLocked(SETTINGS_TYPE_SSAID, + user.id); + for (String uid : ssaidUids) { + ssaidSettings.deleteSettingLocked(uid); } } } @@ -2911,7 +2911,7 @@ public class SettingsProvider extends ContentProvider { boolean someSettingChanged = false; Setting setting = settingsState.getSettingLocked(name); if (!SettingsState.isSystemPackage(getContext(), - setting.getPackageName(), INVALID_UID, userId)) { + setting.getPackageName())) { if (prefix != null && !setting.getName().startsWith(prefix)) { continue; } @@ -2931,7 +2931,7 @@ public class SettingsProvider extends ContentProvider { boolean someSettingChanged = false; Setting setting = settingsState.getSettingLocked(name); if (!SettingsState.isSystemPackage(getContext(), - setting.getPackageName(), INVALID_UID, userId)) { + setting.getPackageName())) { if (prefix != null && !setting.getName().startsWith(prefix)) { continue; } @@ -3009,40 +3009,38 @@ public class SettingsProvider extends ContentProvider { return mSettingsStates.get(key); } - private void migrateAllLegacySettingsIfNeeded() { - synchronized (mLock) { - final int key = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM); - File globalFile = getSettingsFile(key); - if (SettingsState.stateFileExists(globalFile)) { - return; - } + private void migrateAllLegacySettingsIfNeededLocked() { + final int key = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM); + File globalFile = getSettingsFile(key); + if (SettingsState.stateFileExists(globalFile)) { + return; + } - mSettingsCreationBuildId = Build.ID; + mSettingsCreationBuildId = Build.ID; - final long identity = Binder.clearCallingIdentity(); - try { - List<UserInfo> users = mUserManager.getAliveUsers(); + final long identity = Binder.clearCallingIdentity(); + try { + List<UserInfo> users = mUserManager.getAliveUsers(); - final int userCount = users.size(); - for (int i = 0; i < userCount; i++) { - final int userId = users.get(i).id; + final int userCount = users.size(); + for (int i = 0; i < userCount; i++) { + final int userId = users.get(i).id; - DatabaseHelper dbHelper = new DatabaseHelper(getContext(), userId); - SQLiteDatabase database = dbHelper.getWritableDatabase(); - migrateLegacySettingsForUserLocked(dbHelper, database, userId); + DatabaseHelper dbHelper = new DatabaseHelper(getContext(), userId); + SQLiteDatabase database = dbHelper.getWritableDatabase(); + migrateLegacySettingsForUserLocked(dbHelper, database, userId); - // Upgrade to the latest version. - UpgradeController upgrader = new UpgradeController(userId); - upgrader.upgradeIfNeededLocked(); + // Upgrade to the latest version. + UpgradeController upgrader = new UpgradeController(userId); + upgrader.upgradeIfNeededLocked(); - // Drop from memory if not a running user. - if (!mUserManager.isUserRunning(new UserHandle(userId))) { - removeUserStateLocked(userId, false); - } + // Drop from memory if not a running user. + if (!mUserManager.isUserRunning(new UserHandle(userId))) { + removeUserStateLocked(userId, false); } - } finally { - Binder.restoreCallingIdentity(identity); } + } finally { + Binder.restoreCallingIdentity(identity); } } @@ -5036,19 +5034,9 @@ public class SettingsProvider extends ContentProvider { // In the upgrade case we pretend the call is made from the app // that made the last change to the setting to properly determine // whether the call has been made by a system component. - int callingUid = -1; - try { - callingUid = mPackageManager.getPackageUid(setting.getPackageName(), 0, userId); - } catch (RemoteException e) { - /* ignore - handled below */ - } - if (callingUid < 0) { - Slog.e(LOG_TAG, "Unknown package: " + setting.getPackageName()); - continue; - } try { - final boolean systemSet = SettingsState.isSystemPackage(getContext(), - setting.getPackageName(), callingUid, userId); + final boolean systemSet = SettingsState.isSystemPackage( + getContext(), setting.getPackageName()); if (systemSet) { settings.insertSettingOverrideableByRestoreLocked(name, setting.getValue(), setting.getTag(), true, setting.getPackageName()); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 53d868ac0050..e7f1ad7a461f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -17,14 +17,13 @@ package com.android.providers.settings; import static android.os.Process.FIRST_APPLICATION_UID; -import static android.os.Process.INVALID_UID; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.content.pm.Signature; import android.os.Binder; import android.os.Build; import android.os.FileUtils; @@ -37,10 +36,10 @@ import android.provider.Settings; import android.providers.settings.SettingsOperationProto; import android.text.TextUtils; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.AtomicFile; import android.util.Base64; import android.util.Slog; -import android.util.SparseIntArray; import android.util.TimeUtils; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; @@ -149,13 +148,7 @@ final class SettingsState { private static final String NULL_VALUE = "null"; - private static final Object sLock = new Object(); - - @GuardedBy("sLock") - private static final SparseIntArray sSystemUids = new SparseIntArray(); - - @GuardedBy("sLock") - private static Signature sSystemSignature; + private static final ArraySet<String> sSystemPackages = new ArraySet<>(); private final Object mWriteLock = new Object(); @@ -641,7 +634,7 @@ final class SettingsState { /** * Dump historical operations as a proto buf. * - * @param proto The proto buf stream to dump to + * @param proto The proto buf stream to dump to * @param fieldId The repeated field ID to use to save an operation to. */ void dumpHistoricalOperations(@NonNull ProtoOutputStream proto, long fieldId) { @@ -1048,6 +1041,7 @@ final class SettingsState { /** * Uses AtomicFile to check if the file or its backup exists. + * * @param file The file to check for existence * @return whether the original or backup exist */ @@ -1307,9 +1301,9 @@ final class SettingsState { if (NULL_VALUE.equals(value)) { value = null; } - final boolean callerSystem = !forceNonSystemPackage && - !isNull() && isSystemPackage(mContext, packageName); + !isNull() && (isCalledFromSystem(packageName) + || isSystemPackage(mContext, packageName)); // Settings set by the system are always defaults. if (callerSystem) { setDefault = true; @@ -1434,98 +1428,98 @@ final class SettingsState { return sb.toString(); } - // Check if a specific package belonging to the caller is part of the system package. - public static boolean isSystemPackage(Context context, String packageName) { - final int callingUid = Binder.getCallingUid(); - final int callingUserId = UserHandle.getUserId(callingUid); - return isSystemPackage(context, packageName, callingUid, callingUserId); - } - - // Check if a specific package, uid, and user ID are part of the system package. - public static boolean isSystemPackage(Context context, String packageName, int uid, - int userId) { - synchronized (sLock) { - if (SYSTEM_PACKAGE_NAME.equals(packageName)) { - return true; - } - - // Shell and Root are not considered a part of the system - if (SHELL_PACKAGE_NAME.equals(packageName) - || ROOT_PACKAGE_NAME.equals(packageName)) { - return false; + // Cache the list of names of system packages. This is only called once on system boot. + public static void cacheSystemPackageNamesAndSystemSignature(@NonNull Context context) { + final PackageManager packageManager = context.getPackageManager(); + final long identity = Binder.clearCallingIdentity(); + try { + sSystemPackages.add(SYSTEM_PACKAGE_NAME); + // Cache SetupWizard package name. + final String setupWizPackageName = packageManager.getSetupWizardPackageName(); + if (setupWizPackageName != null) { + sSystemPackages.add(setupWizPackageName); } - - if (uid != INVALID_UID) { - // Native services running as a special UID get a pass - final int callingAppId = UserHandle.getAppId(uid); - if (callingAppId < FIRST_APPLICATION_UID) { - sSystemUids.put(callingAppId, callingAppId); - return true; + final List<PackageInfo> packageInfos = packageManager.getInstalledPackages(0); + final int installedPackagesCount = packageInfos.size(); + for (int i = 0; i < installedPackagesCount; i++) { + if (shouldAddToSystemPackages(packageInfos.get(i))) { + sSystemPackages.add(packageInfos.get(i).packageName); } } + } finally { + Binder.restoreCallingIdentity(identity); + } + } - final long identity = Binder.clearCallingIdentity(); - try { - try { - uid = context.getPackageManager().getPackageUidAsUser(packageName, 0, userId); - } catch (PackageManager.NameNotFoundException e) { - return false; - } - - // If the system or a special system UID (like telephony), done. - if (UserHandle.getAppId(uid) < FIRST_APPLICATION_UID) { - sSystemUids.put(uid, uid); - return true; - } + private static boolean shouldAddToSystemPackages(@NonNull PackageInfo packageInfo) { + // Shell and Root are not considered a part of the system + if (isShellOrRoot(packageInfo.packageName)) { + return false; + } + // Already added + if (sSystemPackages.contains(packageInfo.packageName)) { + return false; + } + return isSystemPackage(packageInfo.applicationInfo); + } - // If already known system component, done. - if (sSystemUids.indexOfKey(uid) >= 0) { - return true; - } + private static boolean isShellOrRoot(@NonNull String packageName) { + return (SHELL_PACKAGE_NAME.equals(packageName) + || ROOT_PACKAGE_NAME.equals(packageName)); + } - // If SetupWizard, done. - String setupWizPackage = context.getPackageManager().getSetupWizardPackageName(); - if (packageName.equals(setupWizPackage)) { - sSystemUids.put(uid, uid); - return true; - } + private static boolean isCalledFromSystem(@NonNull String packageName) { + // Shell and Root are not considered a part of the system + if (isShellOrRoot(packageName)) { + return false; + } + final int callingUid = Binder.getCallingUid(); + // Native services running as a special UID get a pass + final int callingAppId = UserHandle.getAppId(callingUid); + return (callingAppId < FIRST_APPLICATION_UID); + } - // If a persistent system app, done. - PackageInfo packageInfo; - try { - packageInfo = context.getPackageManager().getPackageInfoAsUser( - packageName, PackageManager.GET_SIGNATURES, userId); - if ((packageInfo.applicationInfo.flags - & ApplicationInfo.FLAG_PERSISTENT) != 0 - && (packageInfo.applicationInfo.flags - & ApplicationInfo.FLAG_SYSTEM) != 0) { - sSystemUids.put(uid, uid); - return true; - } - } catch (PackageManager.NameNotFoundException e) { - return false; - } + public static boolean isSystemPackage(@NonNull Context context, @NonNull String packageName) { + // Check shell or root before trying to retrieve ApplicationInfo to fail fast + if (isShellOrRoot(packageName)) { + return false; + } + // If it's a known system package or known to be platform signed + if (sSystemPackages.contains(packageName)) { + return true; + } - // Last check if system signed. - if (sSystemSignature == null) { - try { - sSystemSignature = context.getPackageManager().getPackageInfoAsUser( - SYSTEM_PACKAGE_NAME, PackageManager.GET_SIGNATURES, - UserHandle.USER_SYSTEM).signatures[0]; - } catch (PackageManager.NameNotFoundException e) { - /* impossible */ - return false; - } - } - if (sSystemSignature.equals(packageInfo.signatures[0])) { - sSystemUids.put(uid, uid); - return true; - } - } finally { - Binder.restoreCallingIdentity(identity); + ApplicationInfo aInfo = null; + final long identity = Binder.clearCallingIdentity(); + try { + try { + // Notice that this makes a call to package manager inside the lock + aInfo = context.getPackageManager().getApplicationInfo(packageName, 0); + } catch (PackageManager.NameNotFoundException ignored) { } + } finally { + Binder.restoreCallingIdentity(identity); + } + return isSystemPackage(aInfo); + } + private static boolean isSystemPackage(@Nullable ApplicationInfo aInfo) { + if (aInfo == null) { return false; } + // If the system or a special system UID (like telephony), done. + if (aInfo.uid < FIRST_APPLICATION_UID) { + return true; + } + // If a persistent system app, done. + if ((aInfo.flags & ApplicationInfo.FLAG_PERSISTENT) != 0 + && (aInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { + return true; + } + // Platform signed packages are considered to be from the system + if (aInfo.isSignedWithPlatformKey()) { + return true; + } + return false; } } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index bef6423f3baa..f685d888ffa3 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -113,6 +113,8 @@ <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" /> <!-- ACCESS_BACKGROUND_LOCATION is needed for testing purposes only. --> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> + <!-- ACCESS_MTP is needed for testing purposes only. --> + <uses-permission android:name="android.permission.ACCESS_MTP" /> <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> @@ -539,6 +541,9 @@ <!-- Permission required for CTS test - CtsRotationResolverServiceDeviceTestCases --> <uses-permission android:name="android.permission.MANAGE_ROTATION_RESOLVER" /> + <!-- Permission required for CTS test - CtsUwbTestCases --> + <uses-permission android:name="android.permission.UWB_PRIVILEGED" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" diff --git a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java index 35423a979cbc..53ff9f0e8c0b 100644 --- a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java +++ b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java @@ -58,5 +58,7 @@ public interface BcSmartspaceDataPlugin extends Plugin { /** View to which this plugin can be registered, in order to get updates. */ interface SmartspaceView { void registerDataProvider(BcSmartspaceDataPlugin plugin); + + void setPrimaryTextColor(int color); } } diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index 00c27bf5f10d..1cef44b3b3df 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml @@ -79,7 +79,6 @@ android:id="@+id/left_aligned_notification_icon_container" android:layout_width="match_parent" android:layout_height="@dimen/notification_shelf_height" - android:layout_marginTop="@dimen/widget_vertical_padding" android:layout_below="@id/keyguard_status_area" android:paddingStart="@dimen/below_clock_padding_start" /> diff --git a/packages/SystemUI/res/drawable/qs_detail_background.xml b/packages/SystemUI/res/drawable/qs_detail_background.xml index 76045e4126cb..e5c7352807f8 100644 --- a/packages/SystemUI/res/drawable/qs_detail_background.xml +++ b/packages/SystemUI/res/drawable/qs_detail_background.xml @@ -18,7 +18,7 @@ Copyright (C) 2014 The Android Open Source Project <inset> <shape> <solid android:color="@color/qs_detail_transition"/> - <corners android:radius="?android:attr/dialogCornerRadius" /> + <corners android:radius="@dimen/qs_footer_action_corner_radius" /> </shape> </inset> </item> @@ -26,7 +26,7 @@ Copyright (C) 2014 The Android Open Source Project <inset> <shape> <solid android:color="?android:attr/colorBackgroundFloating"/> - <corners android:radius="?android:attr/dialogCornerRadius" /> + <corners android:radius="@dimen/qs_footer_action_corner_radius" /> </shape> </inset> </item> diff --git a/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml b/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml index 34675ab891c1..6022206c208c 100644 --- a/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml +++ b/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml @@ -23,14 +23,14 @@ <item android:id="@android:id/mask"> <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> - <corners android:radius="@dimen/screenshot_button_corner_radius"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> <item> <shape android:shape="rectangle"> <stroke android:width="1dp" android:color="@color/qs_footer_action_border"/> <solid android:color="@android:color/transparent"/> - <corners android:radius="@dimen/screenshot_button_corner_radius"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> </ripple> diff --git a/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml b/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml index 596ed711dd43..bbcfb15d9226 100644 --- a/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml +++ b/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml @@ -22,13 +22,13 @@ <item android:id="@android:id/mask"> <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> - <corners android:radius="@dimen/screenshot_button_corner_radius"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> <item> <shape android:shape="rectangle"> <solid android:color="@android:color/transparent"/> - <corners android:radius="@dimen/screenshot_button_corner_radius"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> </ripple> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 13367c9d96d7..08f23a5ef7c2 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Vang meer vas"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Maak skermkiekie toe"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Skermkiekievoorskou"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Boonste grens"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Onderste grens"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Skermopnemer"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Verwerk tans skermopname"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Deurlopende kennisgewing vir \'n skermopnamesessie"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Invoermetode"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Ligging"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Ligging af"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokkeer kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Demp mikrofoon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kameratoegang"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofoontoegang"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Beskikbaar"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Geblokkeer"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Mediatoestel"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Net noodoproepe"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Skermopname"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Begin"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Om voort te gaan, moet <b><xliff:g id="APP">%s</xliff:g></b> toegang tot jou toestel se mikrofoon hê."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Om voort te gaan, moet <b><xliff:g id="APP">%s</xliff:g></b> toegang tot jou toestel se kamera hê."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblokkeer toestelmikrofoon?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblokkeer toestelkamera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Deblokkeer toestelkamera en mikrofoon?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Dit deblokkeer toegang vir alle programme en dienste wat toegelaat word om jou mikrofoon te gebruik."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Dit deblokkeer toegang vir alle programme en dienste wat toegelaat word om jou kamera te gebruik."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Dit deblokkeer toegang vir alle programme en dienste wat toegelaat word om jou kamera of mikrofoon te gebruik."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Toestel"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swiep op om programme te wissel"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Sleep regs om programme vinnig te wissel"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Wekker"</string> <string name="wallet_title" msgid="5369767670735827105">"Beursie"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Wys alles"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Ontsluit om te betaal"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Gereed"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Stel betaling op"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ontsluit om te gebruik"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index f378b4cbf73b..3f0789f8a893 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ተጨማሪ ይቅረጹ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ቅጽበታዊ ገጽ ዕይታን አሰናብት"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"የቅጽበታዊ ገጽ ዕይታ ቅድመ-ዕይታ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"የላይኛው ወሰን"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"የታችኛው ወሰን"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"የማያ መቅጃ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"የማያ ገጽ ቀረጻን በማሰናዳት ላይ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ለአንድ የማያ ገጽ ቀረጻ ክፍለ-ጊዜ በመካሄድ ያለ ማሳወቂያ"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"የግቤት ስልት"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"አካባቢ"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"አካባቢ ጠፍቷል"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ካሜራ አግድ"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"ማይክሮፎንን ድምጸ-ከል አድርግ"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"የካሜራ መዳረሻ"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"የማይክሮፎን መዳረሻ"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"ይገኛል"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ታግዷል"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"የሚዲያ መሣሪያ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"የአደጋ ጊዜ ጥሪዎች ብቻ"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"የማያ ገጽ ቀረጻ"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ጀምር"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"አቁም"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ለመቀጠል፣ <b><xliff:g id="APP">%s</xliff:g></b> ወደ መሳሪያዎ ማይክሮፎን መድረስ ይፈልጋል።"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ለመቀጠል፣ <b><xliff:g id="APP">%s</xliff:g></b> የመሣሪያዎን ካሜራ መድረስ ይፈልጋል።"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"የመሣሪያ ማይክሮፎን እገዳ ይነሳ?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"የመሣሪያ ካሜራ እገዳ ይነሳ?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"የመሣሪያ ካሜራ እና ማይክሮፎን እገዳ ይነሳ?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ይህ የእርስዎን ማይክሮፎን እንዲጠቀሙ የተፈቀደላቸው የሁሉም መተግበሪያዎች እና አገልግሎቶች መዳረሻ እገዳን ያነሳል።"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ይህ ካሜራዎን እንዲጠቀሙ ለተፈቀደላቸው ሁሉም መተግበሪያዎች እና አገልግሎቶች መዳረሻን እገዳ ያነሳል።"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"ይህ የእርስዎን ካሜራ ወይም ማይክሮፎን እንዲጠቀሙ የተፈቀደላቸው የሁሉም መተግበሪያዎች እና አገልግሎቶች መዳረሻ እገዳን ያነሳል።"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"መሣሪያ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"መተግበሪያዎችን ለመቀየር ወደ ላይ ያንሸራትቱ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"መተግበሪያዎችን በፍጥነት ለመቀየር ወደ ቀኝ ይጎትቱ"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ኤተርኔት"</string> <string name="status_bar_alarm" msgid="87160847643623352">"ማንቂያ"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"ሁሉንም አሳይ"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"ለመክፈል ይክፈቱ"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"ዝግጁ"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ክፍያን ያዋቅሩ"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ለማየት ይክፈቱ"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 475a28bd3e98..9daa2b40ff38 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"التقاط المزيد من المحتوى"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"إغلاق لقطة الشاشة"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"معاينة لقطة الشاشة"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"الحد العلوي"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"الحد السفلي"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"مسجّل الشاشة"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"جارٍ معالجة تسجيل الشاشة"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"إشعار مستمر لجلسة تسجيل شاشة"</string> @@ -353,8 +359,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"أسلوب الإدخال"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"الموقع الجغرافي"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"الموقع قيد الإيقاف"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"حظر الكاميرا"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"كتم صوت الميكروفون"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"الوصول إلى الكاميرا"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"الوصول إلى الميكروفون"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"متاح"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"محظور"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"جهاز الوسائط"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"مكالمات طوارئ فقط"</string> @@ -430,8 +438,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"تسجيل الشاشة"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"بدء"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"إيقاف"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"للمتابعة، يحتاج تطبيق <b><xliff:g id="APP">%s</xliff:g></b> إلى الوصول إلى ميكروفون الجهاز."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"للمتابعة، يحتاج تطبيق <b><xliff:g id="APP">%s</xliff:g></b> إلى الوصول إلى كاميرا الجهاز."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"هل تريد إزالة حظر ميكروفون الجهاز؟"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"هل تريد إزالة حظر كاميرا الجهاز؟"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"هل تريد إزالة حظر الكاميرا والميكروفون؟"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"يؤدي هذا الخيار إلى إزالة حظر الوصول بالنسبة إلى كل التطبيقات والخدمات المسموح لها باستخدام الميكروفون."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"يؤدي هذا الخيار إلى إزالة حظر الوصول بالنسبة إلى كل التطبيقات والخدمات المسموح لها باستخدام الكاميرا."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"يؤدي هذا الخيار إلى إزالة حظر الوصول بالنسبة إلى كل التطبيقات والخدمات المسموح لها باستخدام الكاميرا أو الميكروفون."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"الجهاز"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"مرّر سريعًا لأعلى لتبديل التطبيقات"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"اسحب لليسار للتبديل السريع بين التطبيقات"</string> @@ -669,18 +681,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"إيثرنت"</string> <string name="status_bar_alarm" msgid="87160847643623352">"المنبّه"</string> <string name="wallet_title" msgid="5369767670735827105">"المحفظة"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"جاهز"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"إعداد طريقة دفع"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"فتح القفل للاستخدام"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"حدثت مشكلة أثناء الحصول على البطاقات، يُرجى إعادة المحاولة لاحقًا."</string> <string name="status_bar_work" msgid="5238641949837091056">"الملف الشخصي للعمل"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"وضع الطيران"</string> <string name="add_tile" msgid="6239678623873086686">"إضافة فئة"</string> @@ -749,11 +757,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>الحالة:</b> تم خفض الترتيب إلى الوضع صامت"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>الحالة:</b> تمت زيادة الترتيب"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>الحالة:</b> تم خفض الترتيب"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"يتم دائمًا عرض هذه المحادثات في أعلى الإشعارات حتى عندما يكون وضع \"الأولوية\" مفعّلاً."</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"الإعدادات"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"المحادثات ذات الأولوية"</string> <string name="no_shortcut" msgid="8257177117568230126">"لا يدعم تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> ميزات المحادثات."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"يتعذّر تعديل هذه الإشعارات."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"يتعذّر ضبط مجموعة الإشعارات هذه هنا."</string> @@ -1035,14 +1041,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"الانتقال إلى \"الإعدادات\" لتعديل التنقل داخل النظام"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"وضع الاستعداد"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"تم ضبط المحادثة على أنها ذات أولوية"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"المحادثات ذات الأولوية"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"يتم عرض هذه المحادثات في أعلى القائمة ويمكن دائمًا أن يتم عرضها لك عندما يكون وضع \"الأولوية\" مفعّلاً."</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"يتم عرض صور الملفات الشخصية على شاشة القفل."</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"يمكنك بسهولة العثور على هذه المحادثات في فقاعات المحادثات على شاشتك الرئيسية."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"لا تتقيّد بميزة \"عدم الإزعاج\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"حسنًا"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"الإعدادات"</string> @@ -1060,18 +1062,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"تبديل"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"تم استبدال \"زر أدوات تسهيل الاستخدام\" بإيماءة تسهيل الاستخدام.\n\n"<annotation id="link">"الاطّلاع على الإعدادات"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"يمكنك نقل الزر إلى الحافة لإخفائه مؤقتًا."</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"نقل إلى أعلى يمين الشاشة"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"نقل إلى أعلى يسار الشاشة"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"نقل إلى أسفل يمين الشاشة"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"نقل إلى أسفل يسار الشاشة"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"نقله إلى الحافة وإخفاؤه"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"نقله إلى خارج الحافة وإظهاره"</string> <string name="quick_controls_title" msgid="6839108006171302273">"أدوات التحكم بالأجهزة"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"إضافة عناصر تحكّم لأجهزتك المتصلة"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"إعداد أدوات التحكم بالجهاز"</string> @@ -1154,35 +1150,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"قبل أقل من <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"قبل أكثر <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"تاريخ الميلاد"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"إنه يوم ميلاد <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"تاريخ ميلاد قريب"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"يَحين يوم ميلاد <xliff:g id="NAME">%1$s</xliff:g> قريبًا."</string> <string name="anniversary_status" msgid="1790034157507590838">"الذكرى السنوية"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"إنها الذكرى السنوية لـ <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"تتم مشاركة الموقع الجغرافي"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"تتم الآن مشاركة موقع <xliff:g id="NAME">%1$s</xliff:g> الجغرافي."</string> <string name="new_story_status" msgid="9012195158584846525">"قصة جديدة"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"تمت مشاركة قصة جديدة من <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="video_status" msgid="4548544654316843225">"جارٍ المشاهدة"</string> <string name="audio_status" msgid="4237055636967709208">"يتم الاستماع الآن"</string> <string name="game_status" msgid="1340694320630973259">"جارٍ اللعب"</string> <string name="empty_user_name" msgid="3389155775773578300">"الأصدقاء"</string> <string name="empty_status" msgid="5938893404951307749">"لنجرِ محادثة الليلة."</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"سيظهر المحتوى قريبًا."</string> <string name="missed_call" msgid="4228016077700161689">"مكالمة فائتة"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"عرض أحدث الرسائل والمكلمات الفائتة وآخر أخبار الحالة"</string> <string name="people_tile_title" msgid="6589377493334871272">"محادثة"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"تم إرسال رسالة من <xliff:g id="NAME">%1$s</xliff:g>."</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"تم إرسال صورة من <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"حدثت مشكلة أثناء قراءة مقياس مستوى شحن البطارية."</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"انقر للحصول على مزيد من المعلومات."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"لم يتم ضبط منبّه."</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 138c227bbcf9..631ac3e37ac4 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"অধিক কেপচাৰ কৰক"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"স্ক্ৰীনশ্বট অগ্ৰাহ্য কৰক"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"স্ক্ৰীনশ্বটৰ পূৰ্বদৰ্শন"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ওপৰৰ সীমাৰেখা"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"তলৰ সীমাৰেখা"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"স্ক্ৰীন ৰেকৰ্ডাৰ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"স্ক্রীন ৰেকৰ্ডিঙৰ প্ৰক্ৰিয়াকৰণ হৈ আছে"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"স্ক্রীণ ৰেকৰ্ডিং ছেশ্বন চলি থকা সময়ত পোৱা জাননী"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ইনপুট পদ্ধতি"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"অৱস্থান"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"অৱস্থান অফ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"কেমেৰা অৱৰোধ কৰক"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"মাইক্ৰ’ফ’ন মিউট কৰক"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"মিডিয়া ডিভাইচ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"জৰুৰীকালীন কল মাত্ৰ"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"স্ক্ৰীন ৰেকর্ড"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"আৰম্ভ কৰক"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"বন্ধ কৰক"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"অব্যাহত ৰাখিবলৈ <b><xliff:g id="APP">%s</xliff:g></b>এ আপোনাৰ ডিভাইচৰ মাইক্ৰ’ফ’ন এক্সেছ কৰাৰ আৱশ্যক।"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"অব্যাহত ৰাখিবলৈ <b><xliff:g id="APP">%s</xliff:g></b>এ আপোনাৰ ডিভাইচৰ কেমেৰা এক্সেছ কৰাৰ আৱশ্যক।"</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"ডিভাইচ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"আনটো এপ্ ব্য়ৱহাৰ কৰিবলৈ ওপৰলৈ ছোৱাইপ কৰক"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"খৰতকীয়াকৈ আনটো এপ্ ব্য়ৱহাৰ কৰিবলৈ সোঁফালে টানক"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ইথাৰনেট"</string> <string name="status_bar_alarm" msgid="87160847643623352">"এলাৰ্ম"</string> <string name="wallet_title" msgid="5369767670735827105">"ৱালেট"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"সাজু"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"পৰিশোধ ছেট আপ কৰক"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ব্যৱহাৰ কৰিবলৈ আনলক কৰক"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"আপোনাৰ কাৰ্ড লাভ কৰোঁতে এটা সমস্যা হৈছে, অনুগ্ৰহ কৰি পাছত পুনৰ চেষ্টা কৰক"</string> <string name="status_bar_work" msgid="5238641949837091056">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"এয়াৰপ্লেইন ম\'ড"</string> <string name="add_tile" msgid="6239678623873086686">"টাইল যোগ দিয়ক"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>স্থিতি:</b> নীৰৱলৈ হ্ৰাস কৰা হৈছে"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>স্থিতি:</b> স্থান ওপৰলৈ কৰা হৈছে"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>স্থিতি:</b> স্থান তললৈ কৰা হৈছে"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"সদায় আপোনাৰ জাননীৰ শীৰ্ষত দেখুওৱা হয় আনকি অগ্ৰাধিকাৰ ম’ডটো অন হৈ থাকিলেও"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ছেটিংসমূহ"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"অগ্ৰাধিকাৰপ্ৰাপ্ত বাৰ্তালাপ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ বাৰ্তালাপৰ সুবিধাসমূহ সমৰ্থন নকৰে"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই জাননীসমূহ সংশোধন কৰিব নোৱাৰি।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"এই ধৰণৰ জাননীবোৰ ইয়াত কনফিগাৰ কৰিব পৰা নাযায়"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ছিষ্টেম নেভিগেশ্বন আপডে’ট কৰিবলৈ ছেটিংসমূহ-লৈ যাওক"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ষ্টেণ্ডবাই"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"বাৰ্তালাপসমূহ অগ্ৰাধিকাৰপ্ৰাপ্ত হিচাপে ছেট কৰা হৈছে"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"অগ্ৰাধিকাৰপ্ৰাপ্ত বাৰ্তালাপ"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"এই বাৰ্তালাপসমূহ আপোনাৰ সূচীৰ শীৰ্ষত দেখুওৱা হয় আৰু অগ্ৰাধিকাৰ ম’ডটো অন হৈ থাকিলে আপুনি সদায় এইসমূহ পাব পাৰে"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"লক স্ক্ৰীনত প্ৰ’ফাইল চিত্ৰ দেখুওৱা হয়"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"আপুনি নিজৰ গৃহ স্ক্ৰীনৰ বাবলত সহজে এই বাৰ্তালাপসমূহ বিচাৰি পাব পাৰে"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"অসুবিধা নিদিব সুবিধাটোত ব্যাঘাত জন্মাওক"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"বুজি পালোঁ"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ছেটিংসমূহ"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ছুইচ"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"সাধ্য সুবিধাৰ বুটামটোৱে সাধ্য সুবিধাৰ নিৰ্দেশ সলনি কৰিছে\n\n"<annotation id="link">"ছেটিং চাওক"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"বুটামটোক সাময়িকভাৱে লুকুৱাবলৈ ইয়াক একেবাৰে কাষলৈ লৈ যাওক"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"শীৰ্ষৰ বাওঁফালে নিয়ক"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"শীৰ্ষৰ সোঁফালে নিয়ক"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"তলৰ বাওঁফালে নিয়ক"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"তলৰ সোঁফালে নিয়ক"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"কাষলৈ নিয়ক আৰু লুকুৱাওক"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"কাষৰ বাহিৰলৈ নিয়ক আৰু দেখুৱাওক"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ডিভাইচৰ নিয়ন্ত্ৰণসমূহ"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"আপোনাৰ সংযোজিত ডিভাইচসমূহৰ বাবে নিয়ন্ত্ৰণসমূহ যোগ কৰক"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ডিভাইচৰ নিয়ন্ত্ৰণসমূহ ছেট আপ কৰক"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>তকৈ কম সময়ৰ পূৰ্বে"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g>তকৈ বেছি সময়ৰ পূৰ্বে"</string> <string name="birthday_status" msgid="2596961629465396761">"জন্মদিন"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"এয়া <xliff:g id="NAME">%1$s</xliff:g>ৰ জন্মদিন"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"জন্মদিন সোনকালে আহি আছে"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g>ৰ জন্মদিন শীঘ্ৰেই আহি আছে"</string> <string name="anniversary_status" msgid="1790034157507590838">"বৰ্ষপূৰ্তি"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"এয়া <xliff:g id="NAME">%1$s</xliff:g>ৰ বৰ্ষপূৰ্তি"</string> <string name="location_status" msgid="1294990572202541812">"অৱস্থান শ্বেয়াৰ কৰি থকা হৈছে"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g>এ অৱস্থান শ্বেয়াৰ কৰি আছে"</string> <string name="new_story_status" msgid="9012195158584846525">"নতুন কাহিনী"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g>এ এটা নতুন কাহিনী শ্বেয়াৰ কৰিছে"</string> <string name="video_status" msgid="4548544654316843225">"চাই আছোঁ"</string> <string name="audio_status" msgid="4237055636967709208">"শুনি আছোঁ"</string> <string name="game_status" msgid="1340694320630973259">"প্লে’ হৈ আছে"</string> <string name="empty_user_name" msgid="3389155775773578300">"বন্ধুবৰ্গ"</string> <string name="empty_status" msgid="5938893404951307749">"আজি ৰাতি চাট কৰোঁ আহক!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"সমল শীঘ্ৰেই ওলাব"</string> <string name="missed_call" msgid="4228016077700161689">"মিছড্ কল"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"শেহতীয়া বাৰ্তা, মিছড্ কল আৰু স্থিতিৰ আপডে’ট চাওক"</string> <string name="people_tile_title" msgid="6589377493334871272">"বাৰ্তালাপ"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>এ এটা বাৰ্তা পঠিয়াইছে"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>এ এখন প্ৰতিচ্ছবি পঠিয়াইছে"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"আপোনাৰ বেটাৰী মিটাৰ পঢ়োঁতে সমস্যা হৈছে"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"অধিক তথ্যৰ বাবে টিপক"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"কোনো এলাৰ্ম ছেট কৰা হোৱা নাই"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 04e9ca0029a3..574c091eded2 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Daha çoxunu əhatə edin"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ekran şəklini ötürün"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ekran şəklinə önbaxış"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Yuxarı hüdud"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Aşağı hüdud"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Ekran Yazıcısı"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Ekran çəkilişi emal edilir"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ekranın video çəkimi ərzində silinməyən bildiriş"</string> @@ -218,7 +224,7 @@ <string name="accessibility_cell_data" msgid="172950885786007392">"Mobil Data"</string> <string name="accessibility_cell_data_on" msgid="691666434519443162">"Mobil Data Aktivdir"</string> <string name="cell_data_off" msgid="4886198950247099526">"Deaktiv"</string> - <string name="accessibility_bluetooth_tether" msgid="6327291292208790599">"Bluetooth tezering."</string> + <string name="accessibility_bluetooth_tether" msgid="6327291292208790599">"Bluetooth-modem."</string> <string name="accessibility_airplane_mode" msgid="1899529214045998505">"Uçuş rejimi"</string> <string name="accessibility_vpn_on" msgid="8037549696057288731">"VPN aktivdir."</string> <string name="accessibility_no_sims" msgid="5711270400476534667">"SIM kart yoxdur."</string> @@ -257,7 +263,7 @@ <string name="accessibility_quick_settings_airplane_changed_off" msgid="8880183481476943754">"Təyyarə rejimi deaktiv edildi."</string> <string name="accessibility_quick_settings_airplane_changed_on" msgid="6327378061894076288">"Təyyarə rejimi aktiv edildi."</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"tam sakitlik"</string> - <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"yalnız alarmlar"</string> + <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"bildirişlər"</string> <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Narahat Etməyin."</string> <string name="accessibility_quick_settings_dnd_changed_off" msgid="1457150026842505799">"\"Narahat etməyin\" deaktivdir."</string> <string name="accessibility_quick_settings_dnd_changed_on" msgid="186315911607486129">"\"Narahat etməyin\" aktivdir."</string> @@ -290,8 +296,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="2779253456042059110">"İş rejimi aktivdir."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="6256690740556798683">"İş rejimi sönülüdür."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="1105258550138313384">"İş rejimi yanılıdır."</string> - <string name="accessibility_quick_settings_data_saver_changed_off" msgid="4910847127871603832">"Data Qənaəti deaktiv edildi."</string> - <string name="accessibility_quick_settings_data_saver_changed_on" msgid="6370606590802623078">"Data Qənaəti aktiv edildi."</string> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="4910847127871603832">"Trafikə qənaət edilmir."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="6370606590802623078">"Trafikə qənaət edilir."</string> <string name="accessibility_quick_settings_sensor_privacy_changed_off" msgid="7608378211873807353">"Sensor Məxfiliyi deaktivdir."</string> <string name="accessibility_quick_settings_sensor_privacy_changed_on" msgid="4267393685085328801">"Sensor Məxfiliyi aktivdir."</string> <string name="accessibility_brightness" msgid="5391187016177823721">"Display brightness"</string> @@ -325,9 +331,9 @@ <string name="start_dreams" msgid="9131802557946276718">"Ekran qoruyucu"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> <string name="quick_settings_header_onboarding_text" msgid="1918085351115504765">"Daha çox seçimlər üçün klikləyin və basıb saxlayın"</string> - <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Narahat Etməyin"</string> - <string name="quick_settings_dnd_priority_label" msgid="6251076422352664571">"Yalnız prioritet"</string> - <string name="quick_settings_dnd_alarms_label" msgid="1241780970469630835">"Yalnız alarmlar"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Narahat etməyin"</string> + <string name="quick_settings_dnd_priority_label" msgid="6251076422352664571">"İcazəli şəxslər"</string> + <string name="quick_settings_dnd_alarms_label" msgid="1241780970469630835">"Bildirişlər"</string> <string name="quick_settings_dnd_none_label" msgid="8420869988472836354">"Tam sakitlik"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_multiple_devices_label" msgid="6595808498429809855">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> Cihaz)"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Daxiletmə metodu"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Yer"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Yer Deaktiv"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Kameranı bloklayın"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mikrofonu səssiz edin"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kameraya giriş"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofona giriş"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Əlçatan"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloklanmış"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media cihazı"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Yalnız təcili zənglər"</string> @@ -386,10 +394,10 @@ <string name="quick_settings_connected" msgid="3873605509184830379">"Qoşulu"</string> <string name="quick_settings_connected_battery_level" msgid="1322075669498906959">"Qoşuldu, <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g> batareya"</string> <string name="quick_settings_connecting" msgid="2381969772953268809">"Qoşulur..."</string> - <string name="quick_settings_tethering_label" msgid="5257299852322475780">"Birləşmə"</string> + <string name="quick_settings_tethering_label" msgid="5257299852322475780">"Modem rejimi"</string> <string name="quick_settings_hotspot_label" msgid="1199196300038363424">"Hotspot"</string> <string name="quick_settings_hotspot_secondary_label_transient" msgid="7585604088079160564">"Aktiv edilir..."</string> - <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="1280433136266439372">"Data Qənaəti aktivdir"</string> + <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="1280433136266439372">"Trafikə qənaət edilir"</string> <plurals name="quick_settings_hotspot_secondary_label_num_devices" formatted="false" msgid="3142308865165871976"> <item quantity="other">%d cihaz</item> <item quantity="one">%d cihaz</item> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekran yazması"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Başlayın"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Dayandırın"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Davam etmək üçün <b><xliff:g id="APP">%s</xliff:g></b> tətbiqi cihazın mikrofonuna giriş tələb edir."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Davam etmək üçün <b><xliff:g id="APP">%s</xliff:g></b> tətbiqi cihazın kamerasına giriş tələb edir."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Cihaz mikrofonu blokdan çıxarılsın?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Cihaz kamerası blokdan çıxarılsın?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Cihaz kamerası və mikrofonu blokdan çıxarılsın?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Bu, mikrofonunuzdan istifadə etməyə icazə verilən bütün tətbiq və xidmətlər üçün girişi blokdan çıxarır."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Bu, kameranızdan istifadə etməyə icazə verilən bütün tətbiq və xidmətlər üçün girişi blokdan çıxarır."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Bu, kamera və ya mikrofonunuzdan istifadə etməyə icazə verilən bütün tətbiq və xidmətlər üçün girişi blokdan çıxarır."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Cihaz"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Tətbiqi dəyişmək üçün yuxarı sürüşdürün"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Tətbiqləri cəld dəyişmək üçün sağa çəkin"</string> @@ -455,8 +467,8 @@ <string name="camera_hint" msgid="4519495795000658637">"Kamera üçün ikonadan sürüşdürün"</string> <string name="interruption_level_none_with_warning" msgid="8394434073508145437">"Ümumi sakitlik. Bu, ekran oxucularını da susduracaq."</string> <string name="interruption_level_none" msgid="219484038314193379">"Tam sakitlik"</string> - <string name="interruption_level_priority" msgid="661294280016622209">"Yalnız prioritet"</string> - <string name="interruption_level_alarms" msgid="2457850481335846959">"Yalnız alarmlar"</string> + <string name="interruption_level_priority" msgid="661294280016622209">"İcazəli şəxslər"</string> + <string name="interruption_level_alarms" msgid="2457850481335846959">"Bildirişlər"</string> <string name="interruption_level_none_twoline" msgid="8579382742855486372">"Tam\nsakitlik"</string> <string name="interruption_level_priority_twoline" msgid="8523482736582498083">"Yalnız\nprioritet"</string> <string name="interruption_level_alarms_twoline" msgid="2045067991335708767">"Yalnız\nalarmlar"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Zəngli saat"</string> <string name="wallet_title" msgid="5369767670735827105">"Pulqabı"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Hazır"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Ödəniş kartı ayarlayın"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"İstifadə etmək üçün kiliddən çıxarın"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Kartların əldə edilməsində problem oldu, sonra yenidən cəhd edin"</string> <string name="status_bar_work" msgid="5238641949837091056">"İş profili"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Təyyarə rejimi"</string> <string name="add_tile" msgid="6239678623873086686">"Xana əlavə edin"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Səssiz rejimə keçirilib"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Yuxarı sıraya keçirilib"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Aşağı sıraya keçirilib"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Prioritet rejimi aktiv olsa da, həmişə bildirişlərinizin yuxarı hissəsində göstərilir"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Ayarlar"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioritet söhbətlər"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> söhbət funksiyalarını dəstəkləmir"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirişlər dəyişdirilə bilməz."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Bu bildiriş qrupunu burada konfiqurasiya etmək olmaz"</string> @@ -850,9 +856,9 @@ <string name="accessibility_long_click_tile" msgid="210472753156768705">"Ayarları açın"</string> <string name="accessibility_status_bar_headphones" msgid="1304082414912647414">"Qulaqlıq qoşulub"</string> <string name="accessibility_status_bar_headset" msgid="2699275863720926104">"Qulaqlıq qoşulub"</string> - <string name="data_saver" msgid="3484013368530820763">"Data Qənaəti"</string> - <string name="accessibility_data_saver_on" msgid="5394743820189757731">"Data Qənaəti aktivdir"</string> - <string name="accessibility_data_saver_off" msgid="58339669022107171">"Data Qənaəti deaktivdir"</string> + <string name="data_saver" msgid="3484013368530820763">"Trafikə qənaət"</string> + <string name="accessibility_data_saver_on" msgid="5394743820189757731">"Trafikə qənaət edilir"</string> + <string name="accessibility_data_saver_off" msgid="58339669022107171">"Trafikə qənaət edilmir"</string> <string name="switch_bar_on" msgid="1770868129120096114">"Aktiv"</string> <string name="switch_bar_off" msgid="5669805115416379556">"Deaktiv"</string> <string name="tile_unavailable" msgid="3095879009136616920">"Əlçatan deyil"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Sistem naviqasiyasını yeniləmək üçün Ayarlara keçin"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Gözləmə rejimi"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Söhbət prioritet olaraq ayarlanıb"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioritet söhbətlər"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Bu söhbətlər siyahınızın yuxarı hissəsində göstərilir və Prioritet rejimi aktiv olduqda hər zaman sizə çata bilər"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profil şəkilləri kilid ekranında göstərilir"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Bu danışıqları Əsas ekranda yumrucuqlarda asanlıqla tapa bilərsiniz"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Narahat Etməyin rejimində göstərilsin"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Anladım"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Ayarlar"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Dəyişdirici"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Əlçatımlılıq düyməsi əlçatımlılıq jestini əvəz etdi\n\n"<annotation id="link">"Ayarlara baxın"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Düyməni müvəqqəti gizlətmək üçün kənara çəkin"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Yuxarıya sola köçürün"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Yuxarıya sağa köçürün"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Aşağıya sola köçürün"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Aşağıya sağa köçürün"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"İçəri keçirib gizlədin"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Kənara daşıyıb göstərin"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Cihaz idarəetmələri"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Qoşulmuş cihazlarınız üçün nizamlayıcılar əlavə edin"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Cihaz idarəetmələrini ayarlayın"</string> @@ -1116,7 +1112,7 @@ <string name="media_output_dialog_multiple_devices" msgid="1093771040315422350">"<xliff:g id="COUNT">%1$d</xliff:g> cihaz seçilib"</string> <string name="media_output_dialog_disconnected" msgid="1834473104836986046">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> (bağlantı kəsilib)"</string> <string name="media_output_dialog_connect_failed" msgid="3225190634236259010">"Qoşulmaq alınmadı. Yenə cəhd edin."</string> - <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Yeni cihazı qoşalaşdırın"</string> + <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Cihaz əlavə edin"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versiya nömrəsi"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versiya nömrəsi mübadilə buferinə kopyalandı."</string> <string name="basic_status" msgid="2315371112182658176">"Açıq söhbət"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Maksimum <xliff:g id="DURATION">%1$s</xliff:g> əvvəl"</string> <string name="over_timestamp" msgid="4765793502859358634">"Minimum <xliff:g id="DURATION">%1$s</xliff:g> əvvəl"</string> <string name="birthday_status" msgid="2596961629465396761">"Doğum günü"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> adlı şəxsin doğum günüdür"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Tezliklə doğum günü"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Tezliklə <xliff:g id="NAME">%1$s</xliff:g> adlı şəxsin doğum günüdür"</string> <string name="anniversary_status" msgid="1790034157507590838">"İldönümü"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> adlı şəxsin ildönümüdür"</string> <string name="location_status" msgid="1294990572202541812">"Məkan paylaşılır"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> məkanı paylaşır"</string> <string name="new_story_status" msgid="9012195158584846525">"Yeni hekayə"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> yeni hekayə paylaşıb"</string> <string name="video_status" msgid="4548544654316843225">"Baxır"</string> <string name="audio_status" msgid="4237055636967709208">"Dinlənilir"</string> <string name="game_status" msgid="1340694320630973259">"Oxudulur"</string> <string name="empty_user_name" msgid="3389155775773578300">"Dostlar"</string> <string name="empty_status" msgid="5938893404951307749">"Bugün söhbət edək!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Məzmun tezliklə görünəcək"</string> <string name="missed_call" msgid="4228016077700161689">"Buraxılmış zəng"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Son mesajlar, buraxılmış zənglər və status güncəlləmələrinə baxın"</string> <string name="people_tile_title" msgid="6589377493334871272">"Söhbət"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> mesaj göndərdi"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> şəkil göndərdi"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Batareya ölçüsünü oxuyarkən problem yarandı"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ətraflı məlumat üçün toxunun"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Siqnal ayarlanmayıb"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 3feaa20c9555..b03ca1f5b149 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Snimite još"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Odbacite snimak ekrana"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pregled snimka ekrana"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Gornja granica"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Donja granica"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Snimač ekrana"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Obrađujemo video snimka ekrana"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Obaveštenje o sesiji snimanja ekrana je aktivno"</string> @@ -123,7 +129,7 @@ <string name="usb_preference_title" msgid="1439924437558480718">"Opcije USB prenosa datoteka"</string> <string name="use_mtp_button_title" msgid="5036082897886518086">"Priključi kao medija plejer (MTP)"</string> <string name="use_ptp_button_title" msgid="7676427598943446826">"Priključi kao kameru (PTP)"</string> - <string name="installer_cd_button_title" msgid="5499998592841984743">"Instaliraj Android prebacivanje datoteka za Mac"</string> + <string name="installer_cd_button_title" msgid="5499998592841984743">"Instaliraj Android prebacivanje fajlova za Mac"</string> <string name="accessibility_back" msgid="6530104400086152611">"Nazad"</string> <string name="accessibility_home" msgid="5430449841237966217">"Početna"</string> <string name="accessibility_menu" msgid="2701163794470513040">"Meni"</string> @@ -350,8 +356,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metod unosa"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokacija"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Lokacija je isključena"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokiraj kameru"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Isključi mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Pristup kameri"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Pristup mikrofonu"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Dostupno"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokirano"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medijski uređaj"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Samo hitni pozivi"</string> @@ -424,8 +432,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Snimak ekrana"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Počnite"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Zaustavite"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"<b><xliff:g id="APP">%s</xliff:g></b> zahteva pristup mikrofonu uređaja radi nastavljanja."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"<b><xliff:g id="APP">%s</xliff:g></b> zahteva pristup kameri uređaja radi nastavljanja."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Želite da odblokirate mikrofon uređaja?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Želite da odblokirate kameru uređaja?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Želite da odblokirate kameru i mikrofon uređaja?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ovim će se odblokirati pristup za sve aplikacije i usluge koje imaju dozvolu za korišćenje mikrofona."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ovim će se odblokirati pristup za sve aplikacije i usluge koje imaju dozvolu za korišćenje kamere."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ovim će se odblokirati pristup za sve aplikacije i usluge koje imaju dozvolu za korišćenje kamere ili mikrofona."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Uređaj"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Prevucite nagore da biste menjali aplikacije"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Prevucite udesno da biste brzo promenili aplikacije"</string> @@ -660,18 +672,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Eternet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Novčanik"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Spremno"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Podesite plaćanje"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Otključaj radi korišćenja"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Došlo je do problema pri preuzimanju kartica. Probajte ponovo kasnije"</string> <string name="status_bar_work" msgid="5238641949837091056">"Poslovni profil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Režim rada u avionu"</string> <string name="add_tile" msgid="6239678623873086686">"Dodaj pločicu"</string> @@ -740,11 +748,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Degradirano u Nečujno"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Rangirano više"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Rangirano niže"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Uvek se prikazuje u vrhu obaveštenja čak i kada je Prioritetni režim uključen"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Podešavanja"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioritetne konverzacije"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava funkcije konverzacije"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ova obaveštenja ne mogu da se menjaju."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ova grupa obaveštenja ne može da se konfiguriše ovde"</string> @@ -1020,14 +1026,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Idite u Podešavanja da biste ažurirali navigaciju sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje pripravnosti"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konverzacija je podešena na prioritetnu"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioritetne konverzacije"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ove konverzacije se prikazuju u vrhu liste i uvek mogu da dopru do vas kada je Prioritetni režim uključen"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Slike profila se prikazuju na zaključanom ekranu"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Lako možete da pronađete ove konverzacije u oblačićima na početnom ekranu"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ometa podešavanje Ne uznemiravaj"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Važi"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Podešavanja"</string> @@ -1045,18 +1047,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Pređi"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Dugme Pristupačnost je zamenilo pokret za pristupačnost\n\n"<annotation id="link">"Prikaži podešavanja"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Pomerite dugme do ivice da biste ga privremeno sakrili"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Premesti gore levo"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Premesti gore desno"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Premesti dole levo"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Premesti dole desno"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Premesti do ivice i sakrij"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Premesti izvan ivice i prikaži"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Kontrole uređaja"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Dodajte kontrole za povezane uređaje"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Podesite kontrole uređaja"</string> @@ -1136,35 +1132,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Pre manje od <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Pre više od <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Rođendan"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> danas slavi rođendan"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Rođendan je uskoro"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> uskoro slavi rođendan"</string> <string name="anniversary_status" msgid="1790034157507590838">"Godišnjica"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> danas slavi godišnjicu"</string> <string name="location_status" msgid="1294990572202541812">"Deli se lokacija"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> deli lokaciju"</string> <string name="new_story_status" msgid="9012195158584846525">"Nova priča"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> deli novu priču"</string> <string name="video_status" msgid="4548544654316843225">"Gleda se"</string> <string name="audio_status" msgid="4237055636967709208">"Sluša se"</string> <string name="game_status" msgid="1340694320630973259">"Igra se"</string> <string name="empty_user_name" msgid="3389155775773578300">"Prijatelji"</string> <string name="empty_status" msgid="5938893404951307749">"Ćaskamo večeras!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Sadržaj će se uskoro pojaviti"</string> <string name="missed_call" msgid="4228016077700161689">"Propušten poziv"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pogledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzacija"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> šalje poruku"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> šalje sliku"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem sa očitavanjem merača baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dodirnite za više informacija"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Alarm nije podešen"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 51c67a110a80..2d078fcf4a52 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -57,12 +57,12 @@ <string name="label_view" msgid="6815442985276363364">"Прагляд"</string> <string name="always_use_device" msgid="210535878779644679">"Заўсёды адкрываць <xliff:g id="APPLICATION">%1$s</xliff:g>, калі падключана прылада <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string> <string name="always_use_accessory" msgid="1977225429341838444">"Заўсёды адкрываць <xliff:g id="APPLICATION">%1$s</xliff:g>, калі падключаны аксесуар <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string> - <string name="usb_debugging_title" msgid="8274884945238642726">"Дазволіць адладку USB?"</string> + <string name="usb_debugging_title" msgid="8274884945238642726">"Дазволіць адладку па USB?"</string> <string name="usb_debugging_message" msgid="5794616114463921773">"Адбiтак ключа RSA на гэтым камп\'ютары:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="4003121804294739548">"Заўсёды дазваляць з гэтага камп\'ютара"</string> <string name="usb_debugging_allow" msgid="1722643858015321328">"Дазволіць"</string> - <string name="usb_debugging_secondary_user_title" msgid="7843050591380107998">"Адладка USB не дапускаецца"</string> - <string name="usb_debugging_secondary_user_message" msgid="3740347841470403244">"Карыстальнік, які зараз увайшоў у гэту прыладу, не можа ўключыць адладку USB. Каб выкарыстоўваць гэту функцыю, пераключыцеся на асноўнага карыстальніка."</string> + <string name="usb_debugging_secondary_user_title" msgid="7843050591380107998">"Адладка па USB забаронена"</string> + <string name="usb_debugging_secondary_user_message" msgid="3740347841470403244">"Карыстальнік, які зараз увайшоў у гэту прыладу, не можа ўключыць адладку па USB. Каб выкарыстоўваць гэту функцыю, пераключыцеся на асноўнага карыстальніка."</string> <string name="wifi_debugging_title" msgid="7300007687492186076">"Дазволіць адладку па Wi-Fi у гэтай сетцы?"</string> <string name="wifi_debugging_message" msgid="5461204211731802995">"Назва сеткі (SSID)\n<xliff:g id="SSID_0">%1$s</xliff:g>\n\nАдрас Wi‑Fi (BSSID)\n<xliff:g id="BSSID_1">%2$s</xliff:g>"</string> <string name="wifi_debugging_always" msgid="2968383799517975155">"Заўсёды дазваляць у гэтай сетцы"</string> @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Зняць больш"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Адхіліць здымак экрана"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Перадпрагляд здымка экрана"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Верхняя граніца"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Ніжняя граніца"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Запіс экрана"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Апрацоўваецца запіс экрана"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Бягучае апавяшчэнне для сеанса запісу экрана"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Метад уводу"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Месцазнаходжанне"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Вызначэнне месцазнаходжання адключана"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Заблакіраваць камеру"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Адключыць мікрафон"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Доступ да камеры"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Доступ да мікрафона"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Доступ дазволены"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Няма доступу"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Мультымедыйная прылада"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Толькі экстранныя выклікі"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Запіс экрана"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Пачаць"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Спыніць"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Каб працягнуць, дайце праграме <b><xliff:g id="APP">%s</xliff:g></b> доступ да мікрафона прылады."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Каб працягнуць, дайце праграме <b><xliff:g id="APP">%s</xliff:g></b> доступ да камеры прылады."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Разблакіраваць мікрафон прылады?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Разблакіраваць камеру прылады?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Разблакіраваць камеру і мікрафон прылады?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Доступ адкрыецца для ўсіх праграм і сэрвісаў, якім дазволена выкарыстоўваць мікрафон."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Доступ адкрыецца для ўсіх праграм і сэрвісаў, якім дазволена выкарыстоўваць камеру."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Доступ адкрыецца для ўсіх праграм і сэрвісаў, якім дазволена выкарыстоўваць камеру ці мікрафон."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Прылада"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Правядзіце ўверх, каб пераключыць праграмы"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Каб хутка пераключыцца паміж праграмамі, перацягніце ўправа"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Будзільнік"</string> <string name="wallet_title" msgid="5369767670735827105">"Кашалёк"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Гатова"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Наладзіць спосаб аплаты"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Разблакіраваць для выкарыстання"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Узнікла праблема з загрузкай вашых карт. Паўтарыце спробу пазней"</string> <string name="status_bar_work" msgid="5238641949837091056">"Працоўны профіль"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Рэжым палёту"</string> <string name="add_tile" msgid="6239678623873086686">"Дадаць плітку"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Стан:</b> Пераведзена ў рэжым \"Без гуку\""</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Стан:</b> Ацэнена як важнае"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Стан:</b> Ацэнена як няважнае"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Заўсёды паказваюцца над вашымі апавяшчэннямі, нават калі ўключаны прыярытэтны рэжым"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Налады"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Прыярытэтныя размовы"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не падтрымлівае функцыі размовы"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Гэтыя апавяшчэнні нельга змяніць."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Тут канфігурыраваць гэту групу апавяшчэнняў забаронена"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Перайдзіце ў Налады, каб абнавіць параметры навігацыі ў сістэме"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Рэжым чакання"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Размова пазначана як прыярытэтная"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Прыярытэтныя размовы"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Гэтыя размовы паказваюцца ўверсе вашага спіса, і вы можаце заўсёды бачыць іх, калі ўключаны прыярытэтны рэжым"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Відарысы профілю паказваюцца на экране блакіроўкі"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Вы можаце лёгка знайсці гэтыя размовы ва ўсплывальных апавяшчэннях на галоўным экране"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Паказваюцца ў рэжыме \"Не турбаваць\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Зразумела"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Налады"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Пераключальнік"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Замест жэста спецыяльных магчымасцей будзе выкарыстоўвацца кнопка\n\n"<annotation id="link">"Праглядзець налады"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Каб часова схаваць кнопку, перамясціце яе на край"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Перамясціць лявей і вышэй"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Перамясціць правей і вышэй"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Перамясціць лявей і ніжэй"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Перамясціць правей і ніжэй"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Перамясціць на край і схаваць"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Перамясціць за край і паказаць"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Элементы кіравання прыладай"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Дадайце элементы кіравання для падключаных прылад"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Наладзіць элементы кіравання прыладай"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Менш за <xliff:g id="DURATION">%1$s</xliff:g> таму"</string> <string name="over_timestamp" msgid="4765793502859358634">"Больш за <xliff:g id="DURATION">%1$s</xliff:g> таму"</string> <string name="birthday_status" msgid="2596961629465396761">"Дзень нараджэння"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> святкуе дзень нараджэння"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Хутка свята"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Неўзабаве <xliff:g id="NAME">%1$s</xliff:g> святкуе дзень нараджэння"</string> <string name="anniversary_status" msgid="1790034157507590838">"Гадавіна"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> адзначае юбілей"</string> <string name="location_status" msgid="1294990572202541812">"Абагульваецца месца"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> абагульвае геаданыя"</string> <string name="new_story_status" msgid="9012195158584846525">"Новая гісторыя"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> абагуліў новую гісторыю"</string> <string name="video_status" msgid="4548544654316843225">"Ідзе прагляд відэа"</string> <string name="audio_status" msgid="4237055636967709208">"Гаварыце"</string> <string name="game_status" msgid="1340694320630973259">"Ідзе гульня"</string> <string name="empty_user_name" msgid="3389155775773578300">"Сябры"</string> <string name="empty_status" msgid="5938893404951307749">"Паразмаўляем у чаце!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Неўзабаве з\'явіцца змесціва"</string> <string name="missed_call" msgid="4228016077700161689">"Прапушчаны выклік"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Глядзець нядаўнія паведамленні, прапушчаныя выклікі і абнаўленні стану"</string> <string name="people_tile_title" msgid="6589377493334871272">"Размова"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> адправіў паведамленне"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> адправіў відарыс"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Праблема з чытаннем індыкатара зараду акумулятара"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Націсніце, каб убачыць больш"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Няма будзільнікаў"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index bf8aaad9c720..3ccb31861d92 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Заснемане на още"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Отхвърляне на екранната снимка"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Визуализация на екранната снимка"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Горна граница"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Долна граница"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Запис на екрана"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Записът на екрана се обработва"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Текущо известие за сесия за записване на екрана"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Метод на въвеждане"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Местоположение"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Местоположението е изключено"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Блокиране на камерата"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Спиране на микрофона"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Достъп до камерата"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Достъп до микрофона"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Налице"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Блокирано"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Мултимедийно устройство"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"Индикатор за силата на получения сигнал (RSSI)"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Само спешни обаждания"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Записване на екрана"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Старт"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Стоп"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"За да продължите, <b><xliff:g id="APP">%s</xliff:g></b> се нуждае от достъп до микрофона на устройството ви."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"За да продължите, <b><xliff:g id="APP">%s</xliff:g></b> се нуждае от достъп до камерата на устройството ви."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Да се отблокира ли микрофонът на устройството?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Да се отблокира ли камерата на устройството?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Да се отблокират ли камерата и микрофонът на устройството?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Това действие отблокира достъпа за всички приложения и услуги, които имат разрешение да използват микрофона ви."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Това действие отблокира достъпа за всички приложения и услуги, които имат разрешение да използват камерата ви."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Това действие отблокира достъпа за всички приложения и услуги, които имат разрешение да използват камерата или микрофона ви."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Устройство"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Прекарайте пръст нагоре, за да превключите между приложенията"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Плъзнете надясно за бързо превключване между приложенията"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Будилник"</string> <string name="wallet_title" msgid="5369767670735827105">"Портфейл"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Готово"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Настройване на плащане"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Отключване с цел използване"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"При извличането на картите ви възникна проблем. Моля, опитайте отново по-късно"</string> <string name="status_bar_work" msgid="5238641949837091056">"Потребителски профил в Work"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Самолетен режим"</string> <string name="add_tile" msgid="6239678623873086686">"Добавяне на плочка"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Състояние:</b> Понижено до беззвучно"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Състояние:</b> Класирано по-високо"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Състояние:</b> Класирано по-ниско"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Винаги се показва най-горе в списъка с известия дори когато режимът за приоритетни разговори е включен"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Настройки"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Разговори с приоритет"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не поддържа функциите за разговор"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Тези известия не могат да бъдат променяни."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Тази група от известия не може да бъде конфигурирана тук"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Отворете настройките, за да актуализирате режима за навигиране в системата"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Режим на готовност"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Разговорът е зададен като приоритетен"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Разговори с приоритет"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Тези разговори се показват най-горе в списъка ви и винаги ще стигат до вас, когато приоритетният режим е включен"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Снимките на потребителските профили се показват на заключения екран"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Лесно можете да намерите тези разговори под формата на балончета на началния екран"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Прекъсване на режима „Не безпокойте“"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Разбрах"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Настройки"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Превключване"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Жестът за достъпност бе заменен от бутон\n\n"<annotation id="link">"Преглед на настройките"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Преместете бутона до края, за да го скриете временно"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Преместване горе вляво"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Преместване горе вдясно"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Преместване долу вляво"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Преместване долу вдясно"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Преместване в края и скриване"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Преместване в края и показване"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Контроли за устройството"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Добавяне на контроли за свързаните ви устройства"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Настройване на контролите за устройството"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Преди по-малко от <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Преди повече от <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Рожден ден"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Днес е рожденият ден на <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Предстоящ рожден ден"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Скоро е рожденият ден на <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Годишнина"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Днес е годишнината на <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Местопол. се споделя"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> споделя местоположението си"</string> <string name="new_story_status" msgid="9012195158584846525">"Нова история"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> сподели нова история"</string> <string name="video_status" msgid="4548544654316843225">"Гледате"</string> <string name="audio_status" msgid="4237055636967709208">"Слуша се"</string> <string name="game_status" msgid="1340694320630973259">"Играете"</string> <string name="empty_user_name" msgid="3389155775773578300">"Приятели"</string> <string name="empty_status" msgid="5938893404951307749">"Да разговаряме!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Съдържанието ще се покаже скоро"</string> <string name="missed_call" msgid="4228016077700161689">"Пропуснато обаждане"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Над <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Преглеждайте скорошните съобщения, пропуснатите обаждания и актуална информация за състоянието"</string> <string name="people_tile_title" msgid="6589377493334871272">"Разговор"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> изпрати съобщение"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> изпрати изображение"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Възникна проблем при четенето на данните за нивото на батерията"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Докоснете за още информация"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Няма зададен будилник"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index a13381f1f277..be162f8aec6e 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"আরও বেশি ক্যাপচার করুন"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"স্ক্রিনশট বাতিল করুন"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"স্ক্রিনশটের প্রিভিউ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"স্ক্রিনশটের একদম উপরের দিকে"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"স্ক্রিনশটের একদম নিচের দিকে"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"স্ক্রিন রেকর্ডার"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"স্ক্রিন রেকর্ডিং প্রসেস হচ্ছে"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"স্ক্রিন রেকর্ডিং সেশন চলার বিজ্ঞপ্তি"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ইনপুট পদ্ধতি"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"লোকেশন"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"লোকেশন বন্ধ করা আছে"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ক্যামেরা ব্লক করুন"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"মাইক্রোফোন মিউট করুন"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"মিডিয়া ডিভাইস"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"শুধুমাত্র জরুরি কল"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"স্ক্রিন রেকর্ড"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"শুরু করুন"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"বন্ধ করুন"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"চালিয়ে যেতে, <b><xliff:g id="APP">%s</xliff:g></b> আপনার ডিভাইসের মাইক্রোফোন অ্যাক্সেস করতে চায়।"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"চালিয়ে যেতে, <b><xliff:g id="APP">%s</xliff:g></b> আপনার ডিভাইসের ক্যামেরা অ্যাক্সেস করতে চায়।"</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"ডিভাইস"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"অন্য অ্যাপে যেতে উপরের দিকে সোয়াইপ করুন"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"একটি অ্যাপ ছেড়ে দ্রুত অন্য অ্যাপে যেতে ডান দিকে টেনে আনুন"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ইথারনেট"</string> <string name="status_bar_alarm" msgid="87160847643623352">"অ্যালার্ম"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"রেডি"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"পেমেন্ট সেট আপ করুন"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ব্যবহার করতে আনলক করুন"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"আপনার কার্ড সংক্রান্ত তথ্য পেতে সমস্যা হয়েছে, পরে আবার চেষ্টা করুন"</string> <string name="status_bar_work" msgid="5238641949837091056">"কাজের প্রোফাইল"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"বিমান মোড"</string> <string name="add_tile" msgid="6239678623873086686">"টাইল যোগ করুন"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>স্ট্যাটাস:</b> লেভেল কমিয়ে সাইলেন্ করা হয়েছে"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>স্ট্যাটাস:</b> র্যাঙ্ক বেড়ে গেছে"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>স্ট্যাটাস:</b> র্যাঙ্ক কমে গেছে"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"এমনকি \'অগ্রাধিকার\' মোড চালু থাকলেও এটি সব সময় আপনার বিজ্ঞপ্তির উপরে দেখা যায়"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"সেটিংস"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"গুরুত্বপূর্ণ কথোপকথন"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এ কথোপকথন ফিচার কাজ করে না"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই বিজ্ঞপ্তিগুলি পরিবর্তন করা যাবে না।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"এই সমস্ত বিজ্ঞপ্তিকে এখানে কনফিগার করা যাবে না"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"সিস্টেম নেভিগেশন আপডেট করতে সেটিংসে যান"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"স্ট্যান্ডবাই"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"কথোপকথনকে \'গুরুত্বপূর্ণ\' হিসেবে সেট করা হয়েছে"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"গুরুত্বপূর্ণ কথোপকথন"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"এই কথোপকথনগুলি আপনার তালিকার একেবারে উপরে দেখা যায় এবং \'অগ্রাধিকার\' মোড চালু থাকলে সব সময় আপনি সেগুলি পড়তে পারেন"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"প্রোফাইল ছবি লক স্ক্রিনে দেখা যায়"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"আপনার হোম স্ক্রিনের বাবলে সহজেই এই গুরুত্বপূর্ণ কথোপকথনগুলি দেখতে পাবেন"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"বিরক্ত করবে না মোডে ব্যাঘাত ঘটাতে পারে"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"বুঝেছি"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"সেটিংস"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"বদল করুন"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"অ্যাক্সেসিবিলিটি জেসচার পরিবর্তন করে অ্যাক্সেসেবিলিটি বোতাম করা হয়েছে\n\n"<annotation id="link">"সেটিংস দেখুন"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"এটি অস্থায়ীভাবে লুকাতে বোতামটি কোণে সরান"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"উপরে বাঁদিকে সরান"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"উপরে ডানদিকে সরান"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"নিচে বাঁদিকে সরান"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"নিচে ডান দিকে সরান"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"প্রান্তে যান ও আড়াল করুন"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"প্রান্ত থেকে সরান এবং দেখুন"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ডিভাইস কন্ট্রোল"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"আপনার কানেক্ট করা ডিভাইসের জন্য কন্ট্রোল যোগ করুন"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ডিভাইস কন্ট্রোল সেট-আপ করুন"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> থেকে কিছু কম সময় আগে"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> সপ্তাহেরও আগে"</string> <string name="birthday_status" msgid="2596961629465396761">"জন্মদিন"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g>-এর জন্মদিন"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"জন্মদিন শীঘ্রই আসছে"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g>-এর জন্মদিন খুব শীঘ্র আসছে"</string> <string name="anniversary_status" msgid="1790034157507590838">"বার্ষিকী"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g>-এর বার্ষিকী"</string> <string name="location_status" msgid="1294990572202541812">"লোকেশন শেয়ার করা হচ্ছে"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> লোকেশন শেয়ার করছেন"</string> <string name="new_story_status" msgid="9012195158584846525">"নতুন খবর"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> একটি নতুন খবর শেয়ার করেছেন"</string> <string name="video_status" msgid="4548544654316843225">"দেখছি"</string> <string name="audio_status" msgid="4237055636967709208">"অডিও শুনছি"</string> <string name="game_status" msgid="1340694320630973259">"চালানো হচ্ছে"</string> <string name="empty_user_name" msgid="3389155775773578300">"বন্ধু"</string> <string name="empty_status" msgid="5938893404951307749">"আজ রাতে চ্যাট করা যাক!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"কন্টেন্ট খুব শীঘ্র দেখা যাবে"</string> <string name="missed_call" msgid="4228016077700161689">"মিসড কল"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"সাম্প্রতিক মেসেজ, মিসড কল এবং স্ট্যাটাস সংক্রান্ত আপডেট দেখুন"</string> <string name="people_tile_title" msgid="6589377493334871272">"কথোপকথন"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> একটি মেসেজ পাঠিয়েছেন"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> একটি ছবি পাঠিয়েছেন"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ব্যাটারির মিটারের রিডিং নেওয়ার সময় সমস্যা হয়েছে"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"আরও তথ্যের জন্য ট্যাপ করুন"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"কোনও অ্যালার্ম সেট করা নেই"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 4c5e917aad86..12a123001e33 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Snimite više"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Odbacite snimak ekrana"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pregled snimka ekrana"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Gornja granica"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Donja granica"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Snimač ekrana"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Obrađivanje snimka ekrana"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Obavještenje za sesiju snimanja ekrana je u toku"</string> @@ -121,7 +127,7 @@ <string name="screenrecord_permission_error" msgid="7856841237023137686">"Dobijanje odobrenja nije uspjelo"</string> <string name="screenrecord_start_error" msgid="2200660692479682368">"Greška pri pokretanju snimanja ekrana"</string> <string name="usb_preference_title" msgid="1439924437558480718">"Opcije USB prijenosa fajlova"</string> - <string name="use_mtp_button_title" msgid="5036082897886518086">"Reproduciranje medijskih sadržaja (MTP)"</string> + <string name="use_mtp_button_title" msgid="5036082897886518086">"Učitaj kao plejer medija (MTP)"</string> <string name="use_ptp_button_title" msgid="7676427598943446826">"Priključiti kao kameru (PTP)"</string> <string name="installer_cd_button_title" msgid="5499998592841984743">"Instalirajte Android File Transfer za Mac"</string> <string name="accessibility_back" msgid="6530104400086152611">"Nazad"</string> @@ -350,8 +356,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Način unosa"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokacija"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Utvrđivanje lokacije isključeno"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokirajte kameru"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Isključite mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Pristup kameri"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Pristup mikrofonu"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Dostupno"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokirano"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medijski uređaj"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Samo pozivi za hitne slučajeve"</string> @@ -424,8 +432,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Snimanje ekrana"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Započnite"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Zaustavite"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Da nastavite, aplikaciji <b><xliff:g id="APP">%s</xliff:g></b> je potreban pristup mikrofonu vašeg uređaja."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Da nastavite, aplikaciji <b><xliff:g id="APP">%s</xliff:g></b> je potreban pristup kameri vašeg uređaja."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblokirati mikrofon uređaja?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblokirati kameru uređaja?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Deblokirati kameru i mikrofon uređaja?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ovim se deblokira pristup za sve aplikacije i usluge kojima je dozvoljeno da koriste vaš mikrofon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ovim se deblokira pristup za sve aplikacije i usluge kojima je dozvoljeno da koriste vašu kameru."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ovim se deblokira pristup za sve aplikacije i usluge kojima je dozvoljeno da koriste vašu kameru ili mikrofon."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Uređaj"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Prevucite prema gore za promjenu aplikacije"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Prevucite udesno za brzu promjenu aplikacija"</string> @@ -660,18 +672,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Novčanik"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Spremno"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Postavite način plaćanja"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Otključajte da koristite"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Došlo je do problema prilikom preuzimanja vaših kartica. Pokušajte ponovo kasnije"</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil za posao"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Način rada u avionu"</string> <string name="add_tile" msgid="6239678623873086686">"Dodaj pločicu"</string> @@ -740,11 +748,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> je unazađen u Nečujno"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> je rangiran više"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> je rangiran niže"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Uvijek se prikazuje na vrhu obavještenja, čak i kada je uključen način rada Prioriteti"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Postavke"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioritetni razgovori"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava funkcije razgovora"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ta obavještenja se ne mogu izmijeniti."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ovu grupu obavještenja nije moguće konfigurirati ovdje"</string> @@ -1020,14 +1026,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Idite u Postavke da ažurirate navigiranje sistemom"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje mirovanja"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Razgovor je postavljen kao prioritetan"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioritetni razgovori"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ti razgovori se prikazuju na vrhu liste i uvijek ih možete vidjeti kada je uključen način rada Prioriteti"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Slike profila se prikazuju na zaključanom ekranu"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"S lakoćom možete pronaći te razgovore u oblačićima na Početnom ekranu"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Prekida način rada Ne ometaj"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Razumijem"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Postavke"</string> @@ -1045,18 +1047,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Prekidač"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Dugme za pristupačnost je zamijenilo pokret za pristupačnost\n\n"<annotation id="link">"Prikaži postavke"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Premjestite dugme do ivice da ga privremeno sakrijete"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Pomjeranje gore lijevo"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Pomjeranje gore desno"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Pomjeranje dolje lijevo"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Pomjeranje dolje desno"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Pomjeranje do ivice i sakrivanje"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Pomjeranje izvan ivice i prikaz"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Kontrole uređaja"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Dodajte kontrole za povezane uređaje"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Postavite kontrole uređaja"</string> @@ -1136,35 +1132,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Prije manje od <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Prije više od <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Rođendan"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> slavi rođendan"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Rođendan je uskoro"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> uskoro slavi rođendan"</string> <string name="anniversary_status" msgid="1790034157507590838">"Godišnjica"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> slavi godišnjicu"</string> <string name="location_status" msgid="1294990572202541812">"Dijeljenje lokacije"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> dijeli lokaciju"</string> <string name="new_story_status" msgid="9012195158584846525">"Nova priča"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> je podijelio/la novu priču"</string> <string name="video_status" msgid="4548544654316843225">"Gleda"</string> <string name="audio_status" msgid="4237055636967709208">"Slušanje"</string> <string name="game_status" msgid="1340694320630973259">"Reproduciranje"</string> <string name="empty_user_name" msgid="3389155775773578300">"Prijatelji"</string> <string name="empty_status" msgid="5938893404951307749">"Chatajmo večeras!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Sadržaj će se uskoro prikazati"</string> <string name="missed_call" msgid="4228016077700161689">"Propušteni poziv"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pregledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Razgovor"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la poruku"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la sliku"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Došlo je do problema prilikom očitavanja mjerača stanja baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dodirnite za više informacija"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nije postavljen alarm"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 032986c6eabc..2208ed1f165b 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Captura més"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ignora la captura de pantalla"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Previsualització de la captura de pantalla"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Marge superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Marge inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Gravació de pantalla"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processant gravació de pantalla"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificació en curs d\'una sessió de gravació de la pantalla"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Mètode d\'introducció"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Ubicació"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Ubicació desactivada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloqueja la càmera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Silencia el micròfon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Accés a la càmera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Accés al micròfon"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponible"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloquejat"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositiu multimèdia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Només trucades d\'emergència"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Gravació de pantalla"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Inicia"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Atura"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Per continuar, <b><xliff:g id="APP">%s</xliff:g></b> necessita accedir al micròfon del dispositiu."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Per continuar, <b><xliff:g id="APP">%s</xliff:g></b> necessita accedir a la càmera del dispositiu."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vols desbloquejar el micròfon del dispositiu?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vols desbloquejar la càmera del dispositiu?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vols desbloquejar la càmera i el micròfon del dispositiu?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Aquesta opció desbloqueja l\'accés de tots els serveis i aplicacions que tenen permís per utilitzar el micròfon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Aquesta opció desbloqueja l\'accés de tots els serveis i aplicacions que tenen permís per utilitzar la càmera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Aquesta opció desbloqueja l\'accés de tots els serveis i aplicacions que tenen permís per utilitzar la càmera o el micròfon."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositiu"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Llisca cap amunt per canviar d\'aplicació"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arrossega el dit cap a la dreta per canviar ràpidament d\'aplicació"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Preparat"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configura un pagament"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloqueja per utilitzar"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Hi ha hagut un problema en obtenir les teves targetes; torna-ho a provar més tard"</string> <string name="status_bar_work" msgid="5238641949837091056">"Perfil de treball"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Mode d\'avió"</string> <string name="add_tile" msgid="6239678623873086686">"Afegeix un mosaic"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estat</b>: s\'ha disminuït a Silenci"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Estat</b>: s\'ha classificat amb un nivell superior"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estat</b>: s\'ha classificat amb un nivell inferior"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Mostra sempre a la part superior de la llista de notificacions, fins i tot quan el mode Prioritat està activat"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Configuració"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Converses prioritàries"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admet les funcions de converses"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aquestes notificacions no es poden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Aquest grup de notificacions no es pot configurar aquí"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ves a Configuració per actualitzar el sistema de navegació"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"La conversa s\'ha definit com a prioritària"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Converses prioritàries"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Aquestes converses es mostren a la part superior de la llista i les pots rebre sempre amb el mode Prioritat activat"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Les fotos de perfil es mostren a la pantalla de bloqueig"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Pots trobar fàcilment aquestes converses a les bombolles de la pantalla d\'inici"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interromp el mode No molestis"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entesos"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Configuració"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Canvia"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"El gest d\'accessibilitat s\'ha substituït pel botó d\'accessibilitat\n\n"<annotation id="link">"Mostra la configuració"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Mou el botó a l\'extrem per amagar-lo temporalment"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Mou a dalt a l\'esquerra"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Mou a dalt a la dreta"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Mou a baix a l\'esquerra"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Mou a baix a la dreta"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Mou dins de les vores i amaga"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Mou fora de les vores i mostra"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Controls de dispositius"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Afegeix controls per als teus dispositius connectats"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configura els controls de dispositius"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Fa menys de: <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Fa més de: <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Aniversari"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Avui <xliff:g id="NAME">%1$s</xliff:g> fa anys"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Aniversari aviat"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Aviat serà l\'aniversari de: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Aniversari"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"És l\'aniversari de: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Compartint la ubicació"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> està compartint la ubicació"</string> <string name="new_story_status" msgid="9012195158584846525">"Història nova"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ha compartit una història nova"</string> <string name="video_status" msgid="4548544654316843225">"Mirant"</string> <string name="audio_status" msgid="4237055636967709208">"Escoltant"</string> <string name="game_status" msgid="1340694320630973259">"Jugant"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amics"</string> <string name="empty_status" msgid="5938893404951307749">"Parlem aquesta nit!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"El contingut es mostrarà aviat"</string> <string name="missed_call" msgid="4228016077700161689">"Trucada perduda"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta els missatges recents, les trucades perdudes i les actualitzacions d\'estat"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ha enviat un missatge"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha enviat una imatge"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Hi ha hagut un problema en llegir el mesurador de la bateria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toca per obtenir més informació"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Cap alarma configurada"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index c22fffd0cdc0..0e118996295c 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Zachytit více"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Zavřít snímek obrazovky"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Náhled snímku obrazovky"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Horní hranice"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Dolní hranice"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Rekordér obrazovky"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Záznam obrazovky se zpracovává"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Trvalé oznámení o relaci nahrávání"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metoda zadávání dat"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Poloha"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Poloha vypnuta"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokovat fotoaparát"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Vypnout mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Přístup k fotoaparátu"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Přístup k mikrofonu"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Dostupné"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokováno"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Mediální zařízení"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Pouze tísňová volání"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Záznam obrazovky"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Spustit"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ukončit"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Než budete pokračovat, udělte aplikaci <b><xliff:g id="APP">%s</xliff:g></b> přístup k mikrofonu na zařízení."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Než budete pokračovat, udělte aplikaci <b><xliff:g id="APP">%s</xliff:g></b> přístup k fotoaparátu na zařízení."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Odblokovat mikrofon zařízení?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Odblokovat fotoaparát zařízení?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Odblokovat fotoaparát a mikrofon zařízení?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Tímto odblokujete přístup všem aplikacím a službám, které mají povoleno používat váš mikrofon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Tímto odblokujete přístup všem aplikacím a službám, které mají povoleno používat váš fotoaparát."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Tímto odblokujete přístup všem aplikacím a službám, které mají povoleno používat váš fotoaparát či mikrofon."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Zařízení"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Přejetím nahoru přepnete aplikace"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Přetažením doprava rychle přepnete aplikace"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Budík"</string> <string name="wallet_title" msgid="5369767670735827105">"Peněženka"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Připraveno"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Nastavit platbu"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odemknout a použít"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Při načítání karet došlo k problému, zkuste to později"</string> <string name="status_bar_work" msgid="5238641949837091056">"Pracovní profil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Režim Letadlo"</string> <string name="add_tile" msgid="6239678623873086686">"Přidat dlaždici"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stav:</b> priorita snížena na Tiché"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Stav:</b> zařazeno výše"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stav:</b> zařazeno níže"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Vždy se zobrazuje na začátku vašich oznámení (i když je zapnutý prioritní režim)"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Nastavení"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioritní konverzace"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> funkce konverzace nepodporuje"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tato oznámení nelze upravit."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tuto skupinu oznámení tady nelze nakonfigurovat"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Přejděte do Nastavení a aktualizujte systémovou navigaci"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Pohotovostní režim"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konverzace byla nastavena jako prioritní"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioritní konverzace"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Tyto konverzace se zařazují na začátek seznamu, a když je zapnutý prioritní režim, mohou se vám vždy zobrazit"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Na obrazovce uzamčení se zobrazují profilové obrázky"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Tyto konverzace snadno najdete v bublinách na ploše"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Přerušit režim Nerušit"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Rozumím"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Nastavení"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Přepnout"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Tlačítko přístupnosti bylo nahrazeno gestem přístupnosti\n\n"<annotation id="link">"Zobrazit nastavení"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Přesunutím tlačítka k okraji ho dočasně skryjete"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Přesunout vlevo nahoru"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Přesunout vpravo nahoru"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Přesunout vlevo dolů"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Přesunout vpravo dolů"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Přesunout k okraji a skrýt"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Přesunout okraj ven a zobrazit"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Ovládání zařízení"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Přidejte ovládací prvky pro připojená zařízení"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Nastavení ovládání zařízení"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Před méně než <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Před více než <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Narozeniny"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> má narozeniny"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Brzy má narozeniny"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> bude mít brzy narozeniny"</string> <string name="anniversary_status" msgid="1790034157507590838">"Výročí"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> má výročí"</string> <string name="location_status" msgid="1294990572202541812">"Sdílí polohu"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> sdílí polohu"</string> <string name="new_story_status" msgid="9012195158584846525">"Nový příběh"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> sdílí nový příběh"</string> <string name="video_status" msgid="4548544654316843225">"Sledování"</string> <string name="audio_status" msgid="4237055636967709208">"Poslouchám"</string> <string name="game_status" msgid="1340694320630973259">"Hraje"</string> <string name="empty_user_name" msgid="3389155775773578300">"Přátelé"</string> <string name="empty_status" msgid="5938893404951307749">"Pojďme chatovat."</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Obsah se brzy zobrazí"</string> <string name="missed_call" msgid="4228016077700161689">"Zmeškaný hovor"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Zobrazit poslední zprávy, zmeškané hovory a aktualizace stavu"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzace"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> posílá zprávu"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> posílá obrázek"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problém s načtením měřiče baterie"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Klepnutím zobrazíte další informace"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Budík nenastaven"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 59dd774d3567..cdc52a7dde5c 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Medtag mere"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Luk screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Forhåndsvisning af screenshot"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Øverste kant"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Nederste kant"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Skærmoptagelse"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Behandler skærmoptagelse"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Konstant notifikation om skærmoptagelse"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Inputmetode"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Placering"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Placering fra"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloker kameraet"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Slå mikrofonen fra"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kameraadgang"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofonadgang"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Tilgængelig"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokeret"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medieenhed"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Kun nødopkald"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Optag skærm"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"<b><xliff:g id="APP">%s</xliff:g></b> skal have adgang til din enheds mikrofon, før den kan fortsætte."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"<b><xliff:g id="APP">%s</xliff:g></b> skal have adgang til din enheds kamera, før den kan fortsætte."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vil du fjerne blokeringen af enhedens mikrofone?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vil du fjerne blokeringen af enhedens kamera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vil du fjerne blokeringen af enhedens kamera og mikrofon?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Dette fjerner adgangsblokeringen for alle apps og tjenester, der har tilladelse til at bruge din mikrofon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Dette fjerner adgangsblokeringen for alle apps og tjenester, der har tilladelse til at bruge dit kamera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Dette fjerner adgangsblokeringen for alle apps og tjenester, der har tilladelse til at bruge dit kamera eller din mikrofon."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Enhed"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Stryg opad for at skifte apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Træk til højre for hurtigt at skifte app"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Klar"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Konfigurer betalingsmetode"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lås op for at bruge"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Dine kort kunne ikke hentes. Prøv igen senere."</string> <string name="status_bar_work" msgid="5238641949837091056">"Arbejdsprofil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Flytilstand"</string> <string name="add_tile" msgid="6239678623873086686">"Tilføj et felt"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Angivet som Lydløs"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Rangeret højere"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Placeret lavere"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Vises altid øverst i dine notifikationer – også når tilstanden Prioritet er aktiveret"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Indstillinger"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioriterede samtaler"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> understøtter ikke samtalefunktioner"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Disse notifikationer kan ikke redigeres."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Du kan ikke konfigurere denne gruppe notifikationer her"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gå til Indstillinger for at opdatere systemnavigationen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtalen er angivet som prioriteret"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioriterede samtaler"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Disse samtaler vises øverst på din liste og kan altid ses af dig, når tilstanden Prioritet er aktiveret"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilbilleder vises på låseskærmen"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Du kan nemt finde disse samtaler i bobler på din startskærm"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Afbryd Forstyr ikke"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Indstillinger"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Skift"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Knappen Hjælpefunktioner har erstattet bevægelsen for hjælpefunktioner\n\n"<annotation id="link">"Se indstillinger"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Flyt knappen til kanten for at skjule den midlertidigt"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Flyt op til venstre"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Flyt op til højre"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Flyt ned til venstre"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Flyt ned til højre"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Flyt ud til kanten, og skjul"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Flyt ud til kanten, og vis"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Enhedsstyring"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Tilføj styring af dine tilsluttede enheder"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfigurer enhedsstyring"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"For mindre end <xliff:g id="DURATION">%1$s</xliff:g> siden"</string> <string name="over_timestamp" msgid="4765793502859358634">"For mere end <xliff:g id="DURATION">%1$s</xliff:g> siden"</string> <string name="birthday_status" msgid="2596961629465396761">"Fødselsdag"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> har fødselsdag i dag"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Fødselsdag snart"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> har snart fødselsdag"</string> <string name="anniversary_status" msgid="1790034157507590838">"Årsdag"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> har jubilæum i dag"</string> <string name="location_status" msgid="1294990572202541812">"Deler placering"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> deler sin placering"</string> <string name="new_story_status" msgid="9012195158584846525">"Ny historie"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> har delt en ny historie"</string> <string name="video_status" msgid="4548544654316843225">"Ser"</string> <string name="audio_status" msgid="4237055636967709208">"Lytter"</string> <string name="game_status" msgid="1340694320630973259">"Spiller"</string> <string name="empty_user_name" msgid="3389155775773578300">"Venner"</string> <string name="empty_status" msgid="5938893404951307749">"Lad os chatte i aften!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Indhold dukker snart op"</string> <string name="missed_call" msgid="4228016077700161689">"Ubesvaret opkald"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Se dine seneste beskeder, mistede opkald og statusopdateringer"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtale"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> har sendt en sms"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> har sendt et billede"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Der er problemer med at aflæse dit batteriniveau"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tryk for at få flere oplysninger"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ingen alarm er indstillet"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 7c590cf6f874..6fe66582935e 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Mehr aufnehmen"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Screenshot schließen"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshotvorschau"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Oberer Rand"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Unterer Rand"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Bildschirmaufzeichnung"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Bildschirmaufzeichnung…"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Fortlaufende Benachrichtigung für eine Bildschirmaufzeichnung"</string> @@ -259,8 +265,8 @@ <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"lautlos"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"nur Weckrufe"</string> <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Nicht stören."</string> - <string name="accessibility_quick_settings_dnd_changed_off" msgid="1457150026842505799">"\"Bitte nicht stören\" deaktiviert."</string> - <string name="accessibility_quick_settings_dnd_changed_on" msgid="186315911607486129">"\"Bitte nicht stören\" aktiviert"</string> + <string name="accessibility_quick_settings_dnd_changed_off" msgid="1457150026842505799">"„Bitte nicht stören“ deaktiviert."</string> + <string name="accessibility_quick_settings_dnd_changed_on" msgid="186315911607486129">"„Bitte nicht stören“ aktiviert"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_off" msgid="3795983516942423240">"Bluetooth deaktiviert"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth aktiviert"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Eingabemethode"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Standort"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Standort aus"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Kamera blockieren"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mikrofon stummschalten"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Mediengerät"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Nur Notrufe"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Bildschirmaufnahme"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Starten"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Beenden"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Zum Fortfahren benötigt, <b><xliff:g id="APP">%s</xliff:g></b> Zugriff auf das Mikrofon deines Geräts."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Zum Fortfahren benötigt <b><xliff:g id="APP">%s</xliff:g></b> Zugriff auf die Kamera deines Geräts."</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"Gerät"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Nach oben wischen, um Apps zu wechseln"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Zum schnellen Wechseln der Apps nach rechts ziehen"</string> @@ -497,7 +519,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"Reduzierung der Leistung und Hintergrunddaten"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"Energiesparmodus deaktivieren"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"Die App \"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>\" erhält Zugriff auf alle Informationen, die auf deinem Bildschirm sichtbar sind oder von deinem Gerät wiedergegeben werden, während du aufnimmst oder streamst. Dazu gehören beispielsweise angezeigte Passwörter und Zahlungsdetails, Fotos, Nachrichten und Audioinhalte."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Der Anbieter dieser App erhält Zugriff auf alle Informationen, die auf deinem Bildschirm sichtbar sind oder von deinem Gerät wiedergegeben werden, während du aufnimmst oder streamst. Dazu gehören beispielsweise Passwörter, Zahlungsdetails, Fotos, Nachrichten und Audioinhalte."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Der Anbieter dieser App erhält Zugriff auf alle Informationen, die auf deinem Bildschirm sichtbar sind oder von deinem Gerät wiedergegeben werden, während du aufnimmst oder streamst. Dazu gehören beispielsweise angezeigte Passwörter, Zahlungsdetails, Fotos, Nachrichten und Audioinhalte."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Aufnahme oder Stream starten?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Aufnehmen oder Streamen mit der App \"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>\" starten?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"Nicht mehr anzeigen"</string> @@ -509,7 +531,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Benachrichtigungen"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Unterhaltungen"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Alle lautlosen Benachrichtigungen löschen"</string> - <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Benachrichtigungen durch \"Bitte nicht stören\" pausiert"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Benachrichtigungen durch „Bitte nicht stören“ pausiert"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Jetzt starten"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Keine Benachrichtigungen"</string> <string name="profile_owned_footer" msgid="2756770645766113964">"Profil wird eventuell überwacht."</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Weckruf"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Bereit"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Zahlungsmethode einrichten"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Zum Verwenden entsperren"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Beim Abrufen deiner Karten ist ein Fehler aufgetreten – bitte versuch es später noch einmal"</string> <string name="status_bar_work" msgid="5238641949837091056">"Arbeitsprofil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Flugmodus"</string> <string name="add_tile" msgid="6239678623873086686">"Kachel hinzufügen"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status</b>: auf „Lautlos“ herabgestuft"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status</b>: höher eingestuft"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status</b>: niedriger eingestuft"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Werden immer in deinen Benachrichtigungen immer oben angezeigt, auch wenn der Prioritätsmodus aktiviert ist"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Einstellungen"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Vorrangige Unterhaltungen"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> unterstützt keine Funktionen für Unterhaltungen"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Diese Benachrichtigungen können nicht geändert werden."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Die Benachrichtigungsgruppe kann hier nicht konfiguriert werden"</string> @@ -843,7 +859,7 @@ <string name="tuner_full_zen_title" msgid="5120366354224404511">"Einschließlich Lautstärkeregler anzeigen"</string> <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Bitte nicht stören"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Tastenkombination für Lautstärketasten"</string> - <string name="volume_up_silent" msgid="1035180298885717790">"\"Bitte nicht stören\" bei \"Lauter\" deaktivieren"</string> + <string name="volume_up_silent" msgid="1035180298885717790">"„Bitte nicht stören“ bei \"Lauter\" deaktivieren"</string> <string name="battery" msgid="769686279459897127">"Akku"</string> <string name="clock" msgid="8978017607326790204">"Uhr"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -969,9 +985,9 @@ <string name="wifi_is_off" msgid="5389597396308001471">"WLAN ist deaktiviert"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth ist deaktiviert"</string> <string name="dnd_is_off" msgid="3185706903793094463">"„Bitte nicht stören“ ist deaktiviert"</string> - <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"\"Bitte nicht stören\" wurde von einer automatischen Regel aktiviert (<xliff:g id="ID_1">%s</xliff:g>)."</string> - <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"\"Bitte nicht stören\" wurde von einer App aktiviert (<xliff:g id="ID_1">%s</xliff:g>)."</string> - <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"\"Bitte nicht stören\" wurde von einer automatischen Regel oder einer App aktiviert."</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"„Bitte nicht stören“ wurde von einer automatischen Regel aktiviert (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"„Bitte nicht stören“ wurde von einer App aktiviert (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"„Bitte nicht stören“ wurde von einer automatischen Regel oder einer App aktiviert."</string> <string name="qs_dnd_until" msgid="7844269319043747955">"Bis <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="qs_dnd_keep" msgid="3829697305432866434">"Beibehalten"</string> <string name="qs_dnd_replace" msgid="7712119051407052689">"Ersetzen"</string> @@ -1015,15 +1031,11 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gehe zu den Einstellungen, um die Systemsteuerung anzupassen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Unterhaltung als vorrangig eingestuft"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> - <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\"Bitte nicht stören\" unterbrechen"</string> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Vorrangige Unterhaltungen"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Unterhaltungen, bei denen der Prioritätsmodus an ist, werden auf der Liste oben angezeigt und kommen immer bei dir an"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilbilder werden auf dem Sperrbildschirm angezeigt"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Diese Unterhaltungen kannst du in Bubbles auf deinem Startbildschirm sehen"</string> + <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"„Bitte nicht stören“ unterbrechen"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Einstellungen"</string> <string name="magnification_window_title" msgid="4863914360847258333">"Vergrößerungsfenster"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Schalter"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Die Schaltfläche „Bedienungshilfen“ ersetzt die Touch-Geste für Bedienungshilfen\n\n"<annotation id="link">"Einstellungen aufrufen"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Durch Ziehen an den Rand wird die Schaltfläche zeitweise ausgeblendet"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Nach oben links verschieben"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Nach rechts oben verschieben"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Nach unten links verschieben"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Nach unten rechts verschieben"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"An den Rand verschieben und verbergen"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Vom Rand verschieben und anzeigen"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Gerätesteuerung"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Steuerelemente für verbundene Geräte hinzufügen"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Gerätesteuerung einrichten"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Vor weniger als <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Vor über <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Geburtstag"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> hat Geburtstag"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Bald Geburtstag"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> hat bald Geburtstag"</string> <string name="anniversary_status" msgid="1790034157507590838">"Jahrestag"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> hat heute Jahrestag"</string> <string name="location_status" msgid="1294990572202541812">"Standort wird geteilt"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> teilt den Standort"</string> <string name="new_story_status" msgid="9012195158584846525">"Neue Geschichte"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> hat eine neue Geschichte geteilt"</string> <string name="video_status" msgid="4548544654316843225">"Schaut etwas"</string> <string name="audio_status" msgid="4237055636967709208">"Hört etwas"</string> <string name="game_status" msgid="1340694320630973259">"Spielt"</string> <string name="empty_user_name" msgid="3389155775773578300">"Freunde"</string> <string name="empty_status" msgid="5938893404951307749">"Chat heute Abend!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Der Inhalt wird bald angezeigt"</string> <string name="missed_call" msgid="4228016077700161689">"Verpasster Anruf"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Letzte Nachrichten, verpasste Anrufe und Statusaktualisierungen ansehen"</string> <string name="people_tile_title" msgid="6589377493334871272">"Unterhaltung"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> hat eine Nachricht gesendet"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> hat ein Bild gesendet"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem beim Lesen des Akkustands"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Für weitere Informationen tippen"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Kein Wecker gestellt"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 81cc35bb63d3..28e1b0e259a4 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Λήψη περισσότερων"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Παράβλεψη στιγμιότυπου οθόνης"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Προεπισκόπηση στιγμιότυπου οθόνης"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Ανώτατο όριο"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Κατώτατο όριο"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Εγγραφή οθόνης"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Επεξεργασία εγγραφής οθόνης"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ειδοποίηση σε εξέλιξη για μια περίοδο λειτουργίας εγγραφής οθόνης"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Μέθοδος εισαγωγής"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Τοποθεσία"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Τοποθεσία απενεργοποιημένη"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Αποκλεισμός Κάμερας"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Σίγαση μικροφώνου"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Πρόσβαση κάμερας"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Πρόσβαση μικροφώνου"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Διαθέσιμη"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Αποκλεισμένη"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Συσκευή μέσων"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Μόνο κλήσεις έκτακτης ανάγκης"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Εγγραφή οθόνης"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Έναρξη"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Διακοπή"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Για να συνεχίσετε, η εφαρμογή <b><xliff:g id="APP">%s</xliff:g></b&gt, χρειάζεται πρόσβαση στο μικρόφωνο της συσκευής σας."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Για να συνεχίσετε, η εφαρμογή <b><xliff:g id="APP">%s</xliff:g></b> χρειάζεται πρόσβαση στην κάμερα της συσκευής σας."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Κατάργηση αποκλεισμού μικροφώνου συσκευής;"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Κατάργηση αποκλεισμού κάμερας συσκευής;"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Κατάργηση αποκλεισμού κάμερας και μικροφώνου συσκευής;"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Με αυτόν τον τρόπο καταργείται ο αποκλεισμός της πρόσβασης για όλες τις εφαρμογές και υπηρεσίες που επιτρέπεται να χρησιμοποιούν το μικρόφωνό σας."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Με αυτόν τον τρόπο καταργείται ο αποκλεισμός της πρόσβασης για όλες τις εφαρμογές και υπηρεσίες που επιτρέπεται να χρησιμοποιούν την κάμερά σας."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Με αυτόν τον τρόπο καταργείται ο αποκλεισμός της πρόσβασης για όλες τις εφαρμογές και υπηρεσίες που επιτρέπεται να χρησιμοποιούν την κάμερα ή το μικρόφωνό σας."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Συσκευή"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Σύρετε προς τα επάνω για εναλλαγή των εφαρμογών"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Σύρετε προς τα δεξιά για γρήγορη εναλλαγή εφαρμογών"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Ξυπνητήρι"</string> <string name="wallet_title" msgid="5369767670735827105">"Πορτοφόλι"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Έτοιμο"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Ρύθμιση πληρωμής"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ξεκλείδωμα για χρήση"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Παρουσιάστηκε πρόβλημα με τη λήψη των καρτών σας. Δοκιμάστε ξανά αργότερα"</string> <string name="status_bar_work" msgid="5238641949837091056">"Προφίλ εργασίας"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Λειτουργία πτήσης"</string> <string name="add_tile" msgid="6239678623873086686">"Προσθήκη πλακιδίου"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Κατάσταση:</b> Υποβιβάστηκε σε Αθόρυβη"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Κατάσταση:</b> Κατατάχθηκε υψηλότερα"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Κατάσταση:</b> Κατατάχθηκε χαμηλότερα"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Εμφανίζεται πάντα στην κορυφή των ειδοποιήσεων, ακόμη και όταν η λειτουργία προτεραιότητας είναι ενεργοποιημένη"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Ρυθμίσεις"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Συζητήσεις προτεραιότητας"</string> <string name="no_shortcut" msgid="8257177117568230126">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> δεν υποστηρίζει τις λειτουργίες συζήτησης"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Δεν είναι δυνατή η τροποποίηση αυτών των ειδοποιήσεων"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Δεν είναι δυνατή η διαμόρφωση αυτής της ομάδας ειδοποιήσεων εδώ"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Μεταβείτε στις Ρυθμίσεις για να ενημερώσετε την πλοήγηση συστήματος"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Κατάσταση αναμονής"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Ορίστηκε ως συζήτηση προτεραιότητας"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Συζητήσεις προτεραιότητας"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Αυτές οι συζητ. εμφανίζ. στην κορυφή της λίστας και μπορούν πάντα να προβληθούν όταν η λειτ. προτεραιότ. είναι ενεργή"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Οι φωτογραφίες προφίλ εμφανίζονται στην οθόνη κλειδώματος"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Μπορείτε εύκολα να βρείτε αυτές τις συζητήσεις σε συννεφάκια στην αρχική σας οθόνη"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Διακοπή λειτουργίας Μην ενοχλείτε"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Το κατάλαβα"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Ρυθμίσεις"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Εναλλαγή"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Το κουμπί προσβασιμότητας αντικατέστησε την κίνηση προσβασιμότητας\n\n"<annotation id="link">"Προβολή ρυθμίσεων"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Μετακινήστε το κουμπί στο άκρο για προσωρινή απόκρυψη"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Μετακίνηση επάνω αριστερά"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Μετακίνηση επάνω δεξιά"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Μετακίνηση κάτω αριστερά"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Μετακίνηση κάτω δεξιά"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Μετακίν. στο άκρο και απόκρυψη"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Μετακ. εκτός άκρου και εμφάν."</string> <string name="quick_controls_title" msgid="6839108006171302273">"Στοιχεία ελέγχου συσκευής"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Προσθήκη στοιχείων ελέγχου για τις συνδεδεμένες συσκευές σας."</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Ρύθμιση στοιχείων ελέγχου συσκευής"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Λιγότερο από <xliff:g id="DURATION">%1$s</xliff:g> πριν"</string> <string name="over_timestamp" msgid="4765793502859358634">"Περισσότερο από <xliff:g id="DURATION">%1$s</xliff:g> πριν"</string> <string name="birthday_status" msgid="2596961629465396761">"Γενέθλια"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Είναι τα γενέθλια του χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Προσεχώς γενέθλια"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Πλησιάζουν τα γενέθλια του χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Επέτειος"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Είναι η επέτειος του χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Κοινοποίηση τοποθ."</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> κοινοποιεί την τοποθεσία του"</string> <string name="new_story_status" msgid="9012195158584846525">"Νέα είδηση"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> κοινοποίησε μια νέα είδηση"</string> <string name="video_status" msgid="4548544654316843225">"Παρακολούθηση"</string> <string name="audio_status" msgid="4237055636967709208">"Ακρόαση"</string> <string name="game_status" msgid="1340694320630973259">"Παίζει τώρα"</string> <string name="empty_user_name" msgid="3389155775773578300">"Φίλοι"</string> <string name="empty_status" msgid="5938893404951307749">"Συζήτηση απόψε!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Το περιεχόμενο θα εμφανιστεί σύντομα"</string> <string name="missed_call" msgid="4228016077700161689">"Αναπάντητη κλήση"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Δείτε πρόσφατα μηνύματα, αναπάντητες κλήσεις και ενημερώσεις κατάστασης"</string> <string name="people_tile_title" msgid="6589377493334871272">"Συνομιλία"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έστειλε ένα μήνυμα"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έστειλε μια εικόνα"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Υπάρχει κάποιο πρόβλημα με την ανάγνωση του μετρητή μπαταρίας"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Πατήστε για περισσότερες πληροφορίες."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Δεν ορίστηκε ξυπνητ."</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 19d0ca3aae3d..ba9ec4cf106b 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -92,8 +92,10 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshot preview"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Top boundary"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Bottom boundary"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen Recorder"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processing screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> @@ -349,8 +351,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Input Method"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Location"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Location Off"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Block camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mute microphone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Camera access"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mic access"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Available"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blocked"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media device"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Emergency Calls Only"</string> @@ -422,8 +426,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Screen record"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device\'s microphone."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device’s camera."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Unblock device camera and microphone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"This unblocks access for all apps and services allowed to use your microphone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"This unblocks access for all apps and services allowed to use your camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"This unblocks access for all apps and services allowed to use your camera or microphone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Device"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swipe up to switch apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Drag right to quickly switch apps"</string> @@ -657,8 +665,8 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Show all"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Unlock to pay"</string> + <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> + <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Ready"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Set up payment"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 607f6c7e7c06..5b38178f3eb9 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -92,8 +92,10 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshot preview"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Top boundary"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Bottom boundary"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen Recorder"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processing screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> @@ -349,8 +351,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Input Method"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Location"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Location Off"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Block camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mute microphone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Camera access"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mic access"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Available"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blocked"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media device"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Emergency Calls Only"</string> @@ -422,8 +426,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Screen record"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device\'s microphone."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device’s camera."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Unblock device camera and microphone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"This unblocks access for all apps and services allowed to use your microphone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"This unblocks access for all apps and services allowed to use your camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"This unblocks access for all apps and services allowed to use your camera or microphone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Device"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swipe up to switch apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Drag right to quickly switch apps"</string> @@ -657,8 +665,8 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Show all"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Unlock to pay"</string> + <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> + <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Ready"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Set up payment"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 19d0ca3aae3d..ba9ec4cf106b 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -92,8 +92,10 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshot preview"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Top boundary"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Bottom boundary"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen Recorder"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processing screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> @@ -349,8 +351,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Input Method"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Location"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Location Off"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Block camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mute microphone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Camera access"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mic access"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Available"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blocked"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media device"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Emergency Calls Only"</string> @@ -422,8 +426,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Screen record"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device\'s microphone."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device’s camera."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Unblock device camera and microphone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"This unblocks access for all apps and services allowed to use your microphone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"This unblocks access for all apps and services allowed to use your camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"This unblocks access for all apps and services allowed to use your camera or microphone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Device"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swipe up to switch apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Drag right to quickly switch apps"</string> @@ -657,8 +665,8 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Show all"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Unlock to pay"</string> + <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> + <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Ready"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Set up payment"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 19d0ca3aae3d..ba9ec4cf106b 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -92,8 +92,10 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshot preview"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Top boundary"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Bottom boundary"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen Recorder"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processing screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> @@ -349,8 +351,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Input Method"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Location"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Location Off"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Block camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mute microphone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Camera access"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mic access"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Available"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blocked"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media device"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Emergency Calls Only"</string> @@ -422,8 +426,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Screen record"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device\'s microphone."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device’s camera."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Unblock device camera and microphone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"This unblocks access for all apps and services allowed to use your microphone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"This unblocks access for all apps and services allowed to use your camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"This unblocks access for all apps and services allowed to use your camera or microphone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Device"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swipe up to switch apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Drag right to quickly switch apps"</string> @@ -657,8 +665,8 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Show all"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Unlock to pay"</string> + <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> + <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Ready"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Set up payment"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 03c5eb110912..26f2cffce43c 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -92,8 +92,10 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshot preview"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Top boundary"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Bottom boundary"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen Recorder"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processing screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> @@ -349,8 +351,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Input Method"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Location"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Location Off"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Block Camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mute Microphone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Camera access"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mic access"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Available"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blocked"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media device"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Emergency Calls Only"</string> @@ -422,8 +426,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Screen Record"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device microphone."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"To continue, <b><xliff:g id="APP">%s</xliff:g></b> needs access to your device’s camera."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Unblock device camera and microphone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"This unblocks access for all apps and services allowed to use your microphone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"This unblocks access for all apps and services allowed to use your camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"This unblocks access for all apps and services allowed to use your camera or microphone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Device"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swipe up to switch apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Drag right to quickly switch apps"</string> @@ -657,8 +665,8 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Show all"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Unlock to pay"</string> + <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> + <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Ready"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Set up payment"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 3e9f4daaec5c..cb11333f1597 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar más"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Descartar captura de pantalla"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Vista previa de la captura de pantalla"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Límite superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Límite inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Grabadora de pantalla"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Procesando grabación pantalla"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificación constante para una sesión de grabación de pantalla"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Método de introducción"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Ubicación"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Ubicación desactivada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquear cámara"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Silenciar micrófono"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acceso a la cámara"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acceso al micrófono"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponible"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqueado"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo multimedia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Solo emergencia"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Grabar pantalla"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Detener"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b&gt necesita acceso al micrófono del dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b&gt necesita acceso a la cámara del dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"¿Quieres desbloquear el micrófono del dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"¿Quieres desbloquear la cámara del dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"¿Quieres desbloquear la cámara y el micrófono del dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Esta acción desbloquea el acceso para todos los servicios y las apps que tengan permitido usar el micrófono."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Esta acción desbloquea el acceso para todos los servicios y las apps que tengan permitido usar la cámara."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Esta acción desbloquea el acceso para todos los servicios y las apps que tengan permitido usar la cámara o el micrófono."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Desliza el dedo hacia arriba para cambiar de app"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arrastra a la derecha para cambiar aplicaciones rápidamente"</string> @@ -527,7 +539,7 @@ <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> y está conectado a VPN"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Tu organización puede controlar el tráfico de red en tu perfil de trabajo"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Es posible que <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> controle el tráfico de red en tu perfil de trabajo"</string> - <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"El administrador de IT puede ver la actividad de la red de tu perfil de trabajo"</string> + <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"El admin. de TI puede ver la actividad de red de tu perfil de trabajo"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Es posible que la red esté supervisada"</string> <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a VPN"</string> <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Tu perfil de trabajo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Listo"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurar pago"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Ocurrió un problema al obtener las tarjetas; vuelve a intentarlo más tarde"</string> <string name="status_bar_work" msgid="5238641949837091056">"Perfil de trabajo"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Modo de avión"</string> <string name="add_tile" msgid="6239678623873086686">"Agregar mosaico"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> Descendió de nivel a Silenciada"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Estado:</b> Se clasificó en una posición superior"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> Se clasificó en una posición inferior"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Se muestran siempre en la parte superior de las notificaciones, incluso cuando el Modo prioridad está activado"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Configuración"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversaciones prioritarias"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admite funciones de conversación"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"No se pueden modificar estas notificaciones."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"No se puede configurar aquí este grupo de notificaciones"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ve a Configuración para actualizar la navegación del sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Se estableció la conversación como prioritaria"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversaciones prioritarias"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Estas conversaciones aparecen arriba en la lista y están siempre al alcance cuando el Modo prioridad está activado"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Las fotos de perfil se muestran en la pantalla de bloqueo"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Puedes encontrar estas conversaciones con facilidad en burbujas, en las pantalla principal"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Suspender No interrumpir"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entendido"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Configuración"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Botón"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"El botón de accesibilidad reemplaza el gesto de accesibilidad\n\n"<annotation id="link">"Ver configuración"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Mueve el botón hacia el borde para ocultarlo temporalmente"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Mover arriba a la izquierda"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Mover arriba a la derecha"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Mover abajo a la izquierda"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Mover abajo a la derecha"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Mover fuera de borde y ocultar"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Mover fuera de borde y mostrar"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Controles de dispositivos"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Agrega controles para los dispositivos conectados"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configurar controles de dispositivos"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Hace menos de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Hace más de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Cumpleaños"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Es el cumpleaños de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Cumpleaños pronto"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Pronto será el cumpleaños de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Aniversario"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Es el aniversario de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Comparte ubicación"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> está compartiendo su ubicación"</string> <string name="new_story_status" msgid="9012195158584846525">"Nueva historia"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> compartió una historia nueva"</string> <string name="video_status" msgid="4548544654316843225">"Mirando"</string> <string name="audio_status" msgid="4237055636967709208">"Escuchando"</string> <string name="game_status" msgid="1340694320630973259">"Jugando"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amigos"</string> <string name="empty_status" msgid="5938893404951307749">"Charlemos esta noche"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"El contenido se mostrará pronto"</string> <string name="missed_call" msgid="4228016077700161689">"Llamada perdida"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g> o más"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta mensajes recientes, llamadas perdidas y actualizaciones de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversación"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> envió un mensaje"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> envió una imagen"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problema al leer el medidor de batería"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Presiona para obtener más información"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No se estableció alarma"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 0eae44baf95e..3fb5ee5bd905 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar más"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Cerrar captura de pantalla"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Vista previa de captura de pantalla"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Margen superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Margen inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Grabación de pantalla"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Procesando grabación de pantalla"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificación continua de una sesión de grabación de la pantalla"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Método de entrada"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Ubicación"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Ubicación desactivada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquear cámara"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Silenciar micrófono"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acceso a la cámara"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acceso al micrófono"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponible"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqueado"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo multimedia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Solo llamadas de emergencia"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Grabar pantalla"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Detener"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> necesita tener acceso al micrófono del dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> necesita tener acceso a la cámara del dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"¿Desbloquear el micrófono del dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"¿Desbloquear la cámara del dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"¿Desbloquear la cámara y el micrófono del dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Si lo haces, todos los servicios y todas las aplicaciones que tengan permiso podrán usar tu micrófono."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Si lo haces, todos los servicios y todas las aplicaciones que tengan permiso podrán usar tu cámara."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Si lo haces, todos los servicios y todas las aplicaciones que tengan permiso podrán usar tu cámara o tu micrófono."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Desliza el dedo hacia arriba para cambiar de aplicación"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arrastra hacia la derecha para cambiar rápidamente de aplicación"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Listo"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurar pago"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Se ha producido un problema al obtener tus tarjetas. Inténtalo de nuevo más tarde."</string> <string name="status_bar_work" msgid="5238641949837091056">"Perfil de trabajo"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Modo avión"</string> <string name="add_tile" msgid="6239678623873086686">"Añadir icono"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> cambio a Silencio"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Estado:</b> posición más alta"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> posición más baja"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Mostrar siempre en la parte superior de tus notificaciones, incluso con el modo Prioridad activado"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Ajustes"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversaciones prioritarias"</string> <string name="no_shortcut" msgid="8257177117568230126">"No se pueden usar funciones de conversación con <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificaciones no se pueden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Este grupo de notificaciones no se puede configurar aquí"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ve a Ajustes para actualizar la navegación del sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversación marcada como prioritaria"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversaciones prioritarias"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Estas conversaciones aparecen al principio de tu lista y puedes acceder a ellas con el modo Prioridad activado"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Las imágenes de perfil se muestran en la pantalla de bloqueo"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Puedes encontrar fácilmente estas conversaciones en las burbujas de la pantalla de inicio"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrumpen el modo No molestar"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entendido"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Ajustes"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Cambiar"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"El botón Accesibilidad ha reemplazado al gesto de accesibilidad\n\nVer configuración"<annotation id="link"></annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Mueve el botón hacia el borde para ocultarlo temporalmente"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Mover arriba a la izquierda"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Mover arriba a la derecha"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Mover abajo a la izquierda"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Mover abajo a la derecha"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Mover al borde y ocultar"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Mover al borde y mostrar"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Control de dispositivos"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Añade controles para tus dispositivos conectados"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configurar control de dispositivos"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Hace menos de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Hace más de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Fecha de nacimiento"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Hoy es el cumpleaños de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Cumpleaños en breve"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Se acerca el cumpleaños de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Aniversario"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Es el aniversario de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Compartiendo ubicación"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> está compartiendo su ubicación"</string> <string name="new_story_status" msgid="9012195158584846525">"Nueva historia"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ha compartido una nueva historia"</string> <string name="video_status" msgid="4548544654316843225">"Viendo"</string> <string name="audio_status" msgid="4237055636967709208">"Escuchando"</string> <string name="game_status" msgid="1340694320630973259">"Reproduciendo"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amigos"</string> <string name="empty_status" msgid="5938893404951307749">"Charlemos esta noche"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"El contenido se mostrará en breve"</string> <string name="missed_call" msgid="4228016077700161689">"Llamada perdida"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta los mensajes recientes, las llamadas perdidas y los cambios de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversación"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ha enviado un mensaje"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha enviado una imagen"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"No se ha podido leer el indicador de batería"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toca la pantalla para consultar más información"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ninguna alarma puesta"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 3a92dfa22992..021093f88484 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Jäädvustage rohkem"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ekraanipildist loobumine"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ekraanipildi eelvaade"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Ülempiir"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Alampiir"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Ekraanisalvesti"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Ekraanisalvestuse töötlemine"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Pooleli märguanne ekraanikuva salvestamise seansi puhul"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Sisestusmeetod"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Asukoht"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Asukoht on väljas"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokeeri kaamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Vaigista mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Juurdepääs kaamerale"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Juurdepääs mikrofonile"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Saadaval"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokeeritud"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Meediaseade"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Ainult hädaabikõned"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekraanisalvestus"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Alustage"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Peatage"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Jätkamiseks vajab rakendus <b><xliff:g id="APP">%s</xliff:g></b> juurdepääsu teie seadme mikrofonile."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Jätkamiseks vajab rakendus <b><xliff:g id="APP">%s</xliff:g></b> juurdepääsu teie seadme kaamerale."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Kas tühistada seadme mikrofoni blokeerimine?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Kas tühistada seadme kaamera blokeerimine?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Kas tühistada seadme kaamera ja mikrofoni blokeerimine?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Sellega tühistatakse juurdepääsu blokeerimine kõikide rakenduste ja teenuste puhul, millel on lubatud mikrofoni kasutada."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Sellega tühistatakse juurdepääsu blokeerimine kõikide rakenduste ja teenuste puhul, millel on lubatud kaamerat kasutada."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Sellega tühistatakse juurdepääsu blokeerimine kõikide rakenduste ja teenuste puhul, millel on lubatud kaamerat või mikrofoni kasutada."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Seade"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Rakenduste vahetamiseks pühkige üles"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Lohistage paremale, et rakendusi kiiresti vahetada"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Äratus"</string> <string name="wallet_title" msgid="5369767670735827105">"Rahakott"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Valmis"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Makseviisi seadistamine"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Avage kasutamiseks"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Teie kaartide hankimisel ilmnes probleem, proovige hiljem uuesti"</string> <string name="status_bar_work" msgid="5238641949837091056">"Tööprofiil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Lennukirežiim"</string> <string name="add_tile" msgid="6239678623873086686">"Paani lisamine"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Olek:</b> määrati prioriteet Vaikne"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Olek:</b> määrati kõrgem prioriteet"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Olek:</b> määrati madalam prioriteet"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Kuva alati märguannete ülaosas, isegi kui režiim Prioriteetne on sisse lülitatud"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Seaded"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioriteetsed vestlused"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei toeta vestlusfunktsioone"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Neid märguandeid ei saa muuta."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Seda märguannete rühma ei saa siin seadistada"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Süsteemi navigeerimise värskendamiseks avage jaotis Seaded"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Ooterežiim"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Vestlus määrati prioriteetseks"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioriteetsed vestlused"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Need vestlused kuvatakse loendi ülaosas ja jõuavad alati teieni ka siis, kui režiim Prioriteetne on sisse lülitatud"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profiilipildid kuvatakse lukustuskuval"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Leiate need vestlused hõlpsalt avakuval olevatest mullidest"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Funktsioon Mitte segada katkestatakse"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Selge"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Seaded"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Vaheta"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Juurdepääsetavuse nupp asendas juurdepääsuliigutuse\n\n"<annotation id="link">"Vaadake seadeid"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Teisaldage nupp serva, et see ajutiselt peita"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Teisalda üles vasakule"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Teisalda üles paremale"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Teisalda alla vasakule"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Teisalda alla paremale"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Teisalda serva ja kuva"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Teisalda servast eemale ja kuva"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Seadmete juhikud"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Lisage juhtelemendid ühendatud seadmete jaoks"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Seadmete juhtimisvidinate seadistamine"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Vähem kui <xliff:g id="DURATION">%1$s</xliff:g> tagasi"</string> <string name="over_timestamp" msgid="4765793502859358634">"Üle <xliff:g id="DURATION">%1$s</xliff:g> tagasi"</string> <string name="birthday_status" msgid="2596961629465396761">"Sünnipäev"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"On kasutaja <xliff:g id="NAME">%1$s</xliff:g> sünnipäev!"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Peagi on sünnipäev"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Varsti on kasutaja <xliff:g id="NAME">%1$s</xliff:g> sünnipäev"</string> <string name="anniversary_status" msgid="1790034157507590838">"Aastapäev"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"On kasutaja <xliff:g id="NAME">%1$s</xliff:g> tähtpäev"</string> <string name="location_status" msgid="1294990572202541812">"Asukoha jagamine"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> jagab asukohta"</string> <string name="new_story_status" msgid="9012195158584846525">"Uus lugu"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> jagas uut lugu"</string> <string name="video_status" msgid="4548544654316843225">"Vaatamas"</string> <string name="audio_status" msgid="4237055636967709208">"Kuulamine"</string> <string name="game_status" msgid="1340694320630973259">"Mängimas"</string> <string name="empty_user_name" msgid="3389155775773578300">"Sõbrad"</string> <string name="empty_status" msgid="5938893404951307749">"Vestleme täna õhtul!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Sisu kuvatakse peagi"</string> <string name="missed_call" msgid="4228016077700161689">"Vastamata kõne"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Vaadake hiljutisi sõnumeid, vastamata kõnesid ja olekuvärskendusi"</string> <string name="people_tile_title" msgid="6589377493334871272">"Vestlus"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> saatis sõnumi"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> saatis pildi"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Probleem akumõõdiku lugemisel"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Puudutage lisateabe saamiseks"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Äratust pole"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 1d69d31a4667..7adba36a73ea 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Atera eduki gehiago argazkian"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Baztertu pantaila-argazkia"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pantaila-argazkiaren aurrebista"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Goiko ertza"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Beheko ertza"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Pantaila-grabagailua"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Pantaila-grabaketa prozesatzen"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Pantailaren grabaketa-saioaren jakinarazpen jarraitua"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Idazketa-metodoa"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Kokapena"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Kokapena desaktibatuta"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokeatu kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Desaktibatu mikrofonoa"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kamera atzitzeko baimena"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofonoa atzitzeko baimena"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Baimenduta"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Baimenik gabe"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Multimedia-gailua"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Larrialdi-deiak soilik"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Pantaila-grabaketa"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Hasi"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Gelditu"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Aurrera egiteko, gailuaren mikrofonoa atzitzeko baimena behar du <b><xliff:g id="APP">%s</xliff:g></b> aplikazioak."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Aurrera egiteko, gailuaren kamera atzitzeko baimena behar du <b><xliff:g id="APP">%s</xliff:g></b> aplikazioak."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Gailuaren mikrofonoa desblokeatu nahi duzu?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Gailuaren kamera desblokeatu nahi duzu?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Gailuaren kamera eta mikrofonoa desblokeatu nahi dituzu?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Mikrofonoa atzitzeko baimena duten aplikazio eta zerbitzu guztiek erabili ahalko dute."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Kamera atzitzeko baimena duten aplikazio eta zerbitzu guztiek erabili ahalko dute."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Kamera edo mikrofonoa atzitzeko baimena duten aplikazio eta zerbitzu guztiek erabili ahalko dituzte."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Gailua"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Egin gora aplikazioa aldatzeko"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arrastatu eskuinera aplikazioa azkar aldatzeko"</string> @@ -455,7 +467,7 @@ <string name="camera_hint" msgid="4519495795000658637">"Pasatu hatza ikonotik, kamera irekitzeko"</string> <string name="interruption_level_none_with_warning" msgid="8394434073508145437">"Isiltasun osoa. Pantaila-irakurgailuak ere isilaraziko dira."</string> <string name="interruption_level_none" msgid="219484038314193379">"Isiltasun osoa"</string> - <string name="interruption_level_priority" msgid="661294280016622209">"Lehentasunezkoak"</string> + <string name="interruption_level_priority" msgid="661294280016622209">"Lehentasunezkoak soilik"</string> <string name="interruption_level_alarms" msgid="2457850481335846959">"Alarmak soilik"</string> <string name="interruption_level_none_twoline" msgid="8579382742855486372">"Isiltasun\nosoa"</string> <string name="interruption_level_priority_twoline" msgid="8523482736582498083">"Lehentasunezkoak\nsoilik"</string> @@ -496,8 +508,8 @@ <string name="battery_saver_notification_title" msgid="8419266546034372562">"Aktibatuta dago bateria-aurrezlea"</string> <string name="battery_saver_notification_text" msgid="2617841636449016951">"Errendimendua eta atzeko planoko datuak murrizten ditu"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"Desaktibatu bateria-aurrezlea"</string> - <string name="media_projection_dialog_text" msgid="1755705274910034772">"Zerbait grabatzen edo igortzen duzunean, pantailan ikus daitekeen edo gailuak erreproduzitzen duen informazio guztia atzitu ahalko du <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> aplikazioak. Horrek barne hartzen ditu pasahitzak, ordainketen xehetasunak, argazkiak, mezuak eta erreproduzitzen dituzun audioak."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Zerbait grabatzen edo igortzen duzunean, pantailan ikus daitekeen edo gailuak erreproduzitzen duen informazio guztia atzitu ahalko du funtzio hori eskaintzen duen zerbitzuak. Horrek barne hartzen ditu pasahitzak, ordainketen xehetasunak, argazkiak, mezuak eta erreproduzitzen dituzun audioak."</string> + <string name="media_projection_dialog_text" msgid="1755705274910034772">"Zerbait grabatzen edo igortzen duzunean, pantailan ikus daitekeen edo gailuak erreproduzitzen duen informazio guztia atzitu ahalko du <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> aplikazioak; besteak beste, pasahitzak, ordainketen xehetasunak, argazkiak, mezuak eta erreproduzitzen dituzun audioak."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Zerbait grabatzen edo igortzen duzunean, pantailan ikus daitekeen edo gailuak erreproduzitzen duen informazio guztia atzitu ahalko du funtzio hori eskaintzen duen zerbitzuak; besteak beste, pasahitzak, ordainketen xehetasunak, argazkiak, mezuak eta erreproduzitzen dituzun audioak."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Grabatzen edo igortzen hasi nahi duzu?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> aplikazioarekin grabatzen edo igortzen hasi nahi duzu?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"Ez erakutsi berriro"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Prest"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Konfiguratu ordainketa"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desblokeatu erabiltzeko"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Arazo bat izan da txartelak eskuratzean. Saiatu berriro geroago."</string> <string name="status_bar_work" msgid="5238641949837091056">"Work profila"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Hegaldi modua"</string> <string name="add_tile" msgid="6239678623873086686">"Gehitu lauza"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"Soinurik gabeko modura aldatu da <b>egoera:</b>"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"Mailaz igo da <b>egoera:</b>"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"Mailaz jaitsi da <b>egoera:</b>"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Jakinarazpenen goialdean agertuko dira beti, baita lehentasunezko modua aktibatuta dagoenean ere"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Ezarpenak"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Lehentasunezko elkarrizketak"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak ez ditu onartzen elkarrizketetarako eginbideak"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Jakinarazpen horiek ezin dira aldatu."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Jakinarazpen talde hau ezin da konfiguratu hemen"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Sistemaren nabigazioa eguneratzeko, joan Ezarpenak atalera"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Egonean"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Lehentasunezko gisa ezarritako elkarrizketa"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Lehentasunezko elkarrizketak"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Elkarrizketak zerrendaren goialdean agertuko dira. Lehentasunezko modua aktibatuta badago, beti iritsiko zaizkie mezuak."</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profileko argazkiak pantaila blokeatuan agertzen dira"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Erraz aurki ditzakezu elkarrizketa horiek hasierako pantailako burbuiletan"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Eten ez molestatzeko modua"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ados"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Ezarpenak"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Botoia"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Erabilerraztasuna botoiak erabilerraztasun-keinua ordezkatu du\n\n"<annotation id="link">"Ikusi ezarpenak"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Eraman botoia ertzera aldi baterako ezkutatzeko"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Eraman goialdera, ezkerretara"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Eraman goialdera, eskuinetara"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Eraman behealdera, ezkerretara"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Eraman behealdera, eskuinetara"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Eraman ertzera eta ezkutatu"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Atera ertzetik eta erakutsi"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Gailuak kontrolatzeko widgetak"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Gehitu konektatutako gailuak kontrolatzeko widgetak"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfiguratu gailuak kontrolatzeko widgetak"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Duela <xliff:g id="DURATION">%1$s</xliff:g> baino gutxiago"</string> <string name="over_timestamp" msgid="4765793502859358634">"Duela <xliff:g id="DURATION">%1$s</xliff:g> baino gehiago"</string> <string name="birthday_status" msgid="2596961629465396761">"Urtebetetzea"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen urtebetetzea da"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Badator urtebetetzea"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Badator <xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen urtebetetzea"</string> <string name="anniversary_status" msgid="1790034157507590838">"Urteurrena"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen urteurrena da"</string> <string name="location_status" msgid="1294990572202541812">"Kokapena partekatzen"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> kokapena partekatzen ari da"</string> <string name="new_story_status" msgid="9012195158584846525">"Istorio berria"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak istorio berri bat partekatu du"</string> <string name="video_status" msgid="4548544654316843225">"Ikusten"</string> <string name="audio_status" msgid="4237055636967709208">"Entzuten"</string> <string name="game_status" msgid="1340694320630973259">"Erreproduzitzen"</string> <string name="empty_user_name" msgid="3389155775773578300">"Lagunak"</string> <string name="empty_status" msgid="5938893404951307749">"Txatea dezagun gaur gauean!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Laster agertuko da edukia"</string> <string name="missed_call" msgid="4228016077700161689">"Dei galdua"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Ikusi azken mezuak, dei galduak eta egoerari buruzko informazio eguneratua"</string> <string name="people_tile_title" msgid="6589377493334871272">"Elkarrizketa"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak mezu bat bidali du"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak irudi bat bidali du"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Arazo bat gertatu da bateria-neurgailua irakurtzean"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Informazio gehiago lortzeko, sakatu hau"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ez da ezarri alarmarik"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 543d83ba269c..11bb41b2f7d0 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -66,7 +66,7 @@ <string name="wifi_debugging_title" msgid="7300007687492186076">"اشکالزدایی بیسیم در این شبکه مجاز شود؟"</string> <string name="wifi_debugging_message" msgid="5461204211731802995">"نام شبکه (SSID)\n<xliff:g id="SSID_0">%1$s</xliff:g>\n\nنشانی Wi‑Fi (BSSID)\n<xliff:g id="BSSID_1">%2$s</xliff:g>"</string> <string name="wifi_debugging_always" msgid="2968383799517975155">"همیشه در این شبکه مجاز شود"</string> - <string name="wifi_debugging_allow" msgid="4573224609684957886">"مجاز"</string> + <string name="wifi_debugging_allow" msgid="4573224609684957886">"مجاز بودن"</string> <string name="wifi_debugging_secondary_user_title" msgid="2493201475880517725">"اشکالزدایی بیسیم مجاز نیست"</string> <string name="wifi_debugging_secondary_user_message" msgid="4492383073970079751">"کاربری که درحالحاضر در این دستگاه به سیستم وارد شده است نمیتواند اشکالزدایی بیسیم را روشن کند. برای استفاده از این ویژگی، به کاربر اصلی بروید."</string> <string name="usb_contaminant_title" msgid="894052515034594113">"درگاه USB غیرفعال شده است"</string> @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ضبط محتوای بیشتر"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"رد کردن نماگرفت"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"پیشنمایش نماگرفت"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"مرز بالایی"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"مرز پایینی"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ضبطکننده صفحهنمایش"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"درحال پردازش ضبط صفحهنمایش"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"اعلان درحال انجام برای جلسه ضبط صفحهنمایش"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"روش ورودی"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"مکان"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"مکان خاموش"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"مسدود کردن دوربین"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"بیصدا کردن میکروفون"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"دسترسی به دوربین"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"دسترسی به میکروفون"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"دردسترس"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"مسدود"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"دستگاه رسانه"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"فقط تماسهای اضطراری"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ضبط کردن صفحهنمایش"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"شروع"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"توقف"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"برای ادامه دادن، <b><xliff:g id="APP">%s</xliff:g></b> باید به میکروفون دستگاه دسترسی داشته باشد."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"برای ادامه دادن، <b><xliff:g id="APP">%s</xliff:g></b> باید به دوربین دستگاه دسترسی داشته باشد."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"میکروفون دستگاه لغو انسداد شود؟"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"دوربین دستگاه لغو انسداد شود؟"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"دوربین و میکروفون دستگاه لغو انسداد شود؟"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"با این کار دسترسی برای همه برنامهها و سرویسهایی که مجاز هستند از میکروفونتان استفاده کنند لغو انسداد میشود."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"با این کار دسترسی برای همه برنامهها و سرویسهایی که مجاز هستند از دوربینتان استفاده کنند لغو انسداد میشود."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"با این کار دسترسی برای همه برنامهها و دستگاههایی که مجاز هستند از دوربین یا میکروفونتان استفاده کنند لغو انسداد میشود."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"دستگاه"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"برای تغییر برنامهها، تند بهبالا بکشید"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"برای جابهجایی سریع میان برنامهها، به چپ بکشید"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"اترنت"</string> <string name="status_bar_alarm" msgid="87160847643623352">"زنگ"</string> <string name="wallet_title" msgid="5369767670735827105">"کیفپول"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"نمایش همه"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"برای پرداخت قفل را باز کنید"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"آماده"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"راهاندازی پرداخت"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"برای استفاده، قفل را باز کنید"</string> @@ -758,7 +772,7 @@ <string name="feedback_ok" msgid="6481426753298857144">"تأیید"</string> <string name="notification_channel_controls_opened_accessibility" msgid="6111817750774381094">"کنترلهای اعلان برای <xliff:g id="APP_NAME">%1$s</xliff:g> باز شد"</string> <string name="notification_channel_controls_closed_accessibility" msgid="1561909368876911701">"کنترلهای اعلان برای <xliff:g id="APP_NAME">%1$s</xliff:g> بسته شد"</string> - <string name="notification_channel_switch_accessibility" msgid="8979885820432540252">"مجاز کردن اعلانهای این کانال"</string> + <string name="notification_channel_switch_accessibility" msgid="8979885820432540252">"مجاز بودن اعلانهای این کانال"</string> <string name="notification_more_settings" msgid="4936228656989201793">"تنظیمات بیشتر"</string> <string name="notification_app_settings" msgid="8963648463858039377">"سفارشی کردن"</string> <string name="notification_done" msgid="6215117625922713976">"تمام"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index c8de17b71249..96e083ac77f7 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Kuvaa enemmän"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Hylkää kuvakaappaus"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Kuvakaappauksen esikatselu"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Yläraja"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Alaraja"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Näytön tallentaja"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Näytön tallennusta käsitellään"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Pysyvä ilmoitus näytön tallentamisesta"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Syöttötapa"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Sijainti"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Sijainti ei käytössä"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Estä kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mykistä mikrofoni"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Pääsy kameraan"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Pääsy mikrofoniin"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Käytettävissä"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Estetty"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medialaite"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Vain hätäpuhelut"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Tallennus"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Aloita"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Lopeta"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Jotta voit jatkaa, <b><xliff:g id="APP">%s</xliff:g></b> tarvitsee pääsyn laitteesi mikrofoniin."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Jotta voit jatkaa, <b><xliff:g id="APP">%s</xliff:g></b> tarvitsee pääsyn laitteesi kameraan."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Kumotaanko laitteen mikrofonin esto?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Kumotaanko laitteen kameran esto?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Kumotaanko laitteen kameran ja mikrofonin esto?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Tämä kumoaa kaikkien sellaisten sovellusten ja palveluiden eston, joilla on lupa käyttää mikrofoniasi."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Tämä kumoaa kaikkien sellaisten sovellusten ja palveluiden eston, joilla on lupa käyttää kameraasi."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Tämä kumoaa kaikkien sellaisten sovellusten ja palveluiden eston, joilla on lupa käyttää kameraasi tai mikrofoniasi."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Laite"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Vaihda sovellusta pyyhkäisemällä ylös"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Vaihda sovellusta nopeasti vetämällä oikealle"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Herätys"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Valmis"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Ota maksutapa käyttöön"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Avaa lukitus ja käytä"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Korttien noutamisessa oli ongelma, yritä myöhemmin uudelleen"</string> <string name="status_bar_work" msgid="5238641949837091056">"Työprofiili"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Lentokonetila"</string> <string name="add_tile" msgid="6239678623873086686">"Lisää ruutu"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Tila:</b> hiljennetty"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Tila:</b> valittu tärkeämmäksi"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Tila:</b> valittu vähemmän tärkeäksi"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Näytetään aina ilmoitusten yläpuolella, myös silloin, kun Tärkeät-tila on päällä"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Asetukset"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Tärkeät keskustelut"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei tue keskusteluominaisuuksia"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Näitä ilmoituksia ei voi muokata"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tätä ilmoitusryhmää ei voi määrittää tässä"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Vaihda järjestelmän navigointitapaa asetuksista"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Virransäästötila"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Tärkeäksi merkitty keskustelu"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Tärkeät keskustelut"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Nämä keskustelut näkyvät luettelon yläosassa ja ne näkyvät sinulle aina, kun Tärkeät-tila on päällä"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profiilikuvat näkyvät lukitusnäytöllä"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Voit löytää nämä keskustelut helposti aloitusnäytöllä olevista kuplista"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Keskeyttää Älä häiritse ‑tilan"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Selvä"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Asetukset"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Vaihda"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Esteettömyyspainike on korvannut esteettömyyseleen\n\n"<annotation id="link">"Katso asetukset"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Piilota painike tilapäisesti siirtämällä se reunaan"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Siirrä vasempaan yläreunaan"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Siirrä oikeaan yläreunaan"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Siirrä vasempaan alareunaan"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Siirrä oikeaan alareunaan"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Siirrä reunaan ja piilota"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Siirrä pois reunasta ja näytä"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Laitteiden hallinta"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Lisää ohjaimia yhdistettyjä laitteita varten"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Laitteiden hallinnan käyttöönotto"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Alle <xliff:g id="DURATION">%1$s</xliff:g> sitten"</string> <string name="over_timestamp" msgid="4765793502859358634">"Yli <xliff:g id="DURATION">%1$s</xliff:g> sitten"</string> <string name="birthday_status" msgid="2596961629465396761">"Syntymäpäivä"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> viettää tänään syntymäpäiväänsä"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Syntymäpäivä pian"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> viettää pian syntymäpäiväänsä"</string> <string name="anniversary_status" msgid="1790034157507590838">"Vuosipäivä"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> juhlii tänään vuosipäiväänsä"</string> <string name="location_status" msgid="1294990572202541812">"Sijaintia jaetaan"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> jakaa sijaintia"</string> <string name="new_story_status" msgid="9012195158584846525">"Uusi juttu"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> jakoi uuden tarinan"</string> <string name="video_status" msgid="4548544654316843225">"Katsotaan"</string> <string name="audio_status" msgid="4237055636967709208">"Kuunnellaan"</string> <string name="game_status" msgid="1340694320630973259">"Toistetaan"</string> <string name="empty_user_name" msgid="3389155775773578300">"Kaverit"</string> <string name="empty_status" msgid="5938893404951307749">"Jutellaan illalla!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Sisältö tulee pian näkyviin"</string> <string name="missed_call" msgid="4228016077700161689">"Vastaamaton puhelu"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Yli <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Katso viimeaikaiset viestit, vastaamattomat puhelut ja tilapäivitykset"</string> <string name="people_tile_title" msgid="6589377493334871272">"Keskustelu"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> lähetti viestin"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> lähetti kuvan"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Ongelma akkumittarin lukemisessa"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Saat lisätietoja napauttamalla"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ei herätyksiä"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index df9b7b86496a..abbf1617985d 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturer plus"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Fermer la capture d\'écran"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Aperçu de la capture d\'écran"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Limite supérieure"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Limite inférieure"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Enregistreur d\'écran"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Trait. de l\'enregist. d\'écran…"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notification en cours pour une session d\'enregistrement d\'écran"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Mode de saisie"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Position"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localisation désactivée"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquer l\'appareil photo"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Désactiver le microphone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Accès à l\'appareil photo"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Accès au microphone"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Accessible"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqué"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Appareil multimédia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Appels d\'urgence uniquement"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Enregistrement d\'écran"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Démarrer"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Arrêter"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Pour continuer, vous devez accorder l\'accès au microphone de votre appareil à l\'application <b><xliff:g id="APP">%s</xliff:g></b>."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Pour continuer, vous devez accorder l\'accès à l\'appareil photo de votre appareil à l\'application <b><xliff:g id="APP">%s</xliff:g></b>."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Débloquer le microphone de l\'appareil?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Débloquer l\'appareil photo de l\'appareil?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Débloquer l\'appareil photo et le microphone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Cette action débloque l\'accès à toutes les applications et à tous les services qui possèdent l\'autorisation d\'utiliser le microphone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Cette action débloque l\'accès à toutes les applications et à tous les services qui possèdent l\'autorisation d\'utiliser l\'appareil photo."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Cette action débloque l\'accès à toutes les applications et à tous les services qui possèdent l\'autorisation d\'utiliser l\'appareil photo ou le microphone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Appareil"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Balayez vers le haut pour changer d\'application"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Balayez l\'écran vers la droite pour changer rapidement d\'application"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarme"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Prêt"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurer le paiement"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Déverrouiller pour utiliser"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Un problème est survenu lors de la récupération de vos cartes, veuillez réessayer plus tard"</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil professionnel"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Mode Avion"</string> <string name="add_tile" msgid="6239678623873086686">"Ajouter la tuile"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>État :</b> abaissé à la catégorie Silencieux"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>État :</b> élevé d\'un niveau"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>État :</b> abaissé d\'un niveau"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"S\'affiche toujours en haut de vos notifications, même en mode Prioritaire"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Paramètres"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversations prioritaires"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne prend pas en charge les fonctionnalités de conversation"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ces notifications ne peuvent pas être modifiées"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ce groupe de notifications ne peut pas être configuré ici"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accédez au menu Paramètres pour mettre à jour la navigation système"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Veille"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"La conversation a été définie comme prioritaire"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversations prioritaires"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ces conversations s\'affichent dans le haut de votre liste et restent visibles en mode Prioritaire"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Les photos de profil sont affichées sur l\'écran de verrouillage"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Vous trouverez facilement ces conversations dans des bulles sur votre écran d\'accueil"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompre le mode Ne pas déranger"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Paramètres"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Commutateur"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Le bouton d\'accessibilité a remplacé le geste d\'accessibilité\n\n"<annotation id="link">"Voir les paramètres"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Déplacez le bouton vers le bord pour le masquer temporairement"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Déplacer dans coin sup. gauche"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Déplacer dans coin sup. droit"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Déplacer dans coin inf. gauche"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Déplacer dans coin inf. droit"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Éloigner du bord et masquer"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Éloigner du bord et afficher"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Commandes des appareils"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Ajoutez des commandes pour vos appareils connectés"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configurer les commandes des appareils"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Il y a moins de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Il y a plus de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Anniversaire"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"C\'est l\'anniversaire de naissance de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Anniversaire proche"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Ce sera bientôt l\'anniversaire de naissance de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Anniversaire"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"C\'est l\'anniversaire de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Partage de position"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> partage sa position"</string> <string name="new_story_status" msgid="9012195158584846525">"Nouvel article"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> a partagé une nouvelle histoire"</string> <string name="video_status" msgid="4548544654316843225">"En train de regarder…"</string> <string name="audio_status" msgid="4237055636967709208">"En train d\'écouter…"</string> <string name="game_status" msgid="1340694320630973259">"En train de jouer…"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amis"</string> <string name="empty_status" msgid="5938893404951307749">"Clavardons ce soir!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Le contenu sera bientôt affiché"</string> <string name="missed_call" msgid="4228016077700161689">"Appel manqué"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Afficher les messages récents, les appels manqués et les mises à jour d\'état"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé un message"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé une image"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Un problème est survenu lors de la lecture du niveau de charge de la pile"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Touchez pour en savoir plus"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Aucune alarme définie"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 6efdbd0d98c5..31d4854a5fd3 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturer plus"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Fermer la capture d\'écran"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Aperçu de la capture d\'écran"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Limite supérieure"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Limite inférieure"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Enregistreur d\'écran"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Enregistrement de l\'écran…"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notification en cours pour une session d\'enregistrement de l\'écran"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Mode de saisie"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Localisation"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localisation désactivée"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquer l\'appareil photo"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Couper le micro"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Appareil multimédia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Appels d\'urgence"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Enregistrement de l\'écran"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Démarrer"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Arrêter"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Pour continuer, <b><xliff:g id="APP">%s</xliff:g></b> a besoin d\'accéder au micro de votre appareil."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Pour continuer, <b><xliff:g id="APP">%s</xliff:g></b> a besoin d\'accéder à l\'appareil photo de votre appareil."</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"Appareil"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Balayer l\'écran vers le haut pour changer d\'application"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Déplacer vers la droite pour changer rapidement d\'application"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarme"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Prêt"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurer un mode de paiement"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Déverrouiller pour utiliser"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Problème de récupération de vos cartes. Réessayez plus tard"</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil professionnel"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Mode Avion"</string> <string name="add_tile" msgid="6239678623873086686">"Ajouter un bloc"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>État :</b> Abaissée à la catégorie \"Silencieux\""</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>État :</b> Élevée d\'un niveau"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>État ::</b> Abaissée d\'un niveau"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"S\'affiche toujours en haut des notifications, même en mode Prioritaire"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Paramètres"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversations prioritaires"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas compatible avec les fonctionnalités de conversation"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossible de modifier ces notifications."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Vous ne pouvez pas configurer ce groupe de notifications ici"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accédez aux paramètres pour mettre à jour la navigation système"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Mode Veille imminent"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversation définie comme prioritaire"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversations prioritaires"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ces conversations s\'affichent en haut de la liste et restent visibles en mode Prioritaire"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Les photos de profil s\'affichent sur l\'écran de verrouillage"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Retrouvez facilement ces conversations dans des bulles sur l\'écran d\'accueil"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompre Ne pas déranger"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Paramètres"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Changer"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Le bouton Accessibilité a remplacé le geste d\'accessibilité\n\n"<annotation id="link">"Afficher les paramètres"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Déplacer le bouton vers le bord pour le masquer temporairement"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Déplacer en haut à gauche"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Déplacer en haut à droite"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Déplacer en bas à gauche"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Déplacer en bas à droite"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Rapprocher du bord et masquer"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Éloigner du bord et afficher"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Commandes des appareils"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Ajouter des commandes pour vos appareils connectés"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configurer les commandes des appareils"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Il y a moins de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Il y a plus de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Anniversaire"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"C\'est l\'anniversaire de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Anniversaire à venir"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"C\'est bientôt l\'anniversaire de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Fête"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"C\'est l\'anniversaire de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Partage sa position"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> partage sa position"</string> <string name="new_story_status" msgid="9012195158584846525">"Nouvelle story"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> a partagé une story"</string> <string name="video_status" msgid="4548544654316843225">"Regarde une vidéo"</string> <string name="audio_status" msgid="4237055636967709208">"Écoute"</string> <string name="game_status" msgid="1340694320630973259">"Joue"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amis"</string> <string name="empty_status" msgid="5938893404951307749">"Chattez ce soir !"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Le contenu s\'affichera bientôt"</string> <string name="missed_call" msgid="4228016077700161689">"Appel manqué"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+ de <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Voir les messages récents, les appels manqués et les notifications d\'état"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé un message"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé une image"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Un problème est survenu au niveau de la lecture de votre outil de mesure de batterie"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Appuyer pour en savoir plus"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Pas d\'alarme définie"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index eeacc9fa0386..9c584bba1036 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar máis"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ignorar a captura de pantalla"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Vista previa da captura de pantalla"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Bordo superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Bordo inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Gravadora da pantalla"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Procesando gravación pantalla"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificación en curso sobre unha sesión de gravación de pantalla"</string> @@ -332,7 +338,7 @@ <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_multiple_devices_label" msgid="6595808498429809855">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> dispositivos)"</string> <string name="quick_settings_bluetooth_off_label" msgid="6375098046500790870">"Bluetooth desactivado"</string> - <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Non hai dispositivos sincronizados dispoñibles"</string> + <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Non hai dispositivos vinculados dispoñibles"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de batería"</string> <string name="quick_settings_bluetooth_secondary_label_audio" msgid="780333390310051161">"Audio"</string> <string name="quick_settings_bluetooth_secondary_label_headset" msgid="2332093067553000852">"Auriculares"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Método de introdución de texto"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Localización"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localización desactivada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquear cámara"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Silenciar micrófono"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acceso á cámara"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acceso ao micrófono"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Dispoñible"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqueado"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo multimedia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Só chamadas de emerxencia"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Gravación da pantalla"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Deter"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> precisa acceder ao micrófono do dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> precisa acceder á cámara do dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Queres desbloquear o micrófono do dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Queres desbloquear a cámara do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Queres desbloquear a cámara e o micrófono do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Con esta acción desbloquearase o acceso ao micrófono para todas as aplicacións e servizos que teñan permiso para utilizalo."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Con esta acción desbloquearase o acceso á cámara para todas as aplicacións e servizos que teñan permiso para utilizala."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Con esta acción desbloquearase o acceso á cámara ou ao micrófono para todas as aplicacións e servizos que teñan permiso para utilizalos."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Pasar o dedo cara arriba para cambiar de aplicación"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arrastra cara á dereita para cambiar de aplicacións rapidamente"</string> @@ -447,9 +459,9 @@ <string name="keyguard_unlock" msgid="8031975796351361601">"Pasa o dedo cara arriba para abrir"</string> <string name="keyguard_retry" msgid="886802522584053523">"Pasa o dedo cara arriba para tentalo de novo"</string> <string name="require_unlock_for_nfc" msgid="1305686454823018831">"Desbloquea o dispositivo para utilizar a NFC"</string> - <string name="do_disclosure_generic" msgid="4896482821974707167">"Este dispositivo pertence á túa organización"</string> - <string name="do_disclosure_with_name" msgid="2091641464065004091">"Este dispositivo pertence a <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="do_financed_disclosure_with_name" msgid="6723004643314467864">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona este dispositivo"</string> + <string name="do_disclosure_generic" msgid="4896482821974707167">"Este dispositivo pertence á túa organización."</string> + <string name="do_disclosure_with_name" msgid="2091641464065004091">"Este dispositivo pertence a <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string> + <string name="do_financed_disclosure_with_name" msgid="6723004643314467864">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona este dispositivo."</string> <string name="phone_hint" msgid="6682125338461375925">"Pasa o dedo desde a icona para acceder ao teléfono"</string> <string name="voice_hint" msgid="7476017460191291417">"Pasa o dedo desde a icona para acceder ao asistente de voz"</string> <string name="camera_hint" msgid="4519495795000658637">"Pasa o dedo desde a icona para acceder á cámara"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Listo"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurar pago"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Produciuse un problema ao obter as tarxetas. Téntao de novo máis tarde"</string> <string name="status_bar_work" msgid="5238641949837091056">"Perfil de traballo"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Modo avión"</string> <string name="add_tile" msgid="6239678623873086686">"Engade un atallo"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> o nivel diminuíuse a Silencioso"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Estado:</b> clasificouse nun nivel superior"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> clasificouse nun nivel inferior"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Móstrase sempre na parte superior das notificacións, mesmo cando está activado o modo de prioridade"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Configuración"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversas prioritarias"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> non admite funcións de conversa"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificacións non se poden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Aquí non se pode configurar este grupo de notificacións"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Para actualizar a navegación do sistema, vai a Configuración"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Modo de espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"A conversa definiuse como prioritaria"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversas prioritarias"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Estas conversas móstranse na parte superior da lista e pódenseche amosar mesmo co modo de prioridade activado"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"As fotos dos perfís móstranse na pantalla de bloqueo"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Podes atopar facilmente estas conversas en burbullas situadas na pantalla de inicio"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interromper modo Non molestar"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entendido"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Configuración"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Cambiar"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"O botón de accesibilidade substituíu o xesto de accesibilidade\n\n"<annotation id="link">"Ver configuración"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Para ocultar temporalmente o botón, móveo ata o bordo"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Mover á parte super. esquerda"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Mover á parte superior dereita"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Mover á parte infer. esquerda"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Mover á parte inferior dereita"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Mover ao bordo e ocultar"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Mover fóra do bordo e mostrar"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Control de dispositivos"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Engade controis para os dispositivos conectados"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configurar o control de dispositivos"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Hai menos de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Hai máis de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Aniversario"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> está de aniversario"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Aniversario a caer"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> estará de aniversario pronto"</string> <string name="anniversary_status" msgid="1790034157507590838">"Aniversario"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> está de aniversario"</string> <string name="location_status" msgid="1294990572202541812">"Compartindo localiz."</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> está compartindo a localización"</string> <string name="new_story_status" msgid="9012195158584846525">"Nova historia"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> compartiu unha historia nova"</string> <string name="video_status" msgid="4548544654316843225">"Vendo vídeo"</string> <string name="audio_status" msgid="4237055636967709208">"Escoitando"</string> <string name="game_status" msgid="1340694320630973259">"Xogando"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amigos"</string> <string name="empty_status" msgid="5938893404951307749">"Chateamos á noite?"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"O contido aparecerá pronto"</string> <string name="missed_call" msgid="4228016077700161689">"Chamada perdida"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+ de <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta as mensaxes recentes, as chamadas perdidas e as actualizacións dos estados"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> enviou unha mensaxe"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou unha imaxe"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Produciuse un problema ao ler o medidor da batería"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toca para obter máis información"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Sen alarmas postas"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 57bbb08f4544..37ff5e7d593e 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"વધુ કૅપ્ચર કરો"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"સ્ક્રીનશૉટ છોડી દો"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"સ્ક્રીનશૉટનો પ્રીવ્યૂ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"સ્ક્રીનશૉટની સૌથી ઉપરની બાજુની સીમા"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"સ્ક્રીનશૉટની સૌથી નીચેની બાજુની સીમા"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"સ્ક્રીન રેકૉર્ડર"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"સ્ક્રીન રેકૉર્ડિંગ ચાલુ છે"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"સ્ક્રીન રેકોર્ડિંગ સત્ર માટે ચાલુ નોટિફિકેશન"</string> @@ -201,7 +207,7 @@ <string name="accessibility_wimax_three_bars" msgid="2773714362377629938">"WiMAX ત્રણ બાર."</string> <string name="accessibility_wimax_signal_full" msgid="3101861561730624315">"પૂર્ણ WiMAX સિગ્નલ."</string> <string name="accessibility_no_signal" msgid="1115622734914921920">"કોઈ સિગ્નલ નથી."</string> - <string name="accessibility_not_connected" msgid="4061305616351042142">"કનેક્ટ થયેલ નથી."</string> + <string name="accessibility_not_connected" msgid="4061305616351042142">"કનેક્ટ થયેલું નથી."</string> <string name="accessibility_zero_bars" msgid="1364823964848784827">"શૂન્ય બાર."</string> <string name="accessibility_one_bar" msgid="6312250030039240665">"એક બાર."</string> <string name="accessibility_two_bars" msgid="1335676987274417121">"બે બાર."</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ઇનપુટ પદ્ધતિ"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"સ્થાન"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"સ્થાન બંધ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"કૅમેરા બ્લૉક કરો"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"માઇક્રોફોનને મ્યૂટ કરો"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"મીડિયા ઉપકરણ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ફક્ત ઇમર્જન્સી કૉલ"</string> @@ -363,7 +375,7 @@ <string name="quick_settings_internet_label" msgid="6603068555872455463">"ઇન્ટરનેટ"</string> <string name="quick_settings_networks_available" msgid="1875138606855420438">"નેટવર્ક ઉપલબ્ધ છે"</string> <string name="quick_settings_networks_unavailable" msgid="1167847013337940082">"નેટવર્ક અનુપલબ્ધ છે"</string> - <string name="quick_settings_wifi_not_connected" msgid="4071097522427039160">"કનેક્ટ થયેલ નથી"</string> + <string name="quick_settings_wifi_not_connected" msgid="4071097522427039160">"કનેક્ટ થયેલું નથી"</string> <string name="quick_settings_wifi_no_network" msgid="6003178398713839313">"કોઈ નેટવર્ક નથી"</string> <string name="quick_settings_wifi_off_label" msgid="4003379736176547594">"વાઇ-ફાઇ બંધ"</string> <string name="quick_settings_wifi_on_label" msgid="2489928193654318511">"વાઇ-ફાઇ ચાલુ"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"સ્ક્રીન રેકૉર્ડ કરો"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"શરૂ કરો"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"રોકો"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ચાલુ રાખવા માટે, <b><xliff:g id="APP">%s</xliff:g></b>ને તમારા ડિવાઇસના માઇક્રોફોનના ઍક્સેસની જરૂર છે."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ચાલુ રાખવા માટે, <b><xliff:g id="APP">%s</xliff:g></b>ને તમારા ડિવાઇસના કૅમેરાના ઍક્સેસની જરૂર છે."</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"ડિવાઇસ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ઍપ સ્વિચ કરવા માટે ઉપરની તરફ સ્વાઇપ કરો"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ઍપને ઝડપથી સ્વિચ કરવા માટે જમણે ખેંચો"</string> @@ -510,7 +532,7 @@ <string name="notification_section_header_conversations" msgid="821834744538345661">"વાતચીત"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"બધા સાઇલન્ટ નોટિફિકેશન સાફ કરો"</string> <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ખલેલ પાડશો નહીં દ્વારા થોભાવેલ નોટિફિકેશન"</string> - <string name="media_projection_action_text" msgid="3634906766918186440">"હવે પ્રારંભ કરો"</string> + <string name="media_projection_action_text" msgid="3634906766918186440">"હવે શરૂ કરો"</string> <string name="empty_shade_text" msgid="8935967157319717412">"કોઈ નોટિફિકેશન નથી"</string> <string name="profile_owned_footer" msgid="2756770645766113964">"પ્રોફાઇલ મૉનિટર કરી શકાય છે"</string> <string name="vpn_footer" msgid="3457155078010607471">"નેટવર્ક મૉનિટર કરી શકાય છે"</string> @@ -534,7 +556,7 @@ <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"તમારી વ્યક્તિગત પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g>થી કનેક્ટ કરેલી છે"</string> <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"આ ડિવાઇસ <xliff:g id="VPN_APP">%1$s</xliff:g>થી કનેક્ટ કરેલું છે"</string> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા પ્રદાન કરવામાં આવેલું છે"</string> - <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ઉપકરણનું સંચાલન"</string> + <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ડિવાઇસ મેનેજમેન્ટ"</string> <string name="monitoring_title_profile_owned" msgid="6301118649405449568">"પ્રોફાઇલ નિરીક્ષણ"</string> <string name="monitoring_title" msgid="4063890083735924568">"નેટવર્ક મૉનિટરિંગ"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -551,7 +573,7 @@ <string name="monitoring_description_managed_profile_ca_certificate" msgid="7904323416598435647">"તમારી સંસ્થાએ તમારી કાર્ય પ્રોફાઇલમાં પ્રમાણપત્ર સત્તાધિકારી ઇન્સ્ટૉલ કર્યું છે. તમારા સુરક્ષિત નેટવર્ક ટ્રાફિકનું નિયમન થઈ શકે છે અથવા તેમાં ફેરફાર કરવામાં આવી શકે છે."</string> <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"આ ઉપકરણ પર પ્રમાણપત્ર સત્તાધિકારી ઇન્સ્ટૉલ કરેલ છે. તમારા સુરક્ષિત નેટવર્ક ટ્રાફિકનું નિયમન થઈ શકે છે અથવા તેમાં ફેરફાર કરવામાં આવી શકે છે."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"તમારા વ્યવસ્થાપકે નેટવર્ક લૉગિંગ ચાલુ કર્યું છે, જે તમારા ઉપકરણ પર નેટવર્ક ટ્રાફિકનું નિયમન કરે છે."</string> - <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"તમારા વ્યવસ્થાપકે નેટવર્ક લૉગ ઇન ચાલુ કર્યુ છે, જે તમારી વ્યક્તિગત પ્રોફાઇલમાં નહીં, પરંતુ ઑફિસની પ્રોફાઇલમાં ટ્રાફિકનું નિરીક્ષણ કરે છે."</string> + <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"તમારા વ્યવસ્થાપકે નેટવર્ક લૉગ ઇન ચાલુ કર્યું છે, જે તમારી વ્યક્તિગત પ્રોફાઇલમાં નહીં, પરંતુ ઑફિસની પ્રોફાઇલમાં ટ્રાફિકનું નિરીક્ષણ કરે છે."</string> <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"તમે <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ થયાં છો, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટ સહિત તમારી નેટવર્ક પ્રવૃત્તિનું નિરીક્ષણ કરી શકે છે."</string> <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"તમે <xliff:g id="VPN_APP_0">%1$s</xliff:g> અને <xliff:g id="VPN_APP_1">%2$s</xliff:g> સાથે કનેક્ટ થયાં છો, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટ સહિત તમારી નેટવર્ક પ્રવૃત્તિનું નિરીક્ષણ કરી શકે છે."</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"તમારી કાર્યાલયની પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ કરેલ છે, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટો સહિતની તમારી નેટવર્ક પ્રવૃત્તિનું નિયમન કરી શકે છે."</string> @@ -616,7 +638,7 @@ <string name="stream_system" msgid="7663148785370565134">"સિસ્ટમ"</string> <string name="stream_ring" msgid="7550670036738697526">"રિંગ વગાડો"</string> <string name="stream_music" msgid="2188224742361847580">"મીડિયા"</string> - <string name="stream_alarm" msgid="16058075093011694">"એલાર્મ"</string> + <string name="stream_alarm" msgid="16058075093011694">"અલાર્મ"</string> <string name="stream_notification" msgid="7930294049046243939">"નોટિફિકેશન"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"બ્લૂટૂથ"</string> <string name="stream_dtmf" msgid="7322536356554673067">"દ્વિ બહુ ટોન આવર્તન"</string> @@ -655,20 +677,16 @@ <string name="enable_demo_mode" msgid="3180345364745966431">"ડેમો મોડ સક્ષમ કરો"</string> <string name="show_demo_mode" msgid="3677956462273059726">"ડેમો મોડ બતાવો"</string> <string name="status_bar_ethernet" msgid="5690979758988647484">"ઇથરનેટ"</string> - <string name="status_bar_alarm" msgid="87160847643623352">"એલાર્મ"</string> + <string name="status_bar_alarm" msgid="87160847643623352">"અલાર્મ"</string> <string name="wallet_title" msgid="5369767670735827105">"વૉલેટ"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"તૈયાર છે"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ચુકવણી પદ્ધતિનું સેટઅપ કરો"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ઉપયોગ કરવા માટે અનલૉક કરો"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"તમારા કાર્ડની માહિતી મેળવવામાં સમસ્યા આવી હતી, કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો"</string> <string name="status_bar_work" msgid="5238641949837091056">"ઑફિસની પ્રોફાઇલ"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"એરપ્લેન મોડ"</string> <string name="add_tile" msgid="6239678623873086686">"ટાઇલ ઉમેરો"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>સ્ટેટસ:</b> સાઇલન્ટ પર અવનત કરવામાં આવ્યું"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>સ્ટેટસ:</b> ઉપલી રેંક આપવામાં આવી"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>સ્ટેટસ:</b> નીચલી રેંક આપવામાં આવી"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"જ્યારે પ્રાધાન્યતા મોડ ચાલુ હોય ત્યારે પણ તમારા નોટિફિકેશનમાં હંમેશાં સૌથી ઉપર ટોચમાં બતાવવામાં આવશે"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"સેટિંગ"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"પ્રાધાન્યતા ધરાવતી વાતચીતો"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> વાતચીતની સુવિધાઓને સપોર્ટ આપતી નથી"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"આ નોટિફિકેશનમાં કોઈ ફેરફાર થઈ શકશે નહીં."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"નોટિફિકેશનના આ ગ્રૂપની ગોઠવણી અહીં કરી શકાશે નહીં"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"સિસ્ટમ નૅવિગેશનને અપડેટ કરવા માટે સેટિંગ પર જાઓ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"સ્ટૅન્ડબાય"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"વાતચીતને પ્રાધાન્યતા ધરાવતી તરીકે સેટ કરી"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"પ્રાધાન્યતા ધરાવતી વાતચીતો"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"આ વાતચીતોને તમારી સૂચિમાં ટોચ પર બતાવવામાં આવે છે અને જ્યારે પ્રાધાન્યતા મોડ ચાલુ હોય ત્યારે તમને સો ટકા મળશે"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"લૉક સ્ક્રીન પર પ્રોફાઇલ ફોટા બતાવવામાં આવે છે"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"આ વાતચીતોને તમારી હોમ સ્ક્રીન પર તમે સરળતાથી બબલ સ્વરૂપમાં મેળવી શકશો"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"ખલેલ પાડશો નહીં સેટિંગમાં હસ્તક્ષેપ કરી શકે છે"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"સમજાઈ ગયું"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"સેટિંગ"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"સ્વિચ"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ઍક્સેસિબિલિટી સંકેતને ઍક્સેસિબિલિટી બટન વડે બદલવામાં આવ્યા છે\n\n"<annotation id="link">"સેટિંગ જુઓ"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"તેને હંગામી રૂપે ખસેડવા માટે બટનને કિનારી પર ખસેડો"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"ઉપર ડાબે ખસેડો"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"ઉપર જમણે ખસેડો"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"નીચે ડાબે ખસેડો"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"નીચે જમણે ખસેડો"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"કિનારી પર ખસેડો અને છુપાવો"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"કિનારીથી ખસેડો અને બતાવો"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ડિવાઇસનાં નિયંત્રણો"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"તમારા કનેક્ટ કરેલા ડિવાઇસ માટે નિયંત્રણો ઉમેરો"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ડિવાઇસનાં નિયંત્રણો સેટઅપ કરો"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>થી ઓછા સમય પહેલાં"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> કરતાં વધુ સમય પહેલાં"</string> <string name="birthday_status" msgid="2596961629465396761">"જન્મદિવસ"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"આ તો <xliff:g id="NAME">%1$s</xliff:g>નો જન્મદિવસ છે"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"જલ્દી જ જન્મદિવસ છે"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"ટૂંક સમયમાં <xliff:g id="NAME">%1$s</xliff:g>નો જન્મદિવસ આવશે"</string> <string name="anniversary_status" msgid="1790034157507590838">"વર્ષગાંઠ"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"આ તો <xliff:g id="NAME">%1$s</xliff:g>ની લગ્નતિથિ છે"</string> <string name="location_status" msgid="1294990572202541812">"સ્થાન શેર કરીએ છીએ"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> સ્થાન શેર કરી રહ્યાં છે"</string> <string name="new_story_status" msgid="9012195158584846525">"નવી સ્ટોરી"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા નવી સ્ટોરી શેર કરવામાં આવી"</string> <string name="video_status" msgid="4548544654316843225">"જોઈ રહ્યાં છે"</string> <string name="audio_status" msgid="4237055636967709208">"સાંભળી રહ્યાં છીએ"</string> <string name="game_status" msgid="1340694320630973259">"રમી રહ્યાં છે"</string> <string name="empty_user_name" msgid="3389155775773578300">"મિત્રો"</string> <string name="empty_status" msgid="5938893404951307749">"આજે રાતે ચૅટ કરીએ!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"ટૂંક સમયમાં કન્ટેન્ટ બતાવવામાં આવશે"</string> <string name="missed_call" msgid="4228016077700161689">"ચૂકી ગયેલો કૉલ"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"તાજેતરના મેસેજ, ચૂકી ગયેલા કૉલ અને સ્ટેટસ અપડેટ જુઓ"</string> <string name="people_tile_title" msgid="6589377493334871272">"વાતચીત"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કોઈ સંદેશ મોકલવામાં આવ્યો"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કોઈ છબી મોકલવામાં આવી"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"તમારું બૅટરી મીટર વાંચવામાં સમસ્યા આવી"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"વધુ માહિતી માટે ટૅપ કરો"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"કોઈ અલાર્મ સેટ નથી"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index de5741c0e051..ca18fe75c929 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ज़्यादा कॉन्टेंट कैप्चर करें"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"स्क्रीनशॉट को खारिज करें"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"स्क्रीनशॉट की झलक"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"स्क्रीनशॉट को ऊपर से काटने की सीमा"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"स्क्रीनशॉट को नीचे से काटने की सीमा"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"स्क्रीन रिकॉर्डर"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"स्क्रीन रिकॉर्डिंग को प्रोसेस किया जा रहा है"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"स्क्रीन रिकॉर्ड सेशन के लिए जारी सूचना"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"इनपुट विधि"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"जगह"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"जगह की जानकारी बंद है"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"कैमरा ब्लॉक करें"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"माइक्रोफ़ोन म्यूट करें"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"कैमरे का ऐक्सेस"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"माइक्रोफ़ोन का ऐक्सेस"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"उपलब्ध"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ब्लॉक किया गया है"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"मीडिया डिवाइस"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"सिर्फ़ आपातकालीन कॉल"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"स्क्रीन रिकॉर्ड"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"शुरू करें"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"रोकें"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"जारी रखने के लिए, <b><xliff:g id="APP">%s</xliff:g></b> को आपके डिवाइस का माइक्रोफ़ोन ऐक्सेस करने की ज़रूरत है."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"जारी रखने के लिए, <b><xliff:g id="APP">%s</xliff:g></b> को आपके डिवाइस का कैमरा ऐक्सेस करने की ज़रूरत है."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"क्या आप डिवाइस के माइक्रोफ़ोन को अनब्लॉक करना चाहते हैं?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"क्या आप डिवाइस के कैमरे को अनब्लॉक करना चाहते हैं?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"क्या आप डिवाइस के कैमरे और माइक्रोफ़ोन को अनब्लॉक करना चाहते हैं?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ऐसा करने से, माइक्रोफ़ोन का ऐक्सेस उन सभी ऐप्लिकेशन और सेवाओं के लिए अनब्लॉक हो जाएगा जिन्हें माइक्रोफ़ोन का इस्तेमाल करने की अनुमति दी गई है."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ऐसा करने से, कैमरे का ऐक्सेस उन सभी ऐप्लिकेशन और सेवाओं के लिए अनब्लॉक हो जाएगा जिन्हें कैमरे का इस्तेमाल करने की अनुमति दी गई है."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"ऐसा करने से, कैमरे या माइक्रोफ़ोन का ऐक्सेस उन सभी ऐप्लिकेशन और सेवाओं के लिए अनब्लॉक हो जाएगा जिन्हें कैमरे या माइक्रोफ़ोन का इस्तेमाल करने की अनुमति दी गई है."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"डिवाइस"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ऐप्लिकेशन बदलने के लिए ऊपर स्वाइप करें"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ऐप्लिकेशन को झटपट स्विच करने के लिए उसे दाईं ओर खींचें और छोड़ें"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ईथरनेट"</string> <string name="status_bar_alarm" msgid="87160847643623352">"अलार्म"</string> <string name="wallet_title" msgid="5369767670735827105">"वॉलेट"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"सभी दिखाएं"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"पेमेंट करने के लिए, डिवाइस अनलॉक करें"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"तैयार है"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"पेमेंट करने का तरीका सेट अप करें"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"इस्तेमाल करने के लिए, डिवाइस अनलॉक करें"</string> @@ -1008,7 +1022,7 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्टैंडबाई"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"बातचीत को \'अहम बातचीत\' के तौर पर सेट किया गया है"</string> <string name="priority_onboarding_behavior" msgid="636826237468953117">"अहम बातचीत"</string> - <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ये बातचीत आपकी सूची में सबसे ऊपर दिखती हैं और प्राथमिकता मोड चालू होने पर, हमेशा आप तक पहुंच सकती हैं"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ये बातचीत आपकी सूची में सबसे ऊपर दिखती हैं. साथ ही, अगर आपने प्राथमिकता मोड चालू किया है, तो ये आपको हमेशा दिखेंगी"</string> <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"प्रोफ़ाइल फ़ोटो, लॉक स्क्रीन पर दिखती हैं"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"आप इन बातचीत को अपनी होम स्क्रीन पर मौजूद बबल्स में, आसानी से देख सकते हैं"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\'परेशान न करें\' मोड में रुकावट"</string> @@ -1114,7 +1128,7 @@ <string name="birthday_status" msgid="2596961629465396761">"जन्मदिन"</string> <string name="birthday_status_content_description" msgid="7677415209545817153">"आज <xliff:g id="NAME">%1$s</xliff:g> का जन्मदिन है"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"जन्मदिन आने वाला है"</string> - <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> का जन्मदिन जल्द आ रहा है"</string> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> का जन्मदिन आने वाला है"</string> <string name="anniversary_status" msgid="1790034157507590838">"सालगिरह"</string> <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> की सालगिरह है"</string> <string name="location_status" msgid="1294990572202541812">"जगह की जानकारी शेयर की जा रही है"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index cc04dc060d3c..0ed18b52cc21 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Snimite više"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Odbacivanje snimke zaslona"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pregled snimke zaslona"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Gornja granica"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Donja granica"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Snimač zaslona"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Obrada snimanja zaslona"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Tekuća obavijest za sesiju snimanja zaslona"</string> @@ -350,8 +356,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Način unosa"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokacija"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Lokacija je isključena"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokiraj kameru"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Isključi mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Pristup fotoaparatu"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Pristup mikrofonu"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Dostupno"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokirano"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medijski uređaj"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Samo hitni pozivi"</string> @@ -424,8 +432,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Snimač zaslona"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Početak"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Zaustavi"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Da bi nastavila s radom, aplikacija <b><xliff:g id="APP">%s</xliff:g></b> treba pristupiti mikrofonu vašeg uređaja."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Da bi nastavila s radom, aplikacija <b><xliff:g id="APP">%s</xliff:g></b> treba pristupiti fotoaparatu vašeg uređaja."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Želite li deblokirati mikrofon uređaja?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Želite li deblokirati fotoaparat uređaja?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Želite li deblokirati fotoaparat i mikrofon uređaja?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Time se deblokira pristup za sve aplikacije i usluge kojima je dopuštena upotreba vašeg mikrofona."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Time se deblokira pristup za sve aplikacije i usluge kojima je dopuštena upotreba vašeg fotoaparata."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Time se deblokira pristup za sve aplikacije i usluge kojima je dopuštena upotreba vašeg fotoaparata ili mikrofona."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Uređaj"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Prijeđite prstom prema gore da biste promijenili aplikaciju"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Povucite udesno da biste brzo promijenili aplikaciju"</string> @@ -660,18 +672,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Novčanik"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Spremno"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Postavi plaćanje"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Otključajte da biste koristili"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Pojavio se problem prilikom dohvaćanja kartica, pokušajte ponovo kasnije"</string> <string name="status_bar_work" msgid="5238641949837091056">"Poslovni profil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Način rada u zrakoplovu"</string> <string name="add_tile" msgid="6239678623873086686">"Dodavanje pločice"</string> @@ -740,11 +748,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> prebačena u bešumnu"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> više rangirana"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> niže rangirana"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Uvijek se prikazuje pri vrhu obavijesti, čak i kada je uključen način prioritetnih obavijesti"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Postavke"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioritetni razgovori"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava značajke razgovora"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Te se obavijesti ne mogu izmijeniti."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ta se grupa obavijesti ne može konfigurirati ovdje"</string> @@ -1020,14 +1026,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Navigaciju sustavom možete ažurirati u Postavkama"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje mirovanja"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Razgovor postavljen na prioritetan"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioritetni razgovori"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ti se razgovori prikazuju pri vrhu vašeg popisa i mogu se uvijek prikazati kad je uključen način prioritetnih obavijesti"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilne slike prikazuju se na zaključanom zaslonu"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Te razgovore možete jednostavno pronaći u oblačićima na početnom zaslonu"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Prekida Ne uznemiravaj"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Shvaćam"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Postavke"</string> @@ -1045,18 +1047,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Prebacivanje"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Gumb za Pristupačnost zamijenio je pokret pristupačnosti\n\n"<annotation id="link">"Prikaz postavki"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Pomaknite gumb do ruba da biste ga privremeno sakrili"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Premjesti u gornji lijevi kut"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Premjesti u gornji desni kut"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Premjesti u donji lijevi kut"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Premjesti u donji desni kut"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Premjesti na rub i sakrij"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Ukloni s ruba i prikaži"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Kontrole uređaja"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Dodavanje kontrola za povezane uređaje"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Postavljanje kontrola uređaja"</string> @@ -1136,35 +1132,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Prije manje od <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Prije više od <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Rođendan"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> ima rođendan"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Rođendan uskoro"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Uskoro je rođendan korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Godišnjica"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Godišnjica je korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Dijeljenje lokacije"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> dijeli lokaciju"</string> <string name="new_story_status" msgid="9012195158584846525">"Novi članak"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> podijelio je novu priču"</string> <string name="video_status" msgid="4548544654316843225">"Gledanje"</string> <string name="audio_status" msgid="4237055636967709208">"Slušanje"</string> <string name="game_status" msgid="1340694320630973259">"Igranje"</string> <string name="empty_user_name" msgid="3389155775773578300">"Prijatelji"</string> <string name="empty_status" msgid="5938893404951307749">"Može chat večeras?"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Sadržaj će se uskoro prikazati"</string> <string name="missed_call" msgid="4228016077700161689">"Propušteni poziv"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pogledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Razgovor"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> šalje poruku"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> poslao je sliku"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem s očitavanjem mjerača baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dodirnite za više informacija"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nema nijednog alarma"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 132134a5dc69..86e53083d5d2 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Több rögzítése"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Képernyőkép elvetése"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Képernyőkép előnézete"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Felső határ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Alsó határ"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Képernyőrögzítő"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Képernyőrögzítés feldolgozása"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Folyamatban lévő értesítés képernyőrögzítési munkamenethez"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Beviteli módszer"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Tartózkodási hely"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Hely kikapcsolva"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Kamera letiltása"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mikrofon némítása"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Hozzáférés a kamerához"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Hozzáférés a mikrofonhoz"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Rendelkezésre áll"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Letiltva"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Médiaeszköz"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Csak segélyhívások"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Képernyő rögzítése"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Indítás"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Leállítás"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"A folytatáshoz a(z) <b><xliff:g id="APP">%s</xliff:g></b> alkalmazásnak hozzáférésre van szüksége az eszköze mikrofonjához."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"A folytatáshoz a(z) <b><xliff:g id="APP">%s</xliff:g></b> alkalmazásnak hozzáférésre van szüksége az eszköze kamerájához."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Feloldja az eszközmikrofon letiltását?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Feloldja az eszközkamera letiltását?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Feloldja az eszközkamera és -mikrofon letiltását?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ezzel feloldja a hozzáférés letiltását az összes olyan alkalmazás és szolgáltatás esetében, amelyek számára engedélyezte a mikrofon használatát."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ezzel feloldja a hozzáférés letiltását az összes olyan alkalmazás és szolgáltatás esetében, amelyek számára engedélyezte a kamera használatát."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ezzel feloldja a hozzáférés letiltását az összes olyan alkalmazás és szolgáltatás esetében, amelyek számára engedélyezte a kamera vagy a mikrofon használatát."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Eszköz"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Váltás az alkalmazások között felfelé csúsztatással"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Húzza jobbra az ujját az alkalmazások közötti gyors váltáshoz"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Ébresztés"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Kész"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Fizetési mód beállítása"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Oldja fel a használathoz"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Probléma merült fel a kártyák lekérésekor, próbálja újra később"</string> <string name="status_bar_work" msgid="5238641949837091056">"Munkahelyi profil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Repülős üzemmód"</string> <string name="add_tile" msgid="6239678623873086686">"Mozaik hozzáadása"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Állapot:</b> némára állítva"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Állapot:</b> előrébb sorolva"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Állapot:</b> hátrébb sorolva"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Még akkor is az értesítések tetején jelenik meg, ha a Prioritásos mód be van kapcsolva"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Beállítások"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Fontos beszélgetések"</string> <string name="no_shortcut" msgid="8257177117568230126">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> nem támogatja a beszélgetési funkciókat"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ezeket az értesítéseket nem lehet módosítani."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Az értesítések jelen csoportját itt nem lehet beállítani"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"A rendszer-navigációs lehetőségeket a Beállításokban módosíthatja"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Készenléti mód"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Fontosnak beállított beszélgetés"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Fontos beszélgetések"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ezek a beszélgetések a lista tetején jelennek meg, és mindig megkapja őket, ha a Prioritásos mód be van kapcsolva"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"A profilképek mindig megjelennek a lezárási képernyőn"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Ezeket a beszélgetéseket könnyedén megtalálja a kezdőképernyő tetején lévő buborékokban"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Megszakítják a Ne zavarjanak módot"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Értem"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Beállítások"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Váltás"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"A kisegítő kézmozdulat helyébe a Kisegítő lehetőségek gomb lépett\n\n"<annotation id="link">"Beállítások megtekintése"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"A gombot a szélre áthelyezve ideiglenesen elrejtheti"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Áthelyezés fel és balra"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Áthelyezés fel és jobbra"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Áthelyezés le és balra"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Áthelyezés le és jobbra"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Áthelyezés a szélen kívül és elrejtés"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Áthelyezés a szélen kívül és mutatás"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Eszközvezérlők"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Vezérlők hozzáadása a csatlakoztatott eszközökhöz"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Eszközvezérlők beállítása"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Kevesebb, mint ennyi ideje: <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Több, mint ennyi ideje: <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Születésnap"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Ma van <xliff:g id="NAME">%1$s</xliff:g> születésnapja"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Közelgő születésnap"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Hamarosan <xliff:g id="NAME">%1$s</xliff:g> születésnapja lesz"</string> <string name="anniversary_status" msgid="1790034157507590838">"Évforduló"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Ma van <xliff:g id="NAME">%1$s</xliff:g> évfordulója"</string> <string name="location_status" msgid="1294990572202541812">"Hely megosztása"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> megosztja a tartózkodási helyét"</string> <string name="new_story_status" msgid="9012195158584846525">"Új történet"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> megosztott egy új történetet"</string> <string name="video_status" msgid="4548544654316843225">"Lejátszás"</string> <string name="audio_status" msgid="4237055636967709208">"Figyelés"</string> <string name="game_status" msgid="1340694320630973259">"Játékban"</string> <string name="empty_user_name" msgid="3389155775773578300">"Ismerősök"</string> <string name="empty_status" msgid="5938893404951307749">"Beszélgessünk egyet!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Hamarosan látható lesz a tartalom"</string> <string name="missed_call" msgid="4228016077700161689">"Nem fogadott hívás"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Megtekintheti a legutóbbi üzeneteket, a nem fogadott hívásokat és az állapotfrissítéseket."</string> <string name="people_tile_title" msgid="6589377493334871272">"Beszélgetés"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> üzenetet küldött"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> képet küldött"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Probléma merült fel az akkumulátor-töltésmérő olvasásakor"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Koppintással további információkat érhet el."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nincs ébresztés"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 04a3267136d0..ce158a97cfbd 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Մեծացնել սքրինշոթի տարածքը"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Փակել սքրինշոթը"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Սքրինշոթի նախադիտում"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Վերևի սահմանագիծ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Ներքևի սահմանագիծ"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Էկրանի տեսագրիչ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Էկրանի տեսագրության մշակում"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Էկրանի տեսագրման աշխատաշրջանի ընթացիկ ծանուցում"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Մուտքագրման եղանակը"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Տեղորոշում"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Անջատել տեղադրությունը"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Արգելափակել տեսախցիկը"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Անջատել խոսափողը"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Տեսախցիկի հասանելիություն"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Խոսափողի հասանելիություն"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Հասանելի է"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Արգելափակված է"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Մեդիա սարք"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Միայն շտապ կանչեր"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Էկրանի ձայնագրում"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Սկսել"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Կանգնեցնել"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Շարունակելու համար <b><xliff:g id="APP">%s</xliff:g></b> հավելվածին անհրաժեշտ է ձեր սարքի խոսափողի օգտագործման թույլտվություն։"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Շարունակելու համար <b><xliff:g id="APP">%s</xliff:g></b> հավելվածին անհրաժեշտ է ձեր սարքի տեսախցիկի օգտագործման թույլտվություն։"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Արգելահանե՞լ սարքի խոսափողը"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Արգելահանե՞լ սարքի տեսախցիկը"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Արգելահանե՞լ սարքի տեսախցիկը և խոսափողը"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Սա բացում է մուտքը բոլոր հավելվածների և ծառայությունների համար, որոնք ունեն ձեր խոսափողն օգտագործելու թույլտվություն։"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Սա բացում է մուտքը բոլոր հավելվածների և ծառայությունների համար, որոնք ունեն ձեր տեսախցիկն օգտագործելու թույլտվություն։"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Սա բացում է մուտքը բոլոր հավելվածների և ծառայությունների համար, որոնք ունեն ձեր տեսախցիկը կամ խոսափողն օգտագործելու թույլտվություն։"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Սարք"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Սահեցրեք վերև՝ մյուս հավելվածին անցնելու համար"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Քաշեք աջ՝ հավելվածների միջև անցնելու համար"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Զարթուցիչ"</string> <string name="wallet_title" msgid="5369767670735827105">"Դրամապանակ"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Պատրաստ է"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Ավելացնել վճարման եղանակ"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ապակողպել՝ օգտագործելու համար"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Չհաջողվեց բեռնել քարտերը։ Նորից փորձեք։"</string> <string name="status_bar_work" msgid="5238641949837091056">"Android for Work-ի պրոֆիլ"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Ավիառեժիմ"</string> <string name="add_tile" msgid="6239678623873086686">"Սալիկի ավելացում"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Կարգավիճակը․</b> իջեցվել է և դարձել անձայն"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Կարգավիճակը․</b> կարևորության մակարդակը բարձրացվել է"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Կարգավիճակը․</b> կարևորության մակարդակն իջեցվել է"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Այն միշտ ցուցադրվում է ձեր ծանուցումների վերևում, անգամ եթե միացված է առաջնահերթության ռեժիմը։"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Կարգավորումներ"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Կարևոր զրույցներ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը զրույցի գործառույթներ չի աջակցում"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Այս ծանուցումները չեն կարող փոփոխվել:"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ծանուցումների տվյալ խումբը հնարավոր չէ կարգավորել այստեղ"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Թարմացրեք համակարգի նավիգացիան կարգավորումներում"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Սպասման ռեժիմ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Զրույցը նշված է որպես կարևոր"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Կարևոր զրույցներ"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Այս զրույցները ցուցադրվում են ցանկի վերևում, և դուք կարող եք դրանք կարդալ, անգամ եթե միացված է առաջնահերթության ռեժիմը։"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Պրոֆիլի նկարները ցուցադրվում են կողպէկրանին"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Այս զրույցները կարող եք գտնել ամպիկներում՝ ձեր հիմնական էկրանին"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ընդհատել «Չանհանգստացնել» ռեժիմը"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Եղավ"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Կարգավորումներ"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Փոխել"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Հատուկ գործառույթների ժեստը փոխարինվել է կոճակով\n\n"<annotation id="link">"Բացել կարգավորումները"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Կոճակը ժամանակավորապես թաքցնելու համար այն տեղափոխեք էկրանի եզր"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Տեղափոխել վերև՝ ձախ"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Տեղափոխել վերև՝ աջ"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Տեղափոխել ներքև՝ ձախ"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Տեղափոխել ներքև՝ աջ"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Տեղափոխել եզրից դուրս և թաքցնել"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Տեղափոխել եզրից դուրս և ցուցադրել"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Սարքերի կառավարման տարրեր"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Ավելացրեք կառավարման տարրեր ձեր միացված սարքերի համար"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Սարքերի կառավարման տարրերի կարգավորում"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Առավելագույնը <xliff:g id="DURATION">%1$s</xliff:g> առաջ"</string> <string name="over_timestamp" msgid="4765793502859358634">"Ավելի քան <xliff:g id="DURATION">%1$s</xliff:g> առաջ"</string> <string name="birthday_status" msgid="2596961629465396761">"Ծննդյան օր"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Այսօր <xliff:g id="NAME">%1$s</xliff:g>-ի տարեդարձն է"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Շուտով ծննդյանս օրն է"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Շուտով <xliff:g id="NAME">%1$s</xliff:g>-ի տարեդարձն է"</string> <string name="anniversary_status" msgid="1790034157507590838">"Տարեդարձ"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Այսօր <xliff:g id="NAME">%1$s</xliff:g>-ի տարեդարձն է"</string> <string name="location_status" msgid="1294990572202541812">"Տեղադրության ցուցադրում"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը հայտնում է իր տեղադրության մասին տվյալները"</string> <string name="new_story_status" msgid="9012195158584846525">"Նոր հոդված"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը նոր պատմություն է հրապարակել"</string> <string name="video_status" msgid="4548544654316843225">"Տեսանյութ եմ դիտում"</string> <string name="audio_status" msgid="4237055636967709208">"Բան եմ լսում"</string> <string name="game_status" msgid="1340694320630973259">"Խաղ եմ խաղում"</string> <string name="empty_user_name" msgid="3389155775773578300">"Ընկերներ"</string> <string name="empty_status" msgid="5938893404951307749">"Արի այսօր զրուցենք"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Բովանդակությունը շուտով կհայտնվի"</string> <string name="missed_call" msgid="4228016077700161689">"Բաց թողնված զանգ"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Տեսեք վերջին հաղորդագրությունները, բաց թողնված զանգերը և կարգավիճակի մասին թարմացումները"</string> <string name="people_tile_title" msgid="6589377493334871272">"Զրույց"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը հաղորդագրություն է ուղարկել"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը պատկեր է ուղարկել"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Մարտկոցի ցուցիչի ցուցմունքը կարդալու հետ կապված խնդիր կա"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Հպեք՝ ավելին իմանալու համար"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Զարթուցիչ դրված չէ"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 2f2385cd4602..102c59275b0e 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Rekam lagi"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Menutup screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pratinjau screenshot"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Batas atas"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Batas bawah"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Perekam Layar"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Memproses perekaman layar"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notifikasi yang sedang berjalan untuk sesi rekaman layar"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metode Masukan"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokasi"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Lokasi Nonaktif"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokir Kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Bisukan Mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Akses kamera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Akses mikrofon"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Tersedia"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Diblokir"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Perangkat media"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Panggilan Darurat Saja"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Rekaman Layar"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Mulai"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Berhenti"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Untuk melanjutkan, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses ke mikrofon perangkat."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Untuk melanjutkan, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses ke kamera perangkat."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Batalkan pemblokiran mikrofon perangkat?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Batalkan pemblokiran kamera perangkat?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Batalkan pemblokiran kamera dan mikrofon perangkat?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ini akan membatalkan pemblokiran akses untuk semua aplikasi dan layanan yang diizinkan menggunakan mikrofon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ini akan membatalkan pemblokiran akses untuk semua aplikasi dan layanan yang diizinkan menggunakan kamera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ini akan membatalkan pemblokiran akses untuk semua aplikasi dan layanan yang diizinkan menggunakan kamera atau mikrofon."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Perangkat"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Geser ke atas untuk beralih aplikasi"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Tarik ke kanan untuk beralih aplikasi dengan cepat"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Siap"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Siapkan pembayaran"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Buka kunci untuk menggunakan"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Terjadi masalah saat mendapatkan kartu Anda, coba lagi nanti"</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil kerja"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Mode pesawat"</string> <string name="add_tile" msgid="6239678623873086686">"Tambahkan ubin"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Didemosikan menjadi Senyap"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Diberi Peringkat Lebih Tinggi"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Diberi Peringkat Lebih Rendah"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Selalu tampilkan di notifikasi paling atas, meski Mode prioritas aktif"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Setelan"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Percakapan prioritas"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak mendukung fitur percakapan"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Notifikasi ini tidak dapat diubah."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Grup notifikasi ini tidak dapat dikonfigurasi di sini"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Buka Setelan untuk mengupdate navigasi sistem"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Siaga"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Percakapan ditetapkan jadi prioritas"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Percakapan prioritas"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Percakapan ini akan ditampilkan di daftar paling atas dan selalu ditampilkan untuk Anda saat Mode prioritas aktif"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Foto profil ditampilkan di layar kunci"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Anda dapat mudah menemukan percakapan ini dalam balon di Layar utama"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Mengganggu fitur Jangan Ganggu"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Oke"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Setelan"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Alihkan"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Tombol aksesibilitas menggantikan gestur aksesibilitas\n\n"<annotation id="link">"Tampilkan setelan"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Pindahkan tombol ke tepi agar tersembunyi untuk sementara"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Pindahkan ke kiri atas"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Pindahkan ke kanan atas"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Pindahkan ke kiri bawah"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Pindahkan ke kanan bawah"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Pindahkan ke tepi dan sembunyikan"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Pindahkan dari tepi dan tampilkan"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Kontrol perangkat"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Tambahkan kontrol untuk perangkat terhubung"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Siapkan kontrol perangkat"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Kurang dari <xliff:g id="DURATION">%1$s</xliff:g> yang lalu"</string> <string name="over_timestamp" msgid="4765793502859358634">"Lebih dari <xliff:g id="DURATION">%1$s</xliff:g> yang lalu"</string> <string name="birthday_status" msgid="2596961629465396761">"Ulang Tahun"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Hari ini ulang tahun <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Ulang tahun segera"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Ulang tahun <xliff:g id="NAME">%1$s</xliff:g> sebentar lagi"</string> <string name="anniversary_status" msgid="1790034157507590838">"Hari Peringatan"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Hari ini hari jadi <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Berbagi lokasi"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> sedang membagikan lokasi"</string> <string name="new_story_status" msgid="9012195158584846525">"Story baru"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> membagikan story baru"</string> <string name="video_status" msgid="4548544654316843225">"Menonton"</string> <string name="audio_status" msgid="4237055636967709208">"Mendengarkan"</string> <string name="game_status" msgid="1340694320630973259">"Bermain"</string> <string name="empty_user_name" msgid="3389155775773578300">"Teman"</string> <string name="empty_status" msgid="5938893404951307749">"Ayo chat malam ini."</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Konten akan segera muncul"</string> <string name="missed_call" msgid="4228016077700161689">"Panggilan tak terjawab"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Melihat pesan terbaru, panggilan tak terjawab, dan pembaruan status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Percakapan"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> mengirim pesan"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> mengirim gambar"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Terjadi masalah saat membaca indikator baterai"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ketuk untuk informasi selengkapnya"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Alarm tidak disetel"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 6d412ecb1af1..8fe7b946e223 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Mynda meira"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Loka skjámynd"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Forskoðun skjámyndar"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Efri mörk"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Neðri mörk"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Skjáupptaka"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Vinnur úr skjáupptöku"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Áframhaldandi tilkynning fyrir skjáupptökulotu"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Innsláttaraðferð"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Staðsetning"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Staðsetning óvirk"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Loka á myndavél"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Slökkva á hljóðnema"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Aðgangur að myndavél"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Aðgangur að hljóðnema"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Tiltækt"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Lokað á"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Margmiðlunartæki"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Aðeins neyðarsímtöl"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Skjáupptaka"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Hefja"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stöðva"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Til að halda áfram þarf <b><xliff:g id="APP">%s</xliff:g></b> aðgang að hljóðnema tækisins."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Til að halda áfram þarf <b><xliff:g id="APP">%s</xliff:g></b> aðgang að myndavél tækisins."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Opna fyrir hljóðnema tækisins?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Opna fyrir myndavél tækisins?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Opna fyrir myndavél og hljóðnema tækisins?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Þetta veitir öllum forritum og þjónustum aðgang að hljóðnemanum þínum."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Þetta veitir öllum forritum og þjónustum aðgang að myndavélinni þinni."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Þetta veitir öllum forritum og þjónustum aðgang að myndavélinni og hljóðnemanum þínum."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Tæki"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Strjúktu upp til að skipta á milli forrita"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Dragðu til hægri til að skipta hratt á milli forrita"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Vekjari"</string> <string name="wallet_title" msgid="5369767670735827105">"Veski"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Tilbúið"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Setja upp greiðslu"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Taktu úr lás til að nota"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Vandamál kom upp við að sækja kortin þín. Reyndu aftur síðar"</string> <string name="status_bar_work" msgid="5238641949837091056">"Vinnusnið"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Flugstilling"</string> <string name="add_tile" msgid="6239678623873086686">"Bæta reit við"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Staða:</b> var gerð þögul"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Staða:</b> fékk hærri stöðu"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Staða:</b> fékk lægri stöðu"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Sýna alltaf efst í tilkynningum þó svo að kveikt sé á forgangsstillingu"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Áfram"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Forgangssamtöl"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> styður ekki samtalseiginleika"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ekki er hægt að breyta þessum tilkynningum."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ekki er hægt að stilla þessar tilkynningar hér"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Farðu í stillingar til að uppfæra kerfisstjórnun"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Biðstaða"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtal sett í forgang"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Forgangssamtöl"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Þessi samtöl birtast efst á listanum og þú getur alltaf séð þau þegar kveikt er á forgangsstillingu"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Prófílmyndir birtast á lásskjánum"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Þú finnur samtölin auðveldlega í blöðrum á heimaskjánum þínum"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Stöðva „Ónáðið ekki“"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ég skil"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Stillingar"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Rofi"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Aðgengishnappur kom í stað aðgengisbendingar\n\n"<annotation id="link">"Skoða stillingar"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Færðu hnappinn að brúninni til að fela hann tímabundið"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Færa efst til vinstri"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Færa efst til hægri"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Færa neðst til vinstri"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Færa neðst til hægri"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Færa að jaðri og fela"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Færa að jaðri og birta"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Tækjastjórnun"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Bæta við stýringum fyrir tengd tæki"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Setja upp tækjastjórnun"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Fyrir minna en <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Fyrir meira en <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Afmæli"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> á afmæli"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Afmæli á næstunni"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> á bráðum afmæli"</string> <string name="anniversary_status" msgid="1790034157507590838">"Brúðkaupsafmæli"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> á brúðkaupsafmæli"</string> <string name="location_status" msgid="1294990572202541812">"Deilir staðsetningu"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> deilir staðsetningu sinni"</string> <string name="new_story_status" msgid="9012195158584846525">"Ný frétt"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> deildi nýrri sögu"</string> <string name="video_status" msgid="4548544654316843225">"Að horfa"</string> <string name="audio_status" msgid="4237055636967709208">"Hlustar"</string> <string name="game_status" msgid="1340694320630973259">"Spilar"</string> <string name="empty_user_name" msgid="3389155775773578300">"Vinir"</string> <string name="empty_status" msgid="5938893404951307749">"Spjöllum í kvöld!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Efnið birtist brátt"</string> <string name="missed_call" msgid="4228016077700161689">"Ósvarað símtal"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Sjá nýleg skilboð, ósvöruð símtöl og stöðuuppfærslur"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtal"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sendi skilaboð"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sendi mynd"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Vandamál við að lesa stöðu rafhlöðu"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ýttu til að fá frekari upplýsingar"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Enginn vekjari"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index e46ce8dd2b70..c3f4f69f8168 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Acquisisci di più"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ignora screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Anteprima screenshot"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Limite superiore"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Limite inferiore"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Registrazione dello schermo"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Elaboraz. registraz. schermo"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notifica costante per una sessione di registrazione dello schermo"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metodo di immissione"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Geolocalizzazione"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Geolocalizz. non attiva"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blocca la fotocamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Disattiva il microfono"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Accesso alla fotocamera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Accesso al microfono"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponibile"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloccato"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo multimediale"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Solo chiamate di emergenza"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Registrazione schermo"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Inizia"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Interrompi"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Per continuare, l\'app <b><xliff:g id="APP">%s</xliff:g></b> deve accedere al microfono del dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Per continuare, l\'app <b><xliff:g id="APP">%s</xliff:g></b> deve accedere alla videocamera del dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vuoi sbloccare il microfono del dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vuoi sbloccare la fotocamera del dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vuoi sbloccare la fotocamera e il microfono del dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Viene sbloccato l\'accesso per tutti i servizi e le app autorizzati a usare il microfono."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Viene sbloccato l\'accesso per tutti i servizi e le app autorizzati a usare la fotocamera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Viene sbloccato l\'accesso per tutti i servizi e le app autorizzati a usare la fotocamera o il microfono."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Scorri verso l\'alto per passare ad altre app"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Trascina verso destra per cambiare velocemente app"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Sveglia"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Pronto"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configura un metodo di pagamento"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Sblocca per usare"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Si è verificato un problema durante il recupero delle tue carte. Riprova più tardi."</string> <string name="status_bar_work" msgid="5238641949837091056">"Profilo di lavoro"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Modalità aereo"</string> <string name="add_tile" msgid="6239678623873086686">"Aggiungi riquadro"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stato:</b> retrocessa a Silenziosa"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Stato:</b> posizionata più in alto"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stato:</b> posizionata più in basso"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Queste conversazioni vengono mostrate sempre in cima alle notifiche, anche quando la modalità Priorità è attiva"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Impostazioni"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversazioni prioritarie"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> non supporta le funzionalità delle conversazioni"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossibile modificare queste notifiche."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Qui non è possibile configurare questo gruppo di notifiche"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Usa le Impostazioni per aggiornare la navigazione del sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversazione impostata come prioritaria"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversazioni prioritarie"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Queste conversazioni si trovano in cima all\'elenco e possono essere sempre mostrate quando la modalità Priorità è attiva"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Le immagini del profilo vengono mostrate nella schermata di blocco"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Puoi trovare facilmente queste conversazioni all\'interno di bolle nella schermata Home"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompono la modalità Non disturbare"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Impostazioni"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Opzione"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Il pulsante Accessibilità ha sostituito il gesto di accessibilità\n\n"<annotation id="link">"Visualizza le impostazioni"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Sposta il pulsante fino al bordo per nasconderlo temporaneamente"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Sposta in alto a sinistra"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Sposta in alto a destra"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Sposta in basso a sinistra"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Sposta in basso a destra"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Sposta fino a bordo e nascondi"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Sposta fuori da bordo e mostra"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Controllo dei dispositivi"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Aggiungi controlli per i dispositivi connessi"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configura il controllo dei dispositivi"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Meno di <xliff:g id="DURATION">%1$s</xliff:g> fa"</string> <string name="over_timestamp" msgid="4765793502859358634">"Più di <xliff:g id="DURATION">%1$s</xliff:g> fa"</string> <string name="birthday_status" msgid="2596961629465396761">"Compleanno"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"È il compleanno di <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Compleanno imminente"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"A breve sarà il compleanno di <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Anniversario"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"È l\'anniversario di <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Condivis. posizione"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> sta condividendo la posizione"</string> <string name="new_story_status" msgid="9012195158584846525">"Nuova notizia"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ha condiviso una nuova storia"</string> <string name="video_status" msgid="4548544654316843225">"Visione in corso"</string> <string name="audio_status" msgid="4237055636967709208">"Ascolto in corso"</string> <string name="game_status" msgid="1340694320630973259">"Gioco in corso"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amici"</string> <string name="empty_status" msgid="5938893404951307749">"Chattiamo stasera."</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"I contenuti verranno mostrati a breve"</string> <string name="missed_call" msgid="4228016077700161689">"Chiamata persa"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Visualizza messaggi recenti, chiamate senza risposta e aggiornamenti dello stato"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversazione"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ha inviato un messaggio"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha inviato un\'immagine"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problema durante la lettura dell\'indicatore di livello della batteria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tocca per ulteriori informazioni"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nessuna sveglia"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 4ba43e1d641c..67d47ae4226e 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"צילום תוכן נוסף"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"סגירת צילום מסך"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"תצוגה מקדימה של צילום מסך"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"הקצה העליון"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"הקצה התחתון"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"מקליט המסך"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"מתבצע עיבוד של הקלטת מסך"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"התראה מתמשכת לסשן הקלטת מסך"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"שיטת קלט"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"מיקום"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"המיקום מושבת"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"חסימת המצלמה"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"השתקת המיקרופון"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"גישה למצלמה"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"גישה למיקרופון"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"יש גישה"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"הגישה חסומה"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"מכשיר מדיה"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"שיחות חירום בלבד"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"הקלטת המסך"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"התחלה"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"עצירה"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"כדי להמשיך, האפליקציה <b><xliff:g id="APP">%s</xliff:g></b> צריכה גישה למיקרופון של המכשיר שלך."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"כדי להמשיך, האפליקציה <b><xliff:g id="APP">%s</xliff:g></b> צריכה גישה למצלמה של המכשיר שלך."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"לבטל את חסימת המיקרופון של המכשיר?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"לבטל את חסימת המצלמה של המכשיר?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"לבטל את חסימת המצלמה והמיקרופון של המכשיר?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"הפעולה הזו מבטלת את חסימת הגישה של כל האפליקציות והשירותים שמורשים להשתמש במיקרופון."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"הפעולה הזו מבטלת את חסימת הגישה של כל האפליקציות והשירותים שמורשים להשתמש במצלמה."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"הפעולה הזו מבטלת את חסימת הגישה של כל האפליקציות והשירותים שמורשים להשתמש במצלמה או במיקרופון."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"מכשיר"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"יש להחליק מעלה כדי להחליף אפליקציות"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"יש לגרור ימינה כדי לעבור במהירות בין אפליקציות"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"אתרנט"</string> <string name="status_bar_alarm" msgid="87160847643623352">"התראה"</string> <string name="wallet_title" msgid="5369767670735827105">"ארנק"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"מוכן"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"הגדרת אמצעי התשלום"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"יש לבטל את הנעילה כדי להשתמש"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"הייתה בעיה בקבלת הכרטיסים שלך. כדאי לנסות שוב מאוחר יותר"</string> <string name="status_bar_work" msgid="5238641949837091056">"פרופיל עבודה"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"מצב טיסה"</string> <string name="add_tile" msgid="6239678623873086686">"הוספת אריח"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>הסטטוס:</b> הורד בדרגה ל\'שקט\'"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>הסטטוס:</b> דורג גבוה יותר"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>הסטטוס:</b> דורג נמוך יותר"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"תמיד מוצגות בראש ההתראות, גם כשמצב העדיפות פועל"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"הגדרות"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"שיחות בעדיפות גבוהה"</string> <string name="no_shortcut" msgid="8257177117568230126">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לא תומכת בתכונות השיחה"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"לא ניתן לשנות את ההתראות האלה."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"לא ניתן להגדיר כאן את קבוצת ההתראות הזו"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"יש לעבור להגדרות כדי לעדכן את הניווט במערכת"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"המתנה"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"השיחה הוגדרה כבעלת עדיפות גבוהה"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"שיחות בעדיפות גבוהה"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"השיחות האלה מוצגות בראש הרשימה והן יופיעו כל עוד מצב העדיפות פועל"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"תמונות הפרופיל מוצגות במסך הנעילה"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"קל למצוא את השיחות האלה בבועות המופיעות במסך הבית"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"גוברות על ההגדרה \'נא לא להפריע\'"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"הבנתי"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"הגדרות"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"מעבר"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"לחצן הנגישות החליף את תנועת הנגישות\n\n"<annotation id="link">"להצגת ההגדרות"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"כדי להסתיר זמנית את הלחצן, יש להזיז אותו לקצה"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"העברה לפינה השמאלית העליונה"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"העברה לפינה הימנית העליונה"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"העברה לפינה השמאלית התחתונה"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"העברה לפינה הימנית התחתונה"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"העברה לשוליים והסתרה"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"העברה מהשוליים והצגה"</string> <string name="quick_controls_title" msgid="6839108006171302273">"פקדי מכשירים"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"יש להוסיף פקדים למכשירים המחוברים"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"הגדרה של פקדי מכשירים"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"לפני פחות מ-<xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"לפני יותר מ-<xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"יום הולדת"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"זהו יום ההולדת של <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"יום הולדת יחול בקרוב"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"יום ההולדת של <xliff:g id="NAME">%1$s</xliff:g> מתקרב"</string> <string name="anniversary_status" msgid="1790034157507590838">"יום השנה"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"זהו יום הנישואין של <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"המיקום משותף"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> משתף/ת את פרטי המיקום"</string> <string name="new_story_status" msgid="9012195158584846525">"סטורי חדש"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> שיתף/ה סטורי חדש"</string> <string name="video_status" msgid="4548544654316843225">"צפייה"</string> <string name="audio_status" msgid="4237055636967709208">"מתבצעת האזנה"</string> <string name="game_status" msgid="1340694320630973259">"במשחק פעיל"</string> <string name="empty_user_name" msgid="3389155775773578300">"חברים"</string> <string name="empty_status" msgid="5938893404951307749">"אפשר לצ\'וטט הערב!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"התוכן יוצג בקרוב"</string> <string name="missed_call" msgid="4228016077700161689">"שיחה שלא נענתה"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ההודעות האחרונות, שיחות שלא נענו ועדכוני סטטוס"</string> <string name="people_tile_title" msgid="6589377493334871272">"שיחה"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> שלח/ה הודעה"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> שלח/ה תמונה"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"בעיה בקריאת מדדי הסוללה"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"יש להקיש כדי להציג מידע נוסף"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"לא הוגדרה התראה"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index d646f05bf512..1db068f88f71 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"キャプチャ範囲を拡大"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"スクリーンショットを閉じます"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"スクリーンショットのプレビュー"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"上部境界"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"下部境界"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"スクリーン レコーダー"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"画面の録画を処理しています"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"画面の録画セッション中の通知"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"入力方法"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"位置情報"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"現在地OFF"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"カメラをブロック"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"マイクをミュート"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"カメラへのアクセス"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"マイクへのアクセス"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"使用可能"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ブロック中"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"メディアデバイス"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"緊急通報のみ"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"スクリーン レコード"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"開始"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停止"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"続行するには、<b><xliff:g id="APP">%s</xliff:g></b> にデバイスのマイクへのアクセスを許可する必要があります。"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"続行するには、<b><xliff:g id="APP">%s</xliff:g></b> にデバイスのカメラへのアクセスを許可する必要があります。"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"デバイスのマイクのブロックを解除しますか？"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"デバイスのカメラのブロックを解除しますか？"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"デバイスのカメラとマイクのブロックを解除しますか？"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"マイクの使用が許可されているすべてのアプリとサービスでアクセスのブロックが解除されます。"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"カメラの使用が許可されているすべてのアプリとサービスでアクセスのブロックが解除されます。"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"カメラやマイクの使用が許可されているすべてのアプリとサービスでアクセスのブロックが解除されます。"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"デバイス"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"アプリを切り替えるには上にスワイプ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"右にドラッグするとアプリを素早く切り替えることができます"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"イーサネット"</string> <string name="status_bar_alarm" msgid="87160847643623352">"アラーム"</string> <string name="wallet_title" msgid="5369767670735827105">"ウォレット"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"準備完了"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"お支払いの設定"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ロックを解除して使用"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"カードの取得中に問題が発生しました。しばらくしてからもう一度お試しください"</string> <string name="status_bar_work" msgid="5238641949837091056">"仕事用プロファイル"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"機内モード"</string> <string name="add_tile" msgid="6239678623873086686">"タイルを追加"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ステータス:</b> ランクがサイレントに下がりました"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>ステータス:</b> ランクが上がりました"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ステータス:</b> ランクが下がりました"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"優先モードが ON の場合でも、常に通知の一番上に表示されます"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"設定"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"優先度の高い会話"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> は会話機能に対応していません"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"これらの通知は変更できません。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"このグループの通知はここでは設定できません"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"システム ナビゲーションを更新するには [設定] に移動してください"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"スタンバイ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"優先度を高く設定された会話"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"優先度の高い会話"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"優先モードが ON の場合、これらの会話はリストの一番上に表示されるのでいつでも確認できます"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"プロフィール写真がロック画面に表示されます"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"これらの会話はホーム画面のバブル内で簡単に確認できます"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"サイレント モードが ON でも表示"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"設定"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"スイッチ"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ユーザー補助ジェスチャーに代わって、ユーザー補助機能ボタンが導入されました\n\n"<annotation id="link">"設定を表示"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ボタンを一時的に非表示にするには端に移動させてください"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"左上に移動"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"右上に移動"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"左下に移動"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"右下に移動"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"端に移動して非表示"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"端から移動して表示"</string> <string name="quick_controls_title" msgid="6839108006171302273">"デバイス コントロール"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"接続済みデバイスのコントロールを追加します"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"デバイス コントロールの設定"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>前まで"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g>以上前"</string> <string name="birthday_status" msgid="2596961629465396761">"誕生日"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"今日は <xliff:g id="NAME">%1$s</xliff:g> さんのお誕生日です"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"もうすぐ誕生日"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"まもなく <xliff:g id="NAME">%1$s</xliff:g> さんのお誕生日です"</string> <string name="anniversary_status" msgid="1790034157507590838">"記念日"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"今日は <xliff:g id="NAME">%1$s</xliff:g> さんの記念日です"</string> <string name="location_status" msgid="1294990572202541812">"現在地を共有中"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> さんが位置情報を共有しています"</string> <string name="new_story_status" msgid="9012195158584846525">"新しいストーリー"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> さんが新しいストーリーを共有しました"</string> <string name="video_status" msgid="4548544654316843225">"視聴中"</string> <string name="audio_status" msgid="4237055636967709208">"再生中"</string> <string name="game_status" msgid="1340694320630973259">"プレイ中"</string> <string name="empty_user_name" msgid="3389155775773578300">"友だち"</string> <string name="empty_status" msgid="5938893404951307749">"今夜、チャットしよう"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"まもなく会話の内容が表示されます"</string> <string name="missed_call" msgid="4228016077700161689">"不在着信"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g> 件以上"</string> <string name="people_tile_description" msgid="8154966188085545556">"最近のメッセージ、不在着信、最新のステータスが表示されます"</string> <string name="people_tile_title" msgid="6589377493334871272">"会話"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> さんからメッセージが届きました"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> さんが画像を送信しました"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"電池残量の読み込み中に問題が発生しました"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"タップすると詳細が表示されます"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"アラーム未設定"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 6461837f38b0..f529abf3181b 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"მეტის აღბეჭდვა"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ეკრანის ანაბეჭდის დახურვა"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ეკრანის ანაბეჭდის გადახედვა"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ზედა საზღვარი"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ქვედა საზღვარი"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ეკრანის ჩამწერი"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ეკრანის ჩანაწერი მუშავდება"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"უწყვეტი შეტყობინება ეკრანის ჩაწერის სესიისთვის"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"შეყვანის მეთოდი"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"მდებარეობა"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"მდებარეობა გამორთულია"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"კამერის დაბლოკვა"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"მიკროფონის დადუმება"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"კამერაზე წვდომა"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"მიკროფონზე წვდომა"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"ხელმისაწვდომი"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"დაბლოკილი"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"მედია მოწყობილობა"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"მხოლოდ გადაუდებელი დახმარების ზარებისთვის"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ეკრანის ჩანაწერი"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"დაწყება"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"შეწყვეტა"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"გასაგრძელებლად <b><xliff:g id="APP">%s</xliff:g></b>-ს თქვენი მოწყობილობის მიკროფონზე წვდომა სჭირდება."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"გასაგრძელებლად <b><xliff:g id="APP">%s</xliff:g></b>-ს თქვენი მოწყობილობის კამერაზე წვდომა სჭირდება."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"გსურთ მოწყობილობის მიკროფონის განბლოკვა?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"გსურთ მოწყობილობის კამერის განბლოკვა?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"გსურთ მოწყობილობის კამერის და მიკროფონის განბლოკვა?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ამ მოქმედების მეშვეობით განიბლოკება ყველა აპსა და მომსახურებაზე წვდომა, რომელთაც აქვთ თქვენი მიკროფონის გამოყენების უფლება."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ამ მოქმედების მეშვეობით განიბლოკება ყველა აპსა და მომსახურებაზე წვდომა, რომელთაც აქვთ თქვენი კამერის გამოყენების უფლება."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"ამ მოქმედების მეშვეობით განიბლოკება ყველა აპსა და მომსახურებაზე წვდომა, რომელთაც აქვთ თქვენი კამერის ან მიკროფონის გამოყენების უფლება."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"მოწყობილობა"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"გადაფურცლეთ ზემოთ აპების გადასართავად"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"აპების სწრაფად გადასართავად ჩავლებით გადაიტანეთ მარჯვნივ"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ეთერნეტი"</string> <string name="status_bar_alarm" msgid="87160847643623352">"მაღვიძარა"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"ყველას ჩვენება"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"გადასახდელად განბლოკვა"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"მზადაა"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"გადახდის დაყენება"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"გამოსაყენებლად განბლოკვა"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 37f6545c7433..da3edb1b73c5 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Тағы суретке түсіру"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Скриншотты жабу"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Скриншотты алдын ала қарау"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Жоғарғы шектік сызық"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Төменгі шектік сызық"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Экран жазғыш"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Экран жазғыш бейнесін өңдеу"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Экранды бейнеге жазудың ағымдағы хабарландыруы"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Енгізу әдісі"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Локация"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Орын өшірулі"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Камераны бөгеу"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Микрофон дыбысын өшіру"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Камераны пайдалану рұқсаты"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Микрофонды пайдалану рұқсаты"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Қолжетімді"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Бөгелген"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Meдиа құрылғысы"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI (алынған сигнал қуатының көрсеткіші)"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Құтқару қызметіне ғана қоңырау шалынады"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Экранды жазу"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Бастау"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Тоқтату"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Жалғастыру үшін <b><xliff:g id="APP">%s</xliff:g></b> қолданбасы құрылғыңыздың микрофонына рұқсат алу керек."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Жалғастыру үшін <b><xliff:g id="APP">%s</xliff:g></b> қолданбасы құрылғыңыздың камерасына рұқсат алу керек."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Құрылғы микрофонының бөгеуі алынсын ба?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Құрылғы камерасының бөгеуі алынсын ба?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Құрылғы камерасы мен микрофонының бөгеуі алынсын ба?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Микрофоныңызды пайдалануға рұқсат берілген барлық қолданба мен қызметтің бөгеуі алынады."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Камераңызды пайдалануға рұқсат берілген барлық қолданба мен қызметтің бөгеуі алынады."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Камераңызды немесе микрофоныңызды пайдалануға рұқсат берілген барлық қолданба мен қызметтің бөгеуі алынады."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Құрылғы"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Қолданбалар арасында ауысу үшін жоғары сырғытыңыз"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Қолданбаларды жылдам ауыстырып қосу үшін оңға қарай сүйреңіз"</string> @@ -508,7 +520,7 @@ <string name="notification_section_header_gentle" msgid="6804099527336337197">"Үнсіз"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Хабарландырулар"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Әңгімелер"</string> - <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Барлық дыбыссыз хабарландыруларды өшіру"</string> + <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Барлық үнсіз хабарландыруларды өшіру"</string> <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Хабарландырулар Мазаламау режимінде кідіртілді"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Қазір бастау"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Хабарландырулар жоқ"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Дабыл"</string> <string name="wallet_title" msgid="5369767670735827105">"Әмиян"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Дайын"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Төлем әдісін реттеу"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Пайдалану үшін құлыпты ашу"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Карталарыңыз алынбады, кейінірек қайталап көріңіз."</string> <string name="status_bar_work" msgid="5238641949837091056">"Жұмыс профилі"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Ұшақ режимі"</string> <string name="add_tile" msgid="6239678623873086686">"Тақтайша қосу"</string> @@ -707,7 +715,7 @@ <string name="notification_header_default_channel" msgid="225454696914642444">"Хабарландырулар"</string> <string name="notification_channel_disabled" msgid="928065923928416337">"Хабарландырулар бұдан былай көрсетілмейді"</string> <string name="notification_channel_minimized" msgid="6892672757877552959">"Хабарландырулар жасырылады"</string> - <string name="notification_channel_silenced" msgid="1995937493874511359">"Бұл хабарландырулар дыбыссыз көрсетіледі"</string> + <string name="notification_channel_silenced" msgid="1995937493874511359">"Бұл хабарландырулар үнсіз көрсетіледі"</string> <string name="notification_channel_unsilenced" msgid="94878840742161152">"Бұл хабарландырулар сізді ескертеді"</string> <string name="inline_blocking_helper" msgid="2891486013649543452">"Әдетте хабарландыруларды көрмейсіз. \nОлар көрсетілсін бе?"</string> <string name="inline_done_button" msgid="6043094985588909584">"Дайын"</string> @@ -718,13 +726,13 @@ <string name="inline_block_button" msgid="479892866568378793">"Бөгеу"</string> <string name="inline_keep_button" msgid="299631874103662170">"Көрсету"</string> <string name="inline_minimize_button" msgid="1474436209299333445">"Жасыру"</string> - <string name="inline_silent_button_silent" msgid="525243786649275816">"Дыбыссыз"</string> + <string name="inline_silent_button_silent" msgid="525243786649275816">"Үнсіз"</string> <string name="inline_silent_button_stay_silent" msgid="2129254868305468743">"Хабарландырулар алғым келмейді"</string> <string name="inline_silent_button_alert" msgid="5705343216858250354">"Ескерту"</string> <string name="inline_silent_button_keep_alerting" msgid="6577845442184724992">"Хабарландырулар келе берсін"</string> <string name="inline_turn_off_notifications" msgid="8543989584403106071">"Хабарландыруларды өшіру"</string> <string name="inline_keep_showing_app" msgid="4393429060390649757">"Осы қолданбаның хабарландырулары көрсетілсін бе?"</string> - <string name="notification_silence_title" msgid="8608090968400832335">"Дыбыссыз"</string> + <string name="notification_silence_title" msgid="8608090968400832335">"Үнсіз"</string> <string name="notification_alert_title" msgid="3656229781017543655">"Әдепкі"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматты"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Дыбыс не діріл қолданылмайды"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Күйі:</b> \"Үнсіз\" санатына төмендетілген"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Күйі:</b> маңыздылық деңгейі көтерілген"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Күйі:</b> маңыздылық деңгейі төмендетілген"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Әрдайым (тіпті \"Маңызды\" режимі қосулы болса да) хабарландыруларыңыздың жоғарғы жағында көрсетіледі"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Параметрлер"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Маңызды чаттар"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> әңгімелесу функцияларын қолдамайды."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бұл хабарландыруларды өзгерту мүмкін емес."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Мұндай хабарландырулар бұл жерде конфигурацияланбайды."</string> @@ -865,7 +871,7 @@ <item msgid="2681220472659720036">"Буфер"</item> <item msgid="4795049793625565683">"Перне коды"</item> <item msgid="80697951177515644">"Айналдыруды растау, пернетақта ауыстырғыш"</item> - <item msgid="7626977989589303588">"Ешқандай"</item> + <item msgid="7626977989589303588">"Жоқ"</item> </string-array> <string-array name="nav_bar_layouts"> <item msgid="9156773083127904112">"Орташа"</item> @@ -941,7 +947,7 @@ <string name="lockscreen_shortcut_right" msgid="4138414674531853719">"Оң жақ таңбаша"</string> <string name="lockscreen_unlock_left" msgid="1417801334370269374">"Сол жақ таңбаша құлыпты ашады"</string> <string name="lockscreen_unlock_right" msgid="4658008735541075346">"Оң жақ таңбаша құлыпты ашады"</string> - <string name="lockscreen_none" msgid="4710862479308909198">"Ешқандай"</string> + <string name="lockscreen_none" msgid="4710862479308909198">"Жоқ"</string> <string name="tuner_launch_app" msgid="3906265365971743305">"<xliff:g id="APP">%1$s</xliff:g> қолданбасын іске қосу"</string> <string name="tuner_other_apps" msgid="7767462881742291204">"Басқа қолданбалар"</string> <string name="tuner_circle" msgid="5270591778160525693">"Шеңбер"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Жүйе навигациясын жаңарту үшін \"Параметрлер\" бөліміне өтіңіз."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Күту режимі"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Әңгіме маңызды деп белгіленді"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Маңызды чаттар"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Бұл чаттар тізіміңіздің жоғарғы жағында көрсетіледі және \"Маңызды\" режимі қосулы болған кезде әрдайым қолжетімді болады."</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Профиль суреттері құлыптаулы экранда көрсетіледі."</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Бұл чаттарды негізгі экрандағы қалқыма хабарлардан оңай таба аласыз."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Мазаламау режимінде көрсетіледі."</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Түсінікті"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Параметрлер"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Ауысу"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"\"Арнайы мүмкіндіктер\" түймесінің орнына арнайы мүмкіндіктер қимылы болады.\n\n"<annotation id="link">"Параметрлерді көру"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Түймені уақытша жасыру үшін оны шетке қарай жылжытыңыз."</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Жоғарғы сол жаққа жылжыту"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Жоғарғы оң жаққа жылжыту"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Төменгі сол жаққа жылжыту"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Төменгі оң жаққа жылжыту"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Шетке жылжыту және жасыру"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Шетке жылжыту және көрсету"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Құрылғыны басқару элементтері"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Жалғанған құрылғылар үшін басқару виджеттерін қосу"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Құрылғыны басқару элементтерін реттеу"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Максимум <xliff:g id="DURATION">%1$s</xliff:g> бұрын"</string> <string name="over_timestamp" msgid="4765793502859358634">"Кемінде <xliff:g id="DURATION">%1$s</xliff:g> бұрын"</string> <string name="birthday_status" msgid="2596961629465396761">"Туған күн"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Бүгін <xliff:g id="NAME">%1$s</xliff:g> туған күнін атап өтуде!"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Жақында туған күн"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Жақында <xliff:g id="NAME">%1$s</xliff:g> туған күнін атап өтеді."</string> <string name="anniversary_status" msgid="1790034157507590838">"Мерейтой"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Бүгін <xliff:g id="NAME">%1$s</xliff:g> мерейтойын атап өтуде!"</string> <string name="location_status" msgid="1294990572202541812">"Геодеректер жіберілуде"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> локациясын бөлісуде."</string> <string name="new_story_status" msgid="9012195158584846525">"Жаңа сюжет"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> жаңа сюжетін бөлісті."</string> <string name="video_status" msgid="4548544654316843225">"Көрілуде"</string> <string name="audio_status" msgid="4237055636967709208">"Тыңдалуда"</string> <string name="game_status" msgid="1340694320630973259">"Ойнатылуда"</string> <string name="empty_user_name" msgid="3389155775773578300">"Достар"</string> <string name="empty_status" msgid="5938893404951307749">"Кешке чатта сөйлесейік!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Мазмұн жақында көрсетіледі."</string> <string name="missed_call" msgid="4228016077700161689">"Өткізіп алған қоңырау"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Соңғы хабарларды, өткізіп алған қоңыраулар мен жаңартылған күйлерді көруге болады."</string> <string name="people_tile_title" msgid="6589377493334871272">"Әңгіме"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> хабар жіберді."</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> сурет жіберді."</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Батарея зарядының дерегі алынбай жатыр"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Толығырақ ақпарат алу үшін түртіңіз."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ешқандай оятқыш орнатылмаған."</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index a0fb09a94208..f7f99c73f4d6 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ថតច្រើនទៀត"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ច្រានចោលរូបថតអេក្រង់"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ការមើលរូបថតអេក្រង់សាកល្បង"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"បន្ទាត់បែងចែកខាងលើ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"បន្ទាត់បែងចែកខាងក្រោម"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"មុខងារថតអេក្រង់"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"កំពុងដំណើរការការថតអេក្រង់"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ការជូនដំណឹងដែលកំពុងដំណើរការសម្រាប់រយៈពេលប្រើការថតសកម្មភាពអេក្រង់"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"វិធីសាស្ត្របញ្ចូល"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ទីតាំង"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ទីតាំងបានបិទ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ទប់ស្កាត់កាមេរ៉ា"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"បិទសំឡេងមីក្រូហ្វូន"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"ការចូលប្រើកាមេរ៉ា"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"ការចូលប្រើមីក្រូហ្វូន"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"អាចប្រើបាន"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"បានទប់ស្កាត់"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"ឧបករណ៍មេឌៀ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ការហៅទៅលេខសង្គ្រោះបន្ទាន់តែប៉ុណ្ណោះ"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ការថតអេក្រង់"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ចាប់ផ្ដើម"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ឈប់"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ដើម្បីបន្ត <b><xliff:g id="APP">%s</xliff:g></b> ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនរបស់ឧបករណ៍អ្នក។"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ដើម្បីបន្ត <b><xliff:g id="APP">%s</xliff:g></b> ត្រូវការសិទ្ធិចូលប្រើកាមេរ៉ារបស់ឧបករណ៍អ្នក។"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ឈប់ទប់ស្កាត់មីក្រូហ្វូនរបស់ឧបករណ៍ឬ?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ឈប់ទប់ស្កាត់កាមេរ៉ារបស់ឧបករណ៍ឬ?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ឈប់ទប់ស្កាត់កាមេរ៉ា និងមីក្រូហ្វូនរបស់ឧបករណ៍ឬ?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ការធ្វើបែបនេះនឹងឈប់ទប់ស្កាត់ការចូលប្រើសម្រាប់កម្មវិធី និងសេវាកម្មទាំងអស់ ដែលត្រូវបានអនុញ្ញាតឱ្យប្រើមីក្រូហ្វូនរបស់អ្នក។"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ការធ្វើបែបនេះនឹងឈប់ទប់ស្កាត់ការចូលប្រើសម្រាប់កម្មវិធី និងសេវាកម្មទាំងអស់ ដែលត្រូវបានអនុញ្ញាតឱ្យប្រើកាមេរ៉ារបស់អ្នក។"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"ការធ្វើបែបនេះនឹងឈប់ទប់ស្កាត់ការចូលប្រើសម្រាប់កម្មវិធី និងសេវាកម្មទាំងអស់ ដែលត្រូវបានអនុញ្ញាតឱ្យប្រើកាមេរ៉ា ឬមីក្រូហ្វូនរបស់អ្នក។"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"ឧបករណ៍"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"អូសឡើងលើដើម្បីប្តូរកម្មវិធី"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"អូសទៅស្ដាំដើម្បីប្ដូរកម្មវិធីបានរហ័ស"</string> @@ -498,7 +510,7 @@ <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"បិទមុខងារសន្សំថ្ម"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> នឹងមានសិទ្ធិចូលប្រើព័ត៌មានទាំងអស់ដែលអាចមើលឃើញនៅលើអេក្រង់របស់អ្នក ឬដែលចាក់ពីឧបករណ៍របស់អ្នក នៅពេលកំពុងថត ឬភ្ជាប់។ ព័ត៌មាននេះមានដូចជា ពាក្យសម្ងាត់ ព័ត៌មានលម្អិតអំពីការទូទាត់ប្រាក់ រូបថត សារ និងសំឡេងដែលអ្នកចាក់ជាដើម។"</string> <string name="media_projection_dialog_service_text" msgid="958000992162214611">"សេវាកម្មដែលផ្ដល់មុខងារនេះនឹងមានសិទ្ធិចូលប្រើព័ត៌មានទាំងអស់ដែលអាចមើលឃើញនៅលើអេក្រង់របស់អ្នក ឬដែលចាក់ពីឧបករណ៍របស់អ្នក នៅពេលកំពុងថត ឬភ្ជាប់។ ព័ត៌មាននេះមានដូចជា ពាក្យសម្ងាត់ ព័ត៌មានលម្អិតអំពីការទូទាត់ប្រាក់ រូបថត សារ និងសំឡេងដែលអ្នកចាក់ជាដើម។"</string> - <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ចាប់ផ្ដើមថត ឬបញ្ជូនមែនទេ?"</string> + <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ចាប់ផ្ដើមថត ឬភ្ជាប់មែនទេ?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"ចាប់ផ្ដើមថត ឬភ្ជាប់ដោយប្រើ <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ឬ?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"កុំបង្ហាញម្ដងទៀត"</string> <string name="clear_all_notifications_text" msgid="348312370303046130">"សម្អាតទាំងអស់"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"អ៊ីសឺរណិត"</string> <string name="status_bar_alarm" msgid="87160847643623352">"ម៉ោងរោទ៍"</string> <string name="wallet_title" msgid="5369767670735827105">"កាបូប"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"រួចរាល់"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"រៀបចំការបង់ប្រាក់"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ដោះសោដើម្បីប្រើប្រាស់"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"មានបញ្ហាក្នុងការទាញយកកាតរបស់អ្នក សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ"</string> <string name="status_bar_work" msgid="5238641949837091056">"ប្រវត្តិរូបការងារ"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"របៀបក្នុងយន្តហោះ"</string> <string name="add_tile" msgid="6239678623873086686">"បន្ថែមក្រឡាល្អិត"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ស្ថានភាព៖</b> បានបញ្ចុះទៅស្ងាត់"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>ស្ថានភាព៖</b> បានចាត់ថ្នាក់ខ្ពស់ជាងមុន"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ស្ថានភាព៖</b> បានចាត់ថ្នាក់ទាបជាងមុន"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"បង្ហាញនៅផ្នែកខាងលើការជូនដំណឹងរបស់អ្នកជានិច្ច ទោះបីជានៅពេលបើកមុខងារអាទិភាពក៏ដោយ"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ការកំណត់"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"ការសន្ទនាអាទិភាព"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> មិនអាចប្រើមុខងារសន្ទនាបានទេ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"មិនអាចកែប្រែការជូនដំណឹងទាំងនេះបានទេ។"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"មិនអាចកំណត់រចនាសម្ព័ន្ធក្រុមការជូនដំណឹងនេះនៅទីនេះបានទេ"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ចូលទៅកាន់ការកំណត់ ដើម្បីធ្វើបច្ចុប្បន្នភាពការរុករកក្នុងប្រព័ន្ធ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ផ្អាកដំណើរការ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"បានកំណត់ការសន្ទនាជាអាទិភាព"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"ការសន្ទនាអាទិភាព"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ការសន្ទនាទាំងនេះបង្ហាញនៅផ្នែកខាងលើបញ្ជីរបស់អ្នក និងអាចបង្ហាញដល់អ្នកជានិច្ច នៅពេលបើកមុខងារអាទិភាព"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"រូបភាពកម្រងព័ត៌មានបង្ហាញនៅលើអេក្រង់ចាក់សោ"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"អ្នកអាចរកមើលការសន្ទនាទាំងនេះបានយ៉ាងងាយស្រួលនៅក្នុងពពុះនៅលើអេក្រង់ដើមរបស់អ្នក"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"ផ្អាកមុខងារកុំរំខាន"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"យល់ហើយ"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ការកំណត់"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ប៊ូតុងបិទបើក"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ប៊ូតុងភាពងាយស្រួលបានជំនួសចលនាភាពងាយស្រួល\n\n"<annotation id="link">"មើលការកំណត់"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ផ្លាស់ទីប៊ូតុងទៅគែម ដើម្បីលាក់វាជាបណ្ដោះអាសន្ន"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"ផ្លាស់ទីទៅខាងលើផ្នែកខាងឆ្វេង"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"ផ្លាស់ទីទៅខាងលើផ្នែកខាងស្ដាំ"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"ផ្លាស់ទីទៅខាងក្រោមផ្នែកខាងឆ្វេង"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"ផ្លាស់ទីទៅខាងក្រោមផ្នែកខាងស្ដាំ"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"ផ្លាស់ទីទៅផ្នែកខាងចុង រួចលាក់"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"ផ្លាស់ទីចេញពីផ្នែកខាងចុង រួចបង្ហាញ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ផ្ទាំងគ្រប់គ្រងឧបករណ៍"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"បញ្ចូលផ្ទាំងគ្រប់គ្រងសម្រាប់ឧបករណ៍ដែលអ្នកបានភ្ជាប់"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"រៀបចំផ្ទាំងគ្រប់គ្រងឧបករណ៍"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"តិចជាង <xliff:g id="DURATION">%1$s</xliff:g> មុន"</string> <string name="over_timestamp" msgid="4765793502859358634">"ជាង <xliff:g id="DURATION">%1$s</xliff:g> មុន"</string> <string name="birthday_status" msgid="2596961629465396761">"ថ្ងៃកំណើត"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"នេះគឺជាថ្ងៃកំណើតរបស់ <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"ថ្ងៃកំណើតឆាប់ៗនេះ"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"ថ្ងៃកំណើតរបស់ <xliff:g id="NAME">%1$s</xliff:g> នឹងចូលមកដល់ឆាប់ៗនេះ"</string> <string name="anniversary_status" msgid="1790034157507590838">"គម្រប់ខួប"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"នេះគឺជាទិវាគម្រប់ខួបរបស់ <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"កំពុងចែករំលែកទីតាំង"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> កំពុងចែករំលែកទីតាំង"</string> <string name="new_story_status" msgid="9012195158584846525">"រឿងថ្មី"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> បានចែករំលែករឿងថ្មី"</string> <string name="video_status" msgid="4548544654316843225">"កំពុងមើល"</string> <string name="audio_status" msgid="4237055636967709208">"កំពុងស្តាប់"</string> <string name="game_status" msgid="1340694320630973259">"កំពុងលេង"</string> <string name="empty_user_name" msgid="3389155775773578300">"មិត្តភ័ក្ដិ"</string> <string name="empty_status" msgid="5938893404951307749">"តោះជជែកគ្នាយប់នេះ!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"ខ្លឹមសារនឹងបង្ហាញក្នុងពេលបន្តិចទៀត"</string> <string name="missed_call" msgid="4228016077700161689">"ខកខានទទួល"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"មើលព័ត៌មានថ្មីៗអំពីស្ថានភាព ការខកខានទទួល និងសារថ្មីៗ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ការសន្ទនា"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> បានផ្ញើសារ"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> បានផ្ញើរូបភាព"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"មានបញ្ហាក្នុងការអានឧបករណ៍រង្វាស់កម្រិតថ្មរបស់អ្នក"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ចុចដើម្បីទទួលបានព័ត៌មានបន្ថែម"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"មិនបានកំណត់ម៉ោងរោទ៍ទេ"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 0c10103f6ba9..2f268d496011 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ಇನ್ನಷ್ಟು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಿ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು ವಜಾಗೊಳಿಸಿ"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ಸ್ಕ್ರೀನ್ಶಾಟ್ನ ಪೂರ್ವವೀಕ್ಷಣೆ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ಮೇಲಿನ ಗಡಿರೇಖೆ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ಕೆಳಗಿನ ಗಡಿರೇಖೆ"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡರ್"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡಿಂಗ್ ಆಗುತ್ತಿದೆ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡಿಂಗ್ ಸೆಶನ್ಗಾಗಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಅಧಿಸೂಚನೆ"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ಇನ್ಪುಟ್ ವಿಧಾನ"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ಸ್ಥಳ"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ಸ್ಥಳ ಆಫ್ ಆಗಿದೆ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ಕ್ಯಾಮರಾವನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್ ಮಾಡಿ"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"ಮಾಧ್ಯಮ ಸಾಧನ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ತುರ್ತು ಕರೆಗಳು ಮಾತ್ರ"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡ್"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ಪ್ರಾರಂಭಿಸಿ"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ನಿಲ್ಲಿಸಿ"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ಮುಂದುವರಿಯಲು, <b><xliff:g id="APP">%s</xliff:g></b> ಗೆ ನಿಮ್ಮ ಸಾಧನದ ಮೈಕ್ರೋಫೋನ್ನ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ಮುಂದುವರಿಯಲು, <b><xliff:g id="APP">%s</xliff:g></b> ಗೆ ನಿಮ್ಮ ಸಾಧನದ ಕ್ಯಾಮರಾದ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ."</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"ಸಾಧನ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಬದಲಿಸಲು ತ್ವರಿತವಾಗಿ ಬಲಕ್ಕೆ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ಇಥರ್ನೆಟ್"</string> <string name="status_bar_alarm" msgid="87160847643623352">"ಅಲಾರಮ್"</string> <string name="wallet_title" msgid="5369767670735827105">"ವಾಲೆಟ್"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"ಸಿದ್ಧವಾಗಿದೆ"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ಪಾವತಿಯನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ಬಳಸಲು ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"ನಿಮ್ಮ ಕಾರ್ಡ್ಗಳನ್ನು ಪಡೆಯುವಾಗ ಸಮಸ್ಯೆ ಉಂಟಾಗಿದೆ, ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string> <string name="status_bar_work" msgid="5238641949837091056">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್"</string> <string name="add_tile" msgid="6239678623873086686">"ಟೈಲ್ ಸೇರಿಸಿ"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ಸ್ಥಿತಿ:</b> ಸೈಲೆಂಟ್ಗೆ ಕೆಳದರ್ಜೆಗೆ ಇಳಿದಿದೆ"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>ಸ್ಥಿತಿ:</b> ಉನ್ನತ ಸ್ಥಾನವನ್ನು ಹೊಂದಿದೆ"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ಸ್ಥಿತಿ:</b> ಕಡಿಮೆ ಸ್ಥಾನವನ್ನು ಹೊಂದಿದೆ"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"ಆದ್ಯತಾ ಮೋಡ್ ಆನ್ ಆಗಿದ್ದರೂ ಸಹ, ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತದೆ"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string> <string name="no_shortcut" msgid="8257177117568230126">"ಸಂವಾದ ಫೀಚರ್ಗಳನ್ನು <xliff:g id="APP_NAME">%1$s</xliff:g> ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ಈ ಗುಂಪಿನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಇಲ್ಲಿ ಕಾನ್ಫಿಗರ್ ಮಾಡಲಾಗಿರುವುದಿಲ್ಲ"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ಸಿಸ್ಟಂ ನ್ಯಾವಿಗೇಷನ್ ಅಪ್ಡೇಟ್ ಮಾಡಲು ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ಸ್ಟ್ಯಾಂಡ್ಬೈ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"ಸಂವಾದವನ್ನು ಆದ್ಯತೆಯಾಗಿ ಹೊಂದಿಸಲಾಗಿದೆ"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ಈ ಸಂಭಾಷಣೆಗಳನ್ನು ನಿಮ್ಮ ಪಟ್ಟಿಯ ಮೇಲ್ಭಾಗದಲ್ಲಿ ತೋರಿಸಲಾಗಿದೆ ಮತ್ತು ಆದ್ಯತಾ ಮೋಡ್ ಆನ್ ಆಗಿರುವಾಗ ಯಾವಾಗಲೂ ನಿಮ್ಮನ್ನು ತಲುಪಬಹುದು"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"ಪ್ರೊಫೈಲ್ ಚಿತ್ರಗಳನ್ನು ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ತೋರಿಸಲಾಗಿದೆ"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್ನ ಬಬಲ್ಸ್ನಲ್ಲಿ ಈ ಸಂಭಾಷಣೆಗಳನ್ನು ನೀವು ಸುಲಭವಾಗಿ ಕಾಣಬಹುದು"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅನ್ನು ಅಡ್ಡಿಪಡಿಸಿ"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"ಅರ್ಥವಾಯಿತು"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ಸ್ವಿಚ್"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಅಕ್ಸೆಸಿಬಿಲಿಟಿ ಗೆಸ್ಚರ್ ಅನ್ನು ಬದಲಾಯಿಸಿದೆ\n\n"<annotation id="link">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ಅದನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಮರೆಮಾಡಲು ಅಂಚಿಗೆ ಬಟನ್ ಸರಿಸಿ"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"ಎಡ ಮೇಲ್ಭಾಗಕ್ಕೆ ಸರಿಸಿ"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"ಬಲ ಮೇಲ್ಭಾಗಕ್ಕೆ ಸರಿಸಿ"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"ಸ್ಕ್ರೀನ್ನ ಎಡ ಕೆಳಭಾಗಕ್ಕೆ ಸರಿಸಿ"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"ಕೆಳಗಿನ ಬಲಭಾಗಕ್ಕೆ ಸರಿಸಿ"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"ಅಂಚಿಗೆ ಸರಿಸಿ ಮತ್ತು ಮರೆಮಾಡಿ"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"ಅಂಚನ್ನು ಸರಿಸಿ ಮತ್ತು ತೋರಿಸಿ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ಸಾಧನ ನಿಯಂತ್ರಣಗಳು"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"ನಿಮ್ಮ ಸಂಪರ್ಕಿತ ಸಾಧನಗಳಿಗೆ ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಿ"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ಸಾಧನ ನಿಯಂತ್ರಣಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> ಗಿಂತ ಕಡಿಮೆ ಅವಧಿಯ ಹಿಂದೆ"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚಿನ ಅವಧಿಯ ಹಿಂದೆ"</string> <string name="birthday_status" msgid="2596961629465396761">"ಜನ್ಮದಿನ"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರ ಜನ್ಮದಿನ"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"ಶೀಘ್ರದಲ್ಲಿ ಜನ್ಮದಿನವಿದೆ"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರ ಜನ್ಮದಿನ ಶೀಘ್ರದಲ್ಲೇ ಬರಲಿದೆ"</string> <string name="anniversary_status" msgid="1790034157507590838">"ವಾರ್ಷಿಕೋತ್ಸವ"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರ ವಾರ್ಷಿಕೋತ್ಸವ"</string> <string name="location_status" msgid="1294990572202541812">"ಸ್ಥಳ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಸ್ಥಳವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದಾರೆ"</string> <string name="new_story_status" msgid="9012195158584846525">"ಹೊಸ ಸುದ್ದಿ"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಹೊಸ ಸ್ಟೋರಿಯನ್ನು ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ"</string> <string name="video_status" msgid="4548544654316843225">"ವೀಕ್ಷಿಸುತ್ತಿರುವವರು"</string> <string name="audio_status" msgid="4237055636967709208">"ಆಲಿಸಲಾಗುತ್ತಿದೆ"</string> <string name="game_status" msgid="1340694320630973259">"ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿದೆ"</string> <string name="empty_user_name" msgid="3389155775773578300">"ಸ್ನೇಹಿತರು"</string> <string name="empty_status" msgid="5938893404951307749">"ಈ ರಾತ್ರಿ ಚಾಟ್ ಮಾಡೋಣ!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"ವಿಷಯ ಶೀಘ್ರದಲ್ಲೇ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ"</string> <string name="missed_call" msgid="4228016077700161689">"ಮಿಸ್ಡ್ ಕಾಲ್"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ಇತ್ತೀಚಿನ ಸಂದೇಶಗಳು, ಮಿಸ್ಡ್ ಕಾಲ್ಗಳು ಮತ್ತು ಸ್ಥಿತಿ ಅಪ್ಡೇಟ್ಗಳು"</string> <string name="people_tile_title" msgid="6589377493334871272">"ಸಂಭಾಷಣೆ"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಚಿತ್ರವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಮೀಟರ್ ಓದುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ಇನ್ನಷ್ಟು ಮಾಹಿತಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ಅಲಾರಾಂ ಸೆಟ್ ಆಗಿಲ್ಲ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 5e71548a3193..878b1a7b36fb 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"더 캡처하기"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"스크린샷 닫기"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"스크린샷 미리보기"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"상단 경계"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"하단 경계"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"화면 녹화"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"화면 녹화 처리 중"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"화면 녹화 세션에 관한 지속적인 알림"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"입력 방법"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"위치"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"위치 사용 중지"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"카메라 차단"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"마이크 음소거"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"카메라 액세스"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"마이크 액세스"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"허용됨"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"차단됨"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"미디어 기기"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"긴급 통화만 허용"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"화면 녹화"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"시작"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"중지"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"계속하려면 <b><xliff:g id="APP">%s</xliff:g></b>에서 기기 마이크에 액세스해야 합니다."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"계속하려면 <b><xliff:g id="APP">%s</xliff:g></b>에서 기기 카메라에 액세스해야 합니다."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"기기 마이크를 차단 해제하시겠습니까?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"기기 카메라를 차단 해제하시겠습니까?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"기기 카메라 및 마이크를 차단 해제하시겠습니까?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"마이크를 사용할 수 있는 모든 앱 및 서비스에 대해 액세스가 차단 해제됩니다."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"카메라에 액세스할 수 있는 모든 앱과 서비스에 대해 액세스가 차단 해제됩니다."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"카메라 또는 마이크를 사용할 수 있는 모든 앱 및 서비스에 대해 액세스가 차단 해제됩니다."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"기기"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"위로 스와이프하여 앱 전환"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"앱을 빠르게 전환하려면 오른쪽으로 드래그"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"이더넷"</string> <string name="status_bar_alarm" msgid="87160847643623352">"알람"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"준비됨"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"결제 설정"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"잠금 해제하여 사용"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"카드를 가져오는 중에 문제가 발생했습니다. 나중에 다시 시도해 보세요."</string> <string name="status_bar_work" msgid="5238641949837091056">"직장 프로필"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"비행기 모드"</string> <string name="add_tile" msgid="6239678623873086686">"타일 추가"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>상태:</b> 무음으로 낮춤"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>상태:</b> 순위 높임"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>상태:</b> 순위 낮춤"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"우선순위 모드가 켜져 있어도 항상 알림 맨 위에 표시됩니다"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"설정"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"우선순위 대화"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> 앱은 대화 기능을 지원하지 않습니다."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"이 알림은 수정할 수 없습니다."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"이 알림 그룹은 여기에서 설정할 수 없습니다."</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"설정으로 이동하여 시스템 탐색을 업데이트하세요."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"대기"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"대화가 우선순위 대화로 설정됨"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"우선순위 대화"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"우선순위 대화는 목록 맨 위에 표시되며 우선순위 모드가 켜져 있을 때는 항상 표시됩니다."</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"프로필 사진이 잠금 화면에 표시됩니다."</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"홈 화면에서 풍선 모양의 대화창을 쉽게 찾을 수 있습니다."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"방해 금지 모드 무시"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"확인"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"설정"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"전환"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"접근성 동작이 접근성 버튼으로 대체되었습니다\n\n"<annotation id="link">"설정 보기"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"버튼을 가장자리로 옮겨서 일시적으로 숨기세요"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"왼쪽 상단으로 이동"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"오른쪽 상단으로 이동"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"왼쪽 하단으로 이동"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"오른쪽 하단으로 이동"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"가장자리로 옮겨서 숨기기"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"가장자리 바깥으로 옮겨서 표시"</string> <string name="quick_controls_title" msgid="6839108006171302273">"기기 컨트롤"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"연결된 기기의 컨트롤을 추가하세요."</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"기기 컨트롤 설정"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> 이내"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> 이상 경과"</string> <string name="birthday_status" msgid="2596961629465396761">"생일"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"오늘은 <xliff:g id="NAME">%1$s</xliff:g>님의 생일입니다."</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"다가오는 생일"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"곧 <xliff:g id="NAME">%1$s</xliff:g>님의 생일입니다."</string> <string name="anniversary_status" msgid="1790034157507590838">"기념일"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"오늘은 <xliff:g id="NAME">%1$s</xliff:g>님의 기념일입니다."</string> <string name="location_status" msgid="1294990572202541812">"위치 공유 중"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g>님이 위치를 공유하고 있습니다."</string> <string name="new_story_status" msgid="9012195158584846525">"새 스토리"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g>님이 새로운 스토리를 공유했습니다."</string> <string name="video_status" msgid="4548544654316843225">"시청 중"</string> <string name="audio_status" msgid="4237055636967709208">"듣는 중"</string> <string name="game_status" msgid="1340694320630973259">"플레이 중"</string> <string name="empty_user_name" msgid="3389155775773578300">"친구"</string> <string name="empty_status" msgid="5938893404951307749">"오늘 밤에 채팅"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"곧 콘텐츠가 표시됩니다."</string> <string name="missed_call" msgid="4228016077700161689">"부재중 전화"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"최근 메시지, 부재중 전화, 상태 업데이트 보기"</string> <string name="people_tile_title" msgid="6589377493334871272">"대화"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>님이 메시지를 보냈습니다."</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>님이 이미지를 보냈습니다."</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"배터리 수준을 읽는 중에 문제가 발생함"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"탭하여 자세한 정보를 확인하세요."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"설정된 알람 없음"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 6aacfa02ff79..2c2a8ae98f2f 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Көбүрөөк тартуу"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Скриншотту четке кагуу"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Скриншотту алдын ала көрүү"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Жогорку чеги"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Төмөнкү чеги"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"экрандан видео жаздырып алуу"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Экрандан жаздырылып алынган видео иштетилүүдө"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Экранды жаздыруу сеансы боюнча учурдагы билдирме"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Киргизүү ыкмасы"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Жайгашкан жер"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Жайгашытрууну өчүрүү"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Камераны бөгөттөө"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Микрофондун үнүн басуу"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Камераны колдонуу мүмкүнчүлүгү"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Микрофонду колдонуу мүмкүнчүлүгү"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Жеткиликтүү"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Бөгөттөлдү"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Медиа түзмөгү"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Кырсыктаганда гана чалуу"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Экранды жаздыруу"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Баштадык"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Токтотуу"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Улантуу үчүн <b><xliff:g id="APP">%s</xliff:g></b> колдонмосуна түзмөгүңүздүн микрофонун пайдаланууга уруксат беришиңиз керек."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Улантуу үчүн <b><xliff:g id="APP">%s</xliff:g></b> колдонмосуна түзмөгүңүздүн камерасын пайдаланууга уруксат беришиңиз керек."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Түзмөктүн микрофонунун кулпусу ачысынбы?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Түзмөктүн камерасынын кулпусу ачылсынбы?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Түзмөктүн камерасы менен микрофону бөгөттөн чыгарылсынбы?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ушуну менен микрофонуңузду колдонууга уруксаты бар бардык колдонмолор менен кызматтар бөгөттөн чыгарылат."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ушуну менен камераңызды колдонууга уруксаты бар бардык колдонмолор менен кызматтар бөгөттөн чыгарылат."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ушуну менен камераңызды же микрофонуңузду колдонууга уруксаты бар бардык колдонмолор менен кызматтар бөгөттөн чыгарылат."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Түзмөк"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Башка колдонмого которулуу үчүн өйдө сүрүңүз"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Колдонмолорду тез которуштуруу үчүн, оңго сүйрөңүз"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Ойготкуч"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Даяр"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Төлөмдү жөндөө"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Колдонуу үчүн кулпусун ачыңыз"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Кыйытмаларды алууда ката кетти. Бир аздан кийин кайталап көрүңүз."</string> <string name="status_bar_work" msgid="5238641949837091056">"Жумуш профили"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Учак режими"</string> <string name="add_tile" msgid="6239678623873086686">"Тайл кошуу"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Абалы:</b> Үнсүз абалга төмөндөдү"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Абалы:</b> Жогорулады"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Абалы:</b> Төмөндөдү"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Маанилүү жазышуулар режими күйүп турса да, ар дайым билдирмелердин үстүндө көрүнөт"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Жөндөөлөр"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Маанилүү жазышуулар"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> жазышуу функцияларын колдоого албайт"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бул билдирмелерди өзгөртүүгө болбойт."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Бул билдирмелердин тобун бул жерде конфигурациялоого болбойт"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Тутум чабыттоосун жаңыртуу үчүн Жөндөөлөргө өтүңүз"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Көшүү режими"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Жазышуу маанилүү болуп коюлду"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Маанилүү жазышуулар"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Маанилүү жазышуулар режими күйүп турганда бул жазышуулар ар дайым тизменин жогору жагында болуп, аларды тез табасыз"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Профилдин сүрөттөрү кулпуланган экранда көрүнөт"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Бул жазышууларды Башкы экраныңыздагы калкып чыкма билдирмелерден каалаганда таап алсаңыз болот"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\"Тынчымды алба\" режими үзгүлтүккө учурайт"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Түшүндүм"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Жөндөөлөр"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Которулуу"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Атайын мүмкүнчүлүктөр баскычы атайын мүмкүнчүлүктөр жаңсоосун алмаштырды\n\n"<annotation id="link">"Жөндөөлөрдү көрүү"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Убактылуу жашыруу үчүн баскычты четине жылдырыңыз"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Жогорку сол жакка жылдыруу"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Жогорку оң жакка жылдырыңыз"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Төмөнкү сол жакка жылдыруу"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Төмөнкү оң жакка жылдырыңыз"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Ичине жылдырып, көрсөтүңүз"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Сыртка жылдырып, көрсөтүңүз"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Түзмөктү башкаруу элементтери"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Байланышкан түзмөктөрүңүздү башкаруу элементтерин кошосуз"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Түзмөктү башкаруу элементтерин жөндөө"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> жетпеген убакыт мурда"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> ашуун мурда"</string> <string name="birthday_status" msgid="2596961629465396761">"Туулган күн"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> бүгүн туулган күнүн белгилеп жатат"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Алдыдагы туулган күн"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Жакында <xliff:g id="NAME">%1$s</xliff:g> туулган күнүн белгилейт"</string> <string name="anniversary_status" msgid="1790034157507590838">"Маараке"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> бүгүн мааракесин белгилеп жатат"</string> <string name="location_status" msgid="1294990572202541812">"Кайда жүргөнүмдү көрсөтүү"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> кайда жүргөнүн көрсөтүп жатат"</string> <string name="new_story_status" msgid="9012195158584846525">"Жаңы окуя"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> жаңы окуяны бөлүштү"</string> <string name="video_status" msgid="4548544654316843225">"Көрүүдө"</string> <string name="audio_status" msgid="4237055636967709208">"Угуп жатат"</string> <string name="game_status" msgid="1340694320630973259">"Ойнотулууда"</string> <string name="empty_user_name" msgid="3389155775773578300">"Достор"</string> <string name="empty_status" msgid="5938893404951307749">"Келиңиз, баарлашалы!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Мазмун бир аздан кийин көрүнөт"</string> <string name="missed_call" msgid="4228016077700161689">"Жооп берилбеген чалуу"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Акыркы билдирүүлөрдү, жооп берилбеген чалууларды жана статус жаңыртууларын көрүү"</string> <string name="people_tile_title" msgid="6589377493334871272">"Сүйлөшүү"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> билдирүү жөнөттү"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> сүрөт жөнөттү"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Батареяңыздын кубаты аныкталбай жатат"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Кеңири маалымат алуу үчүн таптап коюңуз"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ойготкуч коюлган жок"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index fb4ecad953d6..6001f77ddedb 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -92,8 +92,10 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ບັນທຶກເພີ່ມເຕີມ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ປິດຮູບໜ້າຈໍ"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ຕົວຢ່າງຮູບໜ້າຈໍ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ຂອບເຂດທາງເທິງ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ຂອບເຂດທາງລຸ່ມ"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"ຂອບເຂດທາງເທິງ <xliff:g id="PERCENT">%1$d</xliff:g> ເປີເຊັນ"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"ຂອບເຂດທາງລຸ່ມ <xliff:g id="PERCENT">%1$d</xliff:g> ເປີເຊັນ"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"ຂອບເຂດທາງຊ້າຍ <xliff:g id="PERCENT">%1$d</xliff:g> ເປີເຊັນ"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"ຂອບເຂດທາງຂວາ <xliff:g id="PERCENT">%1$d</xliff:g> ເປີເຊັນ"</string> <string name="screenrecord_name" msgid="2596401223859996572">"ໂປຣແກຣມບັນທຶກໜ້າຈໍ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ກຳລັງປະມວນຜົນການບັນທຶກໜ້າຈໍ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ການແຈ້ງເຕືອນສຳລັບເຊດຊັນການບັນທຶກໜ້າຈໍໃດໜຶ່ງ"</string> @@ -349,8 +351,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ວິທີການປ້ອນຂໍ້ມູນ"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ສະຖານທີ່"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ຂໍ້ມູນສະຖານທີ່ປິດຢູ່"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ບລັອກກ້ອງຖ່າຍຮູບ"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"ປິດສຽງໄມໂຄຣໂຟນ"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"ການເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"ການເຂົ້າເຖິງໄມ"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"ສາມາດໃຊ້ໄດ້"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ບລັອກແລ້ວ"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"ອຸປະກອນສື່"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ໂທສຸກເສີນເທົ່ານັ້ນ"</string> @@ -422,8 +426,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ການບັນທຶກໜ້າຈໍ"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ເລີ່ມ"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ຢຸດ"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ເພື່ອດຳເນີນການຕໍ່, <b><xliff:g id="APP">%s</xliff:g></b> ຕ້ອງການສິດເຂົ້າເຖິງໄມໂຄຣໂຟນອຸປະກອນຂອງທ່ານ."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ເພື່ອດຳເນີນການຕໍ່, <b><xliff:g id="APP">%s</xliff:g></b> ຕ້ອງການສິດເຂົ້າເຖິງກ້ອງຖ່າຍຮູບຂອງອຸປະກອນທ່ານ."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ຍົກເລີກການບລັອກໄມໂຄຣໂຟນອຸປະກອນບໍ?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ຍົກເລີກການບລັອກກ້ອງຖ່າຍຮູບອຸປະກອນບໍ?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ຍົກເລີກການບລັອກກ້ອງຖ່າຍຮູບ ຫຼື ໄມໂຄຣໂຟນອຸປະກອນບໍ?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ນີ້ຈະຍົກເລີກການບລັອກການເຂົ້າເຖິງແອັບ ແລະ ບໍລິການທັງໝົດທີ່ອະນຸຍາດໃຫ້ໃຊ້ໄມໂຄຣໂຟນຂອງທ່ານ."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ນີ້ຈະຍົກເລີກການບລັອກການເຂົ້າເຖິງແອັບ ແລະ ບໍລິການທັງໝົດທີ່ອະນຸຍາດໃຫ້ໃຊ້ກ້ອງຖ່າຍຮູບຂອງທ່ານ."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"ນີ້ຈະຍົກເລີກການບລັອກການເຂົ້າເຖິງແອັບ ແລະ ບໍລິການທັງໝົດທີ່ອະນຸຍາດໃຫ້ໃຊ້ກ້ອງຖ່າຍຮູບ ຫຼື ໄມໂຄຣໂຟນຂອງທ່ານ."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"ອຸປະກອນ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ປັດຂື້ນເພື່ອສະຫຼັບແອັບ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ລາກໄປຂວາເພື່ອສະຫຼັບແອັບດ່ວນ"</string> @@ -657,8 +665,8 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ອີເທເນັດ"</string> <string name="status_bar_alarm" msgid="87160847643623352">"ໂມງປຸກ"</string> <string name="wallet_title" msgid="5369767670735827105">"ກະເປົາ"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"ສະແດງທັງໝົດ"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"ປົດລັອກເພື່ອຈ່າຍ"</string> + <string name="wallet_app_button_label" msgid="7123784239111190992">"ສະແດງທັງໝົດ"</string> + <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ປົດລັອກເພື່ອຈ່າຍ"</string> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"ພ້ອມແລ້ວ"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ຕັ້ງຄ່າການຈ່າຍເງິນ"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ປົດລັອກເພື່ອໃຊ້"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 12b65a2cbd9b..424eeec31dfe 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Fiksuoti daugiau"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Praleisti ekrano kopiją"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ekrano kopijos peržiūra"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Viršutinė riba"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Apatinė riba"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Ekrano vaizdo įrašytuvas"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Apdorojam. ekrano vaizdo įraš."</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Šiuo metu rodomas ekrano įrašymo sesijos pranešimas"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Įvesties metodas"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Vietovė"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Vietovė išjungta"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokuoti Fotoaparatą"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Nutildyti mikrofoną"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Prieiga prie fotoaparato"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Prieiga prie mikrofono"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Pasiekiama"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Užblokuota"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medijos įrenginys"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Tik skambučiai pagalbos numeriu"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekrano įrašas"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Pradėti"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stabdyti"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Kad būtų galima tęsti, <b><xliff:g id="APP">%s</xliff:g></b> reikalinga prieiga prie įrenginio mikrofono."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Kad būtų galima tęsti, <b><xliff:g id="APP">%s</xliff:g></b> reikalinga prieiga prie įrenginio fotoaparato."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Panaikinti įrenginio mikrofono blokavimą?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Panaikinti įrenginio fotoaparato blokavimą?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Panaikinti įrenginio fotoaparato ir mikrofono blokavimą?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Tai atlikus visų programų ir paslaugų prieigos blokavimas panaikinamas ir joms leidžiama naudoti mikrofoną."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Tai atlikus visų programų ir paslaugų prieigos blokavimas panaikinamas ir joms leidžiama naudoti fotoaparatą."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Tai atlikus visų programų ir paslaugų prieigos blokavimas panaikinamas ir joms leidžiama naudoti fotoaparatą ar mikrofoną."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Įrenginys"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Perbraukite aukštyn, kad perjungtumėte programas"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Vilkite į dešinę, kad greitai perjungtumėte programas"</string> @@ -663,8 +675,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Eternetas"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Signalas"</string> <string name="wallet_title" msgid="5369767670735827105">"Piniginė"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Rodyti viską"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Atrakinti, kad būtų galima mokėti"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Paruošta"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Nustatyti mokėjimą"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Atrakinti, kad būtų galima naudoti"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index e4e19d9006fb..5c863587309d 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Tvert vairāk"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Nerādīt ekrānuzņēmumu"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ekrānuzņēmuma priekšskatījums"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Augšējā robeža"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Apakšējā robeža"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Ekrāna ierakstītājs"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Ekrāna ieraksta apstrāde"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Aktīvs paziņojums par ekrāna ierakstīšanas sesiju"</string> @@ -350,8 +356,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Ievades metode"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Atrašanās vieta"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Atrašanās vieta izslēgta"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloķēt kameru"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Izslēgt mikrofonu"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Piekļuve kamerai"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Piekļuve mikrofonam"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Piekļuve atļauta"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Piekļuve bloķēta"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Multivides ierīce"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Tikai ārkārtas izsaukumi"</string> @@ -424,8 +432,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekrāna ierakstīšana"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Sākt"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Apturēt"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Lai turpinātu, lietotnei <b><xliff:g id="APP">%s</xliff:g></b> nepieciešama piekļuve jūsu ierīces mikrofonam."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Lai turpinātu, lietotnei <b><xliff:g id="APP">%s</xliff:g></b> nepieciešama piekļuve jūsu ierīces kamerai."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vai vēlaties atbloķēt ierīces mikrofonu?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vai vēlaties atbloķēt ierīces kameru?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vai vēlaties atbloķēt ierīces kameru un mikrofonu?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Visas lietotnes un pakalpojumi, kas drīkst izmantot mikrofonu, varēs tam piekļūt."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Visas lietotnes un pakalpojumi, kas drīkst izmantot kameru, varēs tai piekļūt."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Visas lietotnes un pakalpojumi, kas drīkst izmantot kameru vai mikrofonu, varēs piekļūt kamerai vai mikrofonam."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Ierīce"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Velciet augšup, lai pārslēgtu lietotnes"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Lai ātri pārslēgtu lietotnes, velciet pa labi"</string> @@ -660,8 +672,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Tīkls Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Signāls"</string> <string name="wallet_title" msgid="5369767670735827105">"Maks"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Rādīt visu"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Lai maksātu, atbloķējiet ekrānu"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Gatavs"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Maksājuma veida iestatīšana"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lai izmantotu, atbloķējiet ekrānu"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 87246ce1eb41..25bc0e99c17e 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Сними повеќе"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Отфрлете ја сликата од екранот"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Преглед на слика од екранот"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Горна граница"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Долна граница"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Снимач на екран"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Се обработува снимка од екран"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Тековно известување за сесија за снимање на екранот"</string> @@ -300,7 +306,7 @@ <string name="data_usage_disabled_dialog_4g_title" msgid="1490779000057752281">"Податоците 4G се паузирани"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="2286843518689837719">"Мобилниот интернет е паузиран"</string> <string name="data_usage_disabled_dialog_title" msgid="9131615296036724838">"Податоците се паузирани"</string> - <string name="data_usage_disabled_dialog" msgid="7933201635215099780">"Го достигнавте ограничувањето за мобилен сообраќај што сте го поставиле. Веќе не користите мобилен интернет.\n\nДоколку продолжите, ќе ви биде наплатено за потрошениот сообраќај."</string> + <string name="data_usage_disabled_dialog" msgid="7933201635215099780">"Го достигнавте ограничувањето за мобилен интернет што сте го поставиле. Веќе не користите мобилен интернет.\n\nДоколку продолжите, ќе ви биде наплатено за потрошениот интернет."</string> <string name="data_usage_disabled_dialog_enable" msgid="2796648546086408937">"Продолжи"</string> <string name="gps_notification_searching_text" msgid="231304732649348313">"Се пребарува за GPS"</string> <string name="gps_notification_found_text" msgid="3145873880174658526">"Локацијата е поставена со GPS"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Метод на внес"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Локација"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Исклучи локација"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Блокирај камера"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Исклучи звук на микрофонот"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Пристап до камерата"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Пристап до микрофонот"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Достапен"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Блокиран"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Медиумски уред"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Само итни повици"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Снимање екран"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Започни"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Сопри"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"За да продолжи, на <b><xliff:g id="APP">%s</xliff:g></b> ѝ е потребен пристап до микрофонот на уредот."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"За да продолжи, на <b><xliff:g id="APP">%s</xliff:g></b> ѝ е потребен пристап до камерата на уредот."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Да се одблокира пристапот до микрофонот на уредот?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Да се одблокира пристапот до камерата на уредот?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Да се одблокира пристапот до камерата и микрофонот на уредот?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ова ќе го одблокира пристапот за сите апликации и услуги на кои им е дозволено користење на микрофонот."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ова ќе го одблокира пристапот за сите апликации и услуги на кои им е дозволено користење на камерата."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ова ќе го одблокира пристапот за сите апликации и услуги на кои им е дозволено користење на камерата или микрофонот."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Уред"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Повлечете нагоре за да се префрлите од една на друга апликација"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Повлечете надесно за брзо префрлање меѓу апликациите"</string> @@ -497,7 +509,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"Ја намалува изведбата и податоците во заднина"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"Исклучете го штедачот на батерија"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ќе има пристап до сите податоци што се видливи на екранот или пуштени од вашиот уред додека се снима или емитува. Ова вклучува податоци како лозинки, детали за плаќање, фотографии, пораки, аудио што го пуштате итн."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Услугата што ја обезбедува функцијава ќе има пристап до сите податоци што се видливи на екранот или пуштени од вашиот уред додека се снима или емитува. Ова вклучува информации како лозинки, детали за плаќање, фотографии, пораки, аудио што го пуштате итн."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Услугата што ја обезбедува функцијава ќе има пристап до сите податоци што се видливи на екранот или пуштени од вашиот уред додека се снима или емитува. Ова вклучува податоци како лозинки, детали за плаќање, фотографии, пораки, аудио што го пуштате итн."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Да почне снимање или емитување?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Да почне снимање или емитување со <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"Не покажувај повторно"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Етернет"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Аларм"</string> <string name="wallet_title" msgid="5369767670735827105">"Паричник"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Прикажи ги сите"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Отклучете за да платите"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Подготвено"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Поставете плаќање"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Отклучете за да користите"</string> @@ -968,7 +982,7 @@ <string name="qs_dnd_keep" msgid="3829697305432866434">"Задржи"</string> <string name="qs_dnd_replace" msgid="7712119051407052689">"Замени"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Апликациите се извршуваат во заднина"</string> - <string name="running_foreground_services_msg" msgid="3009459259222695385">"Допрете за детали за батеријата и потрошениот сообраќај"</string> + <string name="running_foreground_services_msg" msgid="3009459259222695385">"Допрете за детали за батеријата и потрошениот интернет"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Да се исклучи мобилниот интернет?"</string> <string name="mobile_data_disable_message" msgid="8604966027899770415">"Нема да имате пристап до податоците или интернетот преку <xliff:g id="CARRIER">%s</xliff:g>. Интернетот ќе биде достапен само преку Wi-Fi."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"вашиот оператор"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 955f14402c98..bf38d28395a5 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"കൂടുതൽ ക്യാപ്ചർ ചെയ്യുക"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"സ്ക്രീൻഷോട്ട് ഡിസ്മിസ് ചെയ്യുക"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"സ്ക്രീൻഷോട്ട് പ്രിവ്യു"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"മുകളിലുള്ള അതിർത്തി"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ചുവടെയുള്ള അതിർത്തി"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"സ്ക്രീൻ റെക്കോർഡർ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"സ്ക്രീൻ റെക്കോർഡിംഗ് പ്രോസസുചെയ്യുന്നു"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ഒരു സ്ക്രീൻ റെക്കോർഡിംഗ് സെഷനായി നിലവിലുള്ള അറിയിപ്പ്"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ടൈപ്പുചെയ്യൽ രീതി"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ലൊക്കേഷൻ"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ലൊക്കേഷൻ ഓഫാണ്"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ക്യാമറ ബ്ലോക്ക് ചെയ്യുക"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"മൈക്രോഫോൺ മ്യൂട്ട് ചെയ്യുക"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"ക്യാമറ ആക്സസ്"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"മൈക്ക് ആക്സസ്"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"ലഭ്യമാണ്"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ബ്ലോക്ക് ചെയ്തിരിക്കുന്നു"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"മീഡിയ ഉപകരണം"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"അടിയന്തിര കോളുകൾ മാത്രം"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"സ്ക്രീൻ റെക്കോർഡ്"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ആരംഭിക്കുക"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"നിര്ത്തുക"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"തുടരാൻ, <b><xliff:g id="APP">%s</xliff:g></b> ആപ്പിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ മൈക്രോഫോണിലേക്ക് ആക്സസ് നൽകേണ്ടതുണ്ട്."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"തുടരാൻ, <b><xliff:g id="APP">%s</xliff:g></b> ആപ്പിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ ക്യാമറയിലേക്ക് ആക്സസ് നൽകേണ്ടതുണ്ട്."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ഉപകരണ മൈക്രോഫോൺ അൺബ്ലോക്ക് ചെയ്യണോ?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ഉപകരണ ക്യാമറ അൺബ്ലോക്ക് ചെയ്യണോ?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ഉപകരണ ക്യാമറയോ മൈക്രോഫോണോ അൺബ്ലോക്ക് ചെയ്യണോ?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"നിങ്ങളുടെ മൈക്രോഫോൺ ഉപയോഗിക്കാൻ അനുവദിച്ചിരിക്കുന്ന എല്ലാ ആപ്പുകൾക്കും സേവനങ്ങൾക്കുമുള്ള ആക്സസ് ഇത് അൺബ്ലോക്ക് ചെയ്യുന്നു."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"നിങ്ങളുടെ ക്യാമറ ഉപയോഗിക്കാൻ അനുവദിച്ചിരിക്കുന്ന എല്ലാ ആപ്പുകൾക്കും സേവനങ്ങൾക്കുമുള്ള ആക്സസ് ഇത് അൺബ്ലോക്ക് ചെയ്യുന്നു."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"നിങ്ങളുടെ ക്യാമറയോ മൈക്രോഫോണോ ഉപയോഗിക്കാൻ അനുവദിച്ചിരിക്കുന്ന എല്ലാ ആപ്പുകൾക്കും സേവനങ്ങൾക്കുമുള്ള ആക്സസ് ഇത് അൺബ്ലോക്ക് ചെയ്യുന്നു."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"ഉപകരണം"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ആപ്പുകൾ മാറാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ആപ്പുകൾ പെട്ടെന്ന് മാറാൻ വലത്തോട്ട് വലിച്ചിടുക"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ഇതർനെറ്റ്"</string> <string name="status_bar_alarm" msgid="87160847643623352">"അലാറം"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"തയ്യാർ"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"പേയ്മെന്റ് സജ്ജീകരിക്കുക"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ഉപയോഗിക്കാൻ അൺലോക്ക് ചെയ്യുക"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"നിങ്ങളുടെ കാർഡുകൾ ലഭ്യമാക്കുന്നതിൽ ഒരു പ്രശ്നമുണ്ടായി, പിന്നീട് വീണ്ടും ശ്രമിക്കുക"</string> <string name="status_bar_work" msgid="5238641949837091056">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"ഫ്ലൈറ്റ് മോഡ്"</string> <string name="add_tile" msgid="6239678623873086686">"ടൈൽ ചേർക്കുക"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>നില:</b> നിശബ്ദമാക്കി തരം താഴ്ത്തി"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>നില:</b> ഉയർന്ന റാങ്കിംഗ് നൽകി"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>നില:</b> താഴ്ന്ന റാങ്കിംഗ് നൽകി"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"മുൻഗണനാ മോഡ് ഓണാണെങ്കിൽ പോലും എപ്പോഴും അറിയിപ്പുകളുടെ മുകളിൽ കാണിക്കും"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ക്രമീകരണം"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"മുൻഗണനാ സംഭാഷണങ്ങൾ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> സംഭാഷണ സവിശേഷതകളെ പിന്തുണയ്ക്കുന്നില്ല"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ഈ അറിയിപ്പുകൾ പരിഷ്ക്കരിക്കാനാവില്ല."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"അറിയിപ്പുകളുടെ ഈ ഗ്രൂപ്പ് ഇവിടെ കോണ്ഫിഗര് ചെയ്യാൻ കഴിയില്ല"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"സിസ്റ്റം നാവിഗേഷൻ അപ്ഡേറ്റ് ചെയ്യാൻ ക്രമീകരണത്തിലേക്ക് പോവുക"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"സ്റ്റാൻഡ്ബൈ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"സംഭാഷണം മുൻഗണനയുള്ളതായി സജ്ജീകരിച്ചു"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"മുൻഗണനാ സംഭാഷണങ്ങൾ"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ഈ സംഭാഷണങ്ങൾ ലിസ്റ്റിന്റെ മുകളിൽ കാണിക്കും, മുൻഗണനാ മോഡ് ഓണാണെങ്കിൽ, എപ്പോഴും നിങ്ങളിലേക്ക് എത്താൻ അവയ്ക്ക് കഴിയും"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"പ്രൊഫെെൽ ചിത്രങ്ങൾ ലോക്ക് സ്ക്രീനിൽ കാണിക്കും"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"ഹോം സ്ക്രീനിലെ ബബിളുകളിൽ ഈ സംഭാഷണങ്ങൾ നിങ്ങൾക്ക് എളുപ്പത്തിൽ കണ്ടെത്താനാകും"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\'ശല്യപ്പെടുത്തരുത്\' തടസ്സപ്പെടുത്തുക"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"മനസ്സിലായി"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ക്രമീകരണം"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"മാറുക"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ഉപയോഗസഹായി വിരൽചലനത്തെ മാറ്റി പകരം ഉപയോഗസഹായി ബട്ടൺ വന്നു\n\n"<annotation id="link">"ക്രമീകരണം കാണുക"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"തൽക്കാലം മറയ്ക്കുന്നതിന് ബട്ടൺ അരുകിലേക്ക് നീക്കുക"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"മുകളിൽ ഇടതുഭാഗത്തേക്ക് നീക്കുക"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"മുകളിൽ വലതുഭാഗത്തേക്ക് നീക്കുക"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"ചുവടെ ഇടതുഭാഗത്തേക്ക് നീക്കുക"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"ചുവടെ വലതുഭാഗത്തേക്ക് നീക്കുക"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"എഡ്ജിലേക്ക് നീക്കി മറയ്ക്കുക"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"എഡ്ജിൽ നിന്ന് നീക്കി കാണിക്കൂ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ഉപകരണ നിയന്ത്രണങ്ങൾ"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"കണക്റ്റ് ചെയ്ത ഉപകരണങ്ങൾക്ക് നിയന്ത്രണങ്ങൾ ചേർക്കുക"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ഉപകരണ നിയന്ത്രണങ്ങൾ സജ്ജീകരിക്കുക"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> എന്നതിൽ കുറവ്"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> മുമ്പ്"</string> <string name="birthday_status" msgid="2596961629465396761">"ജന്മദിനം"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> എന്ന വ്യക്തിയുടെ ജന്മദിനമാണിന്ന്"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"ഉടൻ വരുന്ന ജന്മദിനം"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> എന്ന വ്യക്തിയുടെ ജന്മദിനം ഉടൻ വരുന്നുണ്ട്"</string> <string name="anniversary_status" msgid="1790034157507590838">"വാര്ഷികം"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> എന്ന വ്യക്തിയുടെ വാർഷികമാണിന്ന്"</string> <string name="location_status" msgid="1294990572202541812">"ലൊക്കേഷൻ പങ്കിടുന്നു"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g>, ലൊക്കേഷൻ പങ്കിടുന്നു"</string> <string name="new_story_status" msgid="9012195158584846525">"പുതിയ വാർത്ത"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g>, പുതിയൊരു സ്റ്റോറി പങ്കിട്ടു"</string> <string name="video_status" msgid="4548544654316843225">"കാണുന്നു"</string> <string name="audio_status" msgid="4237055636967709208">"കേൾക്കുന്നു"</string> <string name="game_status" msgid="1340694320630973259">"കളിക്കുന്നു"</string> <string name="empty_user_name" msgid="3389155775773578300">"സുഹൃത്തുക്കൾ"</string> <string name="empty_status" msgid="5938893404951307749">"ഇന്നുരാത്രി ചാറ്റുചെയ്യാം!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"ഉള്ളടക്കം ഉടൻ ദൃശ്യമാകും"</string> <string name="missed_call" msgid="4228016077700161689">"മിസ്ഡ് കോൾ"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"അടുത്തിടെയുള്ള സന്ദേശങ്ങൾ, മിസ്ഡ് കോളുകൾ, സ്റ്റാറ്റസ് അപ്ഡേറ്റുകൾ എന്നിവ കാണുക"</string> <string name="people_tile_title" msgid="6589377493334871272">"സംഭാഷണം"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>, ഒരു സന്ദേശം അയച്ചു"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>, ഒരു ചിത്രം അയച്ചു"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"നിങ്ങളുടെ ബാറ്ററി മീറ്റർ വായിക്കുന്നതിൽ പ്രശ്നമുണ്ട്"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"കൂടുതൽ വിവരങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"അലാറം സജ്ജീകരിച്ചിട്ടില്ല"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 8cdd8d4d86aa..9043a7f45585 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Ихийг багтаасан зураг авах"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Дэлгэцийн агшныг хаах"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Дэлгэцийн агшныг урьдчилан үзэх"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Дээд талын хязгаар"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Доод талын хязгаар"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Дэлгэцийн үйлдэл бичигч"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Дэлгэц бичлэг боловсруулж байна"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Дэлгэц бичих горимын үргэлжилж буй мэдэгдэл"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Оруулах арга"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Байршил"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Байршил идэвхгүй"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Камерыг блоклох"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Микрофоны дууг хаах"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Камерын хандалт"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Микрофоны хандалт"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Боломжтой"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Блоклосон"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Медиа төхөөрөмж"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Зөвхөн яаралтай дуудлага"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Дэлгэцийн бичлэг хийх"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Эхлүүлэх"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Зогсоох"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Үргэлжлүүлэхийн тулд <b><xliff:g id="APP">%s</xliff:g></b> таны төхөөрөмжийн микрофонд хандах шаардлагатай."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Үргэлжлүүлэхийн тулд <b><xliff:g id="APP">%s</xliff:g></b> таны төхөөрөмжийн камерт хандах шаардлагатай."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Төхөөрөмжийн микрофоныг блокоос гаргах уу?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Төхөөрөмжийн камерыг блокоос гаргах уу?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Төхөөрөмжийн камер болон микрофоныг блокоос гаргах уу?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Энэ нь таны микрофоныг ашиглах зөвшөөрөлтэй бүх апп болон үйлчилгээний хандалтыг блокоос гаргана."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Энэ нь таны камерыг ашиглах зөвшөөрөлтэй бүх апп болон үйлчилгээний хандалтыг блокоос гаргана."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Энэ нь таны камер эсвэл микрофоныг ашиглах зөвшөөрөлтэй бүх апп болон үйлчилгээний хандалтыг блокоос гаргана."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Төхөөрөмж"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Апп сэлгэхийн тулд дээш шударна уу"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Аппуудыг хурдан сэлгэхийн тулд баруун тийш чирнэ үү"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Этернет"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Сэрүүлэг"</string> <string name="wallet_title" msgid="5369767670735827105">"Түрийвч"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Бэлэн"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Төлбөр тохируулах"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ашиглахын тулд түгжээг тайлах"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Таны картыг авахад асуудал гарлаа. Дараа дахин оролдоно уу"</string> <string name="status_bar_work" msgid="5238641949837091056">"Ажлын профайл"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Нислэгийн горим"</string> <string name="add_tile" msgid="6239678623873086686">"Вебсайтын цонх нэмэх"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Төлөв:</b> Чимээгүй болгож зэрэглэлийг нь бууруулсан"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Төлөв:</b> Дээгүүр зэрэглэл хийсэн"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Төлөв:</b> Доогуур зэрэглэл хийсэн"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Чухал горим асаалттай байсан ч таны мэдэгдлийн дээр үргэлж харуулдаг"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Тохиргоо"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Чухал харилцан яриа"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> нь харилцан ярианы онцлогуудыг дэмждэггүй"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Эдгээр мэдэгдлийг өөрчлөх боломжгүй."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Энэ бүлэг мэдэгдлийг энд тохируулах боломжгүй байна"</string> @@ -839,7 +845,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Хөгжим"</string> <string name="keyboard_shortcut_group_applications_youtube" msgid="5078136084632450333">"YouTube"</string> - <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Хуанли"</string> + <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календарь"</string> <string name="tuner_full_zen_title" msgid="5120366354224404511">"Түвшний хяналттай харуулах"</string> <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Бүү саад бол"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Дууны түвшний товчлуурын товчлол"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Системийн навигацыг шинэчлэхийн тулд Тохиргоо руу очно уу"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Зогсолтын горим"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Харилцан яриаг чухал гэж тохируулсан"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Чухал харилцан яриа"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Эдгээр харилцан яриаг Чухал горим асаалттай үед таны жагсаалтын дээр харуулах бөгөөд танд үргэлж харуулах боломжтой"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Профайл зургийг түгжигдсэн дэлгэц дээр харуулдаг"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Та бөмбөлгүүд дэх эдгээр харилцан яриаг Үндсэн нүүрээсээ хялбархан олох боломжтой"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Бүү саад бол онцлогийг үл хэрэгсэн тасалдуулна"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ойлголоо"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Тохиргоо"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Сэлгэх"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Хандалтын товчлуурыг хандалтын зангаагаар сольсон\n\n"<annotation id="link">"Тохиргоо харах"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Үүнийг түр нуухын тулд товчлуурыг зах руу зөөнө үү"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Зүүн дээш зөөх"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Баруун дээш зөөх"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Зүүн доош зөөх"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Баруун доош зөөх"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Ирмэг рүү зөөж, нуух"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Ирмэгээс гаргаж, харуулах"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Төхөөрөмжийн хяналт"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Холбогдсон төхөөрөмжүүд дээрээ хяналт нэмэх"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Төхөөрөмжийн хяналтыг тохируулах"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>-с бага хугацааны өмнө"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g>-с дээш хугацааны өмнө"</string> <string name="birthday_status" msgid="2596961629465396761">"Төрсөн өдөр"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Өнөөдөр <xliff:g id="NAME">%1$s</xliff:g>-н төрсөн өдөр болж байна"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Удахгүй болох төрсөн өдөр"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Удахгүй <xliff:g id="NAME">%1$s</xliff:g>-н төрсөн өдөр болно"</string> <string name="anniversary_status" msgid="1790034157507590838">"Тэмдэглэлт ой"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Өнөөдөр <xliff:g id="NAME">%1$s</xliff:g>-н ой тохиож байна"</string> <string name="location_status" msgid="1294990572202541812">"Байршил хуваалцаж байна"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> байршил хуваалцаж байна"</string> <string name="new_story_status" msgid="9012195158584846525">"Шинэ стори"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> шинэ стори хуваалцсан"</string> <string name="video_status" msgid="4548544654316843225">"Үзэж байна"</string> <string name="audio_status" msgid="4237055636967709208">"Сонсож байна"</string> <string name="game_status" msgid="1340694320630973259">"Тоглож байна"</string> <string name="empty_user_name" msgid="3389155775773578300">"Найзууд"</string> <string name="empty_status" msgid="5938893404951307749">"Өнөө орой чаталъя!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Контент удахгүй харагдана"</string> <string name="missed_call" msgid="4228016077700161689">"Аваагүй дуудлага"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Саяхны мессеж, аваагүй дуудлага болон төлөвийн шинэчлэлтийг харах"</string> <string name="people_tile_title" msgid="6589377493334871272">"Харилцан яриа"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> мессеж илгээсэн"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> зураг илгээсэн"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Таны батарей хэмжигчийг уншихад асуудал гарлаа"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Нэмэлт мэдээлэл авахын тулд товшино уу"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Сэрүүлэг тавиагүй"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 77e269423b3c..4a1e331fcf34 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"आणखी गोष्टी कॅप्चर करा"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"स्क्रीनशॉट डिसमिस करा"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"स्क्रीनशॉटचे पूर्वावलोकन"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"सर्वात वरची सीमा"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"तळाची सीमा"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"स्क्रीन रेकॉर्डर"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"स्क्रीन रेकॉर्डिंग प्रोसेस सुरू"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"स्क्रीन रेकॉर्ड सत्रासाठी सुरू असलेली सूचना"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"इनपुट पद्धत"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"स्थान"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"स्थान बंद"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"कॅमेरा ब्लॉक करा"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"मायक्रोफोन म्यूट करा"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"मीडिया डिव्हाइस"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"फक्त आणीबाणीचे कॉल"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"स्क्रीन रेकॉर्ड"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"सुरू"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"थांबा"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"पुढे सुरू ठेवण्यासाठी, <b><xliff:g id="APP">%s</xliff:g></b> ला तुमच्या डिव्हाइसचा मायक्रोफोन अॅक्सेस करण्याची आवश्यकता आहे."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"पुढे सुरू ठेवण्यासाठी, <b><xliff:g id="APP">%s</xliff:g></b> ला तुमच्या डिव्हाइसचा कॅमेरा अॅक्सेस करण्याची आवश्यकता आहे."</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"डिव्हाइस"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"अॅप्स स्विच करण्यासाठी वर स्वाइप करा"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"अॅप्स वर झटपट स्विच करण्यासाठी उजवीकडे ड्रॅग करा"</string> @@ -497,7 +519,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"कामगिरी आणि पार्श्वभूमीवरील डेटा कमी करते"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"बॅटरी सेव्हर बंद करा"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"तुमच्या स्क्रीनवर दृश्यमान असलेल्या किंवा रेकॉर्ड किंवा कास्ट करताना तुमच्या डिव्हाइसमधून प्ले केलेल्या सर्व माहितीचा अॅक्सेस <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ला असेल. यामध्ये पासवर्ड, पेमेंट तपशील, फोटो, मेसेज आणि तुम्ही प्ले केलेला ऑडिओ यासारख्या माहितीचा समावेश असतो."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"हे कार्य पुरवठा करणाऱ्या सेवेस तुमच्या स्क्रीनवर दृश्यमान असलेल्या किंवा रेकॉर्ड किंवा कास्ट करताना तुमच्या डिव्हाइसमधून प्ले केलेल्या सर्व माहितीचा अॅक्सेस असेल. यामध्ये पासवर्ड, पेमेंट तपशील, फोटो, मेसेज आणि तुम्ही प्ले केलेला ऑडिओ यासारख्या माहितीचा समावेश असतो."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"हे कार्य पुरवणाऱ्या सेवेस तुमच्या स्क्रीनवर दृश्यमान असलेल्या किंवा रेकॉर्ड किंवा कास्ट करताना तुमच्या डिव्हाइसमधून प्ले केलेल्या सर्व माहितीचा अॅक्सेस असेल. यामध्ये पासवर्ड, पेमेंट तपशील, फोटो, मेसेज आणि तुम्ही प्ले केलेला ऑडिओ यासारख्या माहितीचा समावेश असतो."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"रेकॉर्ड करणे किंवा कास्ट करणे सुरू करायचे का ?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ने रेकॉर्ड करणे किंवा कास्ट करणे सुरू करायचे का?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"पुन्हा दर्शवू नका"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"इथरनेट"</string> <string name="status_bar_alarm" msgid="87160847643623352">"अलार्म"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"तयार आहे"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"पेमेंट सेट करा"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"वापरण्यासाठी अनलॉक करा"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"तुमची कार्ड मिळवताना समस्या आली, कृपया नंतर पुन्हा प्रयत्न करा"</string> <string name="status_bar_work" msgid="5238641949837091056">"कार्य प्रोफाईल"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"विमान मोड"</string> <string name="add_tile" msgid="6239678623873086686">"टाइल जोडा"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>स्थिती</b> ला सायलंट म्हणून डीमोट केले गेले"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>स्थिती</b> ला थोडे जास्त म्हणून रँक केले गेले"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>स्थिती</b> ला थोडी कमी म्हणून रँक केले गेले"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"प्राधान्य मोड सुरू असतानादेखील, नेहमी तुमच्या सूचनांच्या वरती दाखवले जाते"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"सेटिंग्ज"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"प्राधान्य दिलेली संभाषणे"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> हे संभाषण वैशिष्ट्यांना सपोर्ट करत नाही"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"या सूचनांमध्ये सुधारणा केली जाऊ शकत नाही."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"या सूचनांचा संच येथे कॉंफिगर केला जाऊ शकत नाही"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"सिस्टम नेव्हिगेशन अपडेट करण्यासाठी सेटिंग्जवर जा"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्टँडबाय"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"संभाषणाला प्राधान्य म्हणून सेट केले आहे"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"प्राधान्य दिलेली संभाषणे"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ही संभाषणे तुमच्या सूचीच्या सर्वात वरती दाखवली जातात आणि प्राधान्य मोड सुरू असताना तुम्हाला नेहमी कळू शकते"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"प्रोफाइल फोटो लॉक स्क्रीनवर दाखवले जातात"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"तुम्हाला तुमच्या होम स्क्रीन वरील बबलमध्ये ही संभाषणे सहज आढळतील"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"व्यत्यय आणू नका मध्ये अडथळा आणतील"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"समजले"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"सेटिंग्ज"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"स्विच करा"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"अॅक्सेसिबिलिटी जेश्चर हे आता अॅक्सेसिबिलिटी बटण आहे \n\n"<annotation id="link">"सेटिंग्ज पाहा"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"बटण तात्पुरते लपवण्यासाठी ते कोपर्यामध्ये हलवा"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"वर डावीकडे हलवा"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"वर उजवीकडे हलवा"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"तळाशी डावीकडे हलवा"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"तळाशी उजवीकडे हलवा"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"एजवर हलवा आणि लपवा"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"एजवर हलवा आणि दाखवा"</string> <string name="quick_controls_title" msgid="6839108006171302273">"डिव्हाइस नियंत्रणे"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"तुमच्या कनेक्ट केलेल्या डिव्हाइससाठी नियंत्रणे जोडा"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"डिव्हाइस नियंत्रणे सेट करा"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> पेक्षा कमी"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> पेक्षा आधी"</string> <string name="birthday_status" msgid="2596961629465396761">"वाढदिवस"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"आज <xliff:g id="NAME">%1$s</xliff:g> यांचा वाढदिवस आहे"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"वाढदिवस लवकरच आहे"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> यांचा वाढदिवस लवकरच येत आहे"</string> <string name="anniversary_status" msgid="1790034157507590838">"वर्धापन दिन"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"आज <xliff:g id="NAME">%1$s</xliff:g> यांची अॅनिव्हर्सरी आहे"</string> <string name="location_status" msgid="1294990572202541812">"स्थान शेअर करत आहे"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> स्थान शेअर करत आहे"</string> <string name="new_story_status" msgid="9012195158584846525">"नवीन स्टोरी"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> यांनी नवीन स्टोरी शेअर केली"</string> <string name="video_status" msgid="4548544654316843225">"पाहत आहे"</string> <string name="audio_status" msgid="4237055636967709208">"ऐकत आहे"</string> <string name="game_status" msgid="1340694320630973259">"प्ले करत आहे"</string> <string name="empty_user_name" msgid="3389155775773578300">"मित्रमैत्रिणी"</string> <string name="empty_status" msgid="5938893404951307749">"चला, आज रात्री चॅट करूया!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"आशय लवकरच दाखवला जाईल"</string> <string name="missed_call" msgid="4228016077700161689">"मिस्ड कॉल"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"अलीकडील मेसेज, मिस्ड कॉल आणि स्टेटस अपडेट पाहा"</string> <string name="people_tile_title" msgid="6589377493334871272">"संभाषण"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> यांनी मेसेज पाठवला"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> यांनी इमेज पाठवली"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"तुमचे बॅटरी मीटर वाचताना समस्या आली"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"अधिक माहितीसाठी टॅप करा"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"अलार्म सेट केला नाही"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 6e902342659f..1b61ce9b2241 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Tangkap lebih banyak"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ketepikan tangkapan skrin"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pratonton tangkapan skrin"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Sempadan atas"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Sempadan bawah"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Perakam Skrin"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Memproses rakaman skrin"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Pemberitahuan breterusan untuk sesi rakaman skrin"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Kaedah Input"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokasi"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Lokasi Dimatikan"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Sekat Kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Redamkan Mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Akses kamera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Akses mikrofon"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Tersedia"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Disekat"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Peranti media"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Panggilan Kecemasan Sahaja"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Rakam Skrin"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Mula"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Berhenti"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Untuk meneruskan proses, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses kepada mikrofon peranti anda."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Untuk meneruskan proses, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses kepada kamera peranti anda."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Nyahsekat mikrofon peranti?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Nyahsekat kamera peranti?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Nyahsekat kamera dan mikrofon peranti?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan mikrofon anda."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan kamera anda."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan kamera atau mikrofon anda."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Peranti"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Leret ke atas untuk menukar apl"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Seret ke kanan untuk beralih apl dengan pantas"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Penggera"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Tunjukkan semua"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Buka kunci untuk membayar"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Sedia"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Sediakan pembayaran"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Buka kunci untuk menggunakan"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 091a38401479..e5282b9010ee 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -45,7 +45,7 @@ <string name="status_bar_settings_notifications" msgid="5285316949980621438">"အကြောင်းကြားချက်များ"</string> <string name="bluetooth_tethered" msgid="4171071193052799041">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="2972273031043777851">"ထည့်သွင်းနည်းများ သတ်မှတ်ခြင်း"</string> - <string name="status_bar_use_physical_keyboard" msgid="4849251850931213371">"ခလုတ်ပါဝင်သော ကီးဘုတ်"</string> + <string name="status_bar_use_physical_keyboard" msgid="4849251850931213371">"စက်၏ ကီးဘုတ်"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> အား ဝင်သုံးရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ခွင့်ပြုပါသလား။"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> အား <xliff:g id="USB_DEVICE">%2$s</xliff:g> ကို သုံးခွင့်ပြုမလား။\nဤအက်ပ်ကို အသံဖမ်းခွင့် ပေးမထားသော်လည်း ၎င်းသည် ဤ USB စက်ပစ္စည်းမှတစ်ဆင့် အသံများကို ဖမ်းယူနိုင်ပါသည်။"</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> အား ဝင်သုံးရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ခွင့်ပြုပါသလား။"</string> @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"နောက်ထပ် ရိုက်ကူးရန်"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ဖန်သားပြင်ဓာတ်ပုံကို ပယ်သည်"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ဖန်သားပြင်ဓာတ်ပုံ အစမ်းကြည့်ရှုခြင်း"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ထိပ်ပိုင်းအနားသတ်"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"အောက်ခြေအနားသတ်"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ဖန်သားပြင် ရိုက်ကူးမှု"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ဖန်သားပြင်ရိုက်ကူးနေသည်"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ဖန်သားပြင် ရိုက်ကူးသည့် စက်ရှင်အတွက် ဆက်တိုက်လာနေသော အကြောင်းကြားချက်"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ထည့်သွင်းရန်နည်းလမ်း"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"တည်နေရာ"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"တည်နေရာပြမှု မရှိ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ကင်မရာကို ပိတ်ထားရန်"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"မိုက်ခရိုဖုန်းကို အသံတိတ်ရန်"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"ကင်မရာသုံးခွင့်"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"မိုက်သုံးခွင့်"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"ရနိုင်သည်"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ပိတ်ထားသည်"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"မီဒီယာ စက်ပစ္စည်း"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"အရေးပေါ်ခေါ်ဆိုမှုများသာ"</string> @@ -386,7 +394,7 @@ <string name="quick_settings_connected" msgid="3873605509184830379">"ချိတ်ဆက်ထား"</string> <string name="quick_settings_connected_battery_level" msgid="1322075669498906959">"ချိတ်ဆက်ပြီးပါပြီ၊ ဘက်ထရီ <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> <string name="quick_settings_connecting" msgid="2381969772953268809">"ဆက်သွယ်နေ..."</string> - <string name="quick_settings_tethering_label" msgid="5257299852322475780">"တွဲချီပေးခြင်း"</string> + <string name="quick_settings_tethering_label" msgid="5257299852322475780">"မိုဘိုင်းသုံးတွဲချိတ်ခြင်း"</string> <string name="quick_settings_hotspot_label" msgid="1199196300038363424">"ဟော့စပေါ့"</string> <string name="quick_settings_hotspot_secondary_label_transient" msgid="7585604088079160564">"ဖွင့်နေသည်…"</string> <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="1280433136266439372">"\'ဒေတာချွေတာမှု\' ဖွင့်ထားသည်"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ဖန်သားပြင် မှတ်တမ်းတင်ရန်"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"စတင်ရန်"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ရပ်ရန်"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ဆက်လက်လုပ်ဆောင်ရန် <b><xliff:g id="APP">%s</xliff:g></b> က သင့်စက်၏ မိုက်ခရိုဖုန်းကို အသုံးပြုခွင့်ရရန် လိုအပ်သည်။"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ဆက်လက်လုပ်ဆောင်ရန် <b><xliff:g id="APP">%s</xliff:g></b> က သင့်စက်၏ ကင်မရာကို အသုံးပြုခွင့်ရရန် လိုအပ်သည်။"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"စက်၏မိုက်ခရိုဖုန်းကို ပြန်ဖွင့်မလား။"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"စက်၏ကင်မရာကို ပြန်ဖွင့်မလား။"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"စက်၏ကင်မရာနှင့် မိုက်ခရိုဖုန်းကို ပြန်ဖွင့်မလား။"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"၎င်းက သင့်မိုက်ခရိုဖုန်းသုံးရန် ခွင့်ပြုထားသော အက်ပ်နှင့် ဝန်ဆောင်မှုအားလုံးအတွက် သုံးခွင့်ကို ပြန်ဖွင့်ပေးသည်။"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"၎င်းက သင့်ကင်မရာသုံးရန် ခွင့်ပြုထားသော အက်ပ်နှင့် ဝန်ဆောင်မှုအားလုံးအတွက် သုံးခွင့်ကို ပြန်ဖွင့်ပေးသည်။"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"၎င်းက သင့်ကင်မရာ (သို့) မိုက်ခရိုဖုန်းသုံးရန် ခွင့်ပြုထားသော အက်ပ်နှင့် ဝန်ဆောင်မှုအားလုံးအတွက် သုံးခွင့်ကို ပြန်ဖွင့်ပေးသည်။"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"စက်"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"အက်ပ်များကို ဖွင့်ရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"အက်ပ်များကို ပြောင်းရန် ညာဘက်သို့ ဖိဆွဲပါ"</string> @@ -497,7 +509,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"လုပ်ကိုင်မှုကို လျှော့ချလျက် နောက်ခံ ဒေတာကို ကန့်သတ်သည်"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"ဘက်ထရီ အားထိန်းကို ပိတ်ရန်"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> သည် အသံဖမ်းနေစဉ် (သို့) ကာစ်လုပ်နေစဉ် သင့်ဖန်သားပြင်တွင် မြင်ရသော (သို့) သင့်စက်တွင် ဖွင့်ထားသော အချက်အလက်မှန်သမျှကို သုံးနိုင်နိုင်ပါမည်။ ၎င်းတွင် စကားဝှက်များ၊ ငွေပေးချေမှုအသေးစိတ်များ၊ ဓာတ်ပုံများ၊ မက်ဆေ့ဂျ်များနှင့် သင်ဖွင့်သည့်အသံကဲ့သို့သော အချက်အလက်များ ပါဝင်သည်။"</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"ဤလုပ်ရပ်အတွက် ဝန်ဆောင်မှုသည် အသံဖမ်းနေစဉ် (သို့) ကာစ်လုပ်နေစဉ် သင့်ဖန်သားပြင်တွင် မြင်ရသော (သို့) သင့်စက်တွင် ဖွင့်ထားသော အချက်အလက်မှန်သမျှကို သုံးနိုင်ပြီး သင့်စက်မှ ဖွင့်နိုင်ပါမည်။ ၎င်းတွင် စကားဝှက်များ၊ ငွေပေးချေမှုအသေးစိတ်များ၊ ဓာတ်ပုံများ၊ မက်ဆေ့ဂျ်များနှင့် သင်ဖွင့်သည့်အသံကဲ့သို့သော အချက်အလက်များ ပါဝင်သည်။"</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"ဤဝန်ဆောင်မှုသည် အသံဖမ်းနေစဉ် (သို့) ကာစ်လုပ်နေစဉ်အတွင်း သင့်ဖန်သားပြင်တွင် မြင်ရသော (သို့) သင့်စက်တွင် ဖွင့်ထားသော အချက်အလက်အားလုံးကို ကြည့်နိုင်ပါမည်။ ၎င်းတွင် စကားဝှက်များ၊ ငွေပေးချေမှုအသေးစိတ်များ၊ ဓာတ်ပုံများ၊ မက်ဆေ့ဂျ်များနှင့် သင်ဖွင့်သည့်အသံကဲ့သို့သော အချက်အလက်များ ပါဝင်သည်။"</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ဖမ်းယူခြင်း သို့မဟုတ် ကာစ်လုပ်ခြင်း စတင်မလား။"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> နှင့် ဖမ်းယူခြင်း သို့မဟုတ် ကာစ်လုပ်ခြင်း စတင်မလား။"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"နောက်ထပ် မပြပါနှင့်"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"အီသာနက်"</string> <string name="status_bar_alarm" msgid="87160847643623352">"နှိုးစက်"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"အဆင်သင့်"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ငွေပေးချေမှု သတ်မှတ်ရန်"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"သုံးရန် လော့ခ်ဖွင့်ပါ"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"သင်၏ကတ်များ ရယူရာတွင် ပြဿနာရှိနေသည်၊ နောက်မှ ထပ်စမ်းကြည့်ပါ"</string> <string name="status_bar_work" msgid="5238641949837091056">"အလုပ် ပရိုဖိုင်"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"လေယာဉ်ပျံမုဒ်"</string> <string name="add_tile" msgid="6239678623873086686">"လေးထောင့်ကွက် ထည့်ရန်"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>အခြေအနေ-</b> အသံတိတ်ခြင်းသို့ ပြန်ချိန်ညှိထားသည်"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>အခြေအနေ-</b> အဆင့်တိုးထားသည်"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>အခြေအနေ-</b> အဆင့်လျှော့ထားသည်"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"‘ဦးစားပေးမုဒ်’ ကို ဖွင့်ထားသည့်အခါတွင်ပင် သင့်အကြောင်းကြားချက်များ၏ ထိပ်ဆုံးတွင် အမြဲပြသည်"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ဆက်တင်များ"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"ဦးစားပေး စကားဝိုင်းများ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စကားဝိုင်းဝန်ဆောင်မှုများကို မပံ့ပိုးပါ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ဤအကြောင်းကြားချက်များကို ပြုပြင်၍ မရပါ။"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ဤအကြောင်းကြားချက်အုပ်စုကို ဤနေရာတွင် စီစဉ်သတ်မှတ်၍ မရပါ"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"စနစ်လမ်းညွှန်ခြင်း အပ်ဒိတ်လုပ်ရန် \'ဆက်တင်များ\' သို့သွားပါ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"အသင့်အနေအထား"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"စကားဝိုင်းကို ဦးစားပေးအဖြစ် သတ်မှတ်ထားသည်"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"ဦးစားပေး စကားဝိုင်းများ"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ဤစကားဝိုင်းများကို သင့်စာရင်း၏ထိပ်ဆုံးတွင် ပြပေးပြီး ‘ဦးစားပေးမုဒ်’ ကို ဖွင့်ထားသောအခါ သင့်ထံသို့ အမြဲရောက်ရှိနိုင်သည်"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"ပရိုဖိုင်ပုံများကို လော့ခ်ချထားချိန် ဖန်သားပြင်တွင် ပြပေးသည်"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"ဤစကားဝိုင်းများကို သင့်ပင်မစာမျက်နှာရှိ ပူဖောင်းကွက်များတွင် အလွယ်တကူ ရှာနိုင်ပါသည်"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\'မနှောင့်ယှက်ရ\' ကို ကြားဖြတ်ခြင်း"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ok"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ဆက်တင်များ"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ခလုတ်"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"အများသုံးစွဲနိုင်မှုခလုတ်က အများသုံးစွဲနိုင်မှုလက်ဟန်ကို အစားထိုးသည်\n\n"<annotation id="link">"ဆက်တင်များကို ကြည့်ပါ"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ခလုတ်ကို ယာယီဝှက်ရန် အစွန်းသို့ရွှေ့ပါ"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"ဘယ်ဘက်ထိပ်သို့ ရွှေ့ရန်"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"ညာဘက်ထိပ်သို့ ရွှေ့ရန်"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"ဘယ်ဘက်အောက်ခြေသို့ ရွှေ့ရန်"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"ညာဘက်အောက်ခြေသို့ ရွှေ့ရန်"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"အစွန်းသို့ရွှေ့ပြီး ဝှက်ရန်"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"အစွန်းမှရွှေ့ပြီး ပြရန်"</string> <string name="quick_controls_title" msgid="6839108006171302273">"စက်ထိန်းစနစ်"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"ချိတ်ဆက်စက်များအတွက် ထိန်းချုပ်မှုများထည့်ပါ"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"စက်ထိန်းစနစ် ထည့်သွင်းခြင်း"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"ပြီးခဲ့သော <xliff:g id="DURATION">%1$s</xliff:g> မပြည့်ခင်"</string> <string name="over_timestamp" msgid="4765793502859358634">"ပြီးခဲ့သော <xliff:g id="DURATION">%1$s</xliff:g> ကျော်"</string> <string name="birthday_status" msgid="2596961629465396761">"မွေးနေ့"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> ၏ မွေးနေ့ ဖြစ်ပါသည်"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"မကြာမီလာမည့် မွေးနေ့"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"မကြာမီ <xliff:g id="NAME">%1$s</xliff:g> ၏ မွေးနေ့ ရောက်တော့မည်"</string> <string name="anniversary_status" msgid="1790034157507590838">"နှစ်ပတ်လည်"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> ၏ နှစ်ပတ်လည်နေ့ ဖြစ်ပါသည်"</string> <string name="location_status" msgid="1294990572202541812">"တည်နေရာမျှဝေခြင်း"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> က တည်နေရာကို မျှဝေနေသည်"</string> <string name="new_story_status" msgid="9012195158584846525">"ဝဘ်ပို့စ်အသစ်"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> က ဝဘ်ပို့စ် မျှဝေလိုက်သည်"</string> <string name="video_status" msgid="4548544654316843225">"ကြည့်ရှုနေသည်"</string> <string name="audio_status" msgid="4237055636967709208">"နားထောင်နေသည်"</string> <string name="game_status" msgid="1340694320630973259">"ကစားနေသည်"</string> <string name="empty_user_name" msgid="3389155775773578300">"မိတ်ဆွေများ"</string> <string name="empty_status" msgid="5938893404951307749">"ယနေ့ညချတ်လုပ်ကြစို့။"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"အကြောင်းအရာ မကြာမီ ပေါ်လာပါမည်"</string> <string name="missed_call" msgid="4228016077700161689">"လွတ်သွားသောခေါ်ဆိုမှု"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"မကြာသေးမီက မက်ဆေ့ဂျ်၊ လွတ်သွားသောခေါ်ဆိုမှုနှင့် အခြေအနေအပ်ဒိတ်များကို ကြည့်နိုင်သည်"</string> <string name="people_tile_title" msgid="6589377493334871272">"စကားဝိုင်း"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> က မက်ဆေ့ဂျ်ပို့လိုက်သည်"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> က ပုံပို့လိုက်သည်"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"သင်၏ ဘက်ထရီမီတာကို ဖတ်ရာတွင် ပြဿနာရှိနေသည်"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"နောက်ထပ်အချက်အလက်များအတွက် တို့ပါ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"နှိုးစက်ပေးမထားပါ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index a2e6c48e4639..4afdbd6a8668 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Utvidet skjermdump"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Avvis skjermdumpen"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Forhåndsvisning av skjermdump"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Øvre grense"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Nedre grense"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Skjermopptaker"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Behandler skjermopptaket"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Vedvarende varsel for et skjermopptak"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Inndatametode"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Sted"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Posisjon av"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokkér Kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Slå av mikrofonen"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kameratilgang"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofontilgang"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Tilgjengelig"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokkert"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medieenhet"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Bare nødanrop"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Skjermopptak"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stopp"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"For å fortsette må <b><xliff:g id="APP">%s</xliff:g></b> ha tilgang til enhetsmikrofonen."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"For å fortsette må <b><xliff:g id="APP">%s</xliff:g></b> ha tilgang til enhetskameraet."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vil du oppheve blokkeringen av enhetsmikrofonen?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vil du oppheve blokkeringen av enhetskameraet?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vil du oppheve blokkeringen av enhetskameraet og -mikrofonen?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Dette opphever blokkeringen av tilgang for alle apper og tjenester som har tillatelse til å bruke mikrofonen."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Dette opphever blokkeringen av tilgang for alle apper og tjenester som har tillatelse til å bruke kameraet."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Dette opphever blokkeringen av tilgang for alle apper og tjenester som har tillatelse til å bruke kameraet eller mikrofonen."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Enhet"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Sveip opp for å bytte apper"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Dra til høyre for å bytte apper raskt"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Klar"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Konfigurer betaling"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lås opp for å bruke"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Det oppsto et problem med henting av kortene. Prøv igjen senere"</string> <string name="status_bar_work" msgid="5238641949837091056">"Work-profil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Flymodus"</string> <string name="add_tile" msgid="6239678623873086686">"Legg til felt"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Nedgradert til lydløst"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Rangert høyere"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Rangert lavere"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Vises alltid øverst i varslene – selv når prioritetsmodus er på"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Innstillinger"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioriterte samtaler"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> støtter ikke samtalefunksjoner"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Disse varslene kan ikke endres."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Denne varselgruppen kan ikke konfigureres her"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gå til Innstillinger for å oppdatere systemnavigeringen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Ventemodus"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtalen er prioritert"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioriterte samtaler"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Disse samtalene vises øverst i listen og kan alltid nå deg når prioritetsmodus er på"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilbilder vises på låseskjermen"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Det er lett å finne disse samtalene i bobler på startskjermen"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Overstyr «Ikke forstyrr»"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Greit"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Innstillinger"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Bytt"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Tilgjengelighet-knappen har erstattet tilgjengelighetsbevegelsen\n\n"<annotation id="link">"Se innstillingene"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Flytt knappen til kanten for å skjule den midlertidig"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Flytt til øverst til venstre"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Flytt til øverst til høyre"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Flytt til nederst til venstre"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Flytt til nederst til høyre"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Flytt til kanten og skjul"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Flytt ut kanten og vis"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Enhetsstyring"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Legg til kontroller for de tilkoblede enhetene dine"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfigurer enhetsstyring"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"For mindre enn <xliff:g id="DURATION">%1$s</xliff:g> siden"</string> <string name="over_timestamp" msgid="4765793502859358634">"For mer enn <xliff:g id="DURATION">%1$s</xliff:g> siden"</string> <string name="birthday_status" msgid="2596961629465396761">"Bursdag"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> har bursdag"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Bursdag snart"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> har snart bursdag"</string> <string name="anniversary_status" msgid="1790034157507590838">"Merkedag"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> har merkedag"</string> <string name="location_status" msgid="1294990572202541812">"Deler posisjonen"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> deler posisjon"</string> <string name="new_story_status" msgid="9012195158584846525">"Ny nyhetssak"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> har delt nytt innhold"</string> <string name="video_status" msgid="4548544654316843225">"Ser på"</string> <string name="audio_status" msgid="4237055636967709208">"Lytter"</string> <string name="game_status" msgid="1340694320630973259">"Spiller"</string> <string name="empty_user_name" msgid="3389155775773578300">"Venner"</string> <string name="empty_status" msgid="5938893404951307749">"La oss chatte senere"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Innhold vises snart"</string> <string name="missed_call" msgid="4228016077700161689">"Tapt anrop"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Se nylige meldinger, tapte anrop og statusoppdateringer"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtale"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> har sendt en melding"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> har sendt et bilde"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Kunne ikke lese batterimåleren"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Trykk for å få mer informasjon"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ingen alarm angitt"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 36837c03c42b..f575b3a0ea75 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"अन्य कुराहरू खिच्नुहोस्"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"स्क्रिनसट हटाउनुहोस्"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"स्क्रिनसटको पूर्वावलोकन"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"सिरानको सीमा"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"फेदको सीमा"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"स्क्रिन रेकर्डर"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"स्क्रिन रेकर्डिङको प्रक्रिया अघि बढाइँदै"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"कुनै स्क्रिन रेकर्ड गर्ने सत्रका लागि चलिरहेको सूचना"</string> @@ -329,7 +335,7 @@ <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> <string name="quick_settings_header_onboarding_text" msgid="1918085351115504765">"थप विकल्पहरूका लागि आइकनहरूमा टच एण्ड होल्ड गर्नुहोस्"</string> <string name="quick_settings_dnd_label" msgid="7728690179108024338">"बाधा नपुऱ्याउनुहोस्"</string> - <string name="quick_settings_dnd_priority_label" msgid="6251076422352664571">"प्राथमिकता मात्र"</string> + <string name="quick_settings_dnd_priority_label" msgid="6251076422352664571">"प्राथमिकता दिइएको मात्र"</string> <string name="quick_settings_dnd_alarms_label" msgid="1241780970469630835">"अलार्महरू मात्र"</string> <string name="quick_settings_dnd_none_label" msgid="8420869988472836354">"पूरै शान्त"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ब्लुटुथ"</string> @@ -352,8 +358,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"आगत विधि"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"स्थान"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"स्थान बन्द छ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"क्यामेरा ब्लक गर्नुहोस्"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"माइक्रोफोन म्युट गर्नुहोस्"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"मिडिया उपकरण"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"आपत्कालीन कल मात्र"</string> @@ -366,7 +378,7 @@ <string name="quick_settings_internet_label" msgid="6603068555872455463">"इन्टरनेट"</string> <string name="quick_settings_networks_available" msgid="1875138606855420438">"उपलब्ध नेटवर्कहरू"</string> <string name="quick_settings_networks_unavailable" msgid="1167847013337940082">"नेटवर्क उपलब्ध छैन"</string> - <string name="quick_settings_wifi_not_connected" msgid="4071097522427039160">"जोडिएको छैन"</string> + <string name="quick_settings_wifi_not_connected" msgid="4071097522427039160">"कनेक्ट गरिएको छैन"</string> <string name="quick_settings_wifi_no_network" msgid="6003178398713839313">"नेटवर्क छैन"</string> <string name="quick_settings_wifi_off_label" msgid="4003379736176547594">"Wi-Fi बन्द"</string> <string name="quick_settings_wifi_on_label" msgid="2489928193654318511">"Wi-Fi सक्रिय छ"</string> @@ -425,8 +437,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"स्रिनको रेकर्ड"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"सुरु गर्नुहोस्"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"रोक्नुहोस्"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"जारी राख्न <b><xliff:g id="APP">%s</xliff:g></b> लाई तपाईंको डिभाइसको माइक्रोफोन प्रयोग गर्ने अनुमति दिनु पर्ने हुन्छ।"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"जारी राख्न <b><xliff:g id="APP">%s</xliff:g></b> लाई तपाईंको डिभाइसको क्यामेरा प्रयोग गर्ने अनुमति दिनु पर्ने हुन्छ।"</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"यन्त्र"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"एपहरू बदल्न माथितिर स्वाइप गर्नुहोस्"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"एपहरू बदल्न द्रुत गतिमा दायाँतिर ड्र्याग गर्नुहोस्"</string> @@ -458,7 +480,7 @@ <string name="camera_hint" msgid="4519495795000658637">"क्यामेराको लागि आइकनबाट स्वाइप गर्नुहोस्"</string> <string name="interruption_level_none_with_warning" msgid="8394434073508145437">"पूर्ण शान्त। यसले पनि स्क्रिन बाचकलाई शान्त गराउँछ।"</string> <string name="interruption_level_none" msgid="219484038314193379">"पूरै शान्त"</string> - <string name="interruption_level_priority" msgid="661294280016622209">"प्राथमिकता मात्र"</string> + <string name="interruption_level_priority" msgid="661294280016622209">"प्राथमिकता दिइएको मात्र"</string> <string name="interruption_level_alarms" msgid="2457850481335846959">"अलार्महरू मात्र"</string> <string name="interruption_level_none_twoline" msgid="8579382742855486372">"पूरै\nशान्त"</string> <string name="interruption_level_priority_twoline" msgid="8523482736582498083">"प्राथमिकता \nमात्र"</string> @@ -500,7 +522,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"प्रदर्शन र ब्याकग्राउन्ड डेटा घटाउँनुहोस्"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"ब्याट्री सेभर अफ गर्नुहोस्"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ले तपाईंको स्क्रिनमा देख्न सकिने सबै जानकारी अथवा रेकर्ड वा cast गर्दा तपाईंको यन्त्रबाट प्ले गरिएका कुरामाथि पहुँच राख्न सक्ने छ। यसअन्तर्गत पासवर्ड, भुक्तानीका विवरण, फोटो, सन्देश र तपाईंले प्ले गर्ने अडियो जस्ता जानकारी समावेश हुन्छन्।"</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"यो कार्य प्रदान गर्ने सेवाले तपाईंको स्क्रिनमा देख्न सकिने सबै जानकारी अथवा रेकर्ड वा cast गर्दा तपाईंको यन्त्रबाट प्ले गरिएका कुरामाथि पहुँच राख्न सक्ने छ। यसअन्तर्गत पासवर्ड, भुक्तानीका विवरण, फोटो, सन्देश र तपाईंले प्ले गर्ने अडियो जस्ता जानकारी समावेश हुन्छन्।"</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"यो कार्य गर्ने सेवाले तपाईंको स्क्रिनमा देख्न सकिने सबै जानकारी अथवा रेकर्ड वा कास्ट गर्दा तपाईंको डिभाइसबाट प्ले गरिएका कुरा हेर्न तथा प्रयोग गर्न सक्छ। यसले हेर्न तथा प्रयोग गर्न सक्ने कुरामा पासवर्ड, भुक्तानीका विवरण, फोटो, सन्देश र तपाईंले प्ले गर्ने अडियो कुराहरू समावेश हुन सक्छन्।"</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"रेकर्ड गर्न वा cast गर्न थाल्ने हो?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> मार्फत रेकर्ड गर्न वा cast गर्न थाल्ने हो?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"फेरि नदेखाउनुहोस्"</string> @@ -660,9 +682,9 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"इथरनेट"</string> <string name="status_bar_alarm" msgid="87160847643623352">"अलार्म"</string> <string name="wallet_title" msgid="5369767670735827105">"वालेट"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> <skip /> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index fdf0e9b5d4c7..3169795df2b0 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Meer opnemen"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Screenshot sluiten"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Voorbeeld van screenshot"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Bovengrens"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Ondergrens"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Schermopname"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Schermopname verwerken"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Doorlopende melding voor een schermopname-sessie"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Invoermethode"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Locatie"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Locatie uit"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Camera blokkeren"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Microfoon uitzetten"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Cameratoegang"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Microfoontoegang"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Beschikbaar"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Geblokkeerd"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media-apparaat"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Alleen noodoproepen"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Schermopname"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Starten"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stoppen"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"<b><xliff:g id="APP">%s</xliff:g></b> heeft toegang tot de microfoon van je apparaat nodig om door te gaan."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"<b><xliff:g id="APP">%s</xliff:g></b> heeft toegang tot de camera van je apparaat nodig om door te gaan."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Blokkeren van apparaatmicrofoon opheffen?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Blokkeren van apparaatcamera opheffen?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Blokkeren van apparaatcamera en -microfoon opheffen?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Hiermee hef je de toegangsblokkering op voor alle apps en services die rechten hebben om je microfoon te gebruiken."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Hiermee hef je de toegangsblokkering op voor alle apps en services die rechten hebben om je camera te gebruiken."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Hiermee hef je de toegangsblokkering op voor alle apps en services die rechten hebben om je camera of microfoon te gebruiken."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Apparaat"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swipe omhoog om te schakelen tussen apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Sleep naar rechts om snel tussen apps te schakelen"</string> @@ -551,7 +563,7 @@ <string name="monitoring_description_managed_profile_ca_certificate" msgid="7904323416598435647">"Je organisatie heeft een certificeringsinstantie geïnstalleerd in je werkprofiel. Je beveiligde netwerkverkeer kan worden bijgehouden of aangepast."</string> <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Er is een certificeringsinstantie geïnstalleerd op dit apparaat. Je beveiligde netwerkverkeer kan worden bijgehouden of aangepast."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Je beheerder heeft de netwerkregistratie aangezet, waarmee het verkeer op je apparaat wordt gecontroleerd."</string> - <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Je beheerder heeft logboekregistratie voor het netwerk aangezet. Hiermee wordt verkeer in je werkprofiel bijgehouden, maar niet in je persoonlijke profiel."</string> + <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Je beheerder heeft netwerkregistratie aangezet. Hiermee wordt verkeer in je werkprofiel bijgehouden, maar niet in je persoonlijke profiel."</string> <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Je bent verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden gecontroleerd."</string> <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Je bent verbonden met <xliff:g id="VPN_APP_0">%1$s</xliff:g> en <xliff:g id="VPN_APP_1">%2$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden bijgehouden."</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Je werkprofiel is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden bijgehouden."</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Wekker"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Alles tonen"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Ontgrendelen om te betalen"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Klaar"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Betaling instellen"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ontgrendelen om te gebruiken"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index cc9cad242cf4..f3daff5b852b 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ଅଧିକ କ୍ୟାପଚର୍ କରନ୍ତୁ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ସ୍କ୍ରିନସଟ୍ ଖାରଜ କରନ୍ତୁ"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ସ୍କ୍ରିନସଟର ପ୍ରିଭ୍ୟୁ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ଶୀର୍ଷ ସୀମାରେଖା"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ନିମ୍ନ ସୀମାରେଖା"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ସ୍କ୍ରିନ୍ ରେକର୍ଡର୍"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ସ୍କ୍ରିନ ରେକର୍ଡିଂର ପ୍ରକ୍ରିୟାକରଣ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ଏକ ସ୍କ୍ରିନ୍ ରେକର୍ଡ୍ ସେସନ୍ ପାଇଁ ଚାଲୁଥିବା ବିଜ୍ଞପ୍ତି"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ଇନପୁଟ୍ ପଦ୍ଧତି"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ଲୋକେସନ୍"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ଲୋକେସନ୍ ଅଫ୍"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"କ୍ୟାମେରାକୁ ବ୍ଲକ୍ କରନ୍ତୁ"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"ମାଇକ୍ରୋଫୋନକୁ ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"କ୍ୟାମେରା ଆକ୍ସେସ୍"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"ମାଇକ୍ ଆକ୍ସେସ୍"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"ଉପଲବ୍ଧ"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ବ୍ଲକ୍ କରାଯାଇଛି"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"ମିଡିଆ ଡିଭାଇସ୍"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"କେବଳ ଜରୁରୀକାଳୀନ କଲ୍"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ସ୍କ୍ରିନ୍ ରେକର୍ଡ"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ଆରମ୍ଭ କରନ୍ତୁ"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ବନ୍ଦ କରନ୍ତୁ"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ଜାରି ରଖିବାକୁ, <b><xliff:g id="APP">%s</xliff:g></b> ଆପଣଙ୍କ ଡିଭାଇସର ମାଇକ୍ରୋଫୋନକୁ ଆକ୍ସେସ୍ ଆବଶ୍ୟକ କରେ।"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ଜାରି ରଖିବାକୁ, <b><xliff:g id="APP">%s</xliff:g></b> ଆପଣଙ୍କ ଡିଭାଇସର କ୍ୟାମେରାକୁ ଆକ୍ସେସ୍ ଆବଶ୍ୟକ କରେ।"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ଡିଭାଇସର ମାଇକ୍ରୋଫୋନକୁ ଅନବ୍ଲକ୍ କରିବେ?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ଡିଭାଇସର କ୍ୟାମେରାକୁ ଅନବ୍ଲକ୍ କରିବେ?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ଡିଭାଇସର କ୍ୟାମେରା ଏବଂ ମାଇକ୍ରୋଫୋନକୁ ଅନବ୍ଲକ୍ କରିବେ?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ଆପଣଙ୍କ ମାଇକ୍ରୋଫୋନକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଅନୁମତି ଦିଆଯାଇଥିବା ସମସ୍ତ ଆପ୍ ଓ ସେବା ପାଇଁ ଏହା ଆକ୍ସେସକୁ ଅନବ୍ଲକ୍ କରେ।"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ଆପଣଙ୍କ କ୍ୟାମେରାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଅନୁମତି ଦିଆଯାଇଥିବା ସମସ୍ତ ଆପ୍ ଓ ସେବା ପାଇଁ ଏହା ଆକ୍ସେସକୁ ଅନବ୍ଲକ୍ କରେ।"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"ଆପଣଙ୍କ କ୍ୟାମେରା କିମ୍ବା ମାଇକ୍ରୋଫୋନକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଅନୁମତି ଦିଆଯାଇଥିବା ସମସ୍ତ ଆପ୍ ଓ ସେବା ପାଇଁ ଏହା ଆକ୍ସେସକୁ ଅନବ୍ଲକ୍ କରେ।"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"ଡିଭାଇସ୍"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ଆପ୍କୁ ବଦଳ କରିବା ପାଇଁ ସ୍ଵାଇପ୍ କରନ୍ତୁ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ଆପ୍ଗୁଡ଼ିକ ମଧ୍ୟରେ ଶୀଘ୍ର ବଦଳ କରିବା ପାଇଁ ଡାହାଣକୁ ଡ୍ରାଗ୍ କରନ୍ତୁ"</string> @@ -497,7 +509,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"କାର୍ଯ୍ୟ ସମ୍ପାଦନ ଓ ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ ଡାଟା କମ୍ କରନ୍ତୁ"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"ବ୍ୟାଟେରୀ ସେଭର୍ ଅଫ୍ କରନ୍ତୁ"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>ରେ ସମସ୍ତ ସୂଚନାକୁ ଆକ୍ସେସ୍ ରହିବ ଯାହା ଆପଣଙ୍କର ସ୍କ୍ରିନ୍ରେ ଦେଖାଯିବ ବା ରେକର୍ଡିଂ ବା କାଷ୍ଟିଂ ବେଳେ ଆପଣଙ୍କର ଡିଭାଇସ୍ ଠାରୁ ଚାଲିବ। ପାସ୍ୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ଫଟୋ, ମେସେଜ୍ ଏବଂ ଆପଣ ଚଲାଉଥିବା ଅଡିଓ ପରି ସୂଚନା ଅନ୍ତର୍ଭୁକ୍ତ ଅଛି।"</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"ରେକର୍ଡିଂ ବା କାଷ୍ଟିଂ ବେଳେ ଆପଣଙ୍କର ଡିଭାଇସରେ ଦେଖାଯାଉଥିବା ବା ଆପଣଙ୍କ ଡିଭାଇସରୁ ପ୍ଲେ କରାଯାଉଥିବା ସବୁ ସୂଚନାକୁ ଏହି ପ୍ରକାର୍ଯ୍ୟ ପ୍ରଦାନ କରୁଥିବା ସେବାର ଆକସେସ୍ ରହିବ। ପାସ୍ୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ଫଟୋ, ମେସେଜ୍ ଏବଂ ଆପଣ ଚଲାଉଥିବା ଅଡିଓ ପରି ସୂଚନା ଏଥିରେ ଅନ୍ତର୍ଭୁକ୍ତ ଅଛି।"</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"ରେକର୍ଡିଂ ବା କାଷ୍ଟିଂ ବେଳେ ଆପଣଙ୍କର ଡିଭାଇସରେ ଦେଖାଯାଉଥିବା ବା ଆପଣଙ୍କ ଡିଭାଇସରୁ ପ୍ଲେ କରାଯାଉଥିବା ସବୁ ସୂଚନାକୁ ଏହି ଫଙ୍କସନ୍ ପ୍ରଦାନ କରୁଥିବା ସେବାର ଆକ୍ସେସ୍ ରହିବ। ପାସ୍ୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ଫଟୋ, ମେସେଜ୍ ଏବଂ ଆପଣ ଚଲାଉଥିବା ଅଡିଓ ପରି ସୂଚନା ଏଥିରେ ଅନ୍ତର୍ଭୁକ୍ତ ଅଛି।"</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ରେକର୍ଡିଂ ବା କାଷ୍ଟିଂ ଆରମ୍ଭ କରିବେ?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ସହ ରେକର୍ଡିଂ ବା କାଷ୍ଟିଂ ଆରମ୍ଭ କରିବେ?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"ପୁଣି ଦେଖାନ୍ତୁ ନାହିଁ"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ଇଥରନେଟ୍"</string> <string name="status_bar_alarm" msgid="87160847643623352">"ଆଲାର୍ମ"</string> <string name="wallet_title" msgid="5369767670735827105">"ୱାଲେଟ୍"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"ପ୍ରସ୍ତୁତ"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ପେମେଣ୍ଟ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ବ୍ୟବହାର କରିବାକୁ ଅନଲକ୍ କରନ୍ତୁ"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"ଆପଣଙ୍କ କାର୍ଡଗୁଡ଼ିକ ପାଇବାରେ ଏକ ସମସ୍ୟା ହୋଇଥିଲା। ଦୟାକରି ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string> <string name="status_bar_work" msgid="5238641949837091056">"ୱର୍କ ପ୍ରୋଫାଇଲ୍"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"ଏରୋପ୍ଲେନ୍ ମୋଡ୍"</string> <string name="add_tile" msgid="6239678623873086686">"ଟାଇଲ୍ ଯୋଡ଼ନ୍ତୁ"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ସ୍ଥିତି:</b> ନୀରବକୁ ଡିମୋଟ୍ କରାଯାଇଛି"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>ସ୍ଥିତି:</b> ରେଙ୍କ ଉପରକୁ କରାଯାଇଛି"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ସ୍ଥିତି:</b> ରେଙ୍କ ତଳକୁ କରାଯାଇଛି"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"ଆପଣଙ୍କ ପ୍ରାଥମିକତା ମୋଡ୍ ଚାଲୁ ଥିବା ସମୟରେ ମଧ୍ୟ ସର୍ବଦା ଆପଣଙ୍କ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଶୀର୍ଷରେ ଦେଖାଯାଇଥାଏ"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ସେଟିଂସ୍"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବାର୍ତ୍ତାଳାପ ଫିଚରଗୁଡ଼ିକୁ ସମର୍ଥନ କରେ ନାହିଁ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପରିବର୍ତ୍ତନ କରିହେବ ନାହିଁ।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ଏଠାରେ ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଗ୍ରୁପ୍ କନଫ୍ୟୁଗର୍ କରାଯାଇପାରିବ ନାହିଁ"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ଅପ୍ଡେଟ୍ କରିବା ପାଇଁ ସେଟିଂସ୍କୁ ଯାଆନ୍ତୁ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ଷ୍ଟାଣ୍ଡବାଏ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"ବାର୍ତ୍ତାଳାପ ପ୍ରାଥମିକତାରେ ସେଟ୍ କରାଯାଇଛି"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ଏହି ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ଆପଣଙ୍କ ତାଲିକାର ଶୀର୍ଷରେ ଦେଖାଯାଏ ଏବଂ ପ୍ରାଥମିକତା ମୋଡ୍ ଚାଲୁ ଥିବା ସମୟରେ ସର୍ବଦା ଆପଣଙ୍କ ନିକଟରେ ପହଞ୍ଚିପାରିବ"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"ପ୍ରୋଫାଇଲ୍ ଛବିଗୁଡ଼ିକ ଲକ୍ ସ୍କ୍ରିନରେ ଦେଖାଯାଏ"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"ଆପଣ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ଥିବା ବବଲଗୁଡ଼ିକରେ ଏହି ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକୁ ସହଜରେ ପାଇପାରିବେ"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡରେ ବାଧା"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"ବୁଝିଗଲି"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ସେଟିଂସ୍"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ସ୍ୱିଚ୍ କରନ୍ତୁ"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ଆକ୍ସେସିବିଲିଟୀ ଜେଶ୍ଚରକୁ ଆକ୍ସେସିବିଲିଟୀ ବଟନରେ ପରିବର୍ତ୍ତନ କରାଯାଇଛି\n\n"<annotation id="link">"ସେଟିଂସ୍ ଦେଖନ୍ତୁ"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ବଟନକୁ ଅସ୍ଥାୟୀ ଭାବେ ଲୁଚାଇବା ପାଇଁ ଧାରକୁ ମୁଭ୍ କରନ୍ତୁ"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"ଶୀର୍ଷ ବାମକୁ ମୁଭ୍ କରନ୍ତୁ"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"ଶୀର୍ଷ ଡାହାଣକୁ ମୁଭ୍ କରନ୍ତୁ"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"ନିମ୍ନ ବାମକୁ ମୁଭ୍ କରନ୍ତୁ"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"ନିମ୍ନ ଡାହାଣକୁ ମୁଭ୍ କରନ୍ତୁ"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"ଧାରକୁ ମୁଭ୍ କରି ଲୁଚାନ୍ତୁ"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"ଧାର ବାହାରକୁ ମୁଭ୍ କରି ଦେଖାନ୍ତୁ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ଡିଭାଇସ୍ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"ଆପଣଙ୍କ ସଂଯୁକ୍ତ ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ନିୟନ୍ତ୍ରଣ ଯୋଗ କରନ୍ତୁ"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ଡିଭାଇସ୍ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>ରୁ କମ୍ ସମୟ ପୂର୍ବେ"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g>ରୁ ଅଧିକ ସମୟ ପୂର୍ବେ"</string> <string name="birthday_status" msgid="2596961629465396761">"ଜନ୍ମଦିନ"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"ଆଜି <xliff:g id="NAME">%1$s</xliff:g>ଙ୍କ ଜନ୍ମଦିନ"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"ଜନ୍ମଦିନ ଶୀଘ୍ର ଆସୁଛି"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g>ଙ୍କ ଜନ୍ମଦିନ ଶୀଘ୍ର ଆସୁଛି"</string> <string name="anniversary_status" msgid="1790034157507590838">"ବାର୍ଷିକ ଉତ୍ସବ"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"ଆଜି <xliff:g id="NAME">%1$s</xliff:g>ଙ୍କ ବାର୍ଷିକ ଉତ୍ସବ"</string> <string name="location_status" msgid="1294990572202541812">"ଲୋକେସନ୍ ସେୟାର୍ ହେଉଛି"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> ଲୋକେସନ୍ ସେୟାର୍ କରୁଛନ୍ତି"</string> <string name="new_story_status" msgid="9012195158584846525">"ନୂଆ ଷ୍ଟୋରୀ"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ନୂଆ ଷ୍ଟୋରୀ ସେୟାର୍ କରିଛନ୍ତି"</string> <string name="video_status" msgid="4548544654316843225">"ଦେଖୁଛନ୍ତି"</string> <string name="audio_status" msgid="4237055636967709208">"ଶୁଣୁଛି"</string> <string name="game_status" msgid="1340694320630973259">"ଚାଲୁଛି"</string> <string name="empty_user_name" msgid="3389155775773578300">"ସାଙ୍ଗମାନେ"</string> <string name="empty_status" msgid="5938893404951307749">"ରାତିରେ ଚାଟ୍ କରିବା!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"ବିଷୟବସ୍ତୁ ଶୀଘ୍ର ଦେଖାଯିବ"</string> <string name="missed_call" msgid="4228016077700161689">"ମିସ୍ଡ କଲ୍"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ବର୍ତ୍ତମାନର ମେସେଜ୍, ମିସ୍ଡ କଲ୍ ଏବଂ ସ୍ଥିତି ଅପଡେଟଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ବାର୍ତ୍ତାଳାପ"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ମେସେଜ୍ ପଠାଇଛନ୍ତି"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ଛବି ପଠାଇଛନ୍ତି"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ମିଟର୍ ପଢ଼ିବାରେ ସମସ୍ୟା ହେଉଛି"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ଅଧିକ ସୂଚନା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ଆଲାର୍ମ ସେଟ୍ ହୋଇନାହିଁ"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 3de8716b0c7b..6fba7a429667 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"ਹੋਰ ਕੈਪਚਰ ਕਰੋ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਖਾਰਜ ਕਰੋ"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਪੂਰਵ-ਝਲਕ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ਉੱਪਰ ਦੀ ਸੀਮਾ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ਹੇਠਾਂ ਦੀ ਸੀਮਾ"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡਰ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡਿੰਗ ਜਾਰੀ ਹੈ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ਕਿਸੇ ਸਕ੍ਰੀਨ ਰਿਕਾਰਡ ਸੈਸ਼ਨ ਲਈ ਚੱਲ ਰਹੀ ਸੂਚਨਾ"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ਇਨਪੁੱਟ ਵਿਧੀ"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ਟਿਕਾਣਾ"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਬੰਦ"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"ਕੈਮਰਾ ਬਲਾਕ ਕਰੋ"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਮਿਊਟ ਕਰੋ"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"ਮੀਡੀਆ ਡੀਵਾਈਸ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ਸਿਰਫ਼ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡਰ"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ਰੋਕੋ"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"ਜਾਰੀ ਰੱਖਣ ਲਈ, <b><xliff:g id="APP">%s</xliff:g></b> ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"ਜਾਰੀ ਰੱਖਣ ਲਈ, <b><xliff:g id="APP">%s</xliff:g></b> ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੇ ਕੈਮਰਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।"</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"ਡੀਵਾਈਸ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ਐਪਾਂ ਵਿਚਾਲੇ ਤੇਜ਼ੀ ਨਾਲ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸੱਜੇ ਪਾਸੇ ਵੱਲ ਘਸੀਟੋ"</string> @@ -497,8 +519,8 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"ਪ੍ਰਦਰਸ਼ਨ ਅਤੇ ਪਿਛੋਕੜ ਡਾਟਾ ਘੱਟ ਕਰਦਾ ਹੈ"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਕਰੋ"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ਕੋਲ ਬਾਕੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ ਜੋ ਕਿ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਣਯੋਗ ਹੈ ਜਾਂ ਰਿਕਾਰਡਿੰਗ ਜਾਂ ਕਾਸਟ ਕਰਨ ਵੇਲੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਚਲਾਈ ਜਾਂਦੀ ਹੈ। ਇਸ ਵਿੱਚ ਪਾਸਵਰਡ, ਭੁਗਤਾਨ ਵੇਰਵੇ, ਫ਼ੋਟੋਆਂ, ਸੁਨੇਹੇ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਚਲਾਏ ਆਡੀਓ ਦੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੁੰਦੀ ਹੈ।"</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"ਇਸ ਫੰਕਸ਼ਨ ਦੇ ਸੇਵਾ ਪ੍ਰਦਾਨਕ ਕੋਲ ਬਾਕੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ ਜੋ ਕਿ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਣਯੋਗ ਹੁੰਦੀ ਹੈ ਜਾਂ ਰਿਕਾਰਡਿੰਗ ਜਾਂ ਕਾਸਟ ਕਰਨ ਵੇਲੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਚਲਾਈ ਜਾਂਦੀ ਹੈ। ਇਸ ਵਿੱਚ ਪਾਸਵਰਡ, ਭੁਗਤਾਨ ਵੇਰਵੇ, ਫ਼ੋਟੋਆਂ, ਸੁਨੇਹੇ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਚਲਾਏ ਆਡੀਓ ਦੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੁੰਦੀ ਹੈ।"</string> - <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ਕੀ ਰਿਕਾਰਡਿੰਗ ਜਾਂ ਕਾਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"ਇਹ ਫੰਕਸ਼ਨ ਪ੍ਰਦਾਨ ਕਰਨ ਵਾਲੀ ਸੇਵਾ ਕੋਲ ਸਾਰੀ ਜਾਣਕਾਰੀ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ ਜੋ ਕਿ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਣਯੋਗ ਹੁੰਦੀ ਹੈ ਜਾਂ ਰਿਕਾਰਡ ਜਾਂ ਕਾਸਟ ਕਰਨ ਵੇਲੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਚਲਾਈ ਜਾਂਦੀ ਹੈ। ਇਸ ਵਿੱਚ ਪਾਸਵਰਡ, ਭੁਗਤਾਨ ਵੇਰਵੇ, ਫ਼ੋਟੋਆਂ, ਸੁਨੇਹੇ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਚਲਾਏ ਆਡੀਓ ਦੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੁੰਦੀ ਹੈ।"</string> + <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ਕੀ ਰਿਕਾਰਡ ਜਾਂ ਕਾਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ਨਾਲ ਰਿਕਾਰਡਿੰਗ ਜਾਂ ਕਾਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string> <string name="clear_all_notifications_text" msgid="348312370303046130">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ਈਥਰਨੈਟ"</string> <string name="status_bar_alarm" msgid="87160847643623352">"ਅਲਾਰਮ"</string> <string name="wallet_title" msgid="5369767670735827105">"ਵਾਲੇਟ"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"ਤਿਆਰ"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ਭੁਗਤਾਨ ਸੈੱਟਅੱਪ ਕਰੋ"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ਵਰਤਣ ਲਈ ਅਣਲਾਕ ਕਰੋ"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"ਤੁਹਾਡੇ ਕਾਰਡ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="status_bar_work" msgid="5238641949837091056">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ"</string> <string name="add_tile" msgid="6239678623873086686">"ਟਾਇਲ ਸ਼ਾਮਲ ਕਰੋ"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ਸਥਿਤੀ:</b> ਦਰਜਾ ਘਟਾ ਕੇ ਸ਼ਾਂਤ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਗਿਆ"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>ਸਥਿਤੀ:</b> ਦਰਜਾ ਵਧਾਇਆ ਗਿਆ"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ਸਥਿਤੀ:</b> ਦਰਜਾ ਘਟਾਇਆ ਗਿਆ"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"ਹਮੇਸ਼ਾਂ ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਇਆ ਜਾਂਦਾ ਹੈ, ਭਾਵੇਂ ਤਰਜੀਹ ਮੋਡ ਚਾਲੂ ਹੋਵੇ"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ਸੈਟਿੰਗਾਂ"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਗੱਲਬਾਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ਇਹ ਸੂਚਨਾਵਾਂ ਦਾ ਗਰੁੱਪ ਇੱਥੇ ਸੰਰੂਪਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ਸਟੈਂਡਬਾਈ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"ਗੱਲਬਾਤ ਨੂੰ ਤਰਜੀਹੀ ਗੱਲਬਾਤ ਵਜੋਂ ਸੈੱਟ ਕੀਤਾ ਗਿਆ"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"ਇਹ ਗੱਲਾਂਬਾਤਾਂ ਤੁਹਾਡੀ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਈਆਂ ਜਾਂਦੀਆਂ ਹਨ ਅਤੇ ਤਰਜੀਹ ਮੋਡ ਚਾਲੂ ਹੋਣ \'ਤੇ ਹਮੇਸ਼ਾਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਸਕਦੀਆਂ ਹਨ"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰਾਂ ਨੂੰ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਾਇਆ ਜਾਂਦਾ ਹੈ"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"ਤੁਸੀਂ ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਬੁਲਬੁਲਿਆਂ ਵਿੱਚ ਇਹਨਾਂ ਗੱਲਾਂਬਾਤਾਂ ਨੂੰ ਆਸਾਨੀ ਨਾਲ ਲੱਭ ਸਕਦੇ ਹੋ"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"ਸਮਝ ਲਿਆ"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ਸੈਟਿੰਗਾਂ"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ਸਵਿੱਚ"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਪਹੁੰਚਯੋਗਤਾ ਸੰਕੇਤ ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ\n\n"<annotation id="link">"ਸੈਟਿੰਗਾਂ ਦੇਖੋ"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"ਬਟਨ ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਲੁਕਾਉਣ ਲਈ ਕਿਨਾਰੇ \'ਤੇ ਲਿਜਾਓ"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"ਉੱਪਰ ਵੱਲ ਖੱਬੇ ਲਿਜਾਓ"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"ਉੱਪਰ ਵੱਲ ਸੱਜੇ ਲਿਜਾਓ"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"ਹੇਠਾਂ ਵੱਲ ਖੱਬੇ ਲਿਜਾਓ"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"ਹੇਠਾਂ ਵੱਲ ਸੱਜੇ ਲਿਜਾਓ"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"ਕਿਨਾਰੇ ਵਿੱਚ ਲਿਜਾ ਕੇ ਲੁਕਾਓ"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"ਕਿਨਾਰੇ ਤੋਂ ਬਾਹਰ ਕੱਢ ਕੇ ਦਿਖਾਓ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ਡੀਵਾਈਸ ਕੰਟਰੋਲ"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"ਆਪਣੇ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸਾਂ ਲਈ ਕੰਟਰੋਲ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ਡੀਵਾਈਸ ਕੰਟਰੋਲਾਂ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> ਤੋਂ ਘੱਟ ਸਮਾਂ ਪਹਿਲਾਂ"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਸਮਾਂ ਪਹਿਲਾਂ"</string> <string name="birthday_status" msgid="2596961629465396761">"ਜਨਮਦਿਨ"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"ਅੱਜ <xliff:g id="NAME">%1$s</xliff:g> ਦਾ ਜਨਮਦਿਨ ਹੈ"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"ਜਨਮਦਿਨ ਜਲਦ ਆ ਰਿਹਾ ਹੈ"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> ਦਾ ਜਨਮਦਿਨ ਜਲਦ ਆ ਰਿਹਾ ਹੈ"</string> <string name="anniversary_status" msgid="1790034157507590838">"ਵਰ੍ਹੇਗੰਢ"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"ਅੱਜ <xliff:g id="NAME">%1$s</xliff:g> ਦੀ ਵਰ੍ਹੇਗੰਢ ਹੈ"</string> <string name="location_status" msgid="1294990572202541812">"ਟਿਕਾਣਾ ਸਾਂਝਾ ਹੋ ਰਿਹਾ ਹੈ"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> ਵੱਲੋਂ ਟਿਕਾਣਾ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="new_story_status" msgid="9012195158584846525">"ਨਵੀਂ ਕਹਾਣੀ"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਇੱਕ ਨਵੀਂ ਕਹਾਣੀ ਸਾਂਝੀ ਕੀਤੀ"</string> <string name="video_status" msgid="4548544654316843225">"ਦੇਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="audio_status" msgid="4237055636967709208">"ਸੁਣਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="game_status" msgid="1340694320630973259">"ਖੇਡੀ ਜਾ ਰਹੀ ਹੈ"</string> <string name="empty_user_name" msgid="3389155775773578300">"ਦੋਸਤ"</string> <string name="empty_status" msgid="5938893404951307749">"ਆਓ ਅੱਜ ਰਾਤ ਚੈਟ ਕਰੀਏ!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"ਸਮੱਗਰੀ ਜਲਦ ਦਿਖਾਈ ਜਾਵੇਗੀ"</string> <string name="missed_call" msgid="4228016077700161689">"ਮਿਸ ਕਾਲ"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ਹਾਲੀਆ ਸੁਨੇਹੇ, ਮਿਸ ਕਾਲਾਂ ਅਤੇ ਸਥਿਤੀ ਸੰਬੰਧੀ ਅੱਪਡੇਟ ਦੇਖੋ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ਗੱਲਬਾਤ"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਿਆ"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਇੱਕ ਚਿੱਤਰ ਭੇਜਿਆ ਹੈ"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ਤੁਹਾਡੇ ਬੈਟਰੀ ਮੀਟਰ ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ਕੋਈ ਅਲਾਰਮ ਸੈੱਟ ਨਹੀਂ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index cc0c6d519775..bd82a00ea680 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Zarejestruj więcej danych"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Zamknij zrzut ekranu"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Podgląd zrzutu ekranu"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Górna granica"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Dolna granica"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Nagrywanie ekranu"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Przetwarzam nagrywanie ekranu"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Stałe powiadomienie o sesji rejestrowania zawartości ekranu"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metoda wprowadzania"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokalizacja"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Lokalizacja wyłączona"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Zablokuj aparat"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Wycisz mikrofon"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Dostęp do aparatu"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Dostęp do mikrofonu"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Dostępny"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Zablokowany"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Urządzenie multimedialne"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Tylko połączenia alarmowe"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Nagrywanie ekranu"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Rozpocznij"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Zatrzymaj"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Aby kontynuować, musisz przyznać aplikacji „<xliff:g id="APP">%s</xliff:g>” dostęp do mikrofonu urządzenia."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Aby kontynuować, musisz przyznać aplikacji „<xliff:g id="APP">%s</xliff:g>” dostęp do aparatu urządzenia."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Odblokować mikrofon urządzenia?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Odblokować aparat urządzenia?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Odblokować aparat i mikrofon urządzenia?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Spowoduje to odblokowanie dostępu dla wszystkich aplikacji i usług, które mają uprawnienia do korzystania z mikrofonu."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Spowoduje to odblokowanie dostępu dla wszystkich aplikacji i usług, które mają uprawnienia do korzystania z aparatu."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Spowoduje to odblokowanie dostępu dla wszystkich aplikacji i usług, które mają uprawnienia do korzystania z aparatu lub mikrofonu."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Urządzenie"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Przesuń w górę, by przełączyć aplikacje"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Szybko przeciągnij w prawo, by przełączyć aplikacje"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Portfel"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Gotowe"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Skonfiguruj płatność"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odblokuj, aby użyć"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Podczas pobierania kart wystąpił problem. Spróbuj ponownie później."</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil służbowy"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Tryb samolotowy"</string> <string name="add_tile" msgid="6239678623873086686">"Dodaj nazwę"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stan:</b> zmieniono na Ciche"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Stan:</b> podniesiono ważność"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stan:</b> obniżono ważność"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Zawsze pokazywane u góry powiadomień, nawet po włączeniu trybu Priorytet"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Ustawienia"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Rozmowy priorytetowe"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> nie obsługuje funkcji rozmów"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tych powiadomień nie można zmodyfikować."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tej grupy powiadomień nie można tu skonfigurować"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Otwórz Ustawienia, by zaktualizować nawigację w systemie"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Tryb gotowości"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Rozmowę ustawiono jako priorytetową"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Rozmowy priorytetowe"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Te rozmowy są pokazywane na początku listy i nie przegapisz ich, jeśli włączysz tryb Priorytet"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Zdjęcia profilowe są widoczne na ekranie blokady"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Łatwo znajdziesz te rozmowy w dymkach na ekranie głównym"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ignorują tryb Nie przeszkadzać"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Ustawienia"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Przełącz"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Przycisk ułatwień dostępu zastąpił gest ułatwień dostępu\n\n"<annotation id="link">"Wyświetl ustawienia"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Przesuń przycisk do krawędzi, aby ukryć go tymczasowo"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Przenieś w lewy górny róg"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Przenieś w prawy górny róg"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Przenieś w lewy dolny róg"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Przenieś w prawy dolny róg"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Przenieś do krawędzi i ukryj"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Przenieś poza krawędź i pokaż"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Sterowanie urządzeniami"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Dodaj elementy sterujące połączonymi urządzeniami"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfigurowanie sterowania urządzeniami"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Mniej niż <xliff:g id="DURATION">%1$s</xliff:g> temu"</string> <string name="over_timestamp" msgid="4765793502859358634">"Ponad <xliff:g id="DURATION">%1$s</xliff:g> temu"</string> <string name="birthday_status" msgid="2596961629465396761">"Urodziny"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> ma urodziny"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Wkrótce urodziny"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> będzie mieć wkrótce urodziny"</string> <string name="anniversary_status" msgid="1790034157507590838">"Rocznica"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> ma rocznicę"</string> <string name="location_status" msgid="1294990572202541812">"Udostępniam lokalizację"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> udostępnia lokalizację"</string> <string name="new_story_status" msgid="9012195158584846525">"Nowy artykuł"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> udostępnia nową relację"</string> <string name="video_status" msgid="4548544654316843225">"Oglądam"</string> <string name="audio_status" msgid="4237055636967709208">"Słucham"</string> <string name="game_status" msgid="1340694320630973259">"Odtwarzam"</string> <string name="empty_user_name" msgid="3389155775773578300">"Znajomi"</string> <string name="empty_status" msgid="5938893404951307749">"Porozmawiajmy!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Treść wkrótce będzie widoczna"</string> <string name="missed_call" msgid="4228016077700161689">"Nieodebrane połączenie"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Zobacz ostatnie wiadomości, nieodebrane połączenia i stany"</string> <string name="people_tile_title" msgid="6589377493334871272">"Rozmowa"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> wysyła wiadomość"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> wysyła zdjęcie"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem z odczytaniem pomiaru wykorzystania baterii"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Kliknij, aby uzyskać więcej informacji"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nie ustawiono alarmu"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 5b1f72e198ad..e0be9166e8cd 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar mais"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dispensar captura de tela"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Visualização de captura de tela"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Limite superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Limite inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Gravador de tela"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processando gravação de tela"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificação contínua para uma sessão de gravação de tela"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Método de entrada"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Localização"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localização desativada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquear câmera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Desativar microfone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acesso à câmera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acesso ao microfone"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponível"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqueado"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo de mídia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Chamadas de emergência"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Gravação de tela"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Parar"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para continuar, o app <b><xliff:g id="APP">%s</xliff:g></b> precisa acessar o microfone do dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para continuar, o app <b><xliff:g id="APP">%s</xliff:g></b> precisa acessar a câmera do dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Desbloquear o microfone do dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Desbloquear a câmera do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Desbloquear a câmera e o microfone do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Essa ação desbloqueia o acesso de todos os apps e serviços com autorização para usar seu microfone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Essa ação desbloqueia o acesso de todos os apps e serviços com autorização para usar sua câmera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Essa ação desbloqueia o acesso de todos os apps e serviços com autorização para usar sua câmera ou seu microfone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Deslize para cima para alternar entre os apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arraste para a direita para alternar rapidamente entre os apps"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarme"</string> <string name="wallet_title" msgid="5369767670735827105">"Carteira"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Mostrar tudo"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Desbloquear para pagar"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Pronto"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurar o pagamento"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 602f3cec1f2a..e86ca3ef5b22 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar mais"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ignorar captura de ecrã"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pré-visualização da captura de ecrã"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Limite superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Limite inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Gravador de ecrã"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"A processar a gravação de ecrã"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificação persistente de uma sessão de gravação de ecrã"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Método de Introdução"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Localização"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localização Desativada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquear a câmara"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Desativar o som do microfone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acesso à câmara"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acesso ao microfone"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponível"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqueado"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo multimédia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Apenas chamadas de emergência"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Gravação de ecrã"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Parar"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para continuar, a app <b><xliff:g id="APP">%s</xliff:g></b> precisa de acesso ao microfone do dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para continuar, a app <b><xliff:g id="APP">%s</xliff:g></b> precisa de acesso à câmara do dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Pretende desbloquear o microfone do dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Pretende desbloquear a câmara do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Pretende desbloquear a câmara e o microfone?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Isto desbloqueia o acesso a todas as apps e serviços com autorização para utilizar o seu microfone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Isto desbloqueia o acesso a todas as apps e serviços com autorização para utilizar a sua câmara."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Isto desbloqueia o acesso a todas as apps e serviços com autorização para utilizar a sua câmara ou microfone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Deslizar rapidamente para cima para mudar de app"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arraste para a direita para mudar rapidamente de app."</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarme"</string> <string name="wallet_title" msgid="5369767670735827105">"Carteira"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Pronto"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurar pagamento"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para utilizar"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Ocorreu um problema ao obter os seus cartões. Tente novamente mais tarde."</string> <string name="status_bar_work" msgid="5238641949837091056">"Perfil de trabalho"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Modo de avião"</string> <string name="add_tile" msgid="6239678623873086686">"Adicionar mosaico"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> despromovida para Silenciosa"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Estado:</b> passou para classificação superior"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> passou para classificação inferior"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Apresentadas sempre no topo das suas notificações, mesmo quando o modo Prioridade está ativado"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Definições"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversas com prioridade"</string> <string name="no_shortcut" msgid="8257177117568230126">"A app <xliff:g id="APP_NAME">%1$s</xliff:g> não suporta funcionalidades de conversa."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar estas notificações."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Não é possível configurar este grupo de notificações aqui."</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Aceda às Definições para atualizar a navegação no sistema."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Modo de espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversa definida como prioritária"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversas com prioridade"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Estas conversas são apresentadas no topo da sua lista e recebe-as sempre quando o modo Prioridade está ativado"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"As imagens de perfil são apresentadas no ecrã de bloqueio"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Pode encontrar facilmente estas conversas em balões no seu ecrã principal"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompem o modo Não incomodar."</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Definições"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Mudar"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"O botão Acessibilidade substituiu o gesto de acessibilidade\n\n"<annotation id="link">"Ver definições"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Mova o botão para a extremidade para o ocultar temporariamente"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Mover p/ parte sup. esquerda"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Mover parte superior direita"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Mover p/ parte infer. esquerda"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Mover parte inferior direita"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Mover p/ extremidade e ocultar"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Retirar extremidade e mostrar"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Controlos de dispositivos"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Adicione controlos para os dispositivos associados."</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configure os controlos de dispositivos"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Há menos de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Há mais de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Aniversário"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"É o aniversário de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Aniversário em breve"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"O aniversário de <xliff:g id="NAME">%1$s</xliff:g> é em breve"</string> <string name="anniversary_status" msgid="1790034157507590838">"Aniversário"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"É o aniversário de <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"A partilhar localiz."</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> está a partilhar a localização"</string> <string name="new_story_status" msgid="9012195158584846525">"Nova notícia"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> publicou uma nova história"</string> <string name="video_status" msgid="4548544654316843225">"A ver"</string> <string name="audio_status" msgid="4237055636967709208">"A ouvir"</string> <string name="game_status" msgid="1340694320630973259">"Em reprodução"</string> <string name="empty_user_name" msgid="3389155775773578300">"Amigos"</string> <string name="empty_status" msgid="5938893404951307749">"Vamos conversar!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Será apresentado conteúdo em breve"</string> <string name="missed_call" msgid="4228016077700161689">"Chamada não atendida"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas não atendidas e atualizações de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Ocorreu um problema ao ler o medidor da bateria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toque para obter mais informações"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nenhum alarme defin."</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 5b1f72e198ad..e0be9166e8cd 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar mais"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dispensar captura de tela"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Visualização de captura de tela"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Limite superior"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Limite inferior"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Gravador de tela"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processando gravação de tela"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificação contínua para uma sessão de gravação de tela"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Método de entrada"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Localização"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localização desativada"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Bloquear câmera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Desativar microfone"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acesso à câmera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acesso ao microfone"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponível"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloqueado"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispositivo de mídia"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Chamadas de emergência"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Gravação de tela"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Parar"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para continuar, o app <b><xliff:g id="APP">%s</xliff:g></b> precisa acessar o microfone do dispositivo."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para continuar, o app <b><xliff:g id="APP">%s</xliff:g></b> precisa acessar a câmera do dispositivo."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Desbloquear o microfone do dispositivo?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Desbloquear a câmera do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Desbloquear a câmera e o microfone do dispositivo?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Essa ação desbloqueia o acesso de todos os apps e serviços com autorização para usar seu microfone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Essa ação desbloqueia o acesso de todos os apps e serviços com autorização para usar sua câmera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Essa ação desbloqueia o acesso de todos os apps e serviços com autorização para usar sua câmera ou seu microfone."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispositivo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Deslize para cima para alternar entre os apps"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arraste para a direita para alternar rapidamente entre os apps"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarme"</string> <string name="wallet_title" msgid="5369767670735827105">"Carteira"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Mostrar tudo"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Desbloquear para pagar"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Pronto"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurar o pagamento"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index f68d6ac427a7..0729f69939e5 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Surprindeți mai mult"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Închideți captura de ecran"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Previzualizare a capturii de ecran"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Marginea superioară"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Marginea inferioară"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Recorder pentru ecran"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Se procesează înregistrarea"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificare în curs pentru o sesiune de înregistrare a ecranului"</string> @@ -350,8 +356,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metodă de introducere"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Locație"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Localizarea este dezactivată"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blocați camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Dezactivați sunetul microfonului"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acces la cameră"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acces la microfon"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Disponibil"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blocat"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Dispozitiv media"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Numai apeluri de urgență"</string> @@ -424,8 +432,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Înregistrarea ecranului"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Începeți"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Opriți"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Pentru a continua, <b><xliff:g id="APP">%s</xliff:g></b> necesită acces la microfonul dispozitivului."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Pentru a continua, <b><xliff:g id="APP">%s</xliff:g></b> necesită acces la camera dispozitivului."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblocați microfonul dispozitivului?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblocați camera dispozitivului?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Deblocați camera și microfonul dispozitivului?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Astfel, deblocați accesul pentru toate aplicațiile și serviciile care au permisiunea de a folosi microfonul."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Astfel, deblocați accesul pentru toate aplicațiile și serviciile care au permisiunea de a folosi camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Astfel, deblocați accesul pentru toate aplicațiile și serviciile care au permisiunea de a folosi camera sau microfonul."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Dispozitiv"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Glisați în sus pentru a comuta între aplicații"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Glisați la dreapta pentru a comuta rapid între aplicații"</string> @@ -660,18 +672,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarmă"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Gata"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Configurați o metodă de plată"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Deblocați pentru a folosi"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"A apărut o problemă la preluarea cardurilor. Încercați din nou mai târziu"</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil de serviciu"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Mod Avion"</string> <string name="add_tile" msgid="6239678623873086686">"Adăugați o casetă"</string> @@ -740,11 +748,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stare:</b> setată ca Silențioasă"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Stare:</b> clasificată mai sus"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stare:</b> clasificată mai jos"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Se afișează întotdeauna în partea de sus a notificărilor, chiar și când modul Cu prioritate este activat"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Setări"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Conversații cu prioritate"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> nu acceptă funcții pentru conversații"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aceste notificări nu pot fi modificate."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Acest grup de notificări nu poate fi configurat aici"</string> @@ -1020,14 +1026,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accesați Setările pentru a actualiza navigarea în sistem"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversația a fost setată ca prioritară"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Conversații cu prioritate"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Aceste conversații se afișează în partea de sus a listei și apar chiar și când modul Cu prioritate este activat"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Fotografiile de profil apar pe ecranul de blocare"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Găsiți cu ușurință aceste conversații în baloane pe ecranul de pornire"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Întrerup modul Nu deranja"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Setări"</string> @@ -1045,18 +1047,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Comutator"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Butonul de accesibilitate a înlocuit gestul de accesibilitate\n\n"<annotation id="link">"Vedeți setările"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Mutați butonul spre margine pentru a-l ascunde temporar"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Mutați în stânga sus"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Mutați în dreapta sus"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Mutați în stânga jos"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Mutați în dreapta jos"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Mutați în afară și ascundeți"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Mutați în afară și afișați"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Comenzile dispozitivelor"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Adăugați comenzi pentru dispozitivele conectate"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Configurați comenzile dispozitivelor"</string> @@ -1136,35 +1132,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"În urmă cu mai puțin de <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"În urmă cu peste <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Ziua de naștere"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> își serbează astăzi ziua de naștere"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Zi de naștere în curând"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"În curând <xliff:g id="NAME">%1$s</xliff:g> își va sărbători ziua de naștere"</string> <string name="anniversary_status" msgid="1790034157507590838">"Zi aniversară"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> își sărbătorește aniversarea"</string> <string name="location_status" msgid="1294990572202541812">"Se afișează locația"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> își afișează locația"</string> <string name="new_story_status" msgid="9012195158584846525">"Subiect nou"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> a trimis o poveste nouă"</string> <string name="video_status" msgid="4548544654316843225">"Urmăresc"</string> <string name="audio_status" msgid="4237055636967709208">"Se ascultă"</string> <string name="game_status" msgid="1340694320630973259">"Se redă"</string> <string name="empty_user_name" msgid="3389155775773578300">"Prieteni"</string> <string name="empty_status" msgid="5938893404951307749">"Conversăm prin chat diseară?"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Conținutul va apărea în curând"</string> <string name="missed_call" msgid="4228016077700161689">"Apel nepreluat"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Vedeți mesaje recente, apeluri pierdute și actualizări de stare"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversație"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> a trimis un mesaj"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a trimis o imagine"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problemă la citirea măsurării bateriei"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Atingeți pentru mai multe informații"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nicio alarmă setată"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 9557db3ecee1..9b29cc3e844d 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Увеличить площадь скриншота"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Закрыть скриншот"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Предварительный просмотр скриншота"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Верхняя граница"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Нижняя граница"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Запись видео с экрана"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Обработка записи с экрана…"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Текущее уведомление для записи видео с экрана"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Способ ввода"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Геолокация"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Местоположение выкл."</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Заблокировать камеру"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Выключить микрофон"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Доступ к камере"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Доступ к микрофону"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Доступно"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Заблокировано"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Режим медиа"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Экстр. вызов"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Запись экрана"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Начать"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Остановить"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Чтобы продолжить, предоставьте приложению <b><xliff:g id="APP">%s</xliff:g></b> доступ к микрофону устройства."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Чтобы продолжить, предоставьте приложению <b><xliff:g id="APP">%s</xliff:g></b> доступ к камере устройства."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Разблокировать микрофон устройства?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Разблокировать камеру устройства?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Разблокировать камеру и микрофон устройства?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Будет снята блокировка доступа для всех приложений и сервисов с разрешением на использование микрофона."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Будет снята блокировка доступа для всех приложений и сервисов с разрешением на использование камеры."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Будет снята блокировка доступа для всех приложений и сервисов с разрешением на использование камеры или микрофона."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Устройство"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Чтобы переключиться между приложениями, проведите по экрану вверх."</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Перетащите вправо, чтобы быстро переключиться между приложениями"</string> @@ -503,7 +515,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"Откл. фоновой передачи данных"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"Отключить режим энергосбережения"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"Во время записи или трансляции у приложения \"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>\" будет доступ ко всей информации, которая видна на экране или воспроизводится с устройства, в том числе к паролям, сведениям о платежах, фотографиям, сообщениям и прослушиваемым аудиозаписям."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Во время записи или трансляции у сервиса, предоставляющего эту функцию, будет доступ ко всей информации, которая видна на экране или воспроизводится с устройства, в том числе к паролям, сведениям о платежах, фотографиям, сообщениям и прослушиваемым аудиозаписям."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Во время записи или трансляции у сервиса, предоставляющего эту функцию, будет доступ ко всей информации, которая видна на экране или проигрывается на устройстве, включая пароли, сведения о платежах, фотографии, сообщения и воспроизводимые звуки."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Начать запись или трансляцию?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Начать запись или трансляцию через приложение \"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>\"?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"Больше не показывать"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Будильник"</string> <string name="wallet_title" msgid="5369767670735827105">"Кошелек"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Можно использовать"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Добавить способ оплаты"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Разблокировать для использования"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Не удалось получить информацию о картах. Повторите попытку позже."</string> <string name="status_bar_work" msgid="5238641949837091056">"Рабочий профиль"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Режим полета"</string> <string name="add_tile" msgid="6239678623873086686">"Добавить кнопку быстрого доступа"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Статус:</b> понижено до уровня \"Без звука\""</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Статус:</b> уровень важности повышен"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус:</b> уровень важности понижен"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Всегда показывается вверху списка уведомлений, даже если включен режим \"Только важные\""</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Настройки"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Важные разговоры"</string> <string name="no_shortcut" msgid="8257177117568230126">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" не поддерживает функции разговоров."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Эти уведомления нельзя изменить."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Эту группу уведомлений нельзя настроить здесь."</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Чтобы обновить параметры навигации в системе, перейдите в настройки."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Переход в режим ожидания"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Разговор помечен как важный"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Важные разговоры."</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Эти разговоры показываются вверху списка, и вы можете их читать при включенном режиме \"Только важные\"."</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"На заблокированном экране показываются фото профиля."</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Эти разговоры можно найти во всплывающих чатах на главном экране."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Показывать в режиме \"Не беспокоить\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"ОК"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Настройки"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Переключить"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Жест заменен на кнопку специальных возможностей\n\n"<annotation id="link">"Открыть настройки"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Чтобы временно скрыть кнопку, переместите ее к краю экрана"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Перенести в левый верхний угол"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Перенести в правый верхний угол"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Перенести в левый нижний угол"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Перенести в правый нижний угол"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Перенести к краю и скрыть"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Вернуть из-за края и показать"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Управление устройствами"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Добавьте виджеты для управления устройствами."</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Настройте виджеты управления устройствами"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Прошло не более чем <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Прошло более чем <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"День рождения"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> празднует день рождения"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Скоро день рождения"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Скоро <xliff:g id="NAME">%1$s</xliff:g> празднует день рождения"</string> <string name="anniversary_status" msgid="1790034157507590838">"Годовщина"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> отмечает юбилей"</string> <string name="location_status" msgid="1294990572202541812">"Доступ открыт"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> показывает свое местоположение"</string> <string name="new_story_status" msgid="9012195158584846525">"Новая история"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> поделился новой историей"</string> <string name="video_status" msgid="4548544654316843225">"Просмотр"</string> <string name="audio_status" msgid="4237055636967709208">"Прослушивание аудио"</string> <string name="game_status" msgid="1340694320630973259">"Игра запущена"</string> <string name="empty_user_name" msgid="3389155775773578300">"Друзья"</string> <string name="empty_status" msgid="5938893404951307749">"Давайте поболтаем!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Контент скоро появится."</string> <string name="missed_call" msgid="4228016077700161689">"Пропущенный вызов"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Просматривайте недавние сообщения, пропущенные звонки и обновления статуса."</string> <string name="people_tile_title" msgid="6589377493334871272">"Чат"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> отправил сообщение"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> отправил изображение"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Не удается получить данные об уровне заряда батареи"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Нажмите, чтобы узнать больше."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Будильников нет"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 9f32ac5b48a3..2af8e39f690f 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"තව ග්රහණය කරන්න"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"තිර රුව ඉවත ලන්න"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"තිර රූ පෙර දසුන"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ඉහළම මායිම"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"පහළම මායිම"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"තිර රෙකෝඩරය"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"තිර පටිගත කිරීම සකසමින්"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"තිර පටිගත කිරීමේ සැසියක් සඳහා කෙරෙන දැනුම් දීම"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ආදාන ක්රමය"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ස්ථානය"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ස්ථානය අක්රියයි"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"කැමරාව අවහිර කරන්න"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"මයික්රෆෝනය නිහඬ කරන්න"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"කැමරා ප්රවේශය"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"මයික් ප්රවේශය"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"තිබේ"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"අවහිර කර ඇත"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"මාධ්ය උපාංගය"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"හදිසි ඇමතුම් පමණි"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"තිර පටිගත කිරීම"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ආරම්භ කරන්න"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"නතර කරන්න"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"දිගටම කර ගෙන යාමට, <b><xliff:g id="APP">%s</xliff:g></b> හට ඔබගේ උපාංගයෙහි මයික්රෆෝනයට ප්රවේශය අවශ්යයි."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"දිගටම කර ගෙන යාමට, <b><xliff:g id="APP">%s</xliff:g></b> හට ඔබගේ උපාංගයෙහි කැමරාවට ප්රවේශය අවශ්යයි."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"උපාංග මයික්රෆෝනය අවහිර කිරීම ඉවත් කරන්නද?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"උපාංග කැමරාව අවහිර කිරීම ඉවත් කරන්නද?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"උපාංග කැමරාව සහ මයික්රෆෝනය අවහිර කිරීම ඉවත් කරන්නද?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"මෙය ඔබගේ මයික්රෆෝනය භාවිත කිරීමට ඉඩ දී ඇති සියලු යෙදුම් සහ සේවා සඳහා ප්රවේශය අවහිර කිරීම ඉවත් කරයි."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"මෙය ඔබගේ කැමරාව භාවිතා කිරීමට ඉඩ දී ඇති සියලු යෙදුම් සහ සේවා සඳහා ප්රවේශය අවහිර කිරීම ඉවත් කරයි."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"මෙය ඔබගේ කැමරාව හෝ මයික්රෆෝනය භාවිත කිරීමට ඉඩ දී ඇති සියලු යෙදුම් සහ සේවා සඳහා ප්රවේශය අවහිර කිරීම ඉවත් කරයි."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"උපාංගය"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ඉක්මනින් යෙදුම් මාරු කිරීමට දකුණට අදින්න"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"එලාමය"</string> <string name="wallet_title" msgid="5369767670735827105">"පසුම්බිය"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"සියල්ල පෙන්වන්න"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"ගෙවීමට අගුලු හරින්න"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"සූදානම්"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ගෙවීම පිහිටුවන්න"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"භාවිත කිරීමට අගුලු හරින්න"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index ec2f637f1580..152f2915abf2 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Nasnímať viac"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Zavrieť snímku obrazovky"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ukážka snímky obrazovky"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Horná hranica"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Dolná hranica"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Rekordér obrazovky"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Spracúva sa záznam obrazovky"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Zobrazuje sa upozornenie týkajúce sa relácie záznamu obrazovky"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metóda vstupu"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Poloha"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Poloha vypnutá"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokovať fotoaparát"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Vypnúť zvuk mikrofónu"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Prístup k fotoaparátu"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Prístup k mikrofónu"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"K dispozícii"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokované"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Mediálne zariadenie"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Len tiesňové volania"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Záznam obrazovky"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Začať"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ukončiť"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Ak chcete pokračovať, <b><xliff:g id="APP">%s</xliff:g></b> požaduje prístup k mikrofónu zariadenia."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Ak chcete pokračovať, <b><xliff:g id="APP">%s</xliff:g></b> požaduje prístup k fotoaparátu zariadenia."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Chcete odblokovať mikrofón zariadenia?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Chcete odblokovať fotoaparát zariadenia?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Chcete odblokovať fotoaparát a mikrofón zariadenia?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Táto akcia odblokuje prístup všetkým aplikáciám a službám, ktoré majú povolené používať mikrofón."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Táto akcia odblokuje prístup všetkým aplikáciám a službám, ktoré majú povolené používať fotoaparát."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Táto akcia odblokuje prístup všetkým aplikáciám a službám, ktoré majú povolené používať fotoaparát alebo mikrofón."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Zariadenie"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Potiahnutím nahor prepnete aplikácie"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Presunutím doprava rýchlo prepnete aplikácie"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Budík"</string> <string name="wallet_title" msgid="5369767670735827105">"Peňaženka"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Pripravené"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Nastaviť platbu"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odomknúť a použiť"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Pri načítavaní kariet sa vyskytol problém. Skúste to neskôr."</string> <string name="status_bar_work" msgid="5238641949837091056">"Pracovný profil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Režim v lietadle"</string> <string name="add_tile" msgid="6239678623873086686">"Pridať dlaždicu"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Preradené nižšie do kategórie Tiché"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Preradené vyššie"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stav:</b> Preradené nižšie"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Vždy sa zobrazuje v hornej časti upozornení, aj keď je zapnutý režim priority"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Nastavenia"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioritné konverzácie"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> nepodporuje funkcie konverzácie"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tieto upozornenia sa nedajú upraviť."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Túto skupinu upozornení nejde na tomto mieste konfigurovať"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Prejdite do Nastavení a aktualizujte navigáciu v systéme"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Pohotovostný režim"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konverzácia je nastavená ako prioritná"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioritné konverzácie"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Tieto konverzácie sa zobrazujú na začiatku zoznamu a keď je zapnutý režim priority, vždy dostanete upozornenie"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilové fotky sa zobrazujú na uzamknutej obrazovke"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Tieto konverzácie ľahko nájdete v bublinách na ploche"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Prerušovať režim bez vyrušení"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Dobre"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Nastavenia"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Prepnúť"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Tlačidlo dostupnosti nahradilo gesto dostupnosti\n\n"<annotation id="link">"Zobraziť nastavenia"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Ak chcete tlačidlo dočasne skryť, presuňte ho k okraju"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Presunúť doľava nahor"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Presunúť doprava nahor"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Presunúť doľava nadol"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Presunúť doprava nadol"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Presunúť k okraju a skryť"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Presunúť z okraja a zobraziť"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Ovládanie zariadení"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Pridajte si ovládače pripojených zariadení"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Nastavenie ovládania zariadení"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Pred menej ako <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Pred viac ako <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Narodeniny"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> má narodeniny"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Blížia sa narodeniny"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> má čoskoro narodeniny"</string> <string name="anniversary_status" msgid="1790034157507590838">"Výročie"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> má výročie"</string> <string name="location_status" msgid="1294990572202541812">"Zdieľa sa poloha"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> zdieľa polohu"</string> <string name="new_story_status" msgid="9012195158584846525">"Nová správa"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> zdieľal(a) nový príbeh"</string> <string name="video_status" msgid="4548544654316843225">"Pozerá sa video"</string> <string name="audio_status" msgid="4237055636967709208">"Počúvam"</string> <string name="game_status" msgid="1340694320630973259">"Hrá sa hra"</string> <string name="empty_user_name" msgid="3389155775773578300">"Priatelia"</string> <string name="empty_status" msgid="5938893404951307749">"Porozprávajme sa."</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Obsah sa čoskoro zobrazí"</string> <string name="missed_call" msgid="4228016077700161689">"Zmeškaný hovor"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pozrite si nedávne správy, zmeškané hovory a aktualizácie stavu"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzácia"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> poslal(a) správu"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> poslal(a) obrázok"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Pri čítaní meradla batérie sa vyskytol problém"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Klepnutím si zobrazíte ďalšie informácie"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Žiadny budík"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 868372c9ead7..1215f259aa4e 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Zajemi več"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Opusti posnetek zaslona"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Predogled posnetka zaslona"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Zgornji rob"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Spodnji rob"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Snemalnik zaslona"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Obdelava videoposnetka zaslona"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Nenehno obveščanje o seji snemanja zaslona"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Način vnosa"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokacija"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Lokacija izklopljena"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blokiranje fotoaparata"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Izklop mikrofona"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Dostop do fotoaparata"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Dostop do mikrofona"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Na voljo"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blokirano"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Predstavnostna naprava"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Le klici v sili"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Snemanje zaslona"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Začni"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ustavi"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Za nadaljevanje potrebuje aplikacija <b><xliff:g id="APP">%s</xliff:g></b> dostop do mikrofona v napravi."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Za nadaljevanje potrebuje aplikacija <b><xliff:g id="APP">%s</xliff:g></b> dostop do fotoaparata v napravi."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Želite odblokirati mikrofon v napravi?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Želite odblokirati fotoaparat v napravi?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Želite odblokirati fotoaparat in mikrofon v napravi?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"S tem boste odblokirali dostop za vse aplikacije in storitve, ki imajo dovoljenje za uporabo mikrofona."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"S tem boste odblokirali dostop za vse aplikacije in storitve, ki imajo dovoljenje za uporabo fotoaparata."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"S tem boste odblokirali dostop za vse aplikacije in storitve, ki imajo dovoljenje za uporabo fotoaparata ali mikrofona."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Naprava"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Za preklop aplikacij povlecite navzgor"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Povlecite v desno za hiter preklop med aplikacijami"</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Opozorilo"</string> <string name="wallet_title" msgid="5369767670735827105">"Denarnica"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Pripravljeno"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Nastavite plačilno sredstvo"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odklenite za uporabo"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Pri pridobivanju kartic je prišlo do težave. Poskusite znova pozneje."</string> <string name="status_bar_work" msgid="5238641949837091056">"Profil za Android Work"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Način za letalo"</string> <string name="add_tile" msgid="6239678623873086686">"Dodajanje ploščice"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stanje:</b> Uvrščeno med obvestila brez zvoka"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Stanje:</b> Uvrščeno višje"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stanje:</b> Uvrščeno nižje"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Vedno prikazano na vrhu obvestil, tudi ko je vklopljen prednostni način"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Nastavitve"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prednostni pogovori"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podpira pogovornih funkcij"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Za ta obvestila ni mogoče spremeniti nastavitev."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Te skupine obvestil ni mogoče konfigurirati tukaj"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Če želite posodobiti krmarjenje po sistemu, odprite nastavitve"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje pripravljenosti"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Pogovor je nastavljen kot prednosten"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prednostni pogovori"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ti pogovori so prikazani na vrhu seznama in vas lahko vedno dosežejo, ko je vklopljen prednostni način."</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilne slike so prikazane na zaklenjenem zaslonu."</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Te pogovore brez težav najdete v oblačkih na začetnem zaslonu."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Preglasi način »ne moti«"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"V redu"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Nastavitve"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Stikalo"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Gumb za funkcije za ljudi s posebnimi potrebami je zamenjal pripadajočo potezo.\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> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Premakni zgoraj levo"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Premakni zgoraj desno"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Premakni spodaj levo"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Premakni spodaj desno"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Premakni na rob in skrij"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Premakni z roba in pokaži"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Kontrolniki naprave"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Dodajte kontrolnike za povezane naprave"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Nastavitev kontrolnikov naprave"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Pred manj kot <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Pred več kot <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Rojstni dan"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> ima rojstni dan."</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Rojstni dan se bliža"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Oseba <xliff:g id="NAME">%1$s</xliff:g> bo kmalu imela rojstni dan."</string> <string name="anniversary_status" msgid="1790034157507590838">"Obletnica"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> ima obletnico."</string> <string name="location_status" msgid="1294990572202541812">"Deljenje lokacije"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> deli lokacijo."</string> <string name="new_story_status" msgid="9012195158584846525">"Nova zgodba"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je delila novo zgodbo."</string> <string name="video_status" msgid="4548544654316843225">"Gledanje"</string> <string name="audio_status" msgid="4237055636967709208">"Poslušanje"</string> <string name="game_status" msgid="1340694320630973259">"Igranje"</string> <string name="empty_user_name" msgid="3389155775773578300">"Prijatelji"</string> <string name="empty_status" msgid="5938893404951307749">"Naj se klepet začne!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Vsebina bo kmalu prikazana."</string> <string name="missed_call" msgid="4228016077700161689">"Neodgovorjeni klic"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Več kot <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Ogled nedavnih sporočil, neodgovorjenih klicev in posodobitev stanj"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pogovor"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je poslala sporočilo."</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je poslala sliko."</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Težava z branjem indikatorja stanja napolnjenosti baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dotaknite se za več informacij"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ni nastavljenih alarmov"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 990aad97ee52..433b49f56156 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Shkrep më shumë"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Hiq pamjen e ekranit"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Pamja paraprake e imazhit"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Kufiri i sipërm"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Kufiri i poshtëm"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Regjistruesi i ekranit"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Regjistrimi i ekranit po përpunohet"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Njoftim i vazhdueshëm për një seancë regjistrimi të ekranit"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Metoda e hyrjes"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Vendndodhja"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Vendndodhja është e çaktivizuar"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blloko kamerën"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Çaktivizo mikrofonin"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Qasja te kamera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Qasja te mikrofoni"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"E disponueshme"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"E bllokuar"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Pajisje e jashtme ruajtëse"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Vetëm telefonata urgjence"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Regjistrimi i ekranit"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Nis"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ndalo"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Për të vazhduar, <b><xliff:g id="APP">%s</xliff:g></b> ka nevojë të qaset në mikrofonin e pajisjes sate."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Për të vazhduar, <b><xliff:g id="APP">%s</xliff:g></b> ka nevojë të qaset në kamerën e pajisjes sate."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Të zhbllokohet mikrofoni i pajisjes?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Të zhbllokohet kamera e pajisjes?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Të zhbllokohen kamera dhe mikrofoni i pajisjes?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Kjo zhbllokon qasjen për të gjitha aplikacionet dhe shërbimet që lejohen të përdorin mikrofonin tënd."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Kjo zhbllokon qasjen për të gjitha aplikacionet dhe shërbimet që lejohen të përdorin kamerën tënde."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Kjo zhbllokon qasjen për të gjitha aplikacionet dhe shërbimet që lejohen të përdorin kamerën ose mikrofonin tënd."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Pajisja"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Rrëshqit shpejt lart për të ndërruar aplikacionet"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Zvarrit djathtas për të ndërruar aplikacionet me shpejtësi"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Eternet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarmi"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Gati"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Konfiguro pagesën"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Shkyçe për ta përdorur"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Pati një problem me marrjen e kartave të tua. Provo përsëri më vonë"</string> <string name="status_bar_work" msgid="5238641949837091056">"Profili i punës"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Modaliteti i aeroplanit"</string> <string name="add_tile" msgid="6239678623873086686">"Shto një pllakëz"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Statusi:</b> Ulur në nivel si në heshtje"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Statusi:</b> Renditur më lart"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Statusi:</b> Renditur më poshtë"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Shfaqen gjithmonë në krye të njoftimeve, edhe kur modaliteti \"Me përparësi\" është aktiv"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Cilësimet"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Bisedat me përparësi"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> nuk mbështet veçoritë e bisedës"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Këto njoftime nuk mund të modifikohen."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ky grup njoftimesh nuk mund të konfigurohet këtu"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Shko te \"Cilësimet\" për të përditësuar navigimin e sistemit"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Në gatishmëri"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Biseda u caktua me përparësi"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Bisedat me përparësi"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Këto biseda shfaqen në krye të listës sate dhe mund të të shfaqen gjithmonë kur modaliteti \"Me përparësi\" është aktiv"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Fotografitë e profilit shfaqen në ekranin e kyçjes"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Mund t\'i gjesh me lehtësi këto biseda te flluskat në ekranin bazë"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ndërprit \"Mos shqetëso\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"E kuptova"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Cilësimet"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Ndërro"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Butoni i qasshmërisë është zëvendësuar me gjestin e qasshmërisë\n\n"<annotation id="link">"Shiko cilësimet"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Zhvendose butonin në skaj për ta fshehur përkohësisht"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Zhvendos lart majtas"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Zhvendos lart djathtas"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Zhvendos poshtë majtas"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Zhvendos poshtë djathtas"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Zhvendose te skaji dhe fshihe"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Zhvendose jashtë skajit dhe shfaqe"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Kontrollet e pajisjes"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Shto kontrolle për pajisjet e tua të lidhura"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfiguro kontrollet e pajisjes"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Më pak se <xliff:g id="DURATION">%1$s</xliff:g> më parë"</string> <string name="over_timestamp" msgid="4765793502859358634">"Mbi <xliff:g id="DURATION">%1$s</xliff:g> më parë"</string> <string name="birthday_status" msgid="2596961629465396761">"Ditëlindja"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> ka ditëlindjen"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Ditëlindje së shpejti"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> ka ditëlindjen së shpejti"</string> <string name="anniversary_status" msgid="1790034157507590838">"Përvjetor"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> ka përvjetorin"</string> <string name="location_status" msgid="1294990572202541812">"Ndarja e vendndodhjes"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> po ndan vendndodhjen"</string> <string name="new_story_status" msgid="9012195158584846525">"Histori e re"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ndau një histori të re"</string> <string name="video_status" msgid="4548544654316843225">"Po shikon"</string> <string name="audio_status" msgid="4237055636967709208">"Po dëgjon"</string> <string name="game_status" msgid="1340694320630973259">"Po luhet"</string> <string name="empty_user_name" msgid="3389155775773578300">"Miq"</string> <string name="empty_status" msgid="5938893404951307749">"Le të bisedojmë sonte!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Përmbajtjet do të shfaqen së shpejti"</string> <string name="missed_call" msgid="4228016077700161689">"Telefonatë e humbur"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Mbi <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Shiko mesazhet e fundit, telefonatat e humbura dhe përditësimet e statusit"</string> <string name="people_tile_title" msgid="6589377493334871272">"Biseda"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> dërgoi një mesazh"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> dërgoi një imazh"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem me leximin e matësit të baterisë"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Trokit për më shumë informacione"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nuk është caktuar asnjë alarm"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 55d75f83bd9a..54151e43d9c4 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Снимите још"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Одбаците снимак екрана"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Преглед снимка екрана"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Горња граница"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Доња граница"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Снимач екрана"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Обрађујемо видео снимка екрана"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Обавештење о сесији снимања екрана је активно"</string> @@ -123,7 +129,7 @@ <string name="usb_preference_title" msgid="1439924437558480718">"Опције USB преноса датотека"</string> <string name="use_mtp_button_title" msgid="5036082897886518086">"Прикључи као медија плејер (MTP)"</string> <string name="use_ptp_button_title" msgid="7676427598943446826">"Прикључи као камеру (PTP)"</string> - <string name="installer_cd_button_title" msgid="5499998592841984743">"Инсталирај Android пребацивање датотека за Mac"</string> + <string name="installer_cd_button_title" msgid="5499998592841984743">"Инсталирај Android пребацивање фајлова за Mac"</string> <string name="accessibility_back" msgid="6530104400086152611">"Назад"</string> <string name="accessibility_home" msgid="5430449841237966217">"Почетна"</string> <string name="accessibility_menu" msgid="2701163794470513040">"Мени"</string> @@ -350,8 +356,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Метод уноса"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Локација"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Локација је искључена"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Блокирај камеру"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Искључи микрофон"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Приступ камери"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Приступ микрофону"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Доступно"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Блокирано"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Медијски уређај"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Само хитни позиви"</string> @@ -424,8 +432,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Снимак екрана"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Почните"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Зауставите"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"<b><xliff:g id="APP">%s</xliff:g></b> захтева приступ микрофону уређаја ради настављања."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"<b><xliff:g id="APP">%s</xliff:g></b> захтева приступ камери уређаја ради настављања."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Желите да одблокирате микрофон уређаја?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Желите да одблокирате камеру уређаја?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Желите да одблокирате камеру и микрофон уређаја?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Овим ће се одблокирати приступ за све апликације и услуге које имају дозволу за коришћење микрофона."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Овим ће се одблокирати приступ за све апликације и услуге које имају дозволу за коришћење камере."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Овим ће се одблокирати приступ за све апликације и услуге које имају дозволу за коришћење камере или микрофона."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Уређај"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Превуците нагоре да бисте мењали апликације"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Превуците удесно да бисте брзо променили апликације"</string> @@ -660,18 +672,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Етернет"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Аларм"</string> <string name="wallet_title" msgid="5369767670735827105">"Новчаник"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Спремно"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Подесите плаћање"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Откључај ради коришћења"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Дошло је до проблема при преузимању картица. Пробајте поново касније"</string> <string name="status_bar_work" msgid="5238641949837091056">"Пословни профил"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Режим рада у авиону"</string> <string name="add_tile" msgid="6239678623873086686">"Додај плочицу"</string> @@ -740,11 +748,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Статус:</b> Деградирано у Нечујно"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Статус:</b> Рангирано више"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус:</b> Рангирано ниже"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Увек се приказује у врху обавештења чак и када је Приоритетни режим укључен"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Подешавања"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Приоритетне конверзације"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не подржава функције конверзације"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ова обавештења не могу да се мењају."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ова група обавештења не може да се конфигурише овде"</string> @@ -1020,14 +1026,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Идите у Подешавања да бисте ажурирали навигацију система"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Стање приправности"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Конверзација је подешена на приоритетну"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Приоритетне конверзације"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ове конверзације се приказују у врху листе и увек могу да допру до вас када је Приоритетни режим укључен"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Слике профила се приказују на закључаном екрану"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Лако можете да пронађете ове конверзације у облачићима на почетном екрану"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Омета подешавање Не узнемиравај"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Важи"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Подешавања"</string> @@ -1045,18 +1047,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Пређи"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Дугме Приступачност је заменило покрет за приступачност\n\n"<annotation id="link">"Прикажи подешавања"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Померите дугме до ивице да бисте га привремено сакрили"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Премести горе лево"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Премести горе десно"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Премести доле лево"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Премести доле десно"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Премести до ивице и сакриј"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Премести изван ивице и прикажи"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Контроле уређаја"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Додајте контроле за повезане уређаје"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Подесите контроле уређаја"</string> @@ -1136,35 +1132,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Пре мање од <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="over_timestamp" msgid="4765793502859358634">"Пре више од <xliff:g id="DURATION">%1$s</xliff:g>"</string> <string name="birthday_status" msgid="2596961629465396761">"Рођендан"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> данас слави рођендан"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Рођендан је ускоро"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> ускоро слави рођендан"</string> <string name="anniversary_status" msgid="1790034157507590838">"Годишњица"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> данас слави годишњицу"</string> <string name="location_status" msgid="1294990572202541812">"Дели се локација"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> дели локацију"</string> <string name="new_story_status" msgid="9012195158584846525">"Нова прича"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> дели нову причу"</string> <string name="video_status" msgid="4548544654316843225">"Гледа се"</string> <string name="audio_status" msgid="4237055636967709208">"Слуша се"</string> <string name="game_status" msgid="1340694320630973259">"Игра се"</string> <string name="empty_user_name" msgid="3389155775773578300">"Пријатељи"</string> <string name="empty_status" msgid="5938893404951307749">"Ћаскамо вечерас!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Садржај ће се ускоро појавити"</string> <string name="missed_call" msgid="4228016077700161689">"Пропуштен позив"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Погледајте недавне поруке, пропуштене позиве и ажурирања статуса"</string> <string name="people_tile_title" msgid="6589377493334871272">"Конверзација"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> шаље поруку"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> шаље слику"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Проблем са очитавањем мерача батерије"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Додирните за више информација"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Аларм није подешен"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 8284cbd0ab6f..ff12781e0a36 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Fånga mer"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Stäng skärmbild"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Förhandsgranskning av skärmbild"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Övre gräns"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Nedre gräns"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Skärminspelare"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Behandlar skärminspelning"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Avisering om att skärminspelning pågår"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Inmatningsmetod"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Plats"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Plats har inaktiverats"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Blockera Kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Stäng av mikrofonen"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kameraåtkomst"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofonåtkomst"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Tillgänglig"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Blockerad"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medieenhet"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Endast nödsamtal"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Skärminspelning"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Starta"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stoppa"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"<b><xliff:g id="APP">%s</xliff:g></b> behöver behörighet till enhetens mikrofon för att fortsätta."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"<b><xliff:g id="APP">%s</xliff:g></b> behöver behörighet till enhetens kamera för att fortsätta."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vill du återaktivera enhetens mikrofon?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vill du återaktivera enhetens kamera?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vill du återaktivera enhetens kamera och mikrofon?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Detta återaktiverar åtkomsten för alla appar och tjänster som tillåts att använda mikrofonen."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Detta återaktiverar åtkomsten för alla appar och tjänster som tillåts att använda kameran."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Detta återaktiverar åtkomsten för alla appar och tjänster som tillåts att använda kameran eller mikrofonen."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Enhet"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Byt appar genom att svepa uppåt"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Tryck och dra åt höger för att snabbt byta mellan appar"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Klar"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Konfigurera betalning"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lås upp för att använda"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Det gick inte att hämta dina kort. Försök igen senare."</string> <string name="status_bar_work" msgid="5238641949837091056">"Jobbprofil"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Flygplansläge"</string> <string name="add_tile" msgid="6239678623873086686">"Lägg till en ruta"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Ändrad till Tyst"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Höjd"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Sänkt"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Visas alltid överst i aviseringarna, även när prioritetsläget är på"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Inställningar"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Prioriterade konversationer"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inte stöd för konversationsfunktioner"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Det går inte att ändra de här aviseringarna."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Den här aviseringsgruppen kan inte konfigureras här"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Öppna inställningarna och uppdatera systemnavigeringen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Viloläge"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konversationen har angetts som prioriterad"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Prioriterade konversationer"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"De här konversationerna visas överst i listan och kan alltid nå dig när prioritetsläget på"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profilbilder visas på låsskärmen"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Du hittar enkelt de här konversationerna i bubblor på startskärmen"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Avbryt Stör ej"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Inställningar"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Reglage"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Tillgänglighetsknappen har ersatt tillgänglighetsrörelsen\n\n"<annotation id="link">"Visa inställningarna"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Flytta knappen till kanten för att dölja den tillfälligt"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Flytta högst upp till vänster"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Flytta högst upp till höger"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Flytta längst ned till vänster"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Flytta längst ned till höger"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Flytta till kanten och dölj"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Flytta från kanten och visa"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Enhetsstyrning"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Lägg till snabbkontroller för anslutna enheter"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfigurera enhetsstyrning"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Mindre än <xliff:g id="DURATION">%1$s</xliff:g> sedan"</string> <string name="over_timestamp" msgid="4765793502859358634">"Mer än <xliff:g id="DURATION">%1$s</xliff:g> sedan"</string> <string name="birthday_status" msgid="2596961629465396761">"Födelsedag"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> fyller år"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Födelsedag inom kort"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> fyller snart år"</string> <string name="anniversary_status" msgid="1790034157507590838">"Högtidsdag"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> har bemärkelsedag"</string> <string name="location_status" msgid="1294990572202541812">"Delar plats"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> delar sin plats"</string> <string name="new_story_status" msgid="9012195158584846525">"Ny artikel"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> delade en ny story"</string> <string name="video_status" msgid="4548544654316843225">"Tittar"</string> <string name="audio_status" msgid="4237055636967709208">"Lyssnar"</string> <string name="game_status" msgid="1340694320630973259">"Spelar"</string> <string name="empty_user_name" msgid="3389155775773578300">"Vänner"</string> <string name="empty_status" msgid="5938893404951307749">"Vi chattar i kväll!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Innehåll visas snart"</string> <string name="missed_call" msgid="4228016077700161689">"Missat samtal"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"över <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Se de senaste meddelandena, missade samtal och statusuppdateringar"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konversation"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> skickade ett meddelande"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> skickade en bild"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Batteriindikatorn visas inte"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tryck för mer information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Inget inställt alarm"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 848d5b582b7e..1b986989f827 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Nasa zaidi"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ondoa picha ya skrini"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Onyesho la kukagua picha ya skrini"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Mpaka wa sehemu ya juu"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Mpaka wa sehemu ya chini"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Kinasa Skrini"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Inachakata rekodi ya skrini"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Arifa inayoendelea ya kipindi cha kurekodi skrini"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Mbinu ya uingizaji"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Kutambua Mahali"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Kitambua eneo kimezimwa"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Zuia Kamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Zima Maikrofoni"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Ufikiaji wa kamera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Ufikiaji wa maikrofoni"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Unapatikana"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Umezuiwa"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Kifaa cha faili"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Simu za Dharura Pekee"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Rekodi ya Skrini"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Anza kurekodi"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Acha kurekodi"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Ili uendelee, <b><xliff:g id="APP">%s</xliff:g></b> inahitaji ruhusa ya kufikia maikrofoni ya kifaa chako."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Ili uendelee, <b><xliff:g id="APP">%s</xliff:g></b> inahitaji ruhusa ya kufikia kamera ya kifaa chako."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Ungependa kuondoa kizuizi kwenye maikrofoni ya kifaa?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Ungependa kuondoa kizuizi kwenye kamera ya kifaa?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Ungependa kuondoa kizuizi kwenye kamera na maikrofoni ya kifaa?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Hatua hii huondoa kizuizi cha kufikia kwa programu na huduma zote zinazoruhusiwa kutumia maikrofoni yako."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Hatua hii huondoa kizuizi cha kufikia kwa programu na huduma zote zinazoruhusiwa kutumia kamera yako."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Hatua hii huondoa kizuizi cha kufikia kwa programu na huduma zote zinazoruhusiwa kutumia kamera au maikrofoni yako."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Kifaa"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Telezesha kidole juu ili ubadilishe programu"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Buruta kulia ili ubadilishe programu haraka"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethaneti"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Kengele"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Onyesha zote"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Fungua ili ulipe"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Tayari"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Weka njia ya kulipa"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Fungua ili utumie"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index d6e1b6920000..e4117b955f21 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"கூடுதலாகப் படமெடு"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ஸ்கிரீன்ஷாட்டை நிராகரிக்கும்"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ஸ்கிரீன்ஷாட்டின் மாதிரிக்காட்சி"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"மேற்புற எல்லை"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"கீழ்ப்புற எல்லை"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ஸ்கிரீன் ரெக்கார்டர்"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"ஸ்க்ரீன் ரெக்கார்டிங் செயலாக்கப்படுகிறது"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"திரை ரெக்கார்டிங் அமர்விற்கான தொடர் அறிவிப்பு"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"உள்ளீட்டு முறை"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"இருப்பிடம்"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"இருப்பிடத்தை முடக்கு"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"கேமராவைத் தடு"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"மைக்ரோஃபோனை ஒலியடக்கு"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"கேமரா அணுகல்"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"மைக் அணுகல்"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"கிடைக்கிறது"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"தடைசெய்யப்பட்டது"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"மீடியா சாதனம்"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"அவசரகால அழைப்புகள் மட்டும்"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ஸ்கிரீன் ரெக்கார்டு"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"தொடங்கு"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"நிறுத்து"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"தொடர, உங்கள் சாதனத்தின் மைக்ரோஃபோனை அணுகுவதற்கு <b><xliff:g id="APP">%s</xliff:g></b> ஆப்ஸுக்கு அனுமதி வேண்டும்."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"தொடர, உங்கள் சாதனத்தின் கேமராவை அணுகுவதற்கு <b><xliff:g id="APP">%s</xliff:g></b> ஆப்ஸுக்கு அனுமதி வேண்டும்."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"சாதனத்தின் மைக்ரோஃபோனுக்கான தடுப்பை நீக்கவா?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"சாதனத்தின் கேமராவுக்கான தடுப்பை நீக்கவா?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"சாதனத்தின் கேமராவுக்கும் மைக்ரோஃபோனுக்குமான தடுப்பை நீக்கவா?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"உங்கள் மைக்ரோஃபோனைப் பயன்படுத்த அனுமதிக்கப்பட்டுள்ள அனைத்து ஆப்ஸ் மற்றும் சேவைகளை அணுகுவதற்கான தடுப்பை இது நீக்கும்."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"உங்கள் கேமராவைப் பயன்படுத்த அனுமதிக்கப்பட்டுள்ள அனைத்து ஆப்ஸ் மற்றும் சேவைகளை அணுகுவதற்கான தடுப்பை இது நீக்கும்."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"உங்கள் கேமராவையோ மைக்ரோஃபோனையோ பயன்படுத்த அனுமதிக்கப்பட்டுள்ள அனைத்து ஆப்ஸ் மற்றும் சேவைகளை அணுகுவதற்கான தடுப்பை இது நீக்கும்."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"சாதனம்"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ஆப்ஸிற்கு இடையே மாற்றுவதற்கு, மேல்நோக்கி ஸ்வைப் செய்க"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ஆப்ஸை வேகமாக மாற்ற, வலப்புறம் இழுக்கவும்"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ஈதர்நெட்"</string> <string name="status_bar_alarm" msgid="87160847643623352">"அலாரம்"</string> <string name="wallet_title" msgid="5369767670735827105">"வாலட்"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"தயார்"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"பேமெண்ட் முறையை அமையுங்கள்"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"பயன்படுத்துவதற்கு அன்லாக் செய்க"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"உங்கள் கார்டுகளின் விவரங்களைப் பெறுவதில் சிக்கல் ஏற்பட்டது, பிறகு முயலவும்"</string> <string name="status_bar_work" msgid="5238641949837091056">"பணிக் கணக்கு"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"விமானப் பயன்முறை"</string> <string name="add_tile" msgid="6239678623873086686">"டைலைச் சேர்க்கும்"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>நிலை:</b> நிசப்த நிலைக்குக் குறைத்து அமைக்கப்பட்டது"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>நிலை:</b> முக்கியத்துவம் உயர்த்தப்பட்டது"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>நிலை:</b> முக்கியத்துவம் குறைக்கப்பட்டது"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"முன்னுரிமைப் பயன்முறை இயக்கப்பட்டிருக்கும்போதும், எப்போதுமே அறிவிப்புகளின் மேல்புறத்தில் காட்டப்படும்"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"அமைப்புகள்"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"முன்னுரிமை உரையாடல்கள்"</string> <string name="no_shortcut" msgid="8257177117568230126">"உரையாடல் அம்சங்களை <xliff:g id="APP_NAME">%1$s</xliff:g> ஆதரிக்காது"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"இந்த அறிவிப்புகளை மாற்ற இயலாது."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"இந்த அறிவுப்புக் குழுக்களை இங்கே உள்ளமைக்க இயலாது"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"சிஸ்டம் நேவிகேஷனை மாற்ற ’அமைப்புகளுக்குச்’ செல்லவும்"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"இயக்க நேரம்"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"முன்னுரிமை அளிக்கப்பட்ட உரையாடலாக அமைக்கப்பட்டது"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"முன்னுரிமை உரையாடல்கள்"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"முன்னுரிமைப் பயன்முறை இயக்கப்பட்டிருக்கும்போது பட்டியலின் மேல்புறத்தில் இந்த உரையாடல்கள் எப்போதுமே காட்டப்படும்"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"பூட்டுத் திரையில் சுயவிவரப் படங்கள் காட்டப்படும்"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"முகப்புத் திரையில் தோன்றும் குமிழ்களில் இந்த உரையாடல்களை எளிதாகப் பார்க்கலாம்"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\'தொந்தரவு செய்ய வேண்டாம்\' அம்சத்தைக் குறுக்கிடும்"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"சரி"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"அமைப்புகள்"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"ஸ்விட்ச்"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"அணுகல்தன்மை பட்டன் இப்போது அணுகல்தன்மை சைகையாக மாற்றப்பட்டுள்ளது\n\n"<annotation id="link">"அமைப்புகளில் காண்க"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"பட்டனைத் தற்காலிகமாக மறைக்க ஓரத்திற்கு நகர்த்தும்"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"மேலே இடதுபுறத்திற்கு நகர்த்து"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"மேலே வலதுபுறத்திற்கு நகர்த்து"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"கீழே இடதுபுறத்திற்கு நகர்த்து"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"கீழே வலதுபுறத்திற்கு நகர்த்து"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"ஓரத்திற்கு நகர்த்தி மறை"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"ஓரத்திற்கு நகர்த்தி, காட்டு"</string> <string name="quick_controls_title" msgid="6839108006171302273">"சாதனக் கட்டுப்பாடுகள்"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"இணைக்கப்பட்ட சாதனங்களில் கட்டுப்பாடுகளைச் சேர்க்கலாம்"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"சாதனக் கட்டுப்பாடுகளை அமைத்தல்"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>க்குக் குறைவாக"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g>க்கு முன்பு"</string> <string name="birthday_status" msgid="2596961629465396761">"பிறந்தநாள்"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> அவர்களின் பிறந்தநாள்"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"விரைவில் பிறந்தநாள்"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> அவர்களின் பிறந்தநாள் விரைவில் வரவுள்ளது"</string> <string name="anniversary_status" msgid="1790034157507590838">"ஆண்டு விழா"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> அவர்களின் ஆண்டுவிழா"</string> <string name="location_status" msgid="1294990572202541812">"இடத்தைப் பகிர்கிறது"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> இருப்பிடத்தைப் பகிர்கிறார்"</string> <string name="new_story_status" msgid="9012195158584846525">"புதிய செய்தி"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> புதிய கதையைப் பகிர்ந்துள்ளார்"</string> <string name="video_status" msgid="4548544654316843225">"பார்க்கிறீர்கள்"</string> <string name="audio_status" msgid="4237055636967709208">"ஆடியோ கேட்கிறீர்கள்"</string> <string name="game_status" msgid="1340694320630973259">"விளையாடுகிறீர்கள்"</string> <string name="empty_user_name" msgid="3389155775773578300">"நண்பர்கள்"</string> <string name="empty_status" msgid="5938893404951307749">"இன்றிரவு உரையாடலாம்!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"உள்ளடக்கம் விரைவில் தோன்றும்"</string> <string name="missed_call" msgid="4228016077700161689">"தவறிய அழைப்பு"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"சமீபத்திய மெசேஜ்களையும் தவறிய அழைப்புகளையும் ஸ்டேட்டஸ் அப்டேட்களையும் பார்க்கலாம்"</string> <string name="people_tile_title" msgid="6589377493334871272">"உரையாடல்"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ஒரு மெசேஜ் அனுப்பியுள்ளார்"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ஒரு படம் அனுப்பியுள்ளார்"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"பேட்டரி அளவை அறிவதில் சிக்கல்"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"மேலும் தகவல்களுக்கு தட்டவும்"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"அலாரம் எதுவுமில்லை"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 8b2392ecaaac..1041f6487d64 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"మరిన్ని క్యాప్చర్ చేయండి"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"స్క్రీన్షాట్ను విస్మరించు"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"స్క్రీన్షాట్ ప్రివ్యూ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ఎగువ సరిహద్దు"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"దిగువ సరిహద్దు"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"స్క్రీన్ రికార్డర్"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"స్క్రీన్ రికార్డింగ్ అవుతోంది"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"స్క్రీన్ రికార్డ్ సెషన్ కోసం ఆన్గోయింగ్ నోటిఫికేషన్"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ఇన్పుట్ పద్ధతి"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"లొకేషన్"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"లొకేషన్ ఆఫ్లో ఉంది"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"కెమెరాను బ్లాక్ చేయి"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"మైక్రోఫోన్ను మ్యూట్ చేయి"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"ప్రసార మాధ్యమ పరికరం"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ఎమర్జెన్సీ కాల్స్ మాత్రమే"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"స్క్రీన్ రికార్డ్"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ప్రారంభించు"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ఆపు"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"కొనసాగించడానికి, <b><xliff:g id="APP">%s</xliff:g></b>కు మీ పరికరం యొక్క మైక్రోఫోన్ యాక్సెస్ అవసరం."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"కొనసాగించడానికి, <b><xliff:g id="APP">%s</xliff:g></b&gtకు మీ పరికరం యొక్క కెమెరా యాక్సెస్ అవసరం."</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"పరికరం"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"యాప్లను మార్చడం కోసం ఎగువకు స్వైప్ చేయండి"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"యాప్లను శీఘ్రంగా స్విచ్ చేయడానికి కుడి వైపుకు లాగండి"</string> @@ -497,7 +519,7 @@ <string name="battery_saver_notification_text" msgid="2617841636449016951">"పనితీరుని మరియు నేపథ్య డేటాను తగ్గిస్తుంది"</string> <string name="battery_saver_notification_action_text" msgid="6022091913807026887">"బ్యాటరీ సేవర్ను ఆఫ్ చేయండి"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"రికార్డ్ చేస్తున్నప్పుడు లేదా ప్రసారం చేస్తున్నప్పుడు, మీ స్క్రీన్పై ప్రదర్శించబడిన లేదా మీ పరికరం నుండి ప్లే చేయబడిన సమాచారం మొత్తాన్ని, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> యాక్సెస్ చేయగలుగుతుంది. ఈ సమాచారంలో, పాస్వర్డ్లు, చెల్లింపు వివరాలు, ఫోటోలు, సందేశాలు, మీరు ప్లే చేసే ఆడియో వంటివి ఉంటాయి."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"రికార్డ్ చేస్తున్నప్పుడు లేదా ప్రసారం చేస్తున్నప్పుడు మీ స్క్రీన్పై ప్రదర్శించబడిన లేదా మీ పరికరం నుండి ప్లే చేయబడిన సమాచారం మొత్తాన్ని, ఈ ఫంక్షన్ను అందిస్తున్న సర్వీసు యాక్సెస్ చేయగలదు. ఈ సమాచారంలో, పాస్వర్డ్లు, చెల్లింపు వివరాలు, ఫోటోలు, సందేశాలు, మీరు ప్లే చేసే ఆడియో వంటివి ఉంటాయి."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"రికార్డ్ చేస్తున్నప్పుడు లేదా ప్రసారం చేస్తున్నప్పుడు మీ స్క్రీన్పై ప్రదర్శించబడిన లేదా మీ పరికరం నుండి ప్లే చేయబడిన సమాచారం మొత్తాన్ని, ఈ ఫంక్షన్ను అందిస్తున్న సర్వీసు యాక్సెస్ చేయగలదు. ఈ సమాచారంలో, పాస్వర్డ్లు, పేమెంట్ వివరాలు, ఫోటోలు, మెసేజ్లు, మీరు ప్లే చేసే ఆడియో వంటివి ఉంటాయి."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"రికార్డ్ చేయడం లేదా ప్రసారం చేయడం ప్రారంభించాలా?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>తో రికార్డ్ చేయడం లేదా ప్రసారం చేయడం ప్రారంభించాలా?"</string> <string name="media_projection_remember_text" msgid="6896767327140422951">"మళ్లీ చూపవద్దు"</string> @@ -657,9 +679,9 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ఈథర్నెట్"</string> <string name="status_bar_alarm" msgid="87160847643623352">"అలారం"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> <skip /> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index b8e586de5c42..30723fa88d30 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"จับภาพได้มากขึ้น"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ปิดภาพหน้าจอ"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"ตัวอย่างภาพหน้าจอ"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"ขอบเขตด้านบน"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"ขอบเขตด้านล่าง"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"โปรแกรมบันทึกหน้าจอ"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"กำลังประมวลผลการอัดหน้าจอ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"การแจ้งเตือนต่อเนื่องสำหรับเซสชันการบันทึกหน้าจอ"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"วิธีป้อนข้อมูล"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"ตำแหน่ง"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"ปิดตำแหน่ง"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"บล็อกกล้องถ่ายรูป"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"ปิดเสียงไมโครโฟน"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"สิทธิ์เข้าถึงกล้อง"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"สิทธิ์เข้าถึงไมโครโฟน"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"มี"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ถูกบล็อก"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"อุปกรณ์สื่อ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"โทรฉุกเฉินเท่านั้น"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"บันทึกหน้าจอ"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"เริ่ม"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"หยุด"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"<b><xliff:g id="APP">%s</xliff:g></b> ต้องได้รับสิทธิ์เข้าถึงไมโครโฟนของอุปกรณ์เพื่อดำเนินการต่อ"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"<b><xliff:g id="APP">%s</xliff:g></b> ต้องได้รับสิทธิ์เข้าถึงกล้องของอุปกรณ์เพื่อดำเนินการต่อ"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"เลิกบล็อกไมโครโฟนของอุปกรณ์ใช่ไหม"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"เลิกบล็อกกล้องของอุปกรณ์ใช่ไหม"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"เลิกบล็อกกล้องและไมโครโฟนของอุปกรณ์ใช่ไหม"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"การดำเนินการนี้จะเลิกบล็อกสิทธิ์เข้าถึงของแอปและบริการทั้งหมดที่ได้รับอนุญาตให้ใช้ไมโครโฟนของคุณ"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"การดำเนินการนี้จะเลิกบล็อกสิทธิ์เข้าถึงของแอปและบริการทั้งหมดที่ได้รับอนุญาตให้ใช้กล้องของคุณ"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"การดำเนินการนี้จะเลิกบล็อกสิทธิ์เข้าถึงของแอปและบริการทั้งหมดที่ได้รับอนุญาตให้ใช้กล้องหรือไมโครโฟนของคุณ"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"อุปกรณ์"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"เลื่อนขึ้นเพื่อสลับแอป"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ลากไปทางขวาเพื่อสลับแอปอย่างรวดเร็ว"</string> @@ -550,8 +562,8 @@ <string name="monitoring_description_management_ca_certificate" msgid="7785013130658110130">"องค์กรของคุณติดตั้งผู้ออกใบรับรองในอุปกรณ์นี้ อาจมีการตรวจสอบหรือแก้ไขการจราจรของข้อมูลในเครือข่ายที่ปลอดภัยของคุณ"</string> <string name="monitoring_description_managed_profile_ca_certificate" msgid="7904323416598435647">"องค์กรของคุณติดตั้งผู้ออกใบรับรองในโปรไฟล์งาน อาจมีการตรวจสอบหรือแก้ไขการจราจรของข้อมูลในเครือข่ายที่ปลอดภัยของคุณ"</string> <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"มีการติดตั้งผู้ออกใบรับรองในอุปกรณ์นี้ อาจมีการตรวจสอบหรือแก้ไขการจราจรของข้อมูลในเครือข่ายที่ปลอดภัยของคุณ"</string> - <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ผู้ดูแลระบบได้เปิดการบันทึกเครือข่าย ซึ่งจะตรวจสอบการจราจรของข้อมูลในอุปกรณ์ของคุณ"</string> - <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ผู้ดูแลระบบได้เปิดการบันทึกเครือข่าย ซึ่งจะตรวจสอบการรับส่งข้อมูลในโปรไฟล์งาน แต่ไม่ตรวจสอบในโปรไฟล์ส่วนตัวของคุณ"</string> + <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ผู้ดูแลระบบได้เปิดการบันทึกกิจกรรมของเครือข่าย ซึ่งจะตรวจสอบการรับส่งข้อมูลในอุปกรณ์ของคุณ"</string> + <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ผู้ดูแลระบบได้เปิดการบันทึกกิจกรรมของเครือข่าย ซึ่งจะตรวจสอบการรับส่งข้อมูลในโปรไฟล์งานแต่ไม่ตรวจสอบในโปรไฟล์ส่วนตัวของคุณ"</string> <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"คุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"คุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP_0">%1$s</xliff:g> และ <xliff:g id="VPN_APP_1">%2$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"โปรไฟล์งานของคุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> @@ -566,7 +578,7 @@ <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"เปิดการตั้งค่า VPN"</string> <string name="monitoring_description_ca_cert_settings_separator" msgid="7107390013344435439">" "</string> <string name="monitoring_description_ca_cert_settings" msgid="8329781950135541003">"เปิดข้อมูลรับรองที่เชื่อถือได้"</string> - <string name="monitoring_description_network_logging" msgid="577305979174002252">"ผู้ดูแลระบบได้เปิดการทำบันทึกเครือข่าย ซึ่งจะติดตามดูการรับส่งข้อมูลบนอุปกรณ์ของคุณ\n\nโปรดติดต่อผู้ดูแลระบบสำหรับข้อมูลเพิ่มเติม"</string> + <string name="monitoring_description_network_logging" msgid="577305979174002252">"ผู้ดูแลระบบได้เปิดการบันทึกกิจกรรมของเครือข่าย ซึ่งจะตรวจสอบการรับส่งข้อมูลในอุปกรณ์ของคุณ\n\nโปรดติดต่อผู้ดูแลระบบหากต้องการข้อมูลเพิ่มเติม"</string> <string name="monitoring_description_vpn" msgid="1685428000684586870">"คุณได้ให้สิทธิ์แอปในการตั้งค่าการเชื่อมต่อ VPN\n\nแอปนี้จะสามารถตรวจสอบอุปกรณ์และกิจกรรมในเครือข่าย รวมถึงอีเมล แอป และเว็บไซต์ได้"</string> <string name="monitoring_description_vpn_profile_owned" msgid="4964237035412372751">"โปรไฟล์งานของคุณได้รับการจัดการโดย <xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nผู้ดูแลระบบสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ ซึ่งรวมถึงอีเมล แอป และเว็บไซต์ต่างๆ\n\nโปรดติดต่อผู้ดูแลระบบสำหรับข้อมูลเพิ่มเติม\n\nนอกจากนี้คุณยังเชื่อมต่อกับ VPN ซึ่งตรวจสอบกิจกรรมในเครือข่ายของคุณได้"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"อุปกรณ์นี้จัดการโดยผู้ปกครอง ผู้ปกครองจะดูและจัดการข้อมูลต่างๆ ได้ เช่น แอปที่คุณใช้ ตำแหน่งของคุณ และเวลาอยู่หน้าจอ"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"อีเทอร์เน็ต"</string> <string name="status_bar_alarm" msgid="87160847643623352">"การปลุก"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"แสดงทั้งหมด"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"ปลดล็อกเพื่อชำระเงิน"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"พร้อม"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ตั้งค่าการชำระเงิน"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ปลดล็อกเพื่อใช้"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 9d3378ad03c6..7b6c07e5cc79 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Mag-capture pa"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"I-dismiss ang screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Preview ng screenshot"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Pinakamataas na limitasyon"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Pinakamababang limitasyon"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Recorder ng Screen"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Pinoproseso screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Kasalukuyang notification para sa session ng pag-record ng screen"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Pamamaraan ng Pag-input"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokasyon"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Naka-off ang Lokasyon"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"I-block ang Camera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"I-mute ang Mikropono"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Access sa camera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Access sa mikropono"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Available"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Naka-block"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Device ng media"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Mga Pang-emergency na Tawag Lamang"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Pag-record ng Screen"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Magsimula"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ihinto"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Para magpatuloy, kailangan ng <b><xliff:g id="APP">%s</xliff:g></b> ng access sa mikropono ng iyong device."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Para magpatuloy, kailangan ng <b><xliff:g id="APP">%s</xliff:g></b> ng access sa camera ng iyong device."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"I-unblock ang mikropono ng device?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"I-unblock ang camera ng device?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"I-unblock ang camera at mikropono ng device?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Ina-unblock nito ang access para sa lahat ng app at serbisyong pinapayagang gumamit ng iyong mikropono."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Ina-unblock nito ang access para sa lahat ng app at serbisyong pinapayagang gumamit ng iyong camera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Ina-unblock nito ang access para sa lahat ng app at serbisyong pinapayagang gumamit ng iyong camera o mikropono."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Device"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Mag-swipe pataas upang lumipat ng app"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"I-drag pakanan para mabilisang magpalipat-lipat ng app"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Ipakita lahat"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"I-unlock para magbayad"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Handa na"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Mag-set up ng pagbabayad"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"I-unlock para magamit"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 44ed1aef5714..6bbb41fd1eb5 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Daha fazla ekran görüntüsü al"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ekran görüntüsünü kapat"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ekran görüntüsü önizlemesi"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Üst sınır"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Alt sınır"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Ekran Kaydedicisi"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Ekran kaydı işleniyor"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ekran kaydı oturumu için devam eden bildirim"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Giriş Yöntemi"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Konum"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Konum Bilgisi Kapalı"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Kamerayı Engelle"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mikrofonun Sesini Kapat"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kamera erişimi"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofon erişimi"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Kullanılabilir"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Engellendi"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Medya cihazı"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Yalnızca Acil Çağrılar İçin"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekran Kaydı"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Başlat"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Durdur"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Devam etmek için <b><xliff:g id="APP">%s</xliff:g></b> uygulamasının cihazınızın mikrofonuna erişmesi gerekiyor."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Devam etmek için <b><xliff:g id="APP">%s</xliff:g></b> uygulamasının cihazınızın kamerasına erişmesi gerekiyor."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Cihaz mikrofonunun engellemesi kaldırılsın mı?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Cihaz kamerasının engellemesi kaldırılsın mı?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Cihaz kamerası ile mikrofonunun engellemesi kaldırılsın mı?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Bu işlem, mikrofonunuzu kullanmasına izin verilen tüm uygulama ve hizmetlere erişimin engellemesini kaldırır."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Bu işlem, kameranızı kullanmasına izin verilen tüm uygulama ve hizmetlere erişimin engellemesini kaldırır."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Bu işlem, kamera veya mikrofonunuzu kullanmasına izin verilen tüm uygulama ve hizmetlere erişimin engellemesini kaldırır."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Cihaz"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Uygulamalar arasında geçiş yapmak için yukarı kaydırın"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Uygulamaları hızlıca değiştirmek için sağa kaydırın"</string> @@ -621,7 +633,7 @@ <string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string> <string name="stream_dtmf" msgid="7322536356554673067">"Çift ton çoklu frekans"</string> <string name="stream_accessibility" msgid="3873610336741987152">"Erişilebilirlik"</string> - <string name="ring_toggle_title" msgid="5973120187287633224">"Çağrılar"</string> + <string name="ring_toggle_title" msgid="5973120187287633224">"Aramalar"</string> <string name="volume_ringer_status_normal" msgid="1339039682222461143">"Zili çaldır"</string> <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"Titreşim"</string> <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Sesi kapat"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarm"</string> <string name="wallet_title" msgid="5369767670735827105">"Cüzdan"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Tümünü göster"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Ödeme için kilidi aç"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Hazır"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Ödeme ayarlarını belirle"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Kullanmak için kilidi aç"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 6a762d7affeb..3995e56afec2 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Включити більше деталей"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Закрити знімок екрана"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Перегляд знімка екрана"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Верхня межа"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Нижня межа"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Відеозапис екрана"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Обробка записування екрана"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Сповіщення про сеанс запису екрана"</string> @@ -351,8 +357,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Метод введення"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Місцезнаходження"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Місцезнаходження вимкнено"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Заблокувати камеру"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Вимкнути мікрофон"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Доступ до камери"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Доступ до мікрофона"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Дозволено"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Заблоковано"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Носій"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Екстрені виклики"</string> @@ -426,8 +434,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Запис екрана"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Почати"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Зупинити"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Щоб продовжити, надайте додатку <b><xliff:g id="APP">%s</xliff:g></b> доступ до мікрофона пристрою."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Щоб продовжити, надайте додатку <b><xliff:g id="APP">%s</xliff:g></b> доступ до камери пристрою."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Надати доступ до мікрофона?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Надати доступ до камери пристрою?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Надати доступ до камери й мікрофона?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Усі додатки та сервіси, які можуть користуватися вашим мікрофоном, отримають доступ."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Усі додатки та сервіси, які можуть користуватися вашою камерою, отримають доступ."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Усі додатки та сервіси, які можуть користуватися вашою камерою чи мікрофоном, отримають доступ."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Пристрій"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Проводьте пальцем угору, щоб переходити між додатками"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Перетягуйте праворуч, щоб швидко переходити між додатками"</string> @@ -544,7 +556,7 @@ <string name="monitoring_title_profile_owned" msgid="6301118649405449568">"Відстеження профілю"</string> <string name="monitoring_title" msgid="4063890083735924568">"Відстеження дій у мережі"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"Мережа VPN"</string> - <string name="monitoring_subtitle_network_logging" msgid="2444199331891219596">"Реєстрація в мережі"</string> + <string name="monitoring_subtitle_network_logging" msgid="2444199331891219596">"Журнал мережі"</string> <string name="monitoring_subtitle_ca_certificate" msgid="8588092029755175800">"Сертифікати центру сертифікації"</string> <string name="disable_vpn" msgid="482685974985502922">"Вимкнути VPN"</string> <string name="disconnect_vpn" msgid="26286850045344557">"Від’єднатися від мережі VPN"</string> @@ -556,8 +568,8 @@ <string name="monitoring_description_management_ca_certificate" msgid="7785013130658110130">"Адміністратор організації встановив центр сертифікації на цьому пристрої. Захищений мережевий трафік може відстежуватися або змінюватися."</string> <string name="monitoring_description_managed_profile_ca_certificate" msgid="7904323416598435647">"Адміністратор організації встановив центр сертифікації у вашому робочому профілі. Захищений мережевий трафік може відстежуватися або змінюватися."</string> <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На цьому пристрої встановлено центр сертифікації. Захищений мережевий трафік може відстежуватися або змінюватися."</string> - <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Ваш адміністратор увімкнув реєстрацію в мережі, під час якої на вашому пристрої відстежується трафік."</string> - <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Ваш адміністратор увімкнув реєстрацію в журналі мережі, щоб відстежувати трафік вашого робочого профілю (не особистого)."</string> + <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Ваш адміністратор увімкнув журнал мережі, щоб відстежувати трафік на вашому пристрої."</string> + <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Ваш адміністратор увімкнув журнал мережі, щоб відстежувати трафік вашого робочого профілю (не особистого)."</string> <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Під’єднано додаток <xliff:g id="VPN_APP">%1$s</xliff:g>, який може відстежувати вашу активність у мережі, як-от відкривання електронних листів, додатків і веб-сайтів."</string> <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Під’єднано додатки <xliff:g id="VPN_APP_1">%2$s</xliff:g> та <xliff:g id="VPN_APP_0">%1$s</xliff:g>, які можуть відстежувати вашу активність у мережі, як-от відкривання електронних листів, додатків і веб-сайтів."</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Ваш робочий профіль під’єднано до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>, який може відстежувати вашу активність у мережі, зокрема в електронній пошті, додатках і на веб-сайтах."</string> @@ -572,7 +584,7 @@ <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Відкрити налаштування мережі VPN"</string> <string name="monitoring_description_ca_cert_settings_separator" msgid="7107390013344435439">" "</string> <string name="monitoring_description_ca_cert_settings" msgid="8329781950135541003">"Відкрити надійні облікові дані"</string> - <string name="monitoring_description_network_logging" msgid="577305979174002252">"Ваш адміністратор увімкнув реєстрацію в мережі, під час якої на вашому пристрої відстежується трафік.\n\nЩоб дізнатися більше, зв’яжіться з адміністратором."</string> + <string name="monitoring_description_network_logging" msgid="577305979174002252">"Ваш адміністратор увімкнув журнал мережі, щоб відстежувати трафік на вашому пристрої.\n\nЩоб дізнатися більше, зв’яжіться з адміністратором."</string> <string name="monitoring_description_vpn" msgid="1685428000684586870">"Ви дозволили додатку під’єднуватися до мережі VPN.\n\nЦей додаток може відстежувати вашу активність на пристрої та в мережі, зокрема в електронній пошті, додатках і на веб-сайтах."</string> <string name="monitoring_description_vpn_profile_owned" msgid="4964237035412372751">"Вашим робочим профілем керує адміністратор організації <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nВін може відстежувати ваші дії в мережі, зокрема електронні листи, додатки та веб-сайти.\n\nЩоб дізнатися більше, зв’яжіться з адміністратором.\n\nВаш пристрій також під’єднано до мережі VPN, у якій можна відстежувати ваші дії в мережі."</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Цим пристроєм керують твої батьки. Вони можуть бачити та контролювати, якими додатками ти користуєшся, де перебуваєш і скільки часу проводиш за пристроєм."</string> @@ -663,18 +675,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Сигнал"</string> <string name="wallet_title" msgid="5369767670735827105">"Гаманець"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Готово"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Налаштувати платіж"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Розблокувати, щоб використовувати"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Не вдалось отримати ваші картки. Повторіть спробу пізніше."</string> <string name="status_bar_work" msgid="5238641949837091056">"Робочий профіль"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Режим польоту"</string> <string name="add_tile" msgid="6239678623873086686">"Додавання опції"</string> @@ -743,11 +751,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Статус</b>: знижено до \"Без звуку\""</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Статус</b>: пріоритет підвищено"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус</b>: пріоритет знижено"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Завжди відображаються вгорі списку сповіщень, навіть коли ввімкнено режим пріоритетності"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Налаштування"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Важливі розмови"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не підтримує функції розмов"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ці сповіщення не можна змінити."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Цю групу сповіщень не можна налаштувати тут"</string> @@ -1025,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Перейдіть у налаштування, щоб оновити навігацію в системі"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Режим очікування"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Розмову призначено важливою"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Важливі розмови"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Ці розмови відображаються вгорі списку, і ви завжди можете їх побачити, якщо ввімкнено режим пріоритетності"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Зображення профілів видно на заблокованому екрані"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Для зручності ці розмови відображаються в спливаючих чатах на головному екрані"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Переривають режим \"Не турбувати\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Налаштування"</string> @@ -1050,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Перемкнути"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Замість жесту спеціальних можливостей тепер використовується кнопка\n\n"<annotation id="link">"Переглянути налаштування"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Щоб тимчасово сховати кнопку, перемістіть її на край екрана"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Перемістити ліворуч угору"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Перемістити праворуч угору"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Перемістити ліворуч униз"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Перемістити праворуч униз"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Перемістити до краю, приховати"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Перемістити від краю, показати"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Керування пристроями"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Додайте елементи керування для підключених пристроїв"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Налаштувати елементи керування пристроями"</string> @@ -1142,35 +1138,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Менше ніж <xliff:g id="DURATION">%1$s</xliff:g> тому"</string> <string name="over_timestamp" msgid="4765793502859358634">"Понад <xliff:g id="DURATION">%1$s</xliff:g> тому"</string> <string name="birthday_status" msgid="2596961629465396761">"День народження"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Сьогодні <xliff:g id="NAME">%1$s</xliff:g> святкує День народження"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Скоро іменини"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g> скоро святкуватиме День народження"</string> <string name="anniversary_status" msgid="1790034157507590838">"Річниця"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Сьогодні <xliff:g id="NAME">%1$s</xliff:g> відзначає річницю"</string> <string name="location_status" msgid="1294990572202541812">"Ділюся геоданими"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> ділиться своїм місцезнаходженням"</string> <string name="new_story_status" msgid="9012195158584846525">"Нова історія"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> ділиться новою історією"</string> <string name="video_status" msgid="4548544654316843225">"Дивлюся відео"</string> <string name="audio_status" msgid="4237055636967709208">"Слухаю аудіо"</string> <string name="game_status" msgid="1340694320630973259">"Граю в гру"</string> <string name="empty_user_name" msgid="3389155775773578300">"Друзі"</string> <string name="empty_status" msgid="5938893404951307749">"Поспілкуймося!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Незабаром тут з\'явиться контент"</string> <string name="missed_call" msgid="4228016077700161689">"Пропущений виклик"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Переглядайте останні повідомлення, пропущені виклики й оновлення статусу"</string> <string name="people_tile_title" msgid="6589377493334871272">"Розмова"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> надсилає повідомлення"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> надсилає зображення"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Не вдалось отримати дані лічильника акумулятора"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Натисніть, щоб дізнатися більше"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Немає будильників"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 0ec904f2561f..5f322d5ac848 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"مزید کیپچر کریں"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"اسکرین شاٹ برخاست کریں"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"اسکرین شاٹ کا پیش منظر"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"اوپر کا احاطہ"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"نیچے کا احاطہ"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"سکرین ریکارڈر"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"سکرین ریکارڈنگ پروسیس ہورہی ہے"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"اسکرین ریکارڈ سیشن کیلئے جاری اطلاع"</string> @@ -349,8 +355,14 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"ان پٹ کا طریقہ"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"مقام"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"مقام آف"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"کیمرا مسدود کریں"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"مائیکروفون خاموش کریں"</string> + <!-- no translation found for quick_settings_camera_label (5612076679385269339) --> + <skip /> + <!-- no translation found for quick_settings_mic_label (8392773746295266375) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_available (1453719768420394314) --> + <skip /> + <!-- no translation found for quick_settings_camera_mic_blocked (4710884905006788281) --> + <skip /> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"میڈیا آلہ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"صرف ہنگامی کالیں"</string> @@ -422,8 +434,18 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"اسکرین ریکارڈر کریں"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"آغاز"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"روکیں"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"جاری رکھنے کیلئے <b><xliff:g id="APP">%s</xliff:g></b> کو آپ کے آلے کے مائیکروفون تک رسائی درکار ہے۔"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"جاری رکھنے کیلئے <b><xliff:g id="APP">%s</xliff:g></b> کو آپ کے آلے کے کیمرے تک رسائی درکار ہے۔"</string> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_title (563796653825944944) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_title (8807639852654305227) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_title (4316471859905020023) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_dialog_content (1624701280680913717) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_camera_dialog_content (4704948062372435963) --> + <skip /> + <!-- no translation found for sensor_privacy_start_use_mic_camera_dialog_content (3577642558418404919) --> + <skip /> <string name="media_seamless_remote_device" msgid="177033467332920464">"آلہ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ایپس سوئچ کرنے کیلئے اوپر سوائپ کریں"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"تیزی سے ایپس کو سوئچ کرنے کے لیے دائیں طرف گھسیٹیں"</string> @@ -657,18 +679,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"ایتھرنیٹ"</string> <string name="status_bar_alarm" msgid="87160847643623352">"الارم"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> - <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"تیار ہے"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"ادائیگی سیٹ اپ کریں"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"استعمال کرنے کے لیے غیر مقفل کریں"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"آپ کے کارڈز حاصل کرنے میں ایک مسئلہ درپیش تھا، براہ کرم بعد میں دوبارہ کوشش کریں"</string> <string name="status_bar_work" msgid="5238641949837091056">"دفتری پروفائل"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"ہوائی جہاز وضع"</string> <string name="add_tile" msgid="6239678623873086686">"ٹائل شامل کریں"</string> @@ -737,11 +755,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>اسٹیٹس:</b> کو خاموش پر درجہ بند کیا گیا"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>اسٹیٹس:</b> کو اعلی درجہ دیا گیا"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>اسٹیٹس:</b> کو کم درجہ دیا گیا"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"ترجیحی موڈ آن ہونے پر بھی، ہمیشہ آپ کی اطلاعات کے اوپری حصے میں دکھائی جاتی ہے"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"ترتیبات"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"ترجیحی گفتگوئیں"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> گفتگو کی خصوصیات کو سپورٹ نہیں کرتا ہے"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ان اطلاعات کی ترمیم نہیں کی جا سکتی۔"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"اطلاعات کے اس گروپ کو یہاں کنفیگر نہیں کیا جا سکتا"</string> @@ -1015,14 +1031,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"سسٹم نیویگیشن اپ ڈیٹ کرنے کے لیے ترتیبات پر جائیں"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"اسٹینڈ بائی"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"گفتگو کو ترجیح پر سیٹ کیا گیا"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"ترجیحی گفتگوئیں"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"یہ گفتگوئیں آپ کی فہرست کے اوپری حصے میں دکھائ جاتی ہیں اور جب آپ کا ترجیحی موڈ آن ہوتا ہے تو ہمیشہ آپ تک پہنچ سکتی ہیں"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"پروفائل کی تصاویر مقفل اسکرین پر دکھائی جاتی ہیں"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"آپ ان مکالموں کو آسانی سے اپنی ہوم اسکرین پر بلبلوں میں تلاش کر سکتے ہیں"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"ڈسٹرب نہ کریں میں مداخلت کریں"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"سمجھ آ گئی"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"ترتیبات"</string> @@ -1040,18 +1052,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"سوئچ کریں"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"ایکسیسبیلٹی بٹن کو ایکسیسبیلٹی اشارے سے بدل دیا گیا\n\n"<annotation id="link">"ترتیبات دیکھیں"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"عارضی طور پر بٹن کو چھپانے کے لئے اسے کنارے پر لے جائیں"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"اوپر بائیں جانب لے جائیں"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"اوپر دائیں جانب لے جائيں"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"نیچے بائیں جانب لے جائیں"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"نیچے دائیں جانب لے جائیں"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"EDGE پر لے جائیں اور چھپائیں"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"EDGE اور شو سے باہر منتقل کریں"</string> <string name="quick_controls_title" msgid="6839108006171302273">"آلہ کے کنٹرولز"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"اپنے منسلک آلات کے لیے کنٹرولز شامل کریں"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"آلہ کے کنٹرولز سیٹ اپ کریں"</string> @@ -1130,35 +1136,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g> سے کچھ کم وقت قبل"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g> سے زائد عرصہ قبل"</string> <string name="birthday_status" msgid="2596961629465396761">"سالگرہ"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> کی سالگرہ ہے"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"سالگرہ قریب ہے"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"جلدی ہی <xliff:g id="NAME">%1$s</xliff:g> کی سالگرہ ہے"</string> <string name="anniversary_status" msgid="1790034157507590838">"سالگرہ"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> کی سالگرہ ہے"</string> <string name="location_status" msgid="1294990572202541812">"مقام کا اشتراک کیا جا رہا ہے"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> مقام کا اشتراک کر رہا ہے"</string> <string name="new_story_status" msgid="9012195158584846525">"نئی کہانی"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک نئی کہانی کا اشتراک کیا"</string> <string name="video_status" msgid="4548544654316843225">"دیکھ رہے ہیں"</string> <string name="audio_status" msgid="4237055636967709208">"سنی جا رہی ہے"</string> <string name="game_status" msgid="1340694320630973259">"کھیلی جا رہی ہے"</string> <string name="empty_user_name" msgid="3389155775773578300">"دوست"</string> <string name="empty_status" msgid="5938893404951307749">"آج رات چیٹ کرتے ہیں!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"مواد جلد ہی نظر آئے گا"</string> <string name="missed_call" msgid="4228016077700161689">"چھوٹی ہوئی کال"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"حالیہ پیغامات، چھوٹی ہوئی کالز اور اسٹیٹس اپ ڈیٹس دیکھیں"</string> <string name="people_tile_title" msgid="6589377493334871272">"گفتگو"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک پیغام بھیجا"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک تصویر بھیجی"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"آپ کے بیٹری میٹر کو پڑھنے میں دشواری"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"مزید معلومات کے لیے تھپتھپائیں"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"کوئی الارم سیٹ نہیں ہے"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 66cecef171af..86d1e5f6b4bb 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Yana suratga olish"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Skrinshotni yopish"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Skrinshotga razm solish"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Yuqori chegara"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Quyi chegara"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Ekrandan yozib olish"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Ekran yozib olinmoqda"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ekrandan yozib olish seansi uchun joriy bildirishnoma"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Kiritish usuli"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Joylashuv"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Joylashuvni aniqlash xizmati yoqilmagan"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Kamerani bloklash"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Mikrofonni ovozsiz qilish"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Kameraga ruxsat"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Mikrofonga ruxsat"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Mavjud"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bloklangan"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Media qurilma"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Favqulodda chaqiruvlar"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekranni yozib olish"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Boshlash"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Toʻxtatish"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Davom etish uchun <b> <xliff:g id="APP">%s</xliff:g></b> mikrofoningizdan foydalanishi kerak."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Davom etish uchun <b><xliff:g id="APP">%s</xliff:g></b> qurilmangiz kamerasiga kirishi kerak."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Qurilma mikrofoni blokdan chiqarilsinmi?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Qurilma kamerasi blokdan chiqarilsinmi?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Qurilma kamerasi va mikrofoni blokdan chiqarilsinmi?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Mikrofoningizdan foydalanishga ruxsat berilgan barcha ilovalar va xizmatlar uchun ruxsatni blokdan chiqaradi."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Kamerangizdan foydalanishga ruxsat berilgan barcha ilovalar va xizmatlar uchun ruxsatni blokdan chiqaradi."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Kamera va mikrofoningizdan foydalanishga ruxsat berilgan barcha ilovalar va xizmatlar uchun ruxsatni blokdan chiqaradi."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Qurilma"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Ilovalarni almashtirish uchun ekranni tepaga suring"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Ilovalarni tezkor almashtirish uchun o‘ngga torting"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Signal"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Tayyor"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Toʻlovni sozlash"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Foydalanish uchun qulfdan chiqarish"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Bildirgilarni yuklashda xatolik yuz berdi, keyinroq qaytadan urining"</string> <string name="status_bar_work" msgid="5238641949837091056">"Ish profili"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Parvoz rejimi"</string> <string name="add_tile" msgid="6239678623873086686">"Tezkor sozlamalar tugmasini qo‘shish"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Holati:</b> Sokin darajaga tushirildi"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Holati:</b> Yuqori darajaga chiqarildi"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Holati:</b> Quyi darajaga tushirildi"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"“Faqat muhim” rejimi yoniq boʻlsa ham doimo bildirishnomalaringizning tepasida chiqadi"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Sozlamalar"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Muhim suhbatlar"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasida suhbat funksiyalari ishlamaydi"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirishnomalarni tahrirlash imkonsiz."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ushbu bildirishnomalar guruhi bu yerda sozlanmaydi"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Tizim navigatsiyasini yangilash uchun Sozlamalarni oching"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Kutib turing"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Suhbat muhim deb belgilandi"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Muhim suhbatlar"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Bu suhbatlar roʻyxat yuqorisida chiqadi va “M|uhim” rejimi yoniq boʻlganda oʻqish mumkin"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Profil rasmlari ekran qulfida chiqadi"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Bu suhbatlarni osongina bosh ekrandagi bulutchalardan topishingiz mumkin"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Bezovta qilinmasin rejimida chiqarish"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Sozlamalar"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Almashtirish"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Maxsus imkoniyatlar tugmasi maxsus imkoniyatlar ishorasini almashtirdi\n\n"<annotation id="link">"Sozlamalarni ochish"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Vaqtinchalik berkitish uchun tugmani qirra tomon suring"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Yuqori chapga surish"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Yuqori oʻngga surish"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Quyi chapga surish"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Quyi oʻngga surish"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Chetiga olib borish va yashirish"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Chetidan qaytarish va koʻrsatish"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Qurilmalarni boshqarish"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Ulangan qurilmalar uchun boshqaruv elementlari"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Qurilma boshqaruv elementlarini sozlash"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"<xliff:g id="DURATION">%1$s</xliff:g>dan kam vaqt oldin"</string> <string name="over_timestamp" msgid="4765793502859358634">"<xliff:g id="DURATION">%1$s</xliff:g>dan ortiq vaqt oldin"</string> <string name="birthday_status" msgid="2596961629465396761">"Tavallud kuni"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"<xliff:g id="NAME">%1$s</xliff:g> tavallud ayyomi"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Yaqinda tavallud kun"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Tez orada <xliff:g id="NAME">%1$s</xliff:g> tavallud ayyomini nishonlaydi"</string> <string name="anniversary_status" msgid="1790034157507590838">"Yubiley"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"<xliff:g id="NAME">%1$s</xliff:g> yubileyi"</string> <string name="location_status" msgid="1294990572202541812">"Joylashuv ulashilmoqda"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> joylashuvni ulashmoqda"</string> <string name="new_story_status" msgid="9012195158584846525">"Yangi hikoya"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> yangi hikoyani ulashdi"</string> <string name="video_status" msgid="4548544654316843225">"Tomosha"</string> <string name="audio_status" msgid="4237055636967709208">"Gapiring"</string> <string name="game_status" msgid="1340694320630973259">"Ijro etilmoqda"</string> <string name="empty_user_name" msgid="3389155775773578300">"Doʻstlar"</string> <string name="empty_status" msgid="5938893404951307749">"Bugun yozishaylik!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Kontent tezda chiqadi"</string> <string name="missed_call" msgid="4228016077700161689">"Javobsiz chaqiruv"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Oxirgi xabarlar, javobsiz chaqiruvlar va holat yangilanishlari"</string> <string name="people_tile_title" msgid="6589377493334871272">"Suhbat"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> xabar yubordi"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> rasm yubordi"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Batareya quvvati aniqlanmadi"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Batafsil axborot olish uchun bosing"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Signal sozlanmagan"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index dfcce49d5caf..3afa4057cf20 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Chụp được nhiều hơn"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Đóng ảnh chụp màn hình"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Xem trước ảnh chụp màn hình"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Ranh giới trên"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Ranh giới dưới"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Trình ghi màn hình"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Đang xử lý video ghi màn hình"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Thông báo đang diễn ra về phiên ghi màn hình"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Phương thức nhập"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Vị trí"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Tắt vị trí"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Chặn máy ảnh"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Tắt tiếng micrô"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Quyền truy cập vào máy ảnh"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Quyền truy cập vào micrô"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Được phép"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Bị chặn"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Thiết bị phương tiện"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Chỉ cuộc gọi khẩn cấp"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ghi lại nội dung trên màn hình"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Bắt đầu"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Dừng"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Để tiếp tục, <b><xliff:g id="APP">%s</xliff:g></b> cần quyền truy cập vào micrô trên thiết bị của bạn."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Để tiếp tục, <b><xliff:g id="APP">%s</xliff:g></b> cần quyền truy cập vào máy ảnh trên thiết bị của bạn."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Bỏ chặn micrô của thiết bị?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Bỏ chặn máy ảnh của thiết bị?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Bỏ chặn máy ảnh và micrô của thiết bị?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Thao tác này sẽ bỏ chặn quyền truy cập cho mọi ứng dụng và dịch vụ được phép sử dụng micrô của bạn."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Thao tác này sẽ bỏ chặn quyền truy cập cho mọi ứng dụng và dịch vụ được phép sử dụng máy ảnh của bạn."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Thao tác này sẽ bỏ chặn quyền truy cập cho mọi ứng dụng và dịch vụ được phép sử dụng máy ảnh hoặc micrô của bạn."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Thiết bị"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Vuốt lên để chuyển đổi ứng dụng"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Kéo sang phải để chuyển đổi nhanh giữa các ứng dụng"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Báo thức"</string> <string name="wallet_title" msgid="5369767670735827105">"Ví"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Sẵn sàng"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Thiết lập phương thức thanh toán"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Mở khóa để sử dụng"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Đã xảy ra sự cố khi tải thẻ của bạn. Vui lòng thử lại sau"</string> <string name="status_bar_work" msgid="5238641949837091056">"Hồ sơ công việc"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Chế độ máy bay"</string> <string name="add_tile" msgid="6239678623873086686">"Thêm ô"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Trạng thái:</b> Đã thay đổi thành Im lặng"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Trạng thái:</b> Đã tăng mức độ quan trọng"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Trạng thái:</b> Đã giảm mức độ quan trọng"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"Luôn hiển thị ở đầu thông báo, ngay cả khi Chế độ ưu tiên đang bật"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Cài đặt"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"Cuộc trò chuyện ưu tiên"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> không hỗ trợ các tính năng trò chuyện"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Không thể sửa đổi các thông báo này."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Không thể định cấu hình nhóm thông báo này tại đây"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Chuyển đến phần Cài đặt để cập nhật chế độ di chuyển trên hệ thống"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Chế độ chờ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Đặt cuộc trò chuyện thành ưu tiên"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"Cuộc trò chuyện ưu tiên"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"Các cuộc trò chuyện này hiển thị ở đầu danh sách và luôn trong tầm nhìn của bạn khi Chế độ ưu tiên đang bật"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"Ảnh hồ sơ hiển thị trên màn hình khóa"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"Bạn có thể dễ dàng tìm thấy những cuộc trò chuyện này trong bong bóng trò chuyện trên Màn hình chính"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Làm gián đoạn chế độ Không làm phiền"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"Cài đặt"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Chuyển"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"Nút hỗ trợ tiếp cận đã thay thế cử chỉ hỗ trợ tiếp cận\n\n"<annotation id="link">"Xem chế độ cài đặt"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Di chuyển nút sang cạnh để ẩn nút tạm thời"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Chuyển lên trên cùng bên trái"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Chuyển lên trên cùng bên phải"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"Chuyển tới dưới cùng bên trái"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"Chuyển tới dưới cùng bên phải"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"Chuyển đến cạnh và ẩn"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"Chuyển ra xa cạnh và hiển thị"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Điều khiển thiết bị"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"Thêm các tùy chọn điều khiển cho các thiết bị đã kết nối của bạn"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Thiết lập các tùy chọn điều khiển thiết bị"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"Chưa đầy <xliff:g id="DURATION">%1$s</xliff:g> trước"</string> <string name="over_timestamp" msgid="4765793502859358634">"Hơn <xliff:g id="DURATION">%1$s</xliff:g> trước"</string> <string name="birthday_status" msgid="2596961629465396761">"Sinh nhật"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"Hôm nay là sinh nhật của <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Sắp đến sinh nhật"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"Sắp đến sinh nhật của <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="anniversary_status" msgid="1790034157507590838">"Ngày kỷ niệm"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"Hôm nay là ngày kỷ niệm của <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="location_status" msgid="1294990572202541812">"Đang chia sẻ vị trí"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> đang chia sẻ thông tin vị trí"</string> <string name="new_story_status" msgid="9012195158584846525">"Tin bài mới"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g> đã chia sẻ một tin bài mới"</string> <string name="video_status" msgid="4548544654316843225">"Đang xem"</string> <string name="audio_status" msgid="4237055636967709208">"Đang nghe"</string> <string name="game_status" msgid="1340694320630973259">"Đang chơi"</string> <string name="empty_user_name" msgid="3389155775773578300">"Bạn bè"</string> <string name="empty_status" msgid="5938893404951307749">"Cùng trò chuyện tối nay nhé!"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"Nội dung sẽ sớm hiển thị"</string> <string name="missed_call" msgid="4228016077700161689">"Cuộc gọi nhỡ"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Hơn <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Xem các tin nhắn, cuộc gọi nhỡ và thông tin cập nhật trạng thái gần đây"</string> <string name="people_tile_title" msgid="6589377493334871272">"Cuộc trò chuyện"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> đã gửi một tin nhắn"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> đã gửi một hình ảnh"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Đã xảy ra vấn đề khi đọc dung lượng pin của bạn"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Nhấn để biết thêm thông tin"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Chưa đặt chuông báo"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 96a7ae045987..edef559c5148 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"截取更多内容"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"关闭屏幕截图"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"屏幕截图预览"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"顶部边界"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"底部边界"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"屏幕录制器"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"正在处理屏幕录制视频"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"持续显示屏幕录制会话通知"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"输入法"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"位置信息"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"位置信息：关闭"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"停用摄像头"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"将麦克风静音"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"摄像头使用权限"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"麦克风使用权限"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"已允许"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"已禁用"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"媒体设备"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"只能拨打紧急呼救电话"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"屏幕录制"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"开始"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停止"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"如要继续操作，请向<b><xliff:g id="APP">%s</xliff:g></b>授予设备的麦克风使用权。"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"如要继续操作，请向<b><xliff:g id="APP">%s</xliff:g></b>授予设备的相机使用权。"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"要取消禁用设备麦克风吗？"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"要取消禁用设备摄像头吗？"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"要取消禁用设备摄像头和麦克风吗？"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"这将会为所有获准使用您麦克风的应用和服务启用这项权限。"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"这将会为所有获准使用您摄像头的应用和服务启用这项权限。"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"这将会为所有获准使用您摄像头或麦克风的应用和服务启用这项权限。"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"设备"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"向上滑动可切换应用"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"向右拖动可快速切换应用"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"以太网"</string> <string name="status_bar_alarm" msgid="87160847643623352">"闹钟"</string> <string name="wallet_title" msgid="5369767670735827105">"电子钱包"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"已可使用"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"设置付款方式"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"解锁设备即可使用"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"获取您的卡片时出现问题，请稍后重试"</string> <string name="status_bar_work" msgid="5238641949837091056">"工作资料"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"飞行模式"</string> <string name="add_tile" msgid="6239678623873086686">"添加图块"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>状态</b>：已降低为“静音”"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>状态</b>：已调高顺序"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>状态</b>：已调低顺序"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"始终显示在通知列表的顶部，即使“优先”模式处于开启状态也是如此"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"设置"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"优先对话"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>不支持对话功能"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"无法修改这些通知。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"您无法在此处配置这组通知"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"转到“设置”即可更新系统导航"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待机"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"已设置为优先对话"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"优先对话"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"“优先”模式处于开启状态时，这些对话会显示在对话列表顶部，并且始终显示在屏幕上"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"个人资料照片会显示在锁定屏幕上"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"这些对话会以对话泡形式显示在主屏幕上，您可以轻松查看"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"中断勿扰模式"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"知道了"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"设置"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"切换"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"“无障碍”按钮已取代无障碍手势\n\n"<annotation id="link">"查看设置"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"将按钮移到边缘，即可暂时将其隐藏"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"移至左上角"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"移至右上角"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"移至左下角"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"移至右下角"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"移至边缘并隐藏"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"移至边缘以外并显示"</string> <string name="quick_controls_title" msgid="6839108006171302273">"设备控制器"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"为您所连接的设备添加控件"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"设置设备控件"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"最近 <xliff:g id="DURATION">%1$s</xliff:g>内"</string> <string name="over_timestamp" msgid="4765793502859358634">"超过 <xliff:g id="DURATION">%1$s</xliff:g>前"</string> <string name="birthday_status" msgid="2596961629465396761">"生日"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"今天是<xliff:g id="NAME">%1$s</xliff:g>的生日"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"生日快到了"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g>的生日快到了"</string> <string name="anniversary_status" msgid="1790034157507590838">"周年纪念日"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"今天是<xliff:g id="NAME">%1$s</xliff:g>的周年纪念日"</string> <string name="location_status" msgid="1294990572202541812">"正在分享位置信息"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g>正在分享位置信息"</string> <string name="new_story_status" msgid="9012195158584846525">"新故事"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g>分享了一个新故事"</string> <string name="video_status" msgid="4548544654316843225">"正在观看"</string> <string name="audio_status" msgid="4237055636967709208">"正在收听"</string> <string name="game_status" msgid="1340694320630973259">"正在玩游戏"</string> <string name="empty_user_name" msgid="3389155775773578300">"好友"</string> <string name="empty_status" msgid="5938893404951307749">"今晚来聊聊吧！"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"内容很快就会显示，请稍候"</string> <string name="missed_call" msgid="4228016077700161689">"未接电话"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"查看最近的信息、未接电话和状态更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"对话"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>发送了一条消息"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>发送了一张图片"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"读取电池计量器时出现问题"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"点按即可了解详情"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"未设置闹钟"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 5f5123984f05..34fb6354b5b9 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"擷取更大範圍的螢幕內容"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"關閉螢幕截圖"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"螢幕截圖預覽"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"上方邊界"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"下方邊界"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"螢幕畫面錄影工具"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"正在處理螢幕錄影內容"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"持續顯示錄影畫面工作階段通知"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"輸入法"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"位置"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"位置資訊已關閉"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"停用攝錄機"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"關閉麥克風"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"相機存取權"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"麥克風存取權"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"可用"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"已封鎖"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"媒體裝置"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"只可撥打緊急電話"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"畫面錄影"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"開始"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"如要繼續，<b><xliff:g id="APP">%s</xliff:g></b> 需要裝置的麥克風存取權。"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"如要繼續，<b><xliff:g id="APP">%s</xliff:g></b> 需要裝置的相機存取權。"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"要解除封鎖裝置麥克風嗎？"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"要解除封鎖裝置相機嗎？"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"要解除封鎖裝置相機和麥克風嗎？"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"這麼做可允許所有應用程式和服務使用麥克風。"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"這麼做可允許所有應用程式和服務使用相機。"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"這麼做可允許所有應用程式和服務使用相機或麥克風。"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"裝置"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"向上滑動即可切換應用程式"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"向右拖曳即可快速切換應用程式"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"以太網"</string> <string name="status_bar_alarm" msgid="87160847643623352">"鬧鐘"</string> <string name="wallet_title" msgid="5369767670735827105">"電子錢包"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"準備就緒"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"設定付款方法"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"解鎖即可使用"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"擷取資訊卡時發生問題，請稍後再試。"</string> <string name="status_bar_work" msgid="5238641949837091056">"工作設定檔"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"飛行模式"</string> <string name="add_tile" msgid="6239678623873086686">"加入圖塊"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>狀態：</b>已降低為靜音"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>狀態：</b>已提高次序"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>狀態：</b>已調低次序"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"無論是否開啟「優先」模式，一律在通知頂端顯示"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"設定"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"優先對話"</string> <string name="no_shortcut" msgid="8257177117568230126">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」不支援對話功能"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"無法修改這些通知。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"無法在此設定這組通知"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"前往「設定」更新系統導覽"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待機"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"對話已設為優先"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"優先對話"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"開啟「優先」模式後，這些對話會顯示在清單頂端，讓您一眼就能看見"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"上鎖畫面會顯示個人檔案相片"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"主畫面上會以對話氣泡顯示這些對話，讓您一眼就能看見"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"中斷「請勿騷擾」"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"知道了"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"設定"</string> @@ -1040,18 +1042,12 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"切換"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"無障礙工具按鈕取代咗無障礙手勢\n\n"<annotation id="link">"睇下設定"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"將按鈕移到邊緣即可暫時隱藏"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"移去左上方"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"移去右上方"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"移到左下方"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"移去右下方"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"移到邊緣並隱藏"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"從邊緣移出並顯示"</string> <string name="quick_controls_title" msgid="6839108006171302273">"裝置控制"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"為連接的裝置新增控制選項"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"設定裝置控制"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"最近 <xliff:g id="DURATION">%1$s</xliff:g>內"</string> <string name="over_timestamp" msgid="4765793502859358634">"超過 <xliff:g id="DURATION">%1$s</xliff:g>前"</string> <string name="birthday_status" msgid="2596961629465396761">"生日之星"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"今天是<xliff:g id="NAME">%1$s</xliff:g>的生日"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"即將生日"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g>的生日快到了"</string> <string name="anniversary_status" msgid="1790034157507590838">"週年紀念"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"今天是<xliff:g id="NAME">%1$s</xliff:g>的週年紀念"</string> <string name="location_status" msgid="1294990572202541812">"分享位置資訊"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g>正在分享位置"</string> <string name="new_story_status" msgid="9012195158584846525">"最新報導"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g>分享了新的動態消息"</string> <string name="video_status" msgid="4548544654316843225">"正在觀看"</string> <string name="audio_status" msgid="4237055636967709208">"正在聽取音訊"</string> <string name="game_status" msgid="1340694320630973259">"正在玩遊戲"</string> <string name="empty_user_name" msgid="3389155775773578300">"朋友"</string> <string name="empty_status" msgid="5938893404951307749">"今晚聊天吧！"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"即將顯示內容"</string> <string name="missed_call" msgid="4228016077700161689">"未接來電"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"查看最近的訊息、未接來電和狀態更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"對話"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>傳送了訊息"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>傳送了圖片"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"讀取電池計量器時發生問題"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"輕按即可瞭解詳情"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"未設定鬧鐘"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 8d6ac87132d3..0fba4235f244 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"擷取更大範圍的螢幕內容"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"關閉螢幕截圖"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"螢幕截圖預覽"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"頂端邊界"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"底部邊界"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"螢幕錄影器"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"處理螢幕錄影內容"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"持續顯示螢幕畫面錄製工作階段通知"</string> @@ -217,7 +223,7 @@ <string name="accessibility_no_sim" msgid="1140839832913084973">"沒有 SIM 卡。"</string> <string name="accessibility_cell_data" msgid="172950885786007392">"行動數據"</string> <string name="accessibility_cell_data_on" msgid="691666434519443162">"行動數據已開啟"</string> - <string name="cell_data_off" msgid="4886198950247099526">"已關閉"</string> + <string name="cell_data_off" msgid="4886198950247099526">"關閉"</string> <string name="accessibility_bluetooth_tether" msgid="6327291292208790599">"藍牙網路共用"</string> <string name="accessibility_airplane_mode" msgid="1899529214045998505">"飛行模式。"</string> <string name="accessibility_vpn_on" msgid="8037549696057288731">"VPN 已開啟。"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"輸入法"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"定位"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"定位服務已關閉"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"停用攝影機"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"關閉麥克風"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"相機存取權"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"麥克風存取權"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"可以使用"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"已封鎖"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"媒體裝置"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"僅可撥打緊急電話"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"螢幕畫面錄製"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"開始"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停止"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"如要繼續操作，請將裝置的麥克風存取權授予「<xliff:g id="APP">%s</xliff:g>」<b></b>。"</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"如要繼續操作，請將裝置的相機存取權授予「<xliff:g id="APP">%s</xliff:g>」<b></b>。"</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"要將裝置麥克風解除封鎖嗎？"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"要將裝置相機解除封鎖嗎？"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"要將裝置的相機和麥克風解除封鎖嗎？"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"這麼做可允許所有應用程式和服務使用麥克風。"</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"這麼做可允許所有應用程式和服務使用相機。"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"這麼做可允許所有應用程式和服務使用相機或麥克風。"</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"裝置"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"向上滑動即可切換應用程式"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"向右拖曳即可快速切換應用程式"</string> @@ -657,18 +669,14 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"乙太網路"</string> <string name="status_bar_alarm" msgid="87160847643623352">"鬧鐘"</string> <string name="wallet_title" msgid="5369767670735827105">"電子錢包"</string> - <!-- no translation found for wallet_button_label_device_unlocked (4653372304880486681) --> - <skip /> - <!-- no translation found for wallet_button_label_device_locked (4418473374652969487) --> - <skip /> - <!-- no translation found for wallet_secondary_label_active (4909706168969888137) --> - <skip /> - <!-- no translation found for wallet_secondary_label_no_card (1750103386908123401) --> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> <skip /> - <!-- no translation found for wallet_secondary_label_device_locked (5175862019125370506) --> - <skip /> - <!-- no translation found for wallet_error_generic (257704570182963611) --> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> <skip /> + <string name="wallet_secondary_label_active" msgid="4909706168969888137">"已可使用"</string> + <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"設定付款方式"</string> + <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"解鎖即可使用"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"擷取卡片時發生問題，請稍後再試"</string> <string name="status_bar_work" msgid="5238641949837091056">"工作資料夾"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"飛航模式"</string> <string name="add_tile" msgid="6239678623873086686">"新增圖塊"</string> @@ -737,11 +745,9 @@ <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>狀態：</b>已降低為靜音"</string> <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>狀態：</b>已調高順序"</string> <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>狀態：</b>已調降順序"</string> - <!-- no translation found for notification_channel_summary_priority (4592979359953954258) --> - <skip /> + <string name="notification_channel_summary_priority" msgid="4592979359953954258">"一律顯示在通知頂端 (無論是否開啟「優先」模式)"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"設定"</string> - <!-- no translation found for notification_priority_title (5256226572739882190) --> - <skip /> + <string name="notification_priority_title" msgid="5256226572739882190">"優先對話"</string> <string name="no_shortcut" msgid="8257177117568230126">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」不支援對話功能"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"無法修改這些通知。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"無法在這裡設定這個通知群組"</string> @@ -1015,14 +1021,10 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"請前往「設定」更新系統操作機制"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待機"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"對話已設為優先"</string> - <!-- no translation found for priority_onboarding_behavior (636826237468953117) --> - <skip /> - <!-- no translation found for priority_onboarding_show_at_top_text (3861580571311518785) --> - <skip /> - <!-- no translation found for priority_onboarding_show_avatar_text (1781653813573865071) --> - <skip /> - <!-- no translation found for priority_onboarding_appear_as_bubble_text (4359924720680083057) --> - <skip /> + <string name="priority_onboarding_behavior" msgid="636826237468953117">"優先對話"</string> + <string name="priority_onboarding_show_at_top_text" msgid="3861580571311518785">"開啟「優先」模式後，這些對話會顯示在清單頂端，讓你一眼就能看見"</string> + <string name="priority_onboarding_show_avatar_text" msgid="1781653813573865071">"螢幕鎖定畫面上會顯示個人資料相片"</string> + <string name="priority_onboarding_appear_as_bubble_text" msgid="4359924720680083057">"主畫面上會以對話框形式顯示這些對話，讓你一眼就能看見"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"中斷零打擾模式"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"我知道了"</string> <string name="priority_onboarding_settings_button_title" msgid="6663601574303585927">"設定"</string> @@ -1040,21 +1042,15 @@ <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"切換"</string> <string name="accessibility_floating_button_migration_tooltip" msgid="4431046858918714564">"無障礙工具按鈕已取代無障礙手勢\n\n"<annotation id="link">"查看設定"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"將按鈕移到邊緣處即可暫時隱藏"</string> - <!-- no translation found for accessibility_floating_button_action_move_top_left (6253520703618545705) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_top_right (6106225581993479711) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_left (8063394111137429725) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_bottom_right (6196904373227440500) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_to_edge_and_hide_to_half (662401168245782658) --> - <skip /> - <!-- no translation found for accessibility_floating_button_action_move_out_edge_and_show (8354760891651663326) --> - <skip /> + <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"移到左上方"</string> + <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"移到右上方"</string> + <string name="accessibility_floating_button_action_move_bottom_left" msgid="8063394111137429725">"移到左下方"</string> + <string name="accessibility_floating_button_action_move_bottom_right" msgid="6196904373227440500">"移到右下方"</string> + <string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half" msgid="662401168245782658">"移到邊緣並隱藏"</string> + <string name="accessibility_floating_button_action_move_out_edge_and_show" msgid="8354760891651663326">"從邊緣移出並顯示"</string> <string name="quick_controls_title" msgid="6839108006171302273">"裝置控制"</string> <string name="quick_controls_subtitle" msgid="1667408093326318053">"新增已連結裝置的控制項"</string> - <string name="quick_controls_setup_title" msgid="8901436655997849822">"設定裝置控制"</string> + <string name="quick_controls_setup_title" msgid="8901436655997849822">"設定裝置控制項"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"按住電源按鈕即可存取控制項"</string> <string name="controls_providers_title" msgid="6879775889857085056">"選擇應用程式以新增控制項"</string> <plurals name="controls_number_of_favorites" formatted="false" msgid="1057347832073807380"> @@ -1077,7 +1073,7 @@ <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> - <string name="controls_dialog_title" msgid="2343565267424406202">"新增至裝置控制"</string> + <string name="controls_dialog_title" msgid="2343565267424406202">"新增至裝置控制項"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"新增"</string> <string name="controls_dialog_message" msgid="342066938390663844">"來自「<xliff:g id="APP">%s</xliff:g>」的建議"</string> <string name="controls_dialog_confirmation" msgid="586517302736263447">"已更新控制項"</string> @@ -1130,35 +1126,27 @@ <string name="less_than_timestamp" msgid="6598972791137724517">"最近 <xliff:g id="DURATION">%1$s</xliff:g>內"</string> <string name="over_timestamp" msgid="4765793502859358634">"超過 <xliff:g id="DURATION">%1$s</xliff:g>前"</string> <string name="birthday_status" msgid="2596961629465396761">"本日壽星"</string> - <!-- no translation found for birthday_status_content_description (7677415209545817153) --> - <skip /> + <string name="birthday_status_content_description" msgid="7677415209545817153">"今天是<xliff:g id="NAME">%1$s</xliff:g>的生日"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"生日快到了"</string> - <!-- no translation found for upcoming_birthday_status_content_description (1210885672210845293) --> - <skip /> + <string name="upcoming_birthday_status_content_description" msgid="1210885672210845293">"<xliff:g id="NAME">%1$s</xliff:g>的生日快到了"</string> <string name="anniversary_status" msgid="1790034157507590838">"週年紀念"</string> - <!-- no translation found for anniversary_status_content_description (6214503393960662875) --> - <skip /> + <string name="anniversary_status_content_description" msgid="6214503393960662875">"今天是<xliff:g id="NAME">%1$s</xliff:g>的週年紀念日"</string> <string name="location_status" msgid="1294990572202541812">"正在分享位置資訊"</string> - <!-- no translation found for location_status_content_description (2982386178160071305) --> - <skip /> + <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g>正在分享位置資訊"</string> <string name="new_story_status" msgid="9012195158584846525">"新故事"</string> - <!-- no translation found for new_story_status_content_description (4963137422622516708) --> - <skip /> + <string name="new_story_status_content_description" msgid="4963137422622516708">"<xliff:g id="NAME">%1$s</xliff:g>分享了一篇新故事"</string> <string name="video_status" msgid="4548544654316843225">"正在觀看影片"</string> <string name="audio_status" msgid="4237055636967709208">"正在聆聽內容"</string> <string name="game_status" msgid="1340694320630973259">"正在玩遊戲"</string> <string name="empty_user_name" msgid="3389155775773578300">"好友"</string> <string name="empty_status" msgid="5938893404951307749">"今晚來聊聊吧！"</string> - <!-- no translation found for status_before_loading (1500477307859631381) --> - <skip /> + <string name="status_before_loading" msgid="1500477307859631381">"內容很快就會顯示，請稍候"</string> <string name="missed_call" msgid="4228016077700161689">"未接來電"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"查看最近的訊息、未接來電和狀態更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"對話"</string> - <!-- no translation found for new_notification_text_content_description (5574393603145263727) --> - <skip /> - <!-- no translation found for new_notification_image_content_description (6017506886810813123) --> - <skip /> + <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>傳送了一則訊息"</string> + <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>傳送了一張圖片"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"讀取電池計量器時發生問題"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"輕觸即可瞭解詳情"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"未設定鬧鐘"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 54facecf696c..33ef9da6cd08 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -92,8 +92,14 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Thwebula okuningi"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Cashisa isithombe-skrini"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Ukubuka kuqala isithombe-skrini"</string> - <string name="screenshot_top_boundary" msgid="1500569103321300856">"Umngcele ophezulu"</string> - <string name="screenshot_bottom_boundary" msgid="5657242629526407311">"Umngcele ophansi"</string> + <!-- no translation found for screenshot_top_boundary_pct (2520148599096479332) --> + <skip /> + <!-- no translation found for screenshot_bottom_boundary_pct (3880821519814946478) --> + <skip /> + <!-- no translation found for screenshot_left_boundary_pct (8502323556112287469) --> + <skip /> + <!-- no translation found for screenshot_right_boundary_pct (1201150713021779321) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"Irekhoda yesikrini"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Icubungula okokuqopha iskrini"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Isaziso esiqhubekayo seseshini yokurekhoda isikrini"</string> @@ -349,8 +355,10 @@ <string name="quick_settings_ime_label" msgid="3351174938144332051">"Indlela yokungenayo"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Indawo"</string> <string name="quick_settings_location_off_label" msgid="7923929131443915919">"Indawo ivaliwe"</string> - <string name="quick_settings_camera_label" msgid="1367149596242401934">"Vimba Ikhamera"</string> - <string name="quick_settings_mic_label" msgid="8245831073612564953">"Thulisa Imakrofoni"</string> + <string name="quick_settings_camera_label" msgid="5612076679385269339">"Ukufinyelela kwekhamera"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Ukufinyelela kwe-mic"</string> + <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"Iyatholakala"</string> + <string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"Kuvinjiwe"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"Idivayisi yemidiya"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"Amakholi aphuthumayo kuphela"</string> @@ -422,8 +430,12 @@ <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Irekhodi lesikrini"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Qala"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Misa"</string> - <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8643239110815357707">"Ukuze uqhubeke, <b>i-<xliff:g id="APP">%s</xliff:g></b> idinga ukufinyelela imakrofoni yedivayisi yakho."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7773612142162829116">"Ukuze uqhubeke, <b>i-<xliff:g id="APP">%s</xliff:g></b> idinga ukufinyelela ikhamera yakho."</string> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vulela imakrofoni yedivayisi?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vulela ikhamera yedivayisi?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vulela ikhamera yedivayisi nemakrofoni?"</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Lokhu kuvulela ukufinyelela kwawo wonke ama-app namasevisi avunyelwe ukusebenzisa imakrofoni yakho."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Lokhu kuvulela ukufinyelela kwawo wonke ama-app namasevisi avunyelwe ukusebenzisa ikhamera yakho."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Lokhu kuvulela ukufinyelela kwawo wonke ama-app namasevisi avunyelwe ukusebenzisa ikhamera yakho noma imakrofoni."</string> <string name="media_seamless_remote_device" msgid="177033467332920464">"Idivayisi"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swayiphela phezulu ukuze ushintshe izinhlelo zokusebenza"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Hudula ngqo ukuze ushintshe ngokushesha izinhlelo zokusebenza"</string> @@ -657,8 +669,10 @@ <string name="status_bar_ethernet" msgid="5690979758988647484">"I-Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"I-alamu"</string> <string name="wallet_title" msgid="5369767670735827105">"I-wallet"</string> - <string name="wallet_button_label_device_unlocked" msgid="4653372304880486681">"Bonisa konke"</string> - <string name="wallet_button_label_device_locked" msgid="4418473374652969487">"Vula ukuze ukhokhele"</string> + <!-- no translation found for wallet_app_button_label (7123784239111190992) --> + <skip /> + <!-- no translation found for wallet_action_button_label_unlock (8663239748726774487) --> + <skip /> <string name="wallet_secondary_label_active" msgid="4909706168969888137">"Isikulungele"</string> <string name="wallet_secondary_label_no_card" msgid="1750103386908123401">"Setha inkokhelo"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Vula ukuze usebenzise"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 2355650907df..ac41a250d4e2 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -656,4 +656,10 @@ <!-- Y --> <!-- radius --> </integer-array> + + <!-- Overrides the behavior of the face unlock keyguard bypass setting: + 0 - Don't override the setting (default) + 1 - Override the setting to always bypass keyguard + 2 - Override the setting to never bypass keyguard --> + <integer name="config_face_unlock_bypass_override">0</integer> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index a19d128a9c67..5767174ba603 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -412,6 +412,8 @@ <!-- The size of each of the icon buttons in the QS footer --> <dimen name="qs_footer_action_button_size">@dimen/qs_footer_height</dimen> + <dimen name="qs_footer_action_corner_radius">20dp</dimen> + <!-- (48dp - 44dp) / 2 --> <dimen name="qs_footer_action_inset">2dp</dimen> @@ -1413,17 +1415,17 @@ <dimen name="accessibility_floating_menu_large_single_radius">33dp</dimen> <dimen name="accessibility_floating_menu_large_multiple_radius">35dp</dimen> - <dimen name="rounded_slider_height">44dp</dimen> + <dimen name="rounded_slider_height">48dp</dimen> <!-- rounded_slider_height / 2 --> - <dimen name="rounded_slider_corner_radius">22dp</dimen> + <dimen name="rounded_slider_corner_radius">24dp</dimen> <dimen name="rounded_slider_icon_size">20dp</dimen> <!-- (rounded_slider_height - rounded_slider_icon_size) / 2 --> - <dimen name="rounded_slider_icon_inset">12dp</dimen> + <dimen name="rounded_slider_icon_inset">14dp</dimen> <!-- rounded_slider_corner_radius - rounded_slider_track_corner_radius --> - <dimen name="rounded_slider_track_inset">18dp</dimen> - <dimen name="rounded_slider_track_width">8dp</dimen> + <dimen name="rounded_slider_track_inset">22dp</dimen> + <dimen name="rounded_slider_track_width">4dp</dimen> <!-- rounded_slider_track_width / 2 --> - <dimen name="rounded_slider_track_corner_radius">4dp</dimen> + <dimen name="rounded_slider_track_corner_radius">2dp</dimen> <!-- inset for ic_lock_open within a DisabledUdfpsView --> <dimen name="udfps_unlock_icon_inset">16dp</dimen> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl index af3239e6beb1..1e98f866bd4e 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl @@ -79,11 +79,6 @@ interface ISystemUiProxy { void startAssistant(in Bundle bundle) = 13; /** - * Creates a new gesture monitor - */ - Bundle monitorGestureInput(String name, int displayId) = 14; - - /** * Notifies that the accessibility button in the system's navigation area has been clicked */ void notifyAccessibilityButtonClicked(int displayId) = 15; diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InputMonitorCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InputMonitorCompat.java index 074448d963b1..bf8e6a5663c0 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InputMonitorCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InputMonitorCompat.java @@ -16,10 +16,7 @@ package com.android.systemui.shared.system; import android.hardware.input.InputManager; -import android.os.Bundle; import android.os.Looper; -import android.os.Parcel; -import android.os.Parcelable; import android.view.Choreographer; import android.view.InputMonitor; @@ -29,9 +26,8 @@ import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver; /** * @see android.view.InputMonitor */ -public class InputMonitorCompat implements Parcelable { +public class InputMonitorCompat { private final InputMonitor mInputMonitor; - private boolean mForReturn = false; /** * Monitor input on the specified display for gestures. @@ -40,10 +36,6 @@ public class InputMonitorCompat implements Parcelable { mInputMonitor = InputManager.getInstance().monitorGestureInput(name, displayId); } - private InputMonitorCompat(InputMonitor monitor) { - mInputMonitor = monitor; - } - /** * @see InputMonitor#pilferPointers() */ @@ -66,48 +58,4 @@ public class InputMonitorCompat implements Parcelable { return new InputEventReceiver(mInputMonitor.getInputChannel(), looper, choreographer, listener); } - - /** - * Gets the input monitor stored in a bundle - */ - public static InputMonitorCompat fromBundle(Bundle bundle, String key) { - bundle.setClassLoader(InputMonitorCompat.class.getClassLoader()); - return (InputMonitorCompat) bundle.getParcelable(key); - } - - /** - * Gets the input monitor compat as the return value. - */ - public static InputMonitorCompat obtainReturnValue(InputMonitor monitor) { - final InputMonitorCompat monitorCompat = new InputMonitorCompat(monitor); - monitorCompat.mForReturn = true; - return monitorCompat; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - mInputMonitor.writeToParcel(dest, - mForReturn ? PARCELABLE_WRITE_RETURN_VALUE : flags); - } - - private InputMonitorCompat(Parcel in) { - mInputMonitor = InputMonitor.CREATOR.createFromParcel(in); - } - - public static final Creator<InputMonitorCompat> CREATOR = new Creator<InputMonitorCompat>() { - @Override - public InputMonitorCompat createFromParcel(Parcel in) { - return new InputMonitorCompat(in); - } - - @Override - public InputMonitorCompat[] newArray(int size) { - return new InputMonitorCompat[size]; - } - }; } 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 41840afc4995..927bce08268d 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 @@ -38,7 +38,6 @@ import java.util.StringJoiner; public class QuickStepContract { public static final String KEY_EXTRA_SYSUI_PROXY = "extra_sysui_proxy"; - public static final String KEY_EXTRA_INPUT_MONITOR = "extra_input_monitor"; public static final String KEY_EXTRA_WINDOW_CORNER_RADIUS = "extra_window_corner_radius"; public static final String KEY_EXTRA_SUPPORTS_WINDOW_CORNERS = "extra_supports_window_corners"; // See IPip.aidl diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java index fa2f32fee755..dc42a5382335 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java @@ -92,23 +92,11 @@ public class TransactionCompat { return this; } - public TransactionCompat deferTransactionUntil(SurfaceControlCompat surfaceControl, - SurfaceControl barrier, long frameNumber) { - mTransaction.deferTransactionUntil(surfaceControl.mSurfaceControl, barrier, - frameNumber); - return this; - } - public TransactionCompat setColor(SurfaceControlCompat surfaceControl, float[] color) { mTransaction.setColor(surfaceControl.mSurfaceControl, color); return this; } - public static void deferTransactionUntil(Transaction t, SurfaceControl surfaceControl, - SurfaceControl barrier, long frameNumber) { - t.deferTransactionUntil(surfaceControl, barrier, frameNumber); - } - public static void setRelativeLayer(Transaction t, SurfaceControl surfaceControl, SurfaceControl relativeTo, int z) { t.setRelativeLayer(surfaceControl, relativeTo, z); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 032ed7da0a46..f89e365bc995 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -26,14 +26,18 @@ import android.app.smartspace.SmartspaceSession; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; +import android.graphics.Color; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.View; import android.widget.FrameLayout; import android.widget.RelativeLayout; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.colorextraction.ColorExtractor; +import com.android.internal.graphics.ColorUtils; import com.android.keyguard.clock.ClockManager; +import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.colorextraction.SysuiColorExtractor; @@ -50,6 +54,7 @@ import com.android.systemui.statusbar.notification.stack.AnimationProperties; import com.android.systemui.statusbar.phone.NotificationIconAreaController; import com.android.systemui.statusbar.phone.NotificationIconContainer; import com.android.systemui.statusbar.policy.BatteryController; +import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.util.ViewController; import java.util.Locale; @@ -87,6 +92,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS private Executor mUiExecutor; private SmartspaceSession mSmartspaceSession; private SmartspaceSession.Callback mSmartspaceCallback; + private float mDozeAmount; + private int mWallpaperTextColor; + private int mDozeColor = Color.WHITE; + private ConfigurationController mConfigurationController; /** * Listener for changes to the color palette. @@ -103,8 +112,25 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } }; + private final ConfigurationController.ConfigurationListener mConfigurationListener = + new ConfigurationController.ConfigurationListener() { + @Override + public void onThemeChanged() { + updateWallpaperColor(); + } + }; + private ClockManager.ClockChangedListener mClockChangedListener = this::setClockPlugin; + private final StatusBarStateController.StateListener mStatusBarStateListener = + new StatusBarStateController.StateListener() { + @Override + public void onDozeAmountChanged(float linear, float eased) { + mDozeAmount = eased; + updateSmartspaceColor(); + } + }; + // If set, will replace keyguard_status_area private BcSmartspaceDataPlugin.SmartspaceView mSmartspaceView; @@ -121,7 +147,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS PluginManager pluginManager, FeatureFlags featureFlags, @Main Executor uiExecutor, - BatteryController batteryController) { + BatteryController batteryController, + ConfigurationController configurationController) { super(keyguardClockSwitch); mResources = resources; mStatusBarStateController = statusBarStateController; @@ -134,6 +161,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mIsSmartspaceEnabled = featureFlags.isSmartspaceEnabled(); mUiExecutor = uiExecutor; mBatteryController = batteryController; + mConfigurationController = configurationController; } /** @@ -172,6 +200,12 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mBatteryController); mLargeClockViewController.init(); + mDozeAmount = mStatusBarStateController.getDozeAmount(); + updateWallpaperColor(); + + mStatusBarStateController.addCallback(mStatusBarStateListener); + mConfigurationController.addCallback(mConfigurationListener); + // If a smartspace plugin is detected, replace the existing smartspace // (keyguard_status_area), and initialize a new session mPluginListener = new PluginListener<BcSmartspaceDataPlugin>() { @@ -186,8 +220,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mSmartspaceView = plugin.getView(mView); mSmartspaceView.registerDataProvider(plugin); + updateSmartspaceColor(); View asView = (View) mSmartspaceView; + // Place plugin view below normal clock... RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams( MATCH_PARENT, WRAP_CONTENT); lp.addRule(RelativeLayout.BELOW, R.id.lockscreen_clock_view); @@ -197,6 +233,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS .getDimensionPixelSize(R.dimen.below_clock_padding_start); asView.setPadding(padding, 0, padding, 0); + // ... but above the large clock + lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT); + lp.addRule(RelativeLayout.BELOW, asView.getId()); + mLargeClockFrame.setLayoutParams(lp); + View nic = mView.findViewById( com.android.systemui.R.id.left_aligned_notification_icon_container); lp = (RelativeLayout.LayoutParams) nic.getLayoutParams(); @@ -219,6 +260,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS nic.getLayoutParams(); lp.addRule(RelativeLayout.BELOW, R.id.keyguard_status_area); nic.setLayoutParams(lp); + mLargeClockFrame.setLayoutParams(lp); mSmartspaceView = null; } @@ -235,6 +277,19 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mPluginManager.addPluginListener(mPluginListener, BcSmartspaceDataPlugin.class, false); } + private void updateWallpaperColor() { + mWallpaperTextColor = Utils.getColorAttrDefaultColor(getContext(), + R.attr.wallpaperTextColor); + updateSmartspaceColor(); + } + + private void updateSmartspaceColor() { + if (mSmartspaceView != null) { + int color = ColorUtils.blendARGB(mWallpaperTextColor, mDozeColor, mDozeAmount); + mSmartspaceView.setPrimaryTextColor(color); + } + } + @Override protected void onViewDetached() { if (CUSTOM_CLOCKS_ENABLED) { @@ -249,6 +304,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mSmartspaceSession = null; } mPluginManager.removePluginListener(mPluginListener); + mStatusBarStateController.removeCallback(mStatusBarStateListener); + mConfigurationController.removeCallback(mConfigurationListener); } /** @@ -392,4 +449,9 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS private int getCurrentLayoutDirection() { return TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()); } + + @VisibleForTesting + ConfigurationController.ConfigurationListener getConfigurationListener() { + return mConfigurationListener; + } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 67ee1f45048e..8813e6995f93 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1359,7 +1359,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mPowerManager.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:AOD_INTERRUPT_END"); } - mAuthController.onCancelAodInterrupt(); + mAuthController.onCancelUdfps(); mIsUdfpsRunningWhileDozing = false; } }; diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index ed8f32f31035..0c7b55d6ecbb 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -309,18 +309,14 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, } /** - * Cancel a fingerprint scan. - * - * The sensor that triggers an AOD interrupt for fingerprint doesn't give - * ACTION_UP/ACTION_CANCEL events, so the scan needs to be cancelled manually. This should be - * called when authentication either succeeds or fails. Failing to cancel the scan will leave - * the screen in high brightness mode. + * Cancel a fingerprint scan manually. This will get rid of the white circle on the udfps + * sensor area even if the user hasn't explicitly lifted their finger yet. */ - public void onCancelAodInterrupt() { + public void onCancelUdfps() { if (mUdfpsController == null) { return; } - mUdfpsController.onCancelAodInterrupt(); + mUdfpsController.onCancelUdfps(); } private void sendResultAndCleanUp(@DismissedReason int reason, @@ -499,6 +495,8 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, if (DEBUG) Log.d(TAG, "onBiometricError, hard error: " + errorMessage); mCurrentDialog.onError(errorMessage); } + + onCancelUdfps(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index aa818bfdadeb..9239a8ade615 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -24,6 +24,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -35,15 +36,23 @@ import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.hardware.fingerprint.IUdfpsOverlayController; import android.hardware.fingerprint.IUdfpsOverlayControllerCallback; +import android.media.AudioAttributes; +import android.os.Handler; +import android.os.Looper; import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; +import android.os.VibrationEffect; +import android.os.Vibrator; +import android.provider.Settings; +import android.text.TextUtils; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.Surface; import android.view.VelocityTracker; +import android.view.View; import android.view.WindowManager; import com.android.internal.annotations.VisibleForTesting; @@ -94,7 +103,9 @@ public class UdfpsController implements DozeReceiver, HbmCallback { @NonNull private final DumpManager mDumpManager; @NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; @NonNull private final KeyguardViewMediator mKeyguardViewMediator; - @NonNull private FalsingManager mFalsingManager; + @NonNull private final Vibrator mVibrator; + @NonNull private final Handler mMainHandler; + @NonNull private final FalsingManager mFalsingManager; // Currently the UdfpsController supports a single UDFPS sensor. If devices have multiple // sensors, this, in addition to a lot of the code here, will be updated. @VisibleForTesting final FingerprintSensorPropertiesInternal mSensorProps; @@ -118,6 +129,27 @@ public class UdfpsController implements DozeReceiver, HbmCallback { private boolean mIsAodInterruptActive; @Nullable private Runnable mCancelAodTimeoutAction; + private static final AudioAttributes VIBRATION_SONIFICATION_ATTRIBUTES = + new AudioAttributes.Builder() + .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) + .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) + .build(); + + private final VibrationEffect mEffectTick = VibrationEffect.get(VibrationEffect.EFFECT_TICK); + private final VibrationEffect mEffectTextureTick = + VibrationEffect.get(VibrationEffect.EFFECT_TEXTURE_TICK); + private final VibrationEffect mEffectClick = VibrationEffect.get(VibrationEffect.EFFECT_CLICK); + private final VibrationEffect mEffectHeavy = + VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK); + private final Runnable mAcquiredVibration = new Runnable() { + @Override + public void run() { + String effect = Settings.Global.getString(mContext.getContentResolver(), + "udfps_acquired_type"); + mVibrator.vibrate(getVibration(effect, mEffectTick), VIBRATION_SONIFICATION_ATTRIBUTES); + } + }; + /** * Keeps track of state within a single FingerprintService request. Note that this state * persists across configuration changes, etc, since it is considered a single request. @@ -227,7 +259,9 @@ public class UdfpsController implements DozeReceiver, HbmCallback { }; @SuppressLint("ClickableViewAccessibility") - private final UdfpsView.OnTouchListener mOnTouchListener = (view, event) -> { + private final UdfpsView.OnTouchListener mOnTouchListener = this::onTouch; + + private boolean onTouch(View view, MotionEvent event) { UdfpsView udfpsView = (UdfpsView) view; final boolean isFingerDown = udfpsView.isIlluminationRequested(); boolean handled = false; @@ -251,6 +285,27 @@ public class UdfpsController implements DozeReceiver, HbmCallback { // data for many other pointers because of multi-touch support. mActivePointerId = event.getPointerId(0); mVelocityTracker.addMovement(event); + + // TODO: (b/185124905) these settings are for ux testing purposes and should + // be removed (or cached) before going into production + final ContentResolver contentResolver = mContext.getContentResolver(); + int startEnabled = Settings.Global.getInt(contentResolver, + "udfps_start", 0); + if (startEnabled > 0) { + String startEffectSetting = Settings.Global.getString(contentResolver, + "udfps_start_type"); + mVibrator.vibrate(getVibration(startEffectSetting, mEffectClick), + VIBRATION_SONIFICATION_ATTRIBUTES); + } + + int acquiredEnabled = Settings.Global.getInt(contentResolver, + "udfps_acquired", 0); + if (acquiredEnabled > 0) { + int delay = Settings.Global.getInt(contentResolver, + "udfps_acquired_delay", 500); + mMainHandler.removeCallbacks(mAcquiredVibration); + mMainHandler.postDelayed(mAcquiredVibration, delay); + } handled = true; } break; @@ -307,7 +362,7 @@ public class UdfpsController implements DozeReceiver, HbmCallback { // Do nothing. } return handled; - }; + } @Inject public UdfpsController(@NonNull Context context, @@ -324,6 +379,9 @@ public class UdfpsController implements DozeReceiver, HbmCallback { @NonNull KeyguardViewMediator keyguardViewMediator, @NonNull FalsingManager falsingManager) { mContext = context; + // TODO (b/185124905): inject main handler and vibrator once done prototyping + mMainHandler = new Handler(Looper.getMainLooper()); + mVibrator = context.getSystemService(Vibrator.class); mInflater = inflater; // The fingerprint manager is queried for UDFPS before this class is constructed, so the // fingerprint manager should never be null. @@ -559,19 +617,25 @@ public class UdfpsController implements DozeReceiver, HbmCallback { // Since the sensor that triggers the AOD interrupt doesn't provide ACTION_UP/ACTION_CANCEL, // we need to be careful about not letting the screen accidentally remain in high brightness // mode. As a mitigation, queue a call to cancel the fingerprint scan. - mCancelAodTimeoutAction = mFgExecutor.executeDelayed(this::onCancelAodInterrupt, + mCancelAodTimeoutAction = mFgExecutor.executeDelayed(this::onCancelUdfps, AOD_INTERRUPT_TIMEOUT_MILLIS); // using a hard-coded value for major and minor until it is available from the sensor onFingerDown(screenX, screenY, minor, major); } /** - * Cancel fingerprint scan. + * Cancel updfs scan affordances - ability to hide the HbmSurfaceView (white circle) before + * user explicitly lifts their finger. Generally, this should be called whenever udfps fails + * or errors. * - * This is intended to be called after the fingerprint scan triggered by the AOD interrupt - * either succeeds or fails. + * The sensor that triggers an AOD fingerprint interrupt (see onAodInterrupt) doesn't give + * ACTION_UP/ACTION_CANCEL events, so and AOD interrupt scan needs to be cancelled manually. + * This should be called when authentication either succeeds or fails. Failing to cancel the + * scan will leave the screen in high brightness mode and will show the HbmSurfaceView until + * the user lifts their finger. */ - void onCancelAodInterrupt() { + void onCancelUdfps() { + onFingerUp(); if (!mIsAodInterruptActive) { return; } @@ -580,7 +644,6 @@ public class UdfpsController implements DozeReceiver, HbmCallback { mCancelAodTimeoutAction = null; } mIsAodInterruptActive = false; - onFingerUp(); } // This method can be called from the UI thread. @@ -598,6 +661,7 @@ public class UdfpsController implements DozeReceiver, HbmCallback { // This method can be called from the UI thread. private void onFingerUp() { + mMainHandler.removeCallbacks(mAcquiredVibration); if (mView == null) { Log.w(TAG, "Null view in onFingerUp"); return; @@ -617,4 +681,23 @@ public class UdfpsController implements DozeReceiver, HbmCallback { // Do nothing. This method can be implemented for devices that require the high-brightness // mode for fingerprint illumination. } + + private VibrationEffect getVibration(String effect, VibrationEffect defaultEffect) { + if (TextUtils.isEmpty(effect)) { + return defaultEffect; + } + + switch (effect.toLowerCase()) { + case "click": + return mEffectClick; + case "heavy": + return mEffectHeavy; + case "texture_tick": + return mEffectTextureTick; + case "tick": + return mEffectTick; + default: + return defaultEffect; + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingAnimation.java b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingAnimation.java index 1e86cf1d0171..9d47bbb03380 100644 --- a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingAnimation.java +++ b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingAnimation.java @@ -121,6 +121,7 @@ public class WirelessChargingAnimation { params.setFitInsetsTypes(0 /* ignore all system bar insets */); params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; + params.setTrustedOverlay(); if (looper == null) { // Use Looper.myLooper() if looper is not specified. diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index ce5795ccd339..767d7ab5a490 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -35,12 +35,10 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.settingslib.Utils; import com.android.systemui.Dependency; import com.android.systemui.plugins.GlobalActions; -import com.android.systemui.plugins.GlobalActionsPanelPlugin; import com.android.systemui.statusbar.BlurUtils; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; -import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.KeyguardStateController; import javax.inject.Inject; @@ -50,18 +48,17 @@ import dagger.Lazy; public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks { private final Context mContext; - private final Lazy<GlobalActionsDialog> mGlobalActionsDialogLazy; + private final Lazy<GlobalActionsDialogLite> mGlobalActionsDialogLazy; private final KeyguardStateController mKeyguardStateController; private final DeviceProvisionedController mDeviceProvisionedController; - private final ExtensionController.Extension<GlobalActionsPanelPlugin> mWalletPluginProvider; private final BlurUtils mBlurUtils; private final CommandQueue mCommandQueue; - private GlobalActionsDialog mGlobalActionsDialog; + private GlobalActionsDialogLite mGlobalActionsDialog; private boolean mDisabled; @Inject public GlobalActionsImpl(Context context, CommandQueue commandQueue, - Lazy<GlobalActionsDialog> globalActionsDialogLazy, BlurUtils blurUtils) { + Lazy<GlobalActionsDialogLite> globalActionsDialogLazy, BlurUtils blurUtils) { mContext = context; mGlobalActionsDialogLazy = globalActionsDialogLazy; mKeyguardStateController = Dependency.get(KeyguardStateController.class); @@ -69,10 +66,6 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks mCommandQueue = commandQueue; mBlurUtils = blurUtils; mCommandQueue.addCallback(this); - mWalletPluginProvider = Dependency.get(ExtensionController.class) - .newExtension(GlobalActionsPanelPlugin.class) - .withPlugin(GlobalActionsPanelPlugin.class) - .build(); } @Override @@ -89,8 +82,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks if (mDisabled) return; mGlobalActionsDialog = mGlobalActionsDialogLazy.get(); mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(), - mDeviceProvisionedController.isDeviceProvisioned(), - mWalletPluginProvider.get()); + mDeviceProvisionedController.isDeviceProvisioned()); Dependency.get(KeyguardUpdateMonitor.class).requestFaceAuth(); } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index be9d6bd6edd2..56375adb3d4e 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -70,7 +70,6 @@ import android.database.ContentObserver; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.RectF; -import android.hardware.display.DisplayManager; import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.Binder; @@ -160,7 +159,7 @@ import dagger.Lazy; */ public class NavigationBar implements View.OnAttachStateChangeListener, Callbacks, NavigationModeController.ModeChangedListener, - AccessibilityButtonModeObserver.ModeChangedListener, DisplayManager.DisplayListener { + AccessibilityButtonModeObserver.ModeChangedListener { public static final String TAG = "NavigationBar"; private static final boolean DEBUG = false; @@ -660,7 +659,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); if (mOrientationHandle != null) { resetSecondaryHandle(); - mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this); getBarTransitions().removeDarkIntensityListener(mOrientationHandleIntensityListener); mWindowManager.removeView(mOrientationHandle); mOrientationHandle.getViewTreeObserver().removeOnGlobalLayoutListener( @@ -699,7 +697,15 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mLayoutDirection = ld; refreshLayout(ld); } + repositionNavigationBar(); + if (canShowSecondaryHandle()) { + int rotation = newConfig.windowConfiguration.getRotation(); + if (rotation != mCurrentRotation) { + mCurrentRotation = rotation; + orientSecondaryHomeHandle(); + } + } } private void initSecondaryHomeHandleForRotation() { @@ -707,9 +713,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, return; } - mContext.getSystemService(DisplayManager.class) - .registerDisplayListener(this, new Handler(Looper.getMainLooper())); - mOrientationHandle = new QuickswitchOrientedNavHandle(mContext); mOrientationHandle.setId(R.id.secondary_home_handle); @@ -1604,30 +1607,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, private final AccessibilityServicesStateChangeListener mAccessibilityListener = this::updateAccessibilityServicesState; - @Override - public void onDisplayAdded(int displayId) { - - } - - @Override - public void onDisplayRemoved(int displayId) { - - } - - @Override - public void onDisplayChanged(int displayId) { - if (!canShowSecondaryHandle()) { - return; - } - - int rotation = mContext.getResources().getConfiguration() - .windowConfiguration.getRotation(); - if (rotation != mCurrentRotation) { - mCurrentRotation = rotation; - orientSecondaryHomeHandle(); - } - } - private boolean canShowSecondaryHandle() { return mNavBarMode == NAV_BAR_MODE_GESTURAL && mOrientationHandle != null; } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java index 6d1109ee5f51..3544f60601a8 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java @@ -17,14 +17,18 @@ package com.android.systemui.navigationbar; import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; import android.content.Context; import android.content.pm.ActivityInfo; import android.content.res.Configuration; +import android.content.res.Resources; import android.hardware.display.DisplayManager; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; +import android.os.SystemProperties; +import android.util.DisplayMetrics; import android.util.Log; import android.util.SparseArray; import android.view.Display; @@ -80,6 +84,8 @@ public class NavigationBarController implements Callbacks, ConfigurationController.ConfigurationListener, NavigationModeController.ModeChangedListener, Dumpable { + private static final float TABLET_MIN_DPS = 600; + private static final String TAG = NavigationBarController.class.getSimpleName(); private final Context mContext; @@ -107,6 +113,8 @@ public class NavigationBarController implements Callbacks, private final Handler mHandler; private final DisplayManager mDisplayManager; private final NavigationBarOverlayController mNavBarOverlayController; + private int mNavMode; + private boolean mIsTablet; /** A displayId - nav bar maps. */ @VisibleForTesting @@ -172,11 +180,30 @@ public class NavigationBarController implements Callbacks, configurationController.addCallback(this); mConfigChanges.applyNewConfig(mContext.getResources()); mNavBarOverlayController = navBarOverlayController; + mNavMode = mNavigationModeController.addListener(this); mNavigationModeController.addListener(this); } @Override public void onConfigChanged(Configuration newConfig) { + boolean isOldConfigTablet = mIsTablet; + mIsTablet = isTablet(newConfig); + boolean largeScreenChanged = mIsTablet != isOldConfigTablet; + // If we folded/unfolded while in 3 button, show navbar in folded state, hide in unfolded + if (isThreeButtonTaskbarFlagEnabled() && + largeScreenChanged && mNavMode == NAV_BAR_MODE_3BUTTON) { + if (!mIsTablet) { + // Folded state, show 3 button nav bar + createNavigationBar(mContext.getDisplay(), null, null); + } else { + // Unfolded state, hide 3 button nav bars + for (int i = 0; i < mNavigationBars.size(); i++) { + removeNavigationBar(mNavigationBars.keyAt(i)); + } + } + return; + } + if (mConfigChanges.applyNewConfig(mContext.getResources())) { for (int i = 0; i < mNavigationBars.size(); i++) { recreateNavigationBar(mNavigationBars.keyAt(i)); @@ -190,7 +217,19 @@ public class NavigationBarController implements Callbacks, @Override public void onNavigationModeChanged(int mode) { + final int oldMode = mNavMode; + mNavMode = mode; mHandler.post(() -> { + // create/destroy nav bar based on nav mode only in unfolded state + if (isThreeButtonTaskbarFlagEnabled() && oldMode != mNavMode && mIsTablet) { + if (oldMode == NAV_BAR_MODE_3BUTTON && + mNavigationBars.get(mContext.getDisplayId()) == null) { + // We remove navbar for 3 button unfolded, add it back in + createNavigationBar(mContext.getDisplay(), null, null); + } else if (mNavMode == NAV_BAR_MODE_3BUTTON) { + removeNavigationBar(mContext.getDisplayId()); + } + } for (int i = 0; i < mNavigationBars.size(); i++) { NavigationBar navBar = mNavigationBars.valueAt(i); if (navBar == null) { @@ -212,6 +251,7 @@ public class NavigationBarController implements Callbacks, @Override public void onDisplayReady(int displayId) { Display display = mDisplayManager.getDisplay(displayId); + mIsTablet = isTablet(mContext.getResources().getConfiguration()); createNavigationBar(display, null /* savedState */, null /* result */); } @@ -267,6 +307,10 @@ public class NavigationBarController implements Callbacks, return; } + if (isThreeButtonTaskbarEnabled()) { + return; + } + final int displayId = display.getDisplayId(); final boolean isOnDefaultDisplay = displayId == DEFAULT_DISPLAY; final IWindowManager wms = WindowManagerGlobal.getWindowManagerService(); @@ -398,6 +442,24 @@ public class NavigationBarController implements Callbacks, return mNavigationBars.get(DEFAULT_DISPLAY); } + private boolean isThreeButtonTaskbarEnabled() { + return mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON && + isThreeButtonTaskbarFlagEnabled(); + } + + private boolean isThreeButtonTaskbarFlagEnabled() { + return SystemProperties.getBoolean("persist.debug.taskbar_three_button", false); + } + + private boolean isTablet(Configuration newConfig) { + float density = Resources.getSystem().getDisplayMetrics().density; + int size = Math.min((int) (density * newConfig.screenWidthDp), + (int) (density* newConfig.screenHeightDp)); + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float densityRatio = (float) metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT; + return (size / densityRatio) >= TABLET_MIN_DPS; + } + @Override public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) { for (int i = 0; i < mNavigationBars.size(); i++) { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java index a8c4d6ef9085..01c80f6d33fe 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -281,7 +281,7 @@ public class NavigationBarView extends FrameLayout implements // When in gestural and the IME is showing, don't use the nearest region since it will take // gesture space away from the IME info.setTouchableInsets(InternalInsetsInfo.TOUCHABLE_INSETS_REGION); - info.touchableRegion.set(getButtonLocations(false /* includeFloatingRotationButton */, + info.touchableRegion.set(getButtonLocations(false /* includeFloatingButtons */, false /* inScreen */, false /* useNearestRegion */)); }; @@ -982,7 +982,7 @@ public class NavigationBarView extends FrameLayout implements */ public void notifyActiveTouchRegions() { mOverviewProxyService.onActiveNavBarRegionChanges( - getButtonLocations(true /* includeFloatingRotationButton */, true /* inScreen */, + getButtonLocations(true /* includeFloatingButtons */, true /* inScreen */, true /* useNearestRegion */)); } @@ -995,14 +995,14 @@ public class NavigationBarView extends FrameLayout implements } /** - * @param includeFloatingRotationButton Whether to include the floating rotation button in the - * region for all the buttons + * @param includeFloatingButtons Whether to include the floating rotation and overlay button in + * the region for all the buttons * @param inScreenSpace Whether to return values in screen space or window space * @param useNearestRegion Whether to use the nearest region instead of the actual button bounds * @return */ - private Region getButtonLocations(boolean includeFloatingRotationButton, - boolean inScreenSpace, boolean useNearestRegion) { + private Region getButtonLocations(boolean includeFloatingButtons, boolean inScreenSpace, + boolean useNearestRegion) { if (useNearestRegion && !inScreenSpace) { // We currently don't support getting the nearest region in anything but screen space useNearestRegion = false; @@ -1014,13 +1014,13 @@ public class NavigationBarView extends FrameLayout implements updateButtonLocation(getRecentsButton(), inScreenSpace, useNearestRegion); updateButtonLocation(getImeSwitchButton(), inScreenSpace, useNearestRegion); updateButtonLocation(getAccessibilityButton(), inScreenSpace, useNearestRegion); - if (includeFloatingRotationButton && mFloatingRotationButton.isVisible()) { + if (includeFloatingButtons && mFloatingRotationButton.isVisible()) { // Note: this button is floating so the nearest region doesn't apply updateButtonLocation(mFloatingRotationButton.getCurrentView(), inScreenSpace); } else { updateButtonLocation(getRotateSuggestionButton(), inScreenSpace, useNearestRegion); } - if (mNavBarOverlayController.isNavigationBarOverlayEnabled() + if (includeFloatingButtons && mNavBarOverlayController.isNavigationBarOverlayEnabled() && mNavBarOverlayController.isVisible()) { // Note: this button is floating so the nearest region doesn't apply updateButtonLocation(mNavBarOverlayController.getCurrentView(), inScreenSpace); @@ -1186,6 +1186,7 @@ public class NavigationBarView extends FrameLayout implements boolean uiCarModeChanged = updateCarMode(); updateIcons(mTmpLastConfiguration); updateRecentsIcon(); + mEdgeBackGestureHandler.onConfigurationChanged(mConfiguration); mRecentsOnboarding.onConfigurationChanged(mConfiguration); if (uiCarModeChanged || mTmpLastConfiguration.densityDpi != mConfiguration.densityDpi || mTmpLastConfiguration.getLayoutDirection() != mConfiguration.getLayoutDirection()) { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java index b6a800f5e3a4..806ea4fa147d 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java @@ -20,6 +20,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.PixelFormat; import android.graphics.Point; @@ -50,6 +51,7 @@ import android.view.Surface; import android.view.ViewConfiguration; import android.view.WindowManager; import android.view.WindowManagerGlobal; +import android.view.WindowMetrics; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.policy.GestureNavigationSettingsObserver; @@ -86,8 +88,8 @@ import java.util.concurrent.Executor; /** * Utility class to handle edge swipes for back gesture */ -public class EdgeBackGestureHandler extends CurrentUserTracker implements DisplayListener, - PluginListener<NavigationEdgeBackPlugin>, ProtoTraceable<SystemUiTraceProto> { +public class EdgeBackGestureHandler extends CurrentUserTracker + implements PluginListener<NavigationEdgeBackPlugin>, ProtoTraceable<SystemUiTraceProto> { private static final String TAG = "EdgeBackGestureHandler"; private static final int MAX_LONG_PRESS_TIMEOUT = SystemProperties.getInt( @@ -123,7 +125,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa @Override public void onQuickSwitchToNewTask(@Surface.Rotation int rotation) { mStartingQuickstepRotation = rotation; - updateDisabledForQuickstep(); + updateDisabledForQuickstep(mContext.getResources().getConfiguration()); } }; @@ -414,7 +416,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa if (!mIsEnabled) { mGestureNavigationSettingsObserver.unregister(); - mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this); if (DEBUG_MISSING_GESTURE) { Log.d(DEBUG_MISSING_GESTURE_TAG, "Unregister display listener"); } @@ -433,8 +434,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa } else { mGestureNavigationSettingsObserver.register(); updateDisplaySize(); - mContext.getSystemService(DisplayManager.class).registerDisplayListener(this, - mContext.getMainThreadHandler()); if (DEBUG_MISSING_GESTURE) { Log.d(DEBUG_MISSING_GESTURE_TAG, "Register display listener"); } @@ -805,35 +804,28 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa Dependency.get(ProtoTracer.class).scheduleFrameUpdate(); } - private void updateDisabledForQuickstep() { - int rotation = mContext.getResources().getConfiguration().windowConfiguration.getRotation(); + private void updateDisabledForQuickstep(Configuration newConfig) { + int rotation = newConfig.windowConfiguration.getRotation(); mDisabledForQuickstep = mStartingQuickstepRotation > -1 && mStartingQuickstepRotation != rotation; } - @Override - public void onDisplayAdded(int displayId) { } - - @Override - public void onDisplayRemoved(int displayId) { } - - @Override - public void onDisplayChanged(int displayId) { + public void onConfigurationChanged(Configuration newConfig) { if (mStartingQuickstepRotation > -1) { - updateDisabledForQuickstep(); + updateDisabledForQuickstep(newConfig); } if (DEBUG_MISSING_GESTURE) { - Log.d(DEBUG_MISSING_GESTURE_TAG, "Display changed: mDisplayId=" + mDisplayId - + " displayId=" + displayId); - } - if (displayId == mDisplayId) { - updateDisplaySize(); + Log.d(DEBUG_MISSING_GESTURE_TAG, "Config changed: config=" + newConfig); } + updateDisplaySize(); } private void updateDisplaySize() { - mContext.getDisplay().getRealSize(mDisplaySize); + WindowMetrics metrics = mContext.getSystemService(WindowManager.class) + .getMaximumWindowMetrics(); + Rect bounds = metrics.getBounds(); + mDisplaySize.set(bounds.width(), bounds.height()); if (DEBUG_MISSING_GESTURE) { Log.d(DEBUG_MISSING_GESTURE_TAG, "Update display size: mDisplaySize=" + mDisplaySize); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java index 47212d250c37..b728b4360db0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -138,12 +138,11 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { @Override protected void handleUpdateState(State state, Object arg) { - CharSequence qawLabel = mQuickAccessWalletClient.getServiceLabel(); - state.label = qawLabel == null ? mLabel : qawLabel; + state.label = mLabel; state.contentDescription = state.label; state.icon = ResourceIcon.get(R.drawable.ic_qs_wallet); boolean isDeviceLocked = !mKeyguardStateController.isUnlocked(); - if (mQuickAccessWalletClient.isWalletFeatureAvailable()) { + if (mQuickAccessWalletClient.isWalletServiceAvailable()) { if (mHasCard) { if (isDeviceLocked) { state.state = Tile.STATE_INACTIVE; diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index afbb197c4a12..6d23739b9c78 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -24,7 +24,6 @@ import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_OVERVIEW; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; import static com.android.internal.accessibility.common.ShortcutConstants.CHOOSER_PACKAGE_NAME; -import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR; import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_ONE_HANDED; import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_PIP; import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SHELL_TRANSITIONS; @@ -62,7 +61,6 @@ import android.os.SystemClock; import android.os.UserHandle; import android.util.Log; import android.view.InputDevice; -import android.view.InputMonitor; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.MotionEvent; @@ -89,7 +87,6 @@ import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.ActivityManagerWrapper; -import com.android.systemui.shared.system.InputMonitorCompat; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationShadeWindowController; @@ -358,24 +355,6 @@ public class OverviewProxyService extends CurrentUserTracker implements } @Override - public Bundle monitorGestureInput(String name, int displayId) { - if (!verifyCaller("monitorGestureInput")) { - return null; - } - final long token = Binder.clearCallingIdentity(); - try { - final InputMonitor monitor = - InputManager.getInstance().monitorGestureInput(name, displayId); - final Bundle result = new Bundle(); - result.putParcelable(KEY_EXTRA_INPUT_MONITOR, - InputMonitorCompat.obtainReturnValue(monitor)); - return result; - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override public void notifyAccessibilityButtonClicked(int displayId) { if (!verifyCaller("notifyAccessibilityButtonClicked")) { return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt index fd060e6d486d..718a85a98877 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt @@ -58,6 +58,7 @@ class WiredChargingRippleController @Inject constructor( title = "Wired Charging Animation" flags = (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) + setTrustedOverlay() } @VisibleForTesting @@ -103,7 +104,10 @@ class WiredChargingRippleController @Inject constructor( } fun startRipple() { - if (rippleView.rippleInProgress) { + if (rippleView.rippleInProgress || rippleView.parent != null) { + // Skip if ripple is still playing, or not playing but already added the parent + // (which might happen just before the animation starts or right after + // the animation ends.) return } val mWM = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 8fae7200b56f..500838fac5f9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -71,7 +71,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.ContrastColorUtil; import com.android.internal.widget.CachingIconView; import com.android.internal.widget.CallLayout; -import com.android.internal.widget.MessagingLayout; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.animation.ActivityLaunchAnimator; @@ -658,10 +657,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView boolean beforeS = mEntry.targetSdk < Build.VERSION_CODES.S; int smallHeight; - View expandedView = layout.getExpandedChild(); - boolean isMediaLayout = expandedView != null - && expandedView.findViewById(com.android.internal.R.id.media_actions) != null; - boolean isMessagingLayout = contractedView instanceof MessagingLayout; boolean isCallLayout = contractedView instanceof CallLayout; if (customView && beforeS && !mIsSummaryWithChildren) { @@ -672,12 +667,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } else { smallHeight = mMaxSmallHeightBeforeS; } - } else if (isMessagingLayout) { - // TODO(b/173204301): MessagingStyle notifications currently look broken when we enforce - // the standard notification height, so we have to afford them more vertical space to - // make sure we don't crop them terribly. We actually need to revisit this and give - // them a headerless design, then remove this hack. - smallHeight = mMaxSmallHeightLarge; } else if (isCallLayout) { smallHeight = mMaxExpandedHeight; } else if (mUseIncreasedCollapsedHeight && layout == mPrivateLayout) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt index 383bb7e41a91..08981f1215f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt @@ -23,12 +23,9 @@ import com.android.internal.widget.CachingIconView import com.android.internal.widget.ConversationLayout import com.android.internal.widget.MessagingLinearLayout import com.android.systemui.R -import com.android.systemui.statusbar.TransformableView -import com.android.systemui.statusbar.ViewTransformationHelper import com.android.systemui.statusbar.notification.NotificationUtils -import com.android.systemui.statusbar.notification.TransformState import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow -import com.android.systemui.statusbar.notification.row.HybridNotificationView +import com.android.systemui.statusbar.notification.row.wrapper.NotificationMessagingTemplateViewWrapper.setCustomImageMessageTransform /** * Wraps a notification containing a conversation template @@ -93,33 +90,7 @@ class NotificationConversationTemplateViewWrapper constructor( appName, conversationTitleView) - // Let's ignore the image message container since that is transforming as part of the - // messages already - mTransformationHelper.setCustomTransformation( - object : ViewTransformationHelper.CustomTransformation() { - override fun transformTo( - ownState: TransformState, - otherView: TransformableView, - transformationAmount: Float - ): Boolean { - if (otherView is HybridNotificationView) { - return false - } - // we're hidden by default by the transformState - ownState.ensureVisible() - // Let's do nothing otherwise, this is already handled by the messages - return true - } - - override fun transformFrom( - ownState: TransformState, - otherView: TransformableView, - transformationAmount: Float - ): Boolean = - transformTo(ownState, otherView, transformationAmount) - }, - imageMessageContainer.id - ) + setCustomImageMessageTransform(mTransformationHelper, imageMessageContainer) addViewsTransformingToSimilar( conversationIconView, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java index c9a274294d16..c587ce05b13f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java @@ -18,12 +18,17 @@ package com.android.systemui.statusbar.notification.row.wrapper; import android.content.Context; import android.view.View; +import android.view.ViewGroup; import com.android.internal.widget.MessagingLayout; import com.android.internal.widget.MessagingLinearLayout; import com.android.systemui.R; +import com.android.systemui.statusbar.TransformableView; +import com.android.systemui.statusbar.ViewTransformationHelper; import com.android.systemui.statusbar.notification.NotificationUtils; +import com.android.systemui.statusbar.notification.TransformState; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; +import com.android.systemui.statusbar.notification.row.HybridNotificationView; /** * Wraps a notification containing a messaging template @@ -31,12 +36,17 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow public class NotificationMessagingTemplateViewWrapper extends NotificationTemplateViewWrapper { private final int mMinHeightWithActions; + private final View mTitle; + private final View mTitleInHeader; private MessagingLayout mMessagingLayout; private MessagingLinearLayout mMessagingLinearLayout; + private ViewGroup mImageMessageContainer; protected NotificationMessagingTemplateViewWrapper(Context ctx, View view, ExpandableNotificationRow row) { super(ctx, view, row); + mTitle = mView.findViewById(com.android.internal.R.id.title); + mTitleInHeader = mView.findViewById(com.android.internal.R.id.header_text_secondary); mMessagingLayout = (MessagingLayout) view; mMinHeightWithActions = NotificationUtils.getFontScaledHeight(ctx, R.dimen.notification_messaging_actions_min_height); @@ -44,6 +54,7 @@ public class NotificationMessagingTemplateViewWrapper extends NotificationTempla private void resolveViews() { mMessagingLinearLayout = mMessagingLayout.getMessagingLinearLayout(); + mImageMessageContainer = mMessagingLayout.getImageMessageContainer(); } @Override @@ -59,8 +70,48 @@ public class NotificationMessagingTemplateViewWrapper extends NotificationTempla // This also clears the existing types super.updateTransformedTypes(); if (mMessagingLinearLayout != null) { - mTransformationHelper.addTransformedView(mMessagingLinearLayout.getId(), - mMessagingLinearLayout); + mTransformationHelper.addTransformedView(mMessagingLinearLayout); + } + // The title is not as important for messaging, and stays in the header when expanded, + // but this ensures it animates cleanly between the two positions + if (mTitle == null && mTitleInHeader != null) { + mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TITLE, + mTitleInHeader); + } + setCustomImageMessageTransform(mTransformationHelper, mImageMessageContainer); + } + + static void setCustomImageMessageTransform( + ViewTransformationHelper transformationHelper, ViewGroup imageMessageContainer) { + if (imageMessageContainer != null) { + // Let's ignore the image message container since that is transforming as part of the + // messages already. This is also required to prevent a clipping artifact caused by the + // alpha layering triggering hardware rendering mode that in turn results in more + // aggressive clipping than we want. + transformationHelper.setCustomTransformation( + new ViewTransformationHelper.CustomTransformation() { + @Override + public boolean transformTo( + TransformState ownState, + TransformableView otherView, + float transformationAmount) { + if (otherView instanceof HybridNotificationView) { + return false; + } + // we're hidden by default by the transformState + ownState.ensureVisible(); + // Let's do nothing otherwise, this is already handled by the messages + return true; + } + + @Override + public boolean transformFrom( + TransformState ownState, + TransformableView otherView, + float transformationAmount) { + return transformTo(ownState, otherView, transformationAmount); + } + }, imageMessageContainer.getId()); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java index e0b58125aabd..48f34b3b7716 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java @@ -56,6 +56,7 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp private ProgressBar mProgressBar; private TextView mTitle; private TextView mText; + protected View mSmartReplyContainer; protected View mActionsContainer; private int mContentHeight; @@ -160,6 +161,7 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp // It's still a viewstub mProgressBar = null; } + mSmartReplyContainer = mView.findViewById(com.android.internal.R.id.smart_reply_container); mActionsContainer = mView.findViewById(com.android.internal.R.id.actions_container); mActions = mView.findViewById(com.android.internal.R.id.actions); mRemoteInputHistory = mView.findViewById( @@ -275,6 +277,7 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp mProgressBar); } addViewsTransformingToSimilar(mLeftIcon); + addTransformedViews(mSmartReplyContainer); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt index 707135c3d95b..30d9841e41ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt @@ -16,11 +16,13 @@ package com.android.systemui.statusbar.phone +import android.annotation.IntDef import android.content.Context import android.content.pm.PackageManager import android.hardware.biometrics.BiometricSourceType import android.provider.Settings import com.android.systemui.Dumpable +import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.statusbar.StatusBarStateController @@ -37,9 +39,18 @@ open class KeyguardBypassController : Dumpable { private val mKeyguardStateController: KeyguardStateController private val statusBarStateController: StatusBarStateController + @BypassOverride private val bypassOverride: Int private var hasFaceFeature: Boolean private var pendingUnlock: PendingUnlock? = null + @IntDef( + FACE_UNLOCK_BYPASS_NO_OVERRIDE, + FACE_UNLOCK_BYPASS_ALWAYS, + FACE_UNLOCK_BYPASS_NEVER + ) + @Retention(AnnotationRetention.SOURCE) + private annotation class BypassOverride + /** * Pending unlock info: * @@ -60,7 +71,14 @@ open class KeyguardBypassController : Dumpable { * If face unlock dismisses the lock screen or keeps user on keyguard for the current user. */ var bypassEnabled: Boolean = false - get() = field && mKeyguardStateController.isFaceAuthEnabled + get() { + val enabled = when (bypassOverride) { + FACE_UNLOCK_BYPASS_ALWAYS -> true + FACE_UNLOCK_BYPASS_NEVER -> false + else -> field + } + return enabled && mKeyguardStateController.isFaceAuthEnabled + } private set var bouncerShowing: Boolean = false @@ -86,6 +104,8 @@ open class KeyguardBypassController : Dumpable { this.mKeyguardStateController = keyguardStateController this.statusBarStateController = statusBarStateController + bypassOverride = context.resources.getInteger(R.integer.config_face_unlock_bypass_override) + hasFaceFeature = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE) if (!hasFaceFeature) { return @@ -198,5 +218,9 @@ open class KeyguardBypassController : Dumpable { companion object { const val BYPASS_PANEL_FADE_DURATION = 67 + + private const val FACE_UNLOCK_BYPASS_NO_OVERRIDE = 0 + private const val FACE_UNLOCK_BYPASS_ALWAYS = 1 + private const val FACE_UNLOCK_BYPASS_NEVER = 2 } } diff --git a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java index 662e25c668ee..4284148c38a8 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java +++ b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java @@ -233,7 +233,7 @@ public class SystemUIToast implements ToastPlugin.Toast { return null; } final AppEntry appEntry = appState.getEntry(packageName, userId); - if (appEntry.info == null + if (appEntry == null || appEntry.info == null || !ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER.filterApp(appEntry)) { return null; } diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java index 55b80dd69b6a..db7736620c26 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java @@ -633,7 +633,7 @@ public class BubblesManager implements Dumpable { } else { mNotificationGroupManager.onEntryRemoved(entry); } - }); + }, mSysuiMainExecutor); } /** diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java index 9017dd244fb4..a8709150c3e4 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java @@ -20,6 +20,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,6 +32,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.util.AttributeSet; import android.view.View; +import android.widget.FrameLayout; import android.widget.RelativeLayout; import com.android.internal.colorextraction.ColorExtractor; @@ -48,6 +50,7 @@ import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.phone.NotificationIconAreaController; import com.android.systemui.statusbar.phone.NotificationIconContainer; import com.android.systemui.statusbar.policy.BatteryController; +import com.android.systemui.statusbar.policy.ConfigurationController; import org.junit.Before; import org.junit.Test; @@ -98,9 +101,14 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { @Mock private AnimatableClockView mLargeClockView; @Mock + private FrameLayout mLargeClockFrame; + @Mock BatteryController mBatteryController; + @Mock + ConfigurationController mConfigurationController; private KeyguardClockSwitchController mController; + private View mStatusArea; @Before public void setup() { @@ -108,10 +116,13 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { when(mView.findViewById(R.id.left_aligned_notification_icon_container)) .thenReturn(mNotificationIcons); + when(mNotificationIcons.getLayoutParams()).thenReturn( + mock(RelativeLayout.LayoutParams.class)); when(mView.getContext()).thenReturn(getContext()); when(mView.findViewById(R.id.animatable_clock_view)).thenReturn(mClockView); when(mView.findViewById(R.id.animatable_clock_view_large)).thenReturn(mLargeClockView); + when(mView.findViewById(R.id.lockscreen_clock_view_large)).thenReturn(mLargeClockFrame); when(mClockView.getContext()).thenReturn(getContext()); when(mLargeClockView.getContext()).thenReturn(getContext()); @@ -131,10 +142,15 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { mPluginManager, mFeatureFlags, mExecutor, - mBatteryController); + mBatteryController, + mConfigurationController); when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE); when(mColorExtractor.getColors(anyInt())).thenReturn(mGradientColors); + + mStatusArea = mock(View.class); + when(mView.findViewById(R.id.keyguard_status_area)).thenReturn(mStatusArea); + } @Test @@ -197,39 +213,40 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { public void testSmartspacePluginConnectedRemovesKeyguardStatusArea() { mController.init(); - View statusArea = mock(View.class); - when(mView.findViewById(R.id.keyguard_status_area)).thenReturn(statusArea); - - View nic = mock(View.class); - when(mView.findViewById(R.id.left_aligned_notification_icon_container)).thenReturn(nic); - when(nic.getLayoutParams()).thenReturn(mock(RelativeLayout.LayoutParams.class)); - BcSmartspaceDataPlugin plugin = mock(BcSmartspaceDataPlugin.class); TestView view = mock(TestView.class); when(plugin.getView(any())).thenReturn(view); mController.mPluginListener.onPluginConnected(plugin, mContext); - verify(statusArea).setVisibility(View.GONE); + verify(mStatusArea).setVisibility(View.GONE); } @Test public void testSmartspacePluginDisconnectedShowsKeyguardStatusArea() { mController.init(); - View statusArea = mock(View.class); - when(mView.findViewById(R.id.keyguard_status_area)).thenReturn(statusArea); + BcSmartspaceDataPlugin plugin = mock(BcSmartspaceDataPlugin.class); + TestView view = mock(TestView.class); + when(plugin.getView(any())).thenReturn(view); + + mController.mPluginListener.onPluginConnected(plugin, mContext); + mController.mPluginListener.onPluginDisconnected(plugin); + verify(mStatusArea).setVisibility(View.VISIBLE); + } - View nic = mock(View.class); - when(mView.findViewById(R.id.left_aligned_notification_icon_container)).thenReturn(nic); - when(nic.getLayoutParams()).thenReturn(mock(RelativeLayout.LayoutParams.class)); + @Test + public void testThemeChangeNotifiesSmartspace() { + mController.init(); BcSmartspaceDataPlugin plugin = mock(BcSmartspaceDataPlugin.class); TestView view = mock(TestView.class); when(plugin.getView(any())).thenReturn(view); mController.mPluginListener.onPluginConnected(plugin, mContext); - mController.mPluginListener.onPluginDisconnected(plugin); - verify(statusArea).setVisibility(View.VISIBLE); + + reset(view); + mController.getConfigurationListener().onThemeChanged(); + verify(view).setPrimaryTextColor(anyInt()); } private void verifyAttachment(VerificationMode times) { @@ -246,5 +263,7 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { } public void registerDataProvider(BcSmartspaceDataPlugin plugin) { } + + public void setPrimaryTextColor(int color) { } } } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index d544f7378f8a..42af366ad8fa 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -537,7 +537,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { authCallback.onAuthenticationFailed(); // THEN aod interrupt is cancelled - verify(mAuthController).onCancelAodInterrupt(); + verify(mAuthController).onCancelUdfps(); } @Test @@ -557,7 +557,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { authCallback.onAuthenticationError(0, ""); // THEN aod interrupt is cancelled - verify(mAuthController).onCancelAodInterrupt(); + verify(mAuthController).onCancelUdfps(); } @Test 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 bbd3ce89b997..0aa182fb1e81 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java @@ -259,7 +259,7 @@ public class UdfpsControllerTest extends SysuiTestCase { mFgExecutor.runAllReady(); mUdfpsController.onAodInterrupt(0, 0, 0f, 0f); // WHEN it is cancelled - mUdfpsController.onCancelAodInterrupt(); + mUdfpsController.onCancelUdfps(); // THEN the illumination is hidden verify(mUdfpsView).stopIllumination(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java index 613f879ce80a..d236023499d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java @@ -141,6 +141,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { when(mHost.getUiEventLogger()).thenReturn(mUiEventLogger); when(mFeatureFlags.isQuickAccessWalletEnabled()).thenReturn(true); when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(true); + when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(true); mTile = new QuickAccessWalletTile( mHost, @@ -171,13 +172,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test - public void testIsAvailable_qawServiceNotAvailable() { - when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false); - assertFalse(mTile.isAvailable()); - } - - @Test - public void testIsAvailable_qawServiceAvailable() { + public void testIsAvailable_qawFeatureAvailable() { when(mPackageManager.hasSystemFeature(FEATURE_NFC_HOST_CARD_EMULATION)).thenReturn(true); when(mPackageManager.hasSystemFeature("org.chromium.arc")).thenReturn(false); when(mSecureSettings.getString(NFC_PAYMENT_DEFAULT_COMPONENT)).thenReturn("Component"); @@ -229,11 +224,10 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { public void testHandleUpdateState_updateLabelAndIcon() { QSTile.State state = new QSTile.State(); QSTile.Icon icon = QSTileImpl.ResourceIcon.get(R.drawable.ic_qs_wallet); - when(mQuickAccessWalletClient.getServiceLabel()).thenReturn("QuickAccessWallet"); mTile.handleUpdateState(state, null); - assertEquals("QuickAccessWallet", state.label.toString()); + assertEquals(mContext.getString(R.string.wallet_title), state.label.toString()); assertTrue(state.label.toString().contentEquals(state.contentDescription)); assertEquals(icon, state.icon); } @@ -288,7 +282,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { @Test public void testHandleUpdateState_qawFeatureUnavailable_tileUnavailable() { - when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(false); + when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false); QSTile.State state = new QSTile.State(); mTile.handleUpdateState(state, null); diff --git a/services/Android.bp b/services/Android.bp index ad1406c73c2f..20b89de7f2a6 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -65,6 +65,7 @@ filegroup { ":services.texttospeech-sources", ":services.usage-sources", ":services.usb-sources", + ":services.uwb-sources", ":services.voiceinteraction-sources", ":services.wifi-sources", ], @@ -129,6 +130,7 @@ java_library { "services.texttospeech", "services.usage", "services.usb", + "services.uwb", "services.voiceinteraction", "services.wifi", "service-blobstore", diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index a230f808ee9e..f8b770b4ec84 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -456,6 +456,12 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } : null; } + void newAutofillRequestLocked(@Nullable InlineSuggestionsRequest inlineRequest) { + mPendingFillRequest = null; + mWaitForInlineRequest = inlineRequest != null; + mPendingInlineSuggestionsRequest = inlineRequest; + } + void maybeRequestFillLocked() { if (mPendingFillRequest == null) { return; @@ -886,6 +892,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } // Now request the assist structure data. + requestAssistStructureLocked(requestId, flags); + } + + @GuardedBy("mLock") + private void requestAssistStructureLocked(int requestId, int flags) { try { final Bundle receiverExtras = new Bundle(); receiverExtras.putInt(EXTRA_REQUEST_ID, requestId); @@ -1052,12 +1063,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if (requestLog != null) { requestLog.addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_DATASETS, -1); } - processNullResponseLocked(requestId, requestFlags); + processNullResponseOrFallbackLocked(requestId, requestFlags); return; } fieldClassificationIds = response.getFieldClassificationIds(); - if (fieldClassificationIds != null && !mService.isFieldClassificationEnabledLocked()) { + if (!mSessionFlags.mClientSuggestionsEnabled && fieldClassificationIds != null + && !mService.isFieldClassificationEnabledLocked()) { Slog.w(TAG, "Ignoring " + response + " because field detection is disabled"); processNullResponseLocked(requestId, requestFlags); return; @@ -1136,6 +1148,26 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } } + @GuardedBy("mLock") + private void processNullResponseOrFallbackLocked(int requestId, int flags) { + if (!mSessionFlags.mClientSuggestionsEnabled) { + processNullResponseLocked(requestId, flags); + return; + } + + // fallback to the default platform password manager + mSessionFlags.mClientSuggestionsEnabled = false; + + final InlineSuggestionsRequest inlineRequest = + (mLastInlineSuggestionsRequest != null + && mLastInlineSuggestionsRequest.first == requestId) + ? mLastInlineSuggestionsRequest.second : null; + mAssistReceiver.newAutofillRequestLocked(inlineRequest); + requestAssistStructureLocked(requestId, + flags & ~FLAG_ENABLED_CLIENT_SUGGESTIONS); + return; + } + // FillServiceCallbacks @Override public void onFillRequestFailure(int requestId, @Nullable CharSequence message) { diff --git a/services/core/java/com/android/server/BinderCallsStatsService.java b/services/core/java/com/android/server/BinderCallsStatsService.java index c49b8e8e77c6..78610a2857bd 100644 --- a/services/core/java/com/android/server/BinderCallsStatsService.java +++ b/services/core/java/com/android/server/BinderCallsStatsService.java @@ -138,6 +138,8 @@ public class BinderCallsStatsService extends Binder { private static final String SETTINGS_COLLECT_LATENCY_DATA_KEY = "collect_Latency_data"; private static final String SETTINGS_LATENCY_OBSERVER_SAMPLING_INTERVAL_KEY = "latency_observer_sampling_interval"; + private static final String SETTINGS_LATENCY_OBSERVER_PUSH_INTERVAL_MINUTES_KEY = + "latency_observer_push_interval_minutes"; private static final String SETTINGS_LATENCY_HISTOGRAM_BUCKET_COUNT_KEY = "latency_histogram_bucket_count"; private static final String SETTINGS_LATENCY_HISTOGRAM_FIRST_BUCKET_SIZE_KEY = @@ -218,7 +220,9 @@ public class BinderCallsStatsService extends Binder { mParser.getFloat( SETTINGS_LATENCY_HISTOGRAM_BUCKET_SCALE_FACTOR_KEY, BinderLatencyObserver.BUCKET_SCALE_FACTOR_DEFAULT)); - + binderLatencyObserver.setPushInterval(mParser.getInt( + SETTINGS_LATENCY_OBSERVER_PUSH_INTERVAL_MINUTES_KEY, + BinderLatencyObserver.STATSD_PUSH_INTERVAL_MINUTES_DEFAULT)); final boolean enabled = mParser.getBoolean(SETTINGS_ENABLED_KEY, BinderCallsStats.ENABLED_DEFAULT); diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index 3b31ab272ff2..039f4d9f3cce 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -362,8 +362,7 @@ public class VcnManagementService extends IVcnManagementService.Stub { /** Notifies the VcnManagementService that external dependencies can be set up. */ public void systemReady() { - mContext.getSystemService(ConnectivityManager.class) - .registerNetworkProvider(mNetworkProvider); + mNetworkProvider.register(); mContext.getSystemService(ConnectivityManager.class) .registerNetworkCallback( new NetworkRequest.Builder().clearCapabilities().build(), @@ -935,13 +934,31 @@ public class VcnManagementService extends IVcnManagementService.Stub { pw.println("VcnManagementService dump:"); pw.increaseIndent(); + pw.println("mNetworkProvider:"); + pw.increaseIndent(); mNetworkProvider.dump(pw); + pw.decreaseIndent(); + pw.println(); + + pw.println("mTrackingNetworkCallback:"); + pw.increaseIndent(); + mTrackingNetworkCallback.dump(pw); + pw.decreaseIndent(); + pw.println(); synchronized (mLock) { + pw.println("mLastSnapshot:"); + pw.increaseIndent(); + mLastSnapshot.dump(pw); + pw.decreaseIndent(); + pw.println(); + pw.println("mVcns:"); + pw.increaseIndent(); for (Vcn vcn : mVcns.values()) { vcn.dump(pw); } + pw.decreaseIndent(); pw.println(); } @@ -1003,6 +1020,24 @@ public class VcnManagementService extends IVcnManagementService.Stub { return false; } + + /** Dumps the state of this snapshot for logging and debugging purposes. */ + public void dump(IndentingPrintWriter pw) { + pw.println("TrackingNetworkCallback:"); + pw.increaseIndent(); + + pw.println("mCaps:"); + pw.increaseIndent(); + synchronized (mCaps) { + for (Entry<Network, NetworkCapabilities> entry : mCaps.entrySet()) { + pw.println(entry.getKey() + ": " + entry.getValue()); + } + } + pw.decreaseIndent(); + pw.println(); + + pw.decreaseIndent(); + } } /** VcnCallbackImpl for Vcn signals sent up to VcnManagementService. */ diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 50040e2dad5f..4324717a7938 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1792,6 +1792,9 @@ public final class ActiveServices { showFgsBgRestrictedNotificationLocked(r); updateServiceForegroundLocked(psr, true); ignoreForeground = true; + logForegroundServiceStateChanged(r, + FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED, + 0); if (CompatChanges.isChangeEnabled(FGS_START_EXCEPTION_CHANGE_ID, r.appInfo.uid)) { throw new ForegroundServiceStartNotAllowedException(msg); @@ -1837,6 +1840,7 @@ public final class ActiveServices { } r.isForeground = true; r.mStartForegroundCount++; + r.mFgsEnterTime = SystemClock.uptimeMillis(); if (!stopProcStatsOp) { ServiceState stracker = r.getTracker(); if (stracker != null) { @@ -1846,18 +1850,17 @@ public final class ActiveServices { } else { stopProcStatsOp = false; } + postFgsNotificationLocked(r); mAm.mAppOpsService.startOperation( AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, null, true, false, "", false); - FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, - r.appInfo.uid, r.shortInstanceName, + logForegroundServiceStateChanged(r, FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER, - r.mAllowWhileInUsePermissionInFgs); + 0); registerAppOpCallbackLocked(r); mAm.updateForegroundServiceUsageStats(r.name, r.userId, true); } - postFgsNotificationLocked(r); if (r.app != null) { updateServiceForegroundLocked(psr, true); } @@ -1896,6 +1899,7 @@ public final class ActiveServices { } r.isForeground = false; resetFgsRestrictionLocked(r); + r.mFgsExitTime = SystemClock.uptimeMillis(); ServiceState stracker = r.getTracker(); if (stracker != null) { stracker.setForeground(false, mAm.mProcessStats.getMemFactorLocked(), @@ -1905,10 +1909,10 @@ public final class ActiveServices { AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, null); unregisterAppOpCallbackLocked(r); - FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, - r.appInfo.uid, r.shortInstanceName, + logForegroundServiceStateChanged(r, FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT, - r.mAllowWhileInUsePermissionInFgs); + r.mFgsExitTime > r.mFgsEnterTime + ? (int)(r.mFgsExitTime - r.mFgsEnterTime) : 0); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); if (r.app != null) { mAm.updateLruProcessLocked(r.app, false, null); @@ -1992,9 +1996,13 @@ public final class ActiveServices { Slog.d(TAG_SERVICE, "FGS " + r + " non-deferred notification"); } r.postNotification(); + r.mFgsNotificationDeferred = false; + r.mFgsNotificationShown = true; return; } + r.mFgsNotificationDeferred = true; + r.mFgsNotificationShown = false; // schedule the actual notification post long when = now + mAm.mConstants.mFgsNotificationDeferralInterval; // If there are already deferred FGS notifications for this app, @@ -2052,6 +2060,7 @@ public final class ActiveServices { // the notification. if (r.isForeground && r.app != null) { r.postNotification(); + r.mFgsNotificationShown = true; } else if (DEBUG_FOREGROUND_SERVICE) { Slog.d(TAG_SERVICE, " - service no longer running/fg, ignoring"); } @@ -3027,6 +3036,12 @@ public final class ActiveServices { if (r != null) { r.mRecentCallingPackage = callingPackage; r.mRecentCallingUid = callingUid; + try { + r.mRecentCallerApplicationInfo = + mAm.mContext.getPackageManager().getApplicationInfoAsUser(callingPackage, + 0, userId); + } catch (PackageManager.NameNotFoundException e) { + } if (!mAm.validateAssociationAllowedLocked(callingPackage, callingUid, r.packageName, r.appInfo.uid)) { String msg = "association not allowed between packages " @@ -3963,10 +3978,11 @@ public final class ActiveServices { AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, null); unregisterAppOpCallbackLocked(r); - FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, - r.appInfo.uid, r.shortInstanceName, + r.mFgsExitTime = SystemClock.uptimeMillis(); + logForegroundServiceStateChanged(r, FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT, - r.mAllowWhileInUsePermissionInFgs); + r.mFgsExitTime > r.mFgsEnterTime + ? (int)(r.mFgsExitTime - r.mFgsEnterTime) : 0); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); } @@ -5880,4 +5896,29 @@ public final class ActiveServices { r.mLoggedInfoAllowStartForeground = true; } } + + /** + * Log the statsd event for FGS. + * @param r ServiceRecord + * @param state one of ENTER/EXIT/DENIED event. + * @param durationMs Only meaningful for EXIT event, the duration from ENTER and EXIT state. + */ + private void logForegroundServiceStateChanged(ServiceRecord r, int state, int durationMs) { + FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, + r.appInfo.uid, + r.shortInstanceName, + state, + r.mAllowWhileInUsePermissionInFgs, + r.mAllowStartForeground, + r.appInfo.targetSdkVersion, + r.mRecentCallingUid, + r.mRecentCallerApplicationInfo != null + ? r.mRecentCallerApplicationInfo.targetSdkVersion : 0, + r.mInfoTempFgsAllowListReason != null + ? r.mInfoTempFgsAllowListReason.mCallingUid : INVALID_UID, + r.mFgsNotificationDeferred, + r.mFgsNotificationShown, + durationMs, + r.mStartForegroundCount); + } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 2a1a8971ec8c..e3b06d696423 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2500,7 +2500,7 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void batterySendBroadcast(Intent intent) { synchronized (this) { - broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null, + broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null, null, OP_NONE, null, false, false, -1, SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.USER_ALL); } @@ -3940,7 +3940,7 @@ public class ActivityManagerService extends IActivityManager.Stub intent.putExtra(Intent.EXTRA_UID, uid); intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(uid)); broadcastIntentLocked(null, null, null, intent, - null, null, 0, null, null, null, OP_NONE, + null, null, 0, null, null, null, null, OP_NONE, null, false, false, MY_PID, SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.getUserId(uid)); } @@ -7531,7 +7531,7 @@ public class ActivityManagerService extends IActivityManager.Stub | Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_USER_HANDLE, currentUserId); broadcastIntentLocked(null, null, null, intent, - null, null, 0, null, null, null, OP_NONE, + null, null, 0, null, null, null, null, OP_NONE, null, false, false, MY_PID, SYSTEM_UID, callingUid, callingPid, currentUserId); intent = new Intent(Intent.ACTION_USER_STARTING); @@ -7543,8 +7543,8 @@ public class ActivityManagerService extends IActivityManager.Stub public void performReceive(Intent intent, int resultCode, String data, Bundle extras, boolean ordered, boolean sticky, int sendingUser) {} - }, 0, null, null, new String[] {INTERACT_ACROSS_USERS}, OP_NONE, null, - true, false, MY_PID, SYSTEM_UID, callingUid, callingPid, + }, 0, null, null, new String[] {INTERACT_ACROSS_USERS}, null, OP_NONE, + null, true, false, MY_PID, SYSTEM_UID, callingUid, callingPid, UserHandle.USER_ALL); } catch (Throwable e) { Slog.wtf(TAG, "Failed sending first user broadcasts", e); @@ -12302,7 +12302,7 @@ public class ActivityManagerService extends IActivityManager.Stub Intent intent = allSticky.get(i); BroadcastQueue queue = broadcastQueueForIntent(intent); BroadcastRecord r = new BroadcastRecord(queue, intent, null, - null, null, -1, -1, false, null, null, OP_NONE, null, receivers, + null, null, -1, -1, false, null, null, null, OP_NONE, null, receivers, null, 0, null, null, false, true, true, -1, false, null, false /* only PRE_BOOT_COMPLETED should be exempt, no stickies */); queue.enqueueParallelBroadcastLocked(r); @@ -12544,13 +12544,13 @@ public class ActivityManagerService extends IActivityManager.Stub final int broadcastIntentLocked(ProcessRecord callerApp, String callerPackage, String callerFeatureId, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, - Bundle resultExtras, String[] requiredPermissions, int appOp, Bundle bOptions, - boolean ordered, boolean sticky, int callingPid, int callingUid, int realCallingUid, - int realCallingPid, int userId) { + Bundle resultExtras, String[] requiredPermissions, String[] excludedPermissions, + int appOp, Bundle bOptions, boolean ordered, boolean sticky, int callingPid, + int callingUid, int realCallingUid, int realCallingPid, int userId) { return broadcastIntentLocked(callerApp, callerPackage, callerFeatureId, intent, resolvedType, resultTo, resultCode, resultData, resultExtras, requiredPermissions, - appOp, bOptions, ordered, sticky, callingPid, callingUid, realCallingUid, - realCallingPid, userId, false /* allowBackgroundActivityStarts */, + excludedPermissions, appOp, bOptions, ordered, sticky, callingPid, callingUid, + realCallingUid, realCallingPid, userId, false /* allowBackgroundActivityStarts */, null /* tokenNeededForBackgroundActivityStarts */, null /* broadcastAllowList */); } @@ -12558,9 +12558,11 @@ public class ActivityManagerService extends IActivityManager.Stub final int broadcastIntentLocked(ProcessRecord callerApp, String callerPackage, @Nullable String callerFeatureId, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, - Bundle resultExtras, String[] requiredPermissions, int appOp, Bundle bOptions, - boolean ordered, boolean sticky, int callingPid, int callingUid, int realCallingUid, - int realCallingPid, int userId, boolean allowBackgroundActivityStarts, + Bundle resultExtras, String[] requiredPermissions, + String[] excludedPermissions, int appOp, Bundle bOptions, + boolean ordered, boolean sticky, int callingPid, int callingUid, + int realCallingUid, int realCallingPid, int userId, + boolean allowBackgroundActivityStarts, @Nullable IBinder backgroundActivityStartsToken, @Nullable int[] broadcastAllowList) { intent = new Intent(intent); @@ -13139,8 +13141,8 @@ public class ActivityManagerService extends IActivityManager.Stub final BroadcastQueue queue = broadcastQueueForIntent(intent); BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage, callerFeatureId, callingPid, callingUid, callerInstantApp, resolvedType, - requiredPermissions, appOp, brOptions, registeredReceivers, resultTo, - resultCode, resultData, resultExtras, ordered, sticky, false, userId, + requiredPermissions, excludedPermissions, appOp, brOptions, registeredReceivers, + resultTo, resultCode, resultData, resultExtras, ordered, sticky, false, userId, allowBackgroundActivityStarts, backgroundActivityStartsToken, timeoutExempt); if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Enqueueing parallel broadcast " + r); @@ -13237,10 +13239,10 @@ public class ActivityManagerService extends IActivityManager.Stub BroadcastQueue queue = broadcastQueueForIntent(intent); BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage, callerFeatureId, callingPid, callingUid, callerInstantApp, resolvedType, - requiredPermissions, appOp, brOptions, receivers, resultTo, resultCode, - resultData, resultExtras, ordered, sticky, false, userId, - allowBackgroundActivityStarts, backgroundActivityStartsToken, - timeoutExempt); + requiredPermissions, excludedPermissions, appOp, brOptions, + receivers, resultTo, resultCode, resultData, resultExtras, + ordered, sticky, false, userId, allowBackgroundActivityStarts, + backgroundActivityStartsToken, timeoutExempt); if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Enqueueing ordered broadcast " + r); @@ -13366,14 +13368,14 @@ public class ActivityManagerService extends IActivityManager.Stub String[] requiredPermissions, int appOp, Bundle bOptions, boolean serialized, boolean sticky, int userId) { return broadcastIntentWithFeature(caller, null, intent, resolvedType, resultTo, resultCode, - resultData, resultExtras, requiredPermissions, appOp, bOptions, serialized, sticky, - userId); + resultData, resultExtras, requiredPermissions, null, appOp, bOptions, serialized, + sticky, userId); } public final int broadcastIntentWithFeature(IApplicationThread caller, String callingFeatureId, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras, - String[] requiredPermissions, int appOp, Bundle bOptions, + String[] requiredPermissions, String[] excludedPermissions, int appOp, Bundle bOptions, boolean serialized, boolean sticky, int userId) { enforceNotIsolatedCaller("broadcastIntent"); synchronized(this) { @@ -13388,8 +13390,8 @@ public class ActivityManagerService extends IActivityManager.Stub return broadcastIntentLocked(callerApp, callerApp != null ? callerApp.info.packageName : null, callingFeatureId, intent, resolvedType, resultTo, resultCode, resultData, resultExtras, - requiredPermissions, appOp, bOptions, serialized, sticky, - callingPid, callingUid, callingUid, callingPid, userId); + requiredPermissions, excludedPermissions, appOp, bOptions, serialized, + sticky, callingPid, callingUid, callingUid, callingPid, userId); } finally { Binder.restoreCallingIdentity(origId); } @@ -13410,7 +13412,7 @@ public class ActivityManagerService extends IActivityManager.Stub : new String[] {requiredPermission}; try { return broadcastIntentLocked(null, packageName, featureId, intent, resolvedType, - resultTo, resultCode, resultData, resultExtras, requiredPermissions, + resultTo, resultCode, resultData, resultExtras, requiredPermissions, null, OP_NONE, bOptions, serialized, sticky, -1, uid, realCallingUid, realCallingPid, userId, allowBackgroundActivityStarts, backgroundActivityStartsToken, @@ -15615,7 +15617,7 @@ public class ActivityManagerService extends IActivityManager.Stub return ActivityManagerService.this.broadcastIntentLocked(null /*callerApp*/, null /*callerPackage*/, null /*callingFeatureId*/, intent, null /*resolvedType*/, resultTo, 0 /*resultCode*/, null /*resultData*/, - null /*resultExtras*/, requiredPermissions, AppOpsManager.OP_NONE, + null /*resultExtras*/, requiredPermissions, null, AppOpsManager.OP_NONE, bOptions /*options*/, serialized, false /*sticky*/, callingPid, callingUid, callingUid, callingPid, userId, false /*allowBackgroundStarts*/, @@ -15740,8 +15742,8 @@ public class ActivityManagerService extends IActivityManager.Stub | Intent.FLAG_RECEIVER_FOREGROUND | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS); broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null, - OP_NONE, null, false, false, MY_PID, SYSTEM_UID, Binder.getCallingUid(), - Binder.getCallingPid(), UserHandle.USER_ALL); + null, OP_NONE, null, false, false, MY_PID, SYSTEM_UID, + Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.USER_ALL); if ((changes & ActivityInfo.CONFIG_LOCALE) != 0) { intent = new Intent(Intent.ACTION_LOCALE_CHANGED); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND @@ -15751,8 +15753,9 @@ public class ActivityManagerService extends IActivityManager.Stub intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); } broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null, - OP_NONE, null, false, false, MY_PID, SYSTEM_UID, Binder.getCallingUid(), - Binder.getCallingPid(), UserHandle.USER_ALL); + null, OP_NONE, null, false, false, MY_PID, SYSTEM_UID, + Binder.getCallingUid(), Binder.getCallingPid(), + UserHandle.USER_ALL); } // Send a broadcast to PackageInstallers if the configuration change is interesting @@ -15766,7 +15769,7 @@ public class ActivityManagerService extends IActivityManager.Stub String[] permissions = new String[] { android.Manifest.permission.INSTALL_PACKAGES }; broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, - permissions, OP_NONE, null, false, false, MY_PID, SYSTEM_UID, + permissions, null, OP_NONE, null, false, false, MY_PID, SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.USER_ALL); } } @@ -15791,7 +15794,7 @@ public class ActivityManagerService extends IActivityManager.Stub } broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null, - OP_NONE, null, false, false, -1, SYSTEM_UID, Binder.getCallingUid(), + null, OP_NONE, null, false, false, -1, SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.USER_ALL); } } diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index 42aac295c027..6fa8ecd41d7c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -760,7 +760,7 @@ final class ActivityManagerShellCommand extends ShellCommand { pw.flush(); Bundle bundle = mBroadcastOptions == null ? null : mBroadcastOptions.toBundle(); mInterface.broadcastIntentWithFeature(null, null, intent, null, receiver, 0, null, null, - requiredPermissions, android.app.AppOpsManager.OP_NONE, bundle, true, false, + requiredPermissions, null, android.app.AppOpsManager.OP_NONE, bundle, true, false, mUserId); if (!mAsync) { receiver.waitForFinish(); diff --git a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java index 60e8d54676ec..4942b110cf3c 100644 --- a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java +++ b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java @@ -205,7 +205,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { mPowerStatsInternal = psi; boolean[] supportedStdBuckets = null; - int numCustomBuckets = 0; + String[] customBucketNames = null; if (mPowerStatsInternal != null) { final SparseArray<EnergyConsumer> idToConsumer = populateEnergyConsumerSubsystemMapsLocked(); @@ -227,12 +227,12 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { + e.getCause()); // Continue running, later attempts to query may be successful. } - numCustomBuckets = mMeasuredEnergySnapshot.getNumOtherOrdinals(); + customBucketNames = mMeasuredEnergySnapshot.getOtherOrdinalNames(); supportedStdBuckets = getSupportedEnergyBuckets(idToConsumer); } } synchronized (mStats) { - mStats.initMeasuredEnergyStatsLocked(supportedStdBuckets, numCustomBuckets); + mStats.initMeasuredEnergyStatsLocked(supportedStdBuckets, customBucketNames); } } } diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index a5474d0b8c72..f0b116cc1869 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -1419,6 +1419,7 @@ public final class BroadcastQueue { skip = true; } } + boolean isSingleton = false; try { isSingleton = mService.isSingleton(info.activityInfo.processName, @@ -1553,6 +1554,37 @@ public final class BroadcastQueue { + info.activityInfo.applicationInfo.uid + " : user is not running"); } + if (!skip && r.excludedPermissions != null && r.excludedPermissions.length > 0) { + for (int i = 0; i < r.excludedPermissions.length; i++) { + String excludedPermission = r.excludedPermissions[i]; + try { + perm = AppGlobals.getPackageManager() + .checkPermission(excludedPermission, + info.activityInfo.applicationInfo.packageName, + UserHandle + .getUserId(info.activityInfo.applicationInfo.uid)); + } catch (RemoteException e) { + perm = PackageManager.PERMISSION_DENIED; + } + + if (perm == PackageManager.PERMISSION_GRANTED) { + skip = true; + break; + } + + int appOp = AppOpsManager.permissionToOpCode(excludedPermission); + if (appOp != AppOpsManager.OP_NONE) { + if (mService.getAppOpsManager().checkOpNoThrow(appOp, + info.activityInfo.applicationInfo.uid, + info.activityInfo.packageName) + == AppOpsManager.MODE_ALLOWED) { + skip = true; + break; + } + } + } + } + if (!skip && info.activityInfo.applicationInfo.uid != Process.SYSTEM_UID && r.requiredPermissions != null && r.requiredPermissions.length > 0) { for (int i = 0; i < r.requiredPermissions.length; i++) { diff --git a/services/core/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java index 198ba34e3956..801559620457 100644 --- a/services/core/java/com/android/server/am/BroadcastRecord.java +++ b/services/core/java/com/android/server/am/BroadcastRecord.java @@ -62,6 +62,7 @@ final class BroadcastRecord extends Binder { final int userId; // user id this broadcast was for final String resolvedType; // the resolved data type final String[] requiredPermissions; // permissions the caller has required + final String[] excludedPermissions; // permissions to exclude final int appOp; // an app op that is associated with this broadcast final BroadcastOptions options; // BroadcastOptions supplied by caller final List receivers; // contains BroadcastFilter and ResolveInfo @@ -142,6 +143,10 @@ final class BroadcastRecord extends Binder { pw.print(Arrays.toString(requiredPermissions)); pw.print(" appOp="); pw.println(appOp); } + if (excludedPermissions != null && excludedPermissions.length > 0) { + pw.print(prefix); pw.print("excludedPermissions="); + pw.print(Arrays.toString(excludedPermissions)); + } if (options != null) { pw.print(prefix); pw.print("options="); pw.println(options.toBundle()); } @@ -240,11 +245,11 @@ final class BroadcastRecord extends Binder { Intent _intent, ProcessRecord _callerApp, String _callerPackage, @Nullable String _callerFeatureId, int _callingPid, int _callingUid, boolean _callerInstantApp, String _resolvedType, - String[] _requiredPermissions, int _appOp, BroadcastOptions _options, List _receivers, - IIntentReceiver _resultTo, int _resultCode, String _resultData, Bundle _resultExtras, - boolean _serialized, boolean _sticky, boolean _initialSticky, int _userId, - boolean allowBackgroundActivityStarts, @Nullable IBinder backgroundActivityStartsToken, - boolean timeoutExempt) { + String[] _requiredPermissions, String[] _excludedPermissions, int _appOp, + BroadcastOptions _options, List _receivers, IIntentReceiver _resultTo, int _resultCode, + String _resultData, Bundle _resultExtras, boolean _serialized, boolean _sticky, + boolean _initialSticky, int _userId, boolean allowBackgroundActivityStarts, + @Nullable IBinder backgroundActivityStartsToken, boolean timeoutExempt) { if (_intent == null) { throw new NullPointerException("Can't construct with a null intent"); } @@ -259,6 +264,7 @@ final class BroadcastRecord extends Binder { callerInstantApp = _callerInstantApp; resolvedType = _resolvedType; requiredPermissions = _requiredPermissions; + excludedPermissions = _excludedPermissions; appOp = _appOp; options = _options; receivers = _receivers; @@ -299,6 +305,7 @@ final class BroadcastRecord extends Binder { userId = from.userId; resolvedType = from.resolvedType; requiredPermissions = from.requiredPermissions; + excludedPermissions = from.excludedPermissions; appOp = from.appOp; options = from.options; receivers = from.receivers; @@ -356,8 +363,8 @@ final class BroadcastRecord extends Binder { // build a new BroadcastRecord around that single-target list BroadcastRecord split = new BroadcastRecord(queue, intent, callerApp, callerPackage, callerFeatureId, callingPid, callingUid, callerInstantApp, resolvedType, - requiredPermissions, appOp, options, splitReceivers, resultTo, resultCode, - resultData, resultExtras, ordered, sticky, initialSticky, userId, + requiredPermissions, excludedPermissions, appOp, options, splitReceivers, resultTo, + resultCode, resultData, resultExtras, ordered, sticky, initialSticky, userId, allowBackgroundActivityStarts, mBackgroundActivityStartsToken, timeoutExempt); split.splitToken = this.splitToken; diff --git a/services/core/java/com/android/server/am/MeasuredEnergySnapshot.java b/services/core/java/com/android/server/am/MeasuredEnergySnapshot.java index f9296a0e64fc..65d47550a2ed 100644 --- a/services/core/java/com/android/server/am/MeasuredEnergySnapshot.java +++ b/services/core/java/com/android/server/am/MeasuredEnergySnapshot.java @@ -99,14 +99,6 @@ public class MeasuredEnergySnapshot { mAttributionSnapshots = new SparseArray<>(mNumOtherOrdinals); } - /** - * Returns the number of ordinals for {@link EnergyConsumerType#OTHER}, i.e. the number of - * custom energy buckets supported by the device. - */ - public int getNumOtherOrdinals() { - return mNumOtherOrdinals; - } - /** Class for returning the relevant data calculated from the measured energy delta */ static class MeasuredEnergyDeltaData { /** The chargeUC for {@link EnergyConsumerType#BLUETOOTH}. */ @@ -147,7 +139,7 @@ public class MeasuredEnergySnapshot { * Fields with no interesting data (consumers not present in ecrs or with no energy * difference) will generally be left as their default values. * otherTotalChargeUC and otherUidChargesUC are always either both null or both of - * length {@link #getNumOtherOrdinals()}. + * length {@link #getOtherOrdinalNames().length}. * Returns null, if ecrs is null or empty. */ public @Nullable MeasuredEnergyDeltaData updateAndGetDelta(EnergyConsumerResult[] ecrs, @@ -237,8 +229,8 @@ public class MeasuredEnergySnapshot { case EnergyConsumerType.OTHER: if (output.otherTotalChargeUC == null) { - output.otherTotalChargeUC = new long[getNumOtherOrdinals()]; - output.otherUidChargesUC = new SparseLongArray[getNumOtherOrdinals()]; + output.otherTotalChargeUC = new long[mNumOtherOrdinals]; + output.otherUidChargesUC = new SparseLongArray[mNumOtherOrdinals]; } output.otherTotalChargeUC[ordinal] = deltaChargeUC; output.otherUidChargesUC[ordinal] = otherUidCharges; @@ -342,6 +334,23 @@ public class MeasuredEnergySnapshot { pw.println(); } + /** + * Returns the names of ordinals for {@link EnergyConsumerType#OTHER}, i.e. the names of + * custom energy buckets supported by the device. + */ + public String[] getOtherOrdinalNames() { + final String[] names = new String[mNumOtherOrdinals]; + int consumerIndex = 0; + final int size = mEnergyConsumers.size(); + for (int idx = 0; idx < size; idx++) { + final EnergyConsumer consumer = mEnergyConsumers.valueAt(idx); + if (consumer.type == (int) EnergyConsumerType.OTHER) { + names[consumerIndex++] = consumer.name; + } + } + return names; + } + /** Determines the number of ordinals for a given {@link EnergyConsumerType}. */ private static int calculateNumOrdinals(@EnergyConsumerType int type, SparseArray<EnergyConsumer> idToConsumer) { @@ -361,5 +370,4 @@ public class MeasuredEnergySnapshot { // since the last snapshot. Round off to the nearest whole long. return (deltaEnergyUJ * MILLIVOLTS_PER_VOLT + (avgVoltageMV / 2)) / avgVoltageMV; } - } diff --git a/services/core/java/com/android/server/am/PreBootBroadcaster.java b/services/core/java/com/android/server/am/PreBootBroadcaster.java index 984fe409b086..756209824614 100644 --- a/services/core/java/com/android/server/am/PreBootBroadcaster.java +++ b/services/core/java/com/android/server/am/PreBootBroadcaster.java @@ -124,7 +124,7 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub { REASON_PRE_BOOT_COMPLETED, ""); synchronized (mService) { mService.broadcastIntentLocked(null, null, null, mIntent, null, this, 0, null, null, - null, AppOpsManager.OP_NONE, bOptions.toBundle(), true, + null, null, AppOpsManager.OP_NONE, bOptions.toBundle(), true, false, ActivityManagerService.MY_PID, Process.SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), mUserId); } diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index 54c35123fbb9..21a02ed8c9da 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -161,6 +161,17 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN String mRecentCallingPackage; // the most recent uid that start/bind this service. int mRecentCallingUid; + // ApplicationInfo of the most recent callingPackage that start/bind this service. + @Nullable ApplicationInfo mRecentCallerApplicationInfo; + + // The uptime when the service enters FGS state. + long mFgsEnterTime = 0; + // The uptime when the service exits FGS state. + long mFgsExitTime = 0; + // FGS notification was deferred. + boolean mFgsNotificationDeferred; + // FGS notification was shown before the FGS finishes, or it wasn't deferred in the first place. + boolean mFgsNotificationShown; // allow the service becomes foreground service? Service started from background may not be // allowed to become a foreground service. diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index a5d0e72a81ae..ba3e1fb95e7d 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -2936,8 +2936,8 @@ class UserController implements Handler.Callback { // TODO b/64165549 Verify that mLock is not held before calling AMS methods synchronized (mService) { return mService.broadcastIntentLocked(null, null, null, intent, resolvedType, - resultTo, resultCode, resultData, resultExtras, requiredPermissions, appOp, - bOptions, ordered, sticky, callingPid, callingUid, realCallingUid, + resultTo, resultCode, resultData, resultExtras, requiredPermissions, null, + appOp, bOptions, ordered, sticky, callingPid, callingUid, realCallingUid, realCallingPid, userId); } } diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java index 1bbcedeb0494..b2d35f45ab44 100644 --- a/services/core/java/com/android/server/camera/CameraServiceProxy.java +++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java @@ -15,9 +15,6 @@ */ package com.android.server.camera; -import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; -import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; -import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static android.os.Build.VERSION_CODES.M; import android.annotation.IntDef; @@ -27,15 +24,12 @@ import android.app.ActivityManager; import android.app.ActivityTaskManager; import android.app.TaskStackListener; import android.content.BroadcastReceiver; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ActivityInfo; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.graphics.Rect; import android.hardware.CameraSessionStats; import android.hardware.CameraStreamStats; import android.hardware.ICameraService; @@ -43,7 +37,6 @@ import android.hardware.ICameraServiceProxy; import android.hardware.camera2.CameraMetadata; import android.hardware.display.DisplayManager; import android.media.AudioManager; -import android.metrics.LogMaker; import android.nfc.INfcAdapter; import android.os.Binder; import android.os.Handler; @@ -60,17 +53,16 @@ import android.util.ArraySet; import android.util.Log; import android.util.Slog; import android.view.Display; +import android.view.IDisplayWindowListener; import android.view.Surface; +import android.view.WindowManagerGlobal; import com.android.internal.annotations.GuardedBy; import com.android.framework.protobuf.nano.MessageNano; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.SystemService; -import com.android.server.SystemService.TargetUser; import com.android.server.wm.WindowManagerInternal; import java.lang.annotation.Retention; @@ -223,6 +215,37 @@ public class CameraServiceProxy extends SystemService } } + private final class DisplayWindowListener extends IDisplayWindowListener.Stub { + + @Override + public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) { + ICameraService cs = getCameraServiceRawLocked(); + if (cs == null) return; + + try { + cs.notifyDisplayConfigurationChange(); + } catch (RemoteException e) { + Slog.w(TAG, "Could not notify cameraserver, remote exception: " + e); + // Not much we can do if camera service is dead. + } + } + + @Override + public void onDisplayAdded(int displayId) { } + + @Override + public void onDisplayRemoved(int displayId) { } + + @Override + public void onFixedRotationStarted(int displayId, int newRotation) { } + + @Override + public void onFixedRotationFinished(int displayId) { } + } + + + private final DisplayWindowListener mDisplayWindowListener = new DisplayWindowListener(); + private final TaskStateHandler mTaskStackListener = new TaskStateHandler(); private final class TaskInfo { @@ -236,13 +259,12 @@ public class CameraServiceProxy extends SystemService private final class TaskStateHandler extends TaskStackListener { private final Object mMapLock = new Object(); - // maps the current top level task id to its corresponding package name + // maps the package name to its corresponding current top level task id @GuardedBy("mMapLock") private final ArrayMap<String, TaskInfo> mTaskInfoMap = new ArrayMap<>(); @Override - public void onTaskMovedToFront(ActivityManager.RunningTaskInfo taskInfo) - throws RemoteException { + public void onTaskMovedToFront(ActivityManager.RunningTaskInfo taskInfo) { synchronized (mMapLock) { TaskInfo info = new TaskInfo(); info.frontTaskId = taskInfo.taskId; @@ -257,7 +279,7 @@ public class CameraServiceProxy extends SystemService } @Override - public void onTaskRemoved(int taskId) throws RemoteException { + public void onTaskRemoved(int taskId) { synchronized (mMapLock) { for (Map.Entry<String, TaskInfo> entry : mTaskInfoMap.entrySet()){ if (entry.getValue().frontTaskId == taskId) { @@ -319,7 +341,7 @@ public class CameraServiceProxy extends SystemService /** * Gets whether crop-rotate-scale is needed. */ - private boolean getNeedCropRotateScale(Context ctx, String packageName, + private boolean getNeedCropRotateScale(@NonNull Context ctx, @NonNull String packageName, @Nullable TaskInfo taskInfo, int sensorOrientation, int lensFacing) { if (taskInfo == null) { return false; @@ -334,7 +356,7 @@ public class CameraServiceProxy extends SystemService // Only enable the crop-rotate-scale workaround if the app targets M or below and is not // resizeable. - if ((ctx != null) && !isMOrBelow(ctx, packageName) && taskInfo.isResizeable) { + if (!isMOrBelow(ctx, packageName) && taskInfo.isResizeable) { Slog.v(TAG, "The activity is N or above and claims to support resizeable-activity. " + "Crop-rotate-scale is disabled."); @@ -372,12 +394,8 @@ public class CameraServiceProxy extends SystemService taskInfo.isFixedOrientationLandscape); // We need to do crop-rotate-scale when camera is landscape and activity is portrait or // vice versa. - if ((taskInfo.isFixedOrientationPortrait && landscapeCamera) - || (taskInfo.isFixedOrientationLandscape && !landscapeCamera)) { - return true; - } else { - return false; - } + return (taskInfo.isFixedOrientationPortrait && landscapeCamera) + || (taskInfo.isFixedOrientationLandscape && !landscapeCamera); } @Override @@ -389,14 +407,10 @@ public class CameraServiceProxy extends SystemService return false; } - // A few remaining todos: - // 1) Do the same check when working in WM compatible mode. The sequence needs - // to be adjusted and use orientation events as triggers for all active camera - // clients. - // 2) Modify the sensor orientation in camera characteristics along with any 3A regions - // in capture requests/results to account for thea physical rotation. The former - // is somewhat tricky as it assumes that camera clients always check for the current - // value by retrieving the camera characteristics from the camera device. + // TODO: Modify the sensor orientation in camera characteristics along with any 3A + // regions in capture requests/results to account for thea physical rotation. The + // former is somewhat tricky as it assumes that camera clients always check for the + // current value by retrieving the camera characteristics from the camera device. return getNeedCropRotateScale(mContext, packageName, mTaskStackListener.getFrontTaskInfo(packageName), sensorOrientation, lensFacing); @@ -522,18 +536,25 @@ public class CameraServiceProxy extends SystemService publishBinderService(CAMERA_SERVICE_PROXY_BINDER_NAME, mCameraServiceProxy); publishLocalService(CameraServiceProxy.class, this); - - try { - ActivityTaskManager.getService().registerTaskStackListener(mTaskStackListener); - } catch (RemoteException e) { - Log.e(TAG, "Failed to register task stack listener!"); - } } @Override public void onBootPhase(int phase) { if (phase == PHASE_BOOT_COMPLETED) { CameraStatsJobService.schedule(mContext); + + try { + ActivityTaskManager.getService().registerTaskStackListener(mTaskStackListener); + } catch (RemoteException e) { + Log.e(TAG, "Failed to register task stack listener!"); + } + + try { + WindowManagerGlobal.getWindowManagerService().registerDisplayWindowListener( + mDisplayWindowListener); + } catch (RemoteException e) { + Log.e(TAG, "Failed to register display window listener!"); + } } } diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index 9c10814c7591..47c7e3902556 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -45,6 +45,7 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.net.Uri; import android.os.Binder; +import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -67,6 +68,7 @@ import android.view.autofill.AutofillManagerInternal; import android.view.textclassifier.TextClassificationContext; import android.view.textclassifier.TextClassificationManager; import android.view.textclassifier.TextClassifier; +import android.view.textclassifier.TextClassifierEvent; import android.view.textclassifier.TextLinks; import android.widget.Toast; @@ -211,9 +213,18 @@ public class ClipboardService extends SystemService { /** Uids that have already triggered a toast notification for {@link #primaryClip} */ final SparseBooleanArray mNotifiedUids = new SparseBooleanArray(); + /** + * Uids that have already triggered a notification to text classifier for + * {@link #primaryClip}. + */ + final SparseBooleanArray mNotifiedTextClassifierUids = new SparseBooleanArray(); + final HashSet<String> activePermissionOwners = new HashSet<String>(); + /** The text classifier session that is used to annotate the text in the primary clip. */ + TextClassifier mTextClassifier; + PerUserClipboard(int userId) { this.userId = userId; } @@ -371,6 +382,7 @@ public class ClipboardService extends SystemService { addActiveOwnerLocked(intendingUid, pkg); PerUserClipboard clipboard = getClipboardLocked(intendingUserId); showAccessNotificationLocked(pkg, intendingUid, intendingUserId, clipboard); + notifyTextClassifierLocked(clipboard, pkg, intendingUid); return clipboard.primaryClip; } } @@ -580,6 +592,7 @@ public class ClipboardService extends SystemService { } clipboard.primaryClip = clip; clipboard.mNotifiedUids.clear(); + clipboard.mNotifiedTextClassifierUids.clear(); if (clip != null) { clipboard.primaryClipUid = uid; clipboard.mPrimaryClipPackage = sourcePackage; @@ -619,6 +632,11 @@ public class ClipboardService extends SystemService { @GuardedBy("mLock") private void startClassificationLocked(@NonNull ClipData clip, @UserIdInt int userId) { + if (clip.getItemCount() == 0) { + clip.getDescription().setClassificationStatus( + ClipDescription.CLASSIFICATION_NOT_PERFORMED); + return; + } TextClassifier classifier; final long ident = Binder.clearCallingIdentity(); try { @@ -627,17 +645,11 @@ public class ClipboardService extends SystemService { new TextClassificationContext.Builder( getContext().getPackageName(), TextClassifier.WIDGET_TYPE_CLIPBOARD - ).build() - ); + ).build() + ); } finally { Binder.restoreCallingIdentity(ident); } - - if (clip.getItemCount() == 0) { - clip.getDescription().setClassificationStatus( - ClipDescription.CLASSIFICATION_NOT_PERFORMED); - return; - } CharSequence text = clip.getItemAt(0).getText(); if (TextUtils.isEmpty(text) || text.length() > mMaxClassificationLength || text.length() > classifier.getMaxGenerateLinksTextLength()) { @@ -645,7 +657,7 @@ public class ClipboardService extends SystemService { ClipDescription.CLASSIFICATION_NOT_PERFORMED); return; } - + getClipboardLocked(userId).mTextClassifier = classifier; mWorkerHandler.post(() -> doClassification(text, clip, classifier)); } @@ -653,12 +665,7 @@ public class ClipboardService extends SystemService { private void doClassification( CharSequence text, ClipData clip, TextClassifier classifier) { TextLinks.Request request = new TextLinks.Request.Builder(text).build(); - TextLinks links; - try { - links = classifier.generateLinks(request); - } finally { - classifier.destroy(); - } + TextLinks links = classifier.generateLinks(request); // Find the highest confidence for each entity in the text. ArrayMap<String, Float> confidences = new ArrayMap<>(); @@ -979,6 +986,48 @@ public class ClipboardService extends SystemService { && item.getIntent() == null; } + /** Potentially notifies the text classifier that an app is accessing a text clip. */ + @GuardedBy("mLock") + private void notifyTextClassifierLocked( + PerUserClipboard clipboard, String callingPackage, int callingUid) { + if (clipboard.primaryClip == null) { + return; + } + ClipData.Item item = clipboard.primaryClip.getItemAt(0); + if (item == null) { + return; + } + if (!isText(clipboard.primaryClip)) { + return; + } + TextClassifier textClassifier = clipboard.mTextClassifier; + // Don't notify text classifier if we haven't used it to annotate the text in the clip. + if (textClassifier == null) { + return; + } + // Don't notify text classifier if the app reading the clipboard does not have the focus. + if (!mWm.isUidFocused(callingUid)) { + return; + } + // Don't notify text classifier again if already notified for this uid and clip. + if (clipboard.mNotifiedTextClassifierUids.get(callingUid)) { + return; + } + clipboard.mNotifiedTextClassifierUids.put(callingUid, true); + Binder.withCleanCallingIdentity(() -> { + TextClassifierEvent.TextLinkifyEvent pasteEvent = + new TextClassifierEvent.TextLinkifyEvent.Builder( + TextClassifierEvent.TYPE_READ_CLIPBOARD) + .setEventContext(new TextClassificationContext.Builder( + callingPackage, TextClassifier.WIDGET_TYPE_CLIPBOARD) + .build()) + .setExtras( + Bundle.forPair("source_package", clipboard.mPrimaryClipPackage)) + .build(); + textClassifier.onTextClassifierEvent(pasteEvent); + }); + } + private TextClassificationManager createTextClassificationManagerAsUser(@UserIdInt int userId) { Context context = getContext().createContextAsUser(UserHandle.of(userId), /* flags= */ 0); return context.getSystemService(TextClassificationManager.class); diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/services/core/java/com/android/server/connectivity/NetworkRanker.java index c123ea75c66c..2b345e5aa79f 100644 --- a/services/core/java/com/android/server/connectivity/NetworkRanker.java +++ b/services/core/java/com/android/server/connectivity/NetworkRanker.java @@ -24,6 +24,7 @@ import static android.net.NetworkScore.POLICY_EXITING; import static android.net.NetworkScore.POLICY_TRANSPORT_PRIMARY; import static android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI; +import static com.android.net.module.util.CollectionUtils.filter; import static com.android.server.connectivity.FullScore.POLICY_ACCEPT_UNVALIDATED; import static com.android.server.connectivity.FullScore.POLICY_EVER_USER_SELECTED; import static com.android.server.connectivity.FullScore.POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD; @@ -66,18 +67,6 @@ public class NetworkRanker { public NetworkRanker() { } - // TODO : move to module utils CollectionUtils. - @NonNull private static <T> ArrayList<T> filter(@NonNull final Collection<T> source, - @NonNull final Predicate<T> test) { - final ArrayList<T> matches = new ArrayList<>(); - for (final T e : source) { - if (test.test(e)) { - matches.add(e); - } - } - return matches; - } - /** * Find the best network satisfying this request among the list of passed networks. */ diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index e3eeb6c41d9f..3a7220f7592f 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -394,7 +394,8 @@ public final class DreamManagerService extends SystemService { private void startDreamLocked(final ComponentName name, final boolean isTest, final boolean canDoze, final int userId) { - if (Objects.equals(mCurrentDreamName, name) + if (!mCurrentDreamIsWaking + && Objects.equals(mCurrentDreamName, name) && mCurrentDreamIsTest == isTest && mCurrentDreamCanDoze == canDoze && mCurrentDreamUserId == userId) { diff --git a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java index c56f386701f6..fb14fbd49fde 100644 --- a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java +++ b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java @@ -261,15 +261,15 @@ final class UpdatableFontDir { // Write config file. mLastModifiedMillis = mCurrentTimeSupplier.get(); - curConfig.lastModifiedMillis = mLastModifiedMillis; + PersistentSystemFontConfig.Config newConfig = new PersistentSystemFontConfig.Config(); + newConfig.lastModifiedMillis = mLastModifiedMillis; for (FontFileInfo info : mFontFileInfoMap.values()) { - curConfig.updatedFontDirs.add(info.getRandomizedFontDir().getName()); + newConfig.updatedFontDirs.add(info.getRandomizedFontDir().getName()); } - curConfig.fontFamilies.clear(); - curConfig.fontFamilies.addAll(familyMap.values()); + newConfig.fontFamilies.addAll(familyMap.values()); try (FileOutputStream fos = new FileOutputStream(mTmpConfigFile)) { - PersistentSystemFontConfig.writeToXml(fos, curConfig); + PersistentSystemFontConfig.writeToXml(fos, newConfig); } catch (Exception e) { throw new SystemFontException( FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG, diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 031c057018ad..754fa25191b0 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -1253,6 +1253,7 @@ public class HdmiControlService extends SystemService { void setAudioStatus(boolean mute, int volume) { if (!isTvDeviceEnabled() || !tv().isSystemAudioActivated() + || !tv().isArcEstablished() // Don't update TV volume when SAM is on and ARC is off || getHdmiCecVolumeControl() == HdmiControlManager.VOLUME_CONTROL_DISABLED) { return; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index ed8ea186b1d4..7994fccbd650 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -4100,13 +4100,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } @Override - public void removeImeSurfaceFromWindow(IBinder windowToken, - IVoidResultCallback resultCallback) { - CallbackUtils.onResult(resultCallback, () -> { - // No permission check, because we'll only execute the request if the calling window is - // also the current IME client. - mHandler.obtainMessage(MSG_REMOVE_IME_SURFACE_FROM_WINDOW, windowToken).sendToTarget(); - }); + public void removeImeSurfaceFromWindowAsync(IBinder windowToken) { + // No permission check, because we'll only execute the request if the calling window is + // also the current IME client. + mHandler.obtainMessage(MSG_REMOVE_IME_SURFACE_FROM_WINDOW, windowToken).sendToTarget(); } /** diff --git a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java index ef1489b4adf9..62447439003b 100644 --- a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java @@ -1510,10 +1510,8 @@ public final class MultiClientInputMethodManagerService { @BinderThread @Override - public void removeImeSurfaceFromWindow(IBinder windowToken, - IVoidResultCallback resultCallback) { + public void removeImeSurfaceFromWindowAsync(IBinder windowToken) { reportNotSupported(); - CallbackUtils.onResult(resultCallback, () -> { }); } @BinderThread diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 6b28fbc9b86c..59f00a2a4bc7 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1773,7 +1773,7 @@ public class LockSettingsService extends ILockSettings.Stub { } else { final byte[] hashFactor = getHashFactor(password, userHandle); final byte[] salt = getSalt(userHandle).getBytes(); - String hash = password.passwordToHistoryHash(hashFactor, salt); + String hash = password.passwordToHistoryHash(salt, hashFactor); if (hash == null) { Slog.e(TAG, "Compute new style password hash failed, fallback to legacy style"); hash = password.legacyPasswordToHash(salt); @@ -3658,7 +3658,7 @@ public class LockSettingsService extends ILockSettings.Stub { } @Override - public boolean armRebootEscrow() { + public @ArmRebootEscrowErrorCode int armRebootEscrow() { return mRebootEscrowManager.armRebootEscrowIfNeeded(); } diff --git a/services/core/java/com/android/server/locksettings/RebootEscrowManager.java b/services/core/java/com/android/server/locksettings/RebootEscrowManager.java index 76ecc1acc7ac..c01523a4bc40 100644 --- a/services/core/java/com/android/server/locksettings/RebootEscrowManager.java +++ b/services/core/java/com/android/server/locksettings/RebootEscrowManager.java @@ -18,6 +18,15 @@ package com.android.server.locksettings; import static android.os.UserHandle.USER_SYSTEM; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_ESCROW_NOT_READY; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_KEYSTORE_FAILURE; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_NONE; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_NO_ESCROW_KEY; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_NO_PROVIDER; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_PROVIDER_MISMATCH; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_STORE_ESCROW_KEY; +import static com.android.internal.widget.LockSettingsInternal.ArmRebootEscrowErrorCode; + import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.UserIdInt; @@ -577,16 +586,14 @@ class RebootEscrowManager { mRebootEscrowWanted = false; setRebootEscrowReady(false); - RebootEscrowProviderInterface rebootEscrowProvider = mInjector.getRebootEscrowProvider(); if (rebootEscrowProvider == null) { - Slog.w(TAG, - "Had reboot escrow data for users, but RebootEscrowProvider is unavailable"); - return; + Slog.w(TAG, "RebootEscrowProvider is unavailable for clear request"); + } else { + rebootEscrowProvider.clearRebootEscrowKey(); } clearMetricsStorage(); - rebootEscrowProvider.clearRebootEscrowKey(); List<UserInfo> users = mUserManager.getUsers(); for (UserInfo user : users) { @@ -596,20 +603,30 @@ class RebootEscrowManager { mEventLog.addEntry(RebootEscrowEvent.CLEARED_LSKF_REQUEST); } - boolean armRebootEscrowIfNeeded() { + @ArmRebootEscrowErrorCode int armRebootEscrowIfNeeded() { if (!mRebootEscrowReady) { - return false; + return ARM_REBOOT_ERROR_ESCROW_NOT_READY; } RebootEscrowProviderInterface rebootEscrowProvider = mInjector.getRebootEscrowProvider(); if (rebootEscrowProvider == null) { Slog.w(TAG, "Had reboot escrow data for users, but RebootEscrowProvider is unavailable"); - return false; + clearRebootEscrowIfNeeded(); + return ARM_REBOOT_ERROR_NO_PROVIDER; } + int expectedProviderType = mInjector.serverBasedResumeOnReboot() + ? RebootEscrowProviderInterface.TYPE_SERVER_BASED + : RebootEscrowProviderInterface.TYPE_HAL; int actualProviderType = rebootEscrowProvider.getType(); - // TODO(b/183140900) Fail the reboot if provider type mismatches. + if (expectedProviderType != actualProviderType) { + Slog.w(TAG, "Expect reboot escrow provider " + expectedProviderType + + ", but the RoR is prepared with " + actualProviderType + + ". Please prepare the RoR again."); + clearRebootEscrowIfNeeded(); + return ARM_REBOOT_ERROR_PROVIDER_MISMATCH; + } RebootEscrowKey escrowKey; synchronized (mKeyGenerationLock) { @@ -618,30 +635,38 @@ class RebootEscrowManager { if (escrowKey == null) { Slog.e(TAG, "Escrow key is null, but escrow was marked as ready"); - return false; + clearRebootEscrowIfNeeded(); + return ARM_REBOOT_ERROR_NO_ESCROW_KEY; } // We will use the same key from keystore to encrypt the escrow key and escrow data blob. SecretKey kk = mKeyStoreManager.getKeyStoreEncryptionKey(); if (kk == null) { Slog.e(TAG, "Failed to get encryption key from keystore."); - return false; + clearRebootEscrowIfNeeded(); + return ARM_REBOOT_ERROR_KEYSTORE_FAILURE; } + + // TODO(b/183140900) design detailed errors for store escrow key errors. + // We don't clear rebootEscrow here, because some errors may be recoverable, e.g. network + // unavailable for server based provider. boolean armedRebootEscrow = rebootEscrowProvider.storeRebootEscrowKey(escrowKey, kk); - if (armedRebootEscrow) { - mStorage.setInt(REBOOT_ESCROW_ARMED_KEY, mInjector.getBootCount(), USER_SYSTEM); - mStorage.setLong(REBOOT_ESCROW_KEY_ARMED_TIMESTAMP, mInjector.getCurrentTimeMillis(), - USER_SYSTEM); - // Store the vbmeta digest of both slots. - mStorage.setString(REBOOT_ESCROW_KEY_VBMETA_DIGEST, mInjector.getVbmetaDigest(false), - USER_SYSTEM); - mStorage.setString(REBOOT_ESCROW_KEY_OTHER_VBMETA_DIGEST, - mInjector.getVbmetaDigest(true), USER_SYSTEM); - mStorage.setInt(REBOOT_ESCROW_KEY_PROVIDER, actualProviderType, USER_SYSTEM); - mEventLog.addEntry(RebootEscrowEvent.SET_ARMED_STATUS); - } - - return armedRebootEscrow; + if (!armedRebootEscrow) { + return ARM_REBOOT_ERROR_STORE_ESCROW_KEY; + } + + mStorage.setInt(REBOOT_ESCROW_ARMED_KEY, mInjector.getBootCount(), USER_SYSTEM); + mStorage.setLong(REBOOT_ESCROW_KEY_ARMED_TIMESTAMP, mInjector.getCurrentTimeMillis(), + USER_SYSTEM); + // Store the vbmeta digest of both slots. + mStorage.setString(REBOOT_ESCROW_KEY_VBMETA_DIGEST, mInjector.getVbmetaDigest(false), + USER_SYSTEM); + mStorage.setString(REBOOT_ESCROW_KEY_OTHER_VBMETA_DIGEST, + mInjector.getVbmetaDigest(true), USER_SYSTEM); + mStorage.setInt(REBOOT_ESCROW_KEY_PROVIDER, actualProviderType, USER_SYSTEM); + mEventLog.addEntry(RebootEscrowEvent.SET_ARMED_STATUS); + + return ARM_REBOOT_ERROR_NONE; } private void setRebootEscrowReady(boolean ready) { @@ -663,10 +688,6 @@ class RebootEscrowManager { } boolean clearRebootEscrow() { - if (mInjector.getRebootEscrowProvider() == null) { - return false; - } - clearRebootEscrowIfNeeded(); return true; } diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index b10d56b62acc..abcf4fb939e1 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -384,7 +384,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR if (mPlaybackState == null) { return false; } - return mPlaybackState.isActiveState() == expected; + return mPlaybackState.isActive() == expected; } /** diff --git a/services/core/java/com/android/server/pm/InstantAppRegistry.java b/services/core/java/com/android/server/pm/InstantAppRegistry.java index 7bf704299373..bf323e7d4ff2 100644 --- a/services/core/java/com/android/server/pm/InstantAppRegistry.java +++ b/services/core/java/com/android/server/pm/InstantAppRegistry.java @@ -57,6 +57,7 @@ import com.android.server.pm.parsing.PackageInfoUtils; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.permission.PermissionManagerServiceInternal; import com.android.server.utils.Snappable; +import com.android.server.utils.SnapshotCache; import com.android.server.utils.Watchable; import com.android.server.utils.WatchableImpl; import com.android.server.utils.Watched; @@ -146,7 +147,7 @@ class InstantAppRegistry implements Watchable, Snappable { /** * The cached snapshot */ - private volatile InstantAppRegistry mSnapshot = null; + private final SnapshotCache<InstantAppRegistry> mSnapshot; /** * Watchable machinery @@ -162,7 +163,6 @@ class InstantAppRegistry implements Watchable, Snappable { return mWatchable.isRegisteredObserver(observer); } public void dispatchChange(@Nullable Watchable what) { - mSnapshot = null; mWatchable.dispatchChange(what); } /** @@ -180,6 +180,16 @@ class InstantAppRegistry implements Watchable, Snappable { } }; + private SnapshotCache<InstantAppRegistry> makeCache() { + return new SnapshotCache<InstantAppRegistry>(this, this) { + @Override + public InstantAppRegistry createSnapshot() { + InstantAppRegistry s = new InstantAppRegistry(mSource); + s.mWatchable.seal(); + return s; + }}; + } + public InstantAppRegistry(PackageManagerService service, PermissionManagerServiceInternal permissionManager) { mService = service; @@ -194,6 +204,8 @@ class InstantAppRegistry implements Watchable, Snappable { mInstantGrants.registerObserver(mObserver); mInstalledInstantAppUids.registerObserver(mObserver); Watchable.verifyWatchedAttributes(this, mObserver); + + mSnapshot = makeCache(); } /** @@ -211,20 +223,15 @@ class InstantAppRegistry implements Watchable, Snappable { mInstalledInstantAppUids = new WatchedSparseArray<WatchedSparseBooleanArray>( r.mInstalledInstantAppUids); - // Do not register any observers. This is a clone + // Do not register any observers. This is a snapshot. + mSnapshot = null; } /** * Return a snapshot: the value is the cached snapshot if available. */ public InstantAppRegistry snapshot() { - InstantAppRegistry s = mSnapshot; - if (s == null) { - s = new InstantAppRegistry(this); - s.mWatchable.seal(); - mSnapshot = s; - } - return s; + return mSnapshot.snapshot(); } @GuardedBy("mService.mLock") diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 321c5cabc1c1..85c5a5ea84b8 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -5003,7 +5003,7 @@ public class PackageManagerService extends IPackageManager.Stub // The snapshot disable/enable switch. An image with the flag set true uses snapshots // and an image with the flag set false does not use snapshots. - private static final boolean SNAPSHOT_ENABLED = true; + private static final boolean SNAPSHOT_ENABLED = false; // The per-instance snapshot disable/enable flag. This is generally set to false in // test instances and set to SNAPSHOT_ENABLED in operational instances. @@ -15315,9 +15315,8 @@ public class PackageManagerService extends IPackageManager.Stub final BroadcastOptions bOptions = getTemporaryAppAllowlistBroadcastOptions( REASON_LOCKED_BOOT_COMPLETED); am.broadcastIntentWithFeature(null, null, lockedBcIntent, null, null, 0, null, null, - requiredPermissions, android.app.AppOpsManager.OP_NONE, bOptions.toBundle(), - false, false, - userId); + requiredPermissions, null, android.app.AppOpsManager.OP_NONE, + bOptions.toBundle(), false, false, userId); // Deliver BOOT_COMPLETED only if user is unlocked final UserManagerInternal umInternal = mInjector.getUserManagerInternal(); @@ -15327,9 +15326,8 @@ public class PackageManagerService extends IPackageManager.Stub bcIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); } am.broadcastIntentWithFeature(null, null, bcIntent, null, null, 0, null, null, - requiredPermissions, android.app.AppOpsManager.OP_NONE, bOptions.toBundle(), - false, false, - userId); + requiredPermissions, null, android.app.AppOpsManager.OP_NONE, + bOptions.toBundle(), false, false, userId); } } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -22197,7 +22195,7 @@ public class PackageManagerService extends IPackageManager.Stub intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); try { am.broadcastIntentWithFeature(null, null, intent, null, null, - 0, null, null, null, android.app.AppOpsManager.OP_NONE, + 0, null, null, null, null, android.app.AppOpsManager.OP_NONE, null, false, false, userId); } catch (RemoteException e) { } @@ -27810,8 +27808,8 @@ public class PackageManagerService extends IPackageManager.Stub }; try { am.broadcastIntentWithFeature(null, null, intent, null, null, 0, null, null, - requiredPermissions, android.app.AppOpsManager.OP_NONE, null, false, false, - UserHandle.USER_ALL); + requiredPermissions, null, android.app.AppOpsManager.OP_NONE, null, false, + false, UserHandle.USER_ALL); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 4823c29b96f9..24f393070623 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -117,6 +117,7 @@ import com.android.server.pm.verify.domain.DomainVerificationLegacySettings; import com.android.server.pm.verify.domain.DomainVerificationManagerInternal; import com.android.server.pm.verify.domain.DomainVerificationPersistence; import com.android.server.utils.Snappable; +import com.android.server.utils.SnapshotCache; import com.android.server.utils.TimingsTraceAndSlog; import com.android.server.utils.Watchable; import com.android.server.utils.WatchableImpl; @@ -165,11 +166,6 @@ public final class Settings implements Watchable, Snappable { private static final String TAG = "PackageSettings"; /** - * Cached snapshot - */ - private volatile Settings mSnapshot = null; - - /** * Watchable machinery */ private final WatchableImpl mWatchable = new WatchableImpl(); @@ -212,7 +208,6 @@ public final class Settings implements Watchable, Snappable { * @param what The {@link Watchable} that generated the event. */ public void dispatchChange(@Nullable Watchable what) { - mSnapshot = null; mWatchable.dispatchChange(what); } /** @@ -523,6 +518,19 @@ public final class Settings implements Watchable, Snappable { } }; + private final SnapshotCache<Settings> mSnapshot; + + // Create a snapshot cache + private SnapshotCache<Settings> makeCache() { + return new SnapshotCache<Settings>(this, this) { + @Override + public Settings createSnapshot() { + Settings s = new Settings(mSource); + s.mWatchable.seal(); + return s; + }}; + } + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) public Settings(Map<String, PackageSetting> pkgSettings) { mLock = new PackageManagerTracedLock(); @@ -557,6 +565,8 @@ public final class Settings implements Watchable, Snappable { mDefaultBrowserApp.registerObserver(mObserver); Watchable.verifyWatchedAttributes(this, mObserver); + + mSnapshot = makeCache(); } Settings(File dataDir, RuntimePermissionsPersistence runtimePermissionsPersistence, @@ -608,6 +618,8 @@ public final class Settings implements Watchable, Snappable { mDefaultBrowserApp.registerObserver(mObserver); Watchable.verifyWatchedAttributes(this, mObserver); + + mSnapshot = makeCache(); } /** @@ -661,22 +673,15 @@ public final class Settings implements Watchable, Snappable { mPermissions = r.mPermissions; mPermissionDataProvider = r.mPermissionDataProvider; - // Do not register any Watchables + // Do not register any Watchables and do not create a snapshot cache. + mSnapshot = null; } /** - * Return a snapshot. If the cached snapshot is null, build a new one. The logic in - * the function ensures that this function returns a valid snapshot even if a race - * condition causes the cached snapshot to be cleared asynchronously to this method. + * Return a snapshot. */ public Settings snapshot() { - Settings s = mSnapshot; - if (s == null) { - s = new Settings(this); - s.mWatchable.seal(); - mSnapshot = s; - } - return s; + return mSnapshot.snapshot(); } private void invalidatePackageCache() { diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index e222df04022e..c462a6c7877e 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -264,7 +264,7 @@ class ShortcutPackage extends ShortcutPackageItem { public ShortcutInfo findShortcutById(@Nullable final String id) { if (id == null) return null; final List<ShortcutInfo> ret = getShortcutById(Collections.singleton(id)); - return ret.isEmpty() ? null : ret.get(0); + return (ret == null || ret.isEmpty()) ? null : ret.get(0); } public boolean isShortcutExistsAndInvisibleToPublisher(String id) { @@ -2361,7 +2361,7 @@ class ShortcutPackage extends ShortcutPackageItem { }); } - @NonNull + @Nullable private List<ShortcutInfo> getShortcutById(@NonNull final Collection<String> ids) { final List<String> shortcutIds = new ArrayList<>(1); for (String id : ids) { @@ -2525,7 +2525,8 @@ class ShortcutPackage extends ShortcutPackageItem { private AndroidFuture<AppSearchSession> setupSchema( @NonNull final AppSearchSession session) { SetSchemaRequest.Builder schemaBuilder = new SetSchemaRequest.Builder() - .addSchemas(AppSearchPerson.SCHEMA, AppSearchShortcutInfo.SCHEMA); + .addSchemas(AppSearchPerson.SCHEMA, AppSearchShortcutInfo.SCHEMA) + .setForceOverride(true); for (PackageIdentifier pi : mPackageIdentifiers.values()) { schemaBuilder = schemaBuilder .setSchemaTypeVisibilityForPackage( diff --git a/services/core/java/com/android/server/pm/WatchedIntentFilter.java b/services/core/java/com/android/server/pm/WatchedIntentFilter.java new file mode 100644 index 000000000000..30f276e8386a --- /dev/null +++ b/services/core/java/com/android/server/pm/WatchedIntentFilter.java @@ -0,0 +1,715 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import android.annotation.NonNull; +import android.content.ContentResolver; +import android.content.Intent; +import android.content.IntentFilter; +import android.net.Uri; +import android.os.PatternMatcher; +import android.util.Printer; + +import com.android.server.utils.Snappable; +import com.android.server.utils.WatchableImpl; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.function.Consumer; + +/** + * A watched variant of {@link IntentFilter}. The class consists of a + * {@link IntentFilter} attribute and methods that are identical to those in IntentFilter, + * forwarding to the attribute. + * + * @hide + */ +public class WatchedIntentFilter + extends WatchableImpl + implements Snappable<WatchedIntentFilter> { + + // Watch for modifications made through an {@link Iterator}. + private class WatchedIterator<E> implements Iterator<E> { + private final Iterator<E> mIterator; + WatchedIterator(@NonNull Iterator<E> i) { + mIterator = i; + } + public boolean hasNext() { + return mIterator.hasNext(); + } + public E next() { + return mIterator.next(); + } + public void remove() { + mIterator.remove(); + WatchedIntentFilter.this.onChanged(); + } + public void forEachRemaining(Consumer<? super E> action) { + mIterator.forEachRemaining(action); + WatchedIntentFilter.this.onChanged(); + } + } + + // A convenience function to wrap an iterator result, but only if it is not null. + private <E> Iterator<E> maybeWatch(Iterator<E> i) { + return i == null ? i : new WatchedIterator<>(i); + } + + // The wrapped {@link IntentFilter} + protected IntentFilter mFilter; + + private void onChanged() { + dispatchChange(this); + } + + protected WatchedIntentFilter() { + mFilter = new IntentFilter(); + } + + // Convert an {@link IntentFilter} to a {@link WatchedIntentFilter} + protected WatchedIntentFilter(IntentFilter f) { + mFilter = new IntentFilter(f); + } + + // The copy constructor is used to create a snapshot of the object. + protected WatchedIntentFilter(WatchedIntentFilter f) { + this(f.getIntentFilter()); + } + + /** + * Create a WatchedIntentFilter based on an action + * @see IntentFilter#IntentFilter(String) + */ + public WatchedIntentFilter(String action) { + mFilter = new IntentFilter(action); + } + + /** + * Create a WatchedIntentFilter based on an action and a data type. + * @see IntentFilter#IntentFilter(String, String) + */ + public WatchedIntentFilter(String action, String dataType) + throws IntentFilter.MalformedMimeTypeException { + mFilter = new IntentFilter(action, dataType); + } + + /** + * Return a clone of the filter represented by this object. + */ + public WatchedIntentFilter cloneFilter() { + return new WatchedIntentFilter(mFilter); + } + + /** + * Return the {@link IntentFilter} represented by this object. + */ + public IntentFilter getIntentFilter() { + return mFilter; + } + + /** + * @see IntentFilter#setPriority(int) + */ + public final void setPriority(int priority) { + mFilter.setPriority(priority); + onChanged(); + } + + /** + * @see IntentFilter#getPriority() + */ + public final int getPriority() { + return mFilter.getPriority(); + } + + /** + * @see IntentFilter#setOrder(int) + */ + public final void setOrder(int order) { + mFilter.setOrder(order); + onChanged(); + } + + /** + * @see IntentFilter#getOrder() + */ + public final int getOrder() { + return mFilter.getOrder(); + } + + /** + * @see IntentFilter#getAutoVerify() + */ + public final boolean getAutoVerify() { + return mFilter.getAutoVerify(); + } + + /** + * @see IntentFilter#handleAllWebDataURI() + */ + public final boolean handleAllWebDataURI() { + return mFilter.handleAllWebDataURI(); + } + + /** + * @see IntentFilter#handlesWebUris(boolean) + */ + public final boolean handlesWebUris(boolean onlyWebSchemes) { + return mFilter.handlesWebUris(onlyWebSchemes); + } + + /** + * @see IntentFilter#needsVerification() + */ + public final boolean needsVerification() { + return mFilter.needsVerification(); + } + + /** + * @see IntentFilter#setVerified(boolean) + */ + public void setVerified(boolean verified) { + mFilter.setVerified(verified); + onChanged(); + } + + /** + * @see IntentFilter#setVisibilityToInstantApp(int) + */ + public void setVisibilityToInstantApp(int visibility) { + mFilter.setVisibilityToInstantApp(visibility); + onChanged(); + } + + /** + * @see IntentFilter#getVisibilityToInstantApp() + */ + public int getVisibilityToInstantApp() { + return mFilter.getVisibilityToInstantApp(); + } + + /** + * @see IntentFilter#isVisibleToInstantApp() + */ + public boolean isVisibleToInstantApp() { + return mFilter.isVisibleToInstantApp(); + } + + /** + * @see IntentFilter#isExplicitlyVisibleToInstantApp() + */ + public boolean isExplicitlyVisibleToInstantApp() { + return mFilter.isExplicitlyVisibleToInstantApp(); + } + + /** + * @see IntentFilter#isImplicitlyVisibleToInstantApp() + */ + public boolean isImplicitlyVisibleToInstantApp() { + return mFilter.isImplicitlyVisibleToInstantApp(); + } + + /** + * @see IntentFilter#addAction(String) + */ + public final void addAction(String action) { + mFilter.addAction(action); + onChanged(); + } + + /** + * @see IntentFilter#countActions() + */ + public final int countActions() { + return mFilter.countActions(); + } + + /** + * @see IntentFilter#getAction(int) + */ + public final String getAction(int index) { + return mFilter.getAction(index); + } + + /** + * @see IntentFilter#hasAction(String) + */ + public final boolean hasAction(String action) { + return mFilter.hasAction(action); + } + + /** + * @see IntentFilter#matchAction(String) + */ + public final boolean matchAction(String action) { + return mFilter.matchAction(action); + } + + /** + * @see IntentFilter#actionsIterator() + */ + public final Iterator<String> actionsIterator() { + return maybeWatch(mFilter.actionsIterator()); + } + + /** + * @see IntentFilter#addDataType(String) + */ + public final void addDataType(String type) + throws IntentFilter.MalformedMimeTypeException { + mFilter.addDataType(type); + onChanged(); + } + + /** + * @see IntentFilter#addDynamicDataType(String) + */ + public final void addDynamicDataType(String type) + throws IntentFilter.MalformedMimeTypeException { + mFilter.addDynamicDataType(type); + onChanged(); + } + + /** + * @see IntentFilter#clearDynamicDataTypes() + */ + public final void clearDynamicDataTypes() { + mFilter.clearDynamicDataTypes(); + onChanged(); + } + + /** + * @see IntentFilter#countStaticDataTypes() + */ + public int countStaticDataTypes() { + return mFilter.countStaticDataTypes(); + } + + /** + * @see IntentFilter#hasDataType(String) + */ + public final boolean hasDataType(String type) { + return mFilter.hasDataType(type); + } + + /** + * @see IntentFilter#hasExactDynamicDataType(String) + */ + public final boolean hasExactDynamicDataType(String type) { + return mFilter.hasExactDynamicDataType(type); + } + + /** + * @see IntentFilter#hasExactStaticDataType(String) + */ + public final boolean hasExactStaticDataType(String type) { + return mFilter.hasExactStaticDataType(type); + } + + /** + * @see IntentFilter#countDataTypes() + */ + public final int countDataTypes() { + return mFilter.countDataTypes(); + } + + /** + * @see IntentFilter#getDataType(int) + */ + public final String getDataType(int index) { + return mFilter.getDataType(index); + } + + /** + * @see IntentFilter#typesIterator() + */ + public final Iterator<String> typesIterator() { + return maybeWatch(mFilter.typesIterator()); + } + + /** + /** + * @see IntentFilter#dataTypes() + */ + public final List<String> dataTypes() { + return mFilter.dataTypes(); + } + + /** + * @see IntentFilter#addMimeGroup(String) + */ + public final void addMimeGroup(String name) { + mFilter.addMimeGroup(name); + onChanged(); + } + + /** + * @see IntentFilter#hasMimeGroup(String) + */ + public final boolean hasMimeGroup(String name) { + return mFilter.hasMimeGroup(name); + } + + /** + * @see IntentFilter#getMimeGroup(int) + */ + public final String getMimeGroup(int index) { + return mFilter.getMimeGroup(index); + } + + /** + * @see IntentFilter#countMimeGroups() + */ + public final int countMimeGroups() { + return mFilter.countMimeGroups(); + } + + /** + * @see IntentAction@mimeGroupsIterator() + */ + public final Iterator<String> mimeGroupsIterator() { + return maybeWatch(mFilter.mimeGroupsIterator()); + } + + /** + * @see IntentFilter#addDataScheme(String) + */ + public final void addDataScheme(String scheme) { + mFilter.addDataScheme(scheme); + onChanged(); + } + + /** + * @see IntentFilter#countDataSchemes() + */ + public final int countDataSchemes() { + return mFilter.countDataSchemes(); + } + + /** + * @see IntentFilter#getDataScheme(int) + */ + public final String getDataScheme(int index) { + return mFilter.getDataScheme(index); + } + + /** + * @see IntentFilter#hasDataScheme(String) + */ + public final boolean hasDataScheme(String scheme) { + return mFilter.hasDataScheme(scheme); + } + + /** + * @see IntentFilter#schemesIterator() + */ + public final Iterator<String> schemesIterator() { + return maybeWatch(mFilter.schemesIterator()); + } + + /** + * @see IntentFilter#addDataSchemeSpecificPart(String, int) + */ + public final void addDataSchemeSpecificPart(String ssp, int type) { + mFilter.addDataSchemeSpecificPart(ssp, type); + onChanged(); + } + + /** + * @see IntentFilter#addDataSchemeSpecificPart(PatternMatcher) + */ + public final void addDataSchemeSpecificPart(PatternMatcher ssp) { + mFilter.addDataSchemeSpecificPart(ssp); + onChanged(); + } + + /** + * @see IntentFilter#countDataSchemeSpecificParts() + */ + public final int countDataSchemeSpecificParts() { + return mFilter.countDataSchemeSpecificParts(); + } + + /** + * @see IntentFilter#getDataSchemeSpecificPart(int) + */ + public final PatternMatcher getDataSchemeSpecificPart(int index) { + return mFilter.getDataSchemeSpecificPart(index); + } + + /** + * @see IntentFilter#hasDataSchemeSpecificPart(String) + */ + public final boolean hasDataSchemeSpecificPart(String data) { + return mFilter.hasDataSchemeSpecificPart(data); + } + + /** + * @see IntentFilter#schemeSpecificPartsIterator() + */ + public final Iterator<PatternMatcher> schemeSpecificPartsIterator() { + return maybeWatch(mFilter.schemeSpecificPartsIterator()); + } + + /** + * @see IntentFilter#addDataAuthority(String, String) + */ + public final void addDataAuthority(String host, String port) { + mFilter.addDataAuthority(host, port); + onChanged(); + } + + /** + * @see IntentFilter#addDataAuthority(IntentFilter.AuthorityEntry) + */ + public final void addDataAuthority(IntentFilter.AuthorityEntry ent) { + mFilter.addDataAuthority(ent); + onChanged(); + } + + /** + * @see IntentFilter#countDataAuthorities() + */ + public final int countDataAuthorities() { + return mFilter.countDataAuthorities(); + } + + /** + * @see IntentFilter#getDataAuthority(int) + */ + public final IntentFilter.AuthorityEntry getDataAuthority(int index) { + return mFilter.getDataAuthority(index); + } + + /** + * @see IntentFilter#hasDataAuthority(Uri) + */ + public final boolean hasDataAuthority(Uri data) { + return mFilter.hasDataAuthority(data); + } + + /** + * @see IntentFilter#authoritiesIterator() + */ + public final Iterator<IntentFilter.AuthorityEntry> authoritiesIterator() { + return maybeWatch(mFilter.authoritiesIterator()); + } + + /** + * @see IntentFilter#addDataPath(String, int) + */ + public final void addDataPath(String path, int type) { + mFilter.addDataPath(path, type); + onChanged(); + } + + /** + * @see IntentFilter#addDataPath(PatternMatcher) + */ + public final void addDataPath(PatternMatcher path) { + mFilter.addDataPath(path); + onChanged(); + } + + /** + * @see IntentFilter#countDataPaths() + */ + public final int countDataPaths() { + return mFilter.countDataPaths(); + } + + /** + * @see IntentFilter#getDataPath(int) + */ + public final PatternMatcher getDataPath(int index) { + return mFilter.getDataPath(index); + } + + /** + * @see IntentFilter#hasDataPath(String) + */ + public final boolean hasDataPath(String data) { + return mFilter.hasDataPath(data); + } + + /** + * @see IntentFilter#pathsIterator() + */ + public final Iterator<PatternMatcher> pathsIterator() { + return maybeWatch(mFilter.pathsIterator()); + } + + /** + * @see IntentFilter#matchDataAuthority(Uri) + */ + public final int matchDataAuthority(Uri data) { + return mFilter.matchDataAuthority(data); + } + + /** + * @see IntentFilter#matchDataAuthority(Uri, boolean) + */ + public final int matchDataAuthority(Uri data, boolean wildcardSupported) { + return mFilter.matchDataAuthority(data, wildcardSupported); + } + + /** + * @see IntentFilter#matchData(String, String, Uri) + */ + public final int matchData(String type, String scheme, Uri data) { + return mFilter.matchData(type, scheme, data); + } + + /** + * @see IntentFilter#addCategory(String) + */ + public final void addCategory(String category) { + mFilter.addCategory(category); + } + + /** + * @see IntentFilter#countCategories() + */ + public final int countCategories() { + return mFilter.countCategories(); + } + + /** + * @see IntentFilter#getCategory(int) + */ + public final String getCategory(int index) { + return mFilter.getCategory(index); + } + + /** + * @see IntentFilter#hasCategory(String) + */ + public final boolean hasCategory(String category) { + return mFilter.hasCategory(category); + } + + /** + * @see IntentFilter#categoriesIterator() + */ + public final Iterator<String> categoriesIterator() { + return maybeWatch(mFilter.categoriesIterator()); + } + + /** + * @see IntentFilter#matchCategories(Set<String>) + */ + public final String matchCategories(Set<String> categories) { + return mFilter.matchCategories(categories); + } + + /** + * @see IntentFilter#match(ContentResolver, Intent, boolean, String) + */ + public final int match(ContentResolver resolver, Intent intent, + boolean resolve, String logTag) { + return mFilter.match(resolver, intent, + resolve, logTag); + } + + /** + * @see IntentFilter#match(String, String, String, Uri, Set<String>, String) + */ + public final int match(String action, String type, String scheme, + Uri data, Set<String> categories, String logTag) { + return mFilter.match(action, type, scheme, + data, categories, logTag); + } + + /** + * @see IntentFilter#match(String, String, String, Uri, Set<String>, String, boolean, + Collection<String> ignoreActions) + */ + public final int match(String action, String type, String scheme, + Uri data, Set<String> categories, String logTag, boolean supportWildcards, + Collection<String> ignoreActions) { + return mFilter.match(action, type, scheme, + data, categories, logTag, supportWildcards, + ignoreActions); + } + + /** + * @see IntentFilter#dump(Printer, String) + */ + public void dump(Printer du, String prefix) { + mFilter.dump(du, prefix); + } + + /** + * @see IntentFilter#describeContents() + */ + public final int describeContents() { + return mFilter.describeContents(); + } + + /** + * @see IntentFilter#debugCheck() + */ + public boolean debugCheck() { + return mFilter.debugCheck(); + } + + /** + * @see IntentFilter#getHostsList() + */ + public ArrayList<String> getHostsList() { + return mFilter.getHostsList(); + } + + /** + * @see IntentFilter#getHosts() + */ + public String[] getHosts() { + return mFilter.getHosts(); + } + + /** + * Convert a list of {@link IntentFilter} into a list of {@link WatchedIntentFilter} + */ + public static List<WatchedIntentFilter> toWatchedIntentFilterList(List<IntentFilter> inList) { + ArrayList<WatchedIntentFilter> outList = new ArrayList<>(); + for (int i = 0; i < inList.size(); i++) { + outList.add(new WatchedIntentFilter(inList.get(i))); + } + return outList; + } + + /** + * Convert a list of {@link IntentFilter} into a list of {@link WatchedIntentFilter} + */ + public static List<IntentFilter> toIntentFilterList(List<WatchedIntentFilter> inList) { + ArrayList<IntentFilter> outList = new ArrayList<>(); + for (int i = 0; i < inList.size(); i++) { + outList.add(inList.get(i).getIntentFilter()); + } + return outList; + } + + /** + * Create a snapshot by cloning the object. + */ + public WatchedIntentFilter snapshot() { + return new WatchedIntentFilter(this); + } +} diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 5b333e15fe67..29496b31b4a5 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4492,8 +4492,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } @Override - public boolean okToAnimate() { - return mDefaultDisplayPolicy.isAwake() && !mDeviceGoingToSleep; + public boolean okToAnimate(boolean ignoreScreenOn) { + return (ignoreScreenOn || mDefaultDisplayPolicy.isAwake()) && !mDeviceGoingToSleep; } /** {@inheritDoc} */ diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index d512edfb066a..78b03b2b88e7 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -897,12 +897,13 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { public boolean isScreenOn(); /** + * @param ignoreScreenOn {@code true} if screen state should be ignored. * @return whether the device is currently allowed to animate. * * Note: this can be true even if it is not appropriate to animate for reasons that are outside * of the policy's authority. */ - boolean okToAnimate(); + boolean okToAnimate(boolean ignoreScreenOn); /** * Tell the policy that the lid switch has changed state. diff --git a/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java index 6ea030f56d4d..81a51e290664 100644 --- a/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java +++ b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java @@ -25,6 +25,8 @@ import static android.os.RecoverySystem.RESUME_ON_REBOOT_REBOOT_ERROR_UNSPECIFIE import static android.os.RecoverySystem.ResumeOnRebootRebootErrorCode; import static android.os.UserHandle.USER_SYSTEM; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_NONE; + import android.annotation.IntDef; import android.content.Context; import android.content.IntentSender; @@ -47,6 +49,7 @@ import android.os.SystemProperties; import android.provider.DeviceConfig; import android.util.ArrayMap; import android.util.ArraySet; +import android.util.FastImmutableArraySet; import android.util.Slog; import com.android.internal.annotations.GuardedBy; @@ -143,7 +146,7 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo */ @IntDef({ ROR_NEED_PREPARATION, ROR_SKIP_PREPARATION_AND_NOTIFY, - ROR_SKIP_PREPARATION_NOT_NOTIFY}) + ROR_SKIP_PREPARATION_NOT_NOTIFY }) private @interface ResumeOnRebootActionsOnRequest {} /** @@ -151,10 +154,43 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo */ @IntDef({ ROR_NOT_REQUESTED, ROR_REQUESTED_NEED_CLEAR, - ROR_REQUESTED_SKIP_CLEAR}) + ROR_REQUESTED_SKIP_CLEAR }) private @interface ResumeOnRebootActionsOnClear {} /** + * Fatal arm escrow errors from lock settings that means the RoR is in a bad state. So clients + * need to prepare RoR again. + */ + static final FastImmutableArraySet<Integer> FATAL_ARM_ESCROW_ERRORS = + new FastImmutableArraySet<>(new Integer[]{ + LockSettingsInternal.ARM_REBOOT_ERROR_ESCROW_NOT_READY, + LockSettingsInternal.ARM_REBOOT_ERROR_NO_PROVIDER, + LockSettingsInternal.ARM_REBOOT_ERROR_PROVIDER_MISMATCH, + LockSettingsInternal.ARM_REBOOT_ERROR_NO_ESCROW_KEY, + LockSettingsInternal.ARM_REBOOT_ERROR_KEYSTORE_FAILURE, + }); + + /** + * The error details for ArmRebootEscrow. It contains error codes from RecoverySystemService + * and LockSettingsService. + */ + static class RebootPreparationError { + final @ResumeOnRebootRebootErrorCode int mRebootErrorCode; + final int mProviderErrorCode; // The supplemental error code from lock settings + + RebootPreparationError(int rebootErrorCode, int providerErrorCode) { + mRebootErrorCode = rebootErrorCode; + mProviderErrorCode = providerErrorCode; + } + + int getErrorCodeForMetrics() { + // The ResumeOnRebootRebootErrorCode are aligned with 1000; so it's safe to add them + // for metrics purpose. + return mRebootErrorCode + mProviderErrorCode; + } + } + + /** * Manages shared preference, i.e. the storage used for metrics reporting. */ public static class PreferencesManager { @@ -709,34 +745,40 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo return true; } - private @ResumeOnRebootRebootErrorCode int armRebootEscrow(String packageName, + private RebootPreparationError armRebootEscrow(String packageName, boolean slotSwitch) { if (packageName == null) { Slog.w(TAG, "Missing packageName when rebooting with lskf."); - return RESUME_ON_REBOOT_REBOOT_ERROR_INVALID_PACKAGE_NAME; + return new RebootPreparationError( + RESUME_ON_REBOOT_REBOOT_ERROR_INVALID_PACKAGE_NAME, ARM_REBOOT_ERROR_NONE); } if (!isLskfCaptured(packageName)) { - return RESUME_ON_REBOOT_REBOOT_ERROR_LSKF_NOT_CAPTURED; + return new RebootPreparationError(RESUME_ON_REBOOT_REBOOT_ERROR_LSKF_NOT_CAPTURED, + ARM_REBOOT_ERROR_NONE); } if (!verifySlotForNextBoot(slotSwitch)) { - return RESUME_ON_REBOOT_REBOOT_ERROR_SLOT_MISMATCH; + return new RebootPreparationError(RESUME_ON_REBOOT_REBOOT_ERROR_SLOT_MISMATCH, + ARM_REBOOT_ERROR_NONE); } final long origId = Binder.clearCallingIdentity(); - boolean result; + int providerErrorCode; try { - result = mInjector.getLockSettingsService().armRebootEscrow(); + providerErrorCode = mInjector.getLockSettingsService().armRebootEscrow(); } finally { Binder.restoreCallingIdentity(origId); } - if (!result) { - Slog.w(TAG, "Failure to escrow key for reboot"); - return RESUME_ON_REBOOT_REBOOT_ERROR_PROVIDER_PREPARATION_FAILURE; + if (providerErrorCode != ARM_REBOOT_ERROR_NONE) { + Slog.w(TAG, "Failure to escrow key for reboot, providerErrorCode: " + + providerErrorCode); + return new RebootPreparationError( + RESUME_ON_REBOOT_REBOOT_ERROR_PROVIDER_PREPARATION_FAILURE, providerErrorCode); } - return RESUME_ON_REBOOT_REBOOT_ERROR_NONE; + return new RebootPreparationError(RESUME_ON_REBOOT_REBOOT_ERROR_NONE, + ARM_REBOOT_ERROR_NONE); } private boolean useServerBasedRoR() { @@ -750,7 +792,7 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo } private void reportMetricsOnRebootWithLskf(String packageName, boolean slotSwitch, - @ResumeOnRebootRebootErrorCode int errorCode) { + RebootPreparationError escrowError) { int uid = mInjector.getUidFromPackageName(packageName); boolean serverBased = useServerBasedRoR(); int preparedClientCount; @@ -773,15 +815,31 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo + " request count %d, lskf captured count %d, duration since lskf captured" + " %d seconds.", packageName, preparedClientCount, requestCount, lskfCapturedCount, durationSeconds)); - mInjector.reportRebootEscrowRebootMetrics(errorCode, uid, preparedClientCount, - requestCount, slotSwitch, serverBased, durationSeconds, lskfCapturedCount); + mInjector.reportRebootEscrowRebootMetrics(escrowError.getErrorCodeForMetrics(), uid, + preparedClientCount, requestCount, slotSwitch, serverBased, durationSeconds, + lskfCapturedCount); + } + + private void clearRoRPreparationStateOnRebootFailure(RebootPreparationError escrowError) { + if (!FATAL_ARM_ESCROW_ERRORS.contains(escrowError.mProviderErrorCode)) { + return; + } + + Slog.w(TAG, "Clearing resume on reboot states for all clients on arm escrow error: " + + escrowError.mProviderErrorCode); + synchronized (this) { + mCallerPendingRequest.clear(); + mCallerPreparedForReboot.clear(); + } } private @ResumeOnRebootRebootErrorCode int rebootWithLskfImpl(String packageName, String reason, boolean slotSwitch) { - @ResumeOnRebootRebootErrorCode int errorCode = armRebootEscrow(packageName, slotSwitch); - reportMetricsOnRebootWithLskf(packageName, slotSwitch, errorCode); + RebootPreparationError escrowError = armRebootEscrow(packageName, slotSwitch); + reportMetricsOnRebootWithLskf(packageName, slotSwitch, escrowError); + clearRoRPreparationStateOnRebootFailure(escrowError); + @ResumeOnRebootRebootErrorCode int errorCode = escrowError.mRebootErrorCode; if (errorCode != RESUME_ON_REBOOT_REBOOT_ERROR_NONE) { return errorCode; } diff --git a/services/core/java/com/android/server/timedetector/EnvironmentImpl.java b/services/core/java/com/android/server/timedetector/EnvironmentImpl.java index 4f5e8fa9c944..072cc16f680b 100644 --- a/services/core/java/com/android/server/timedetector/EnvironmentImpl.java +++ b/services/core/java/com/android/server/timedetector/EnvironmentImpl.java @@ -16,26 +16,22 @@ package com.android.server.timedetector; -import static com.android.server.timedetector.TimeDetectorStrategy.ORIGIN_NETWORK; -import static com.android.server.timedetector.TimeDetectorStrategy.ORIGIN_TELEPHONY; -import static com.android.server.timedetector.TimeDetectorStrategy.stringToOrigin; - import android.annotation.NonNull; import android.annotation.UserIdInt; import android.app.AlarmManager; import android.content.ContentResolver; import android.content.Context; -import android.os.Build; +import android.database.ContentObserver; +import android.os.Handler; import android.os.PowerManager; import android.os.SystemClock; -import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.util.Slog; -import com.android.internal.R; -import com.android.server.timedetector.TimeDetectorStrategy.Origin; +import com.android.internal.annotations.GuardedBy; +import com.android.server.timezonedetector.ConfigurationChangeListener; import java.time.Instant; import java.util.Objects; @@ -43,62 +39,71 @@ import java.util.Objects; /** * The real implementation of {@link TimeDetectorStrategyImpl.Environment} used on device. */ -public final class EnvironmentImpl implements TimeDetectorStrategyImpl.Environment { - - private static final String TAG = TimeDetectorService.TAG; - - private static final int SYSTEM_CLOCK_UPDATE_THRESHOLD_MILLIS_DEFAULT = 2 * 1000; - - /** - * Time in the past. If automatic time suggestion is before this point, it's - * incorrect for sure. - */ - private static final Instant TIME_LOWER_BOUND = Instant.ofEpochMilli( - Long.max(android.os.Environment.getRootDirectory().lastModified(), Build.TIME)); - - /** - * By default telephony and network only suggestions are accepted and telephony takes - * precedence over network. - */ - private static final @Origin int[] DEFAULT_AUTOMATIC_TIME_ORIGIN_PRIORITIES = - { ORIGIN_TELEPHONY, ORIGIN_NETWORK }; +final class EnvironmentImpl implements TimeDetectorStrategyImpl.Environment { - /** - * If a newly calculated system clock time and the current system clock time differs by this or - * more the system clock will actually be updated. Used to prevent the system clock being set - * for only minor differences. - */ - private final int mSystemClockUpdateThresholdMillis; + private static final String LOG_TAG = TimeDetectorService.TAG; @NonNull private final Context mContext; + @NonNull private final Handler mHandler; + @NonNull private final ServiceConfigAccessor mServiceConfigAccessor; @NonNull private final ContentResolver mContentResolver; @NonNull private final PowerManager.WakeLock mWakeLock; @NonNull private final AlarmManager mAlarmManager; @NonNull private final UserManager mUserManager; - @NonNull private final int[] mOriginPriorities; - public EnvironmentImpl(@NonNull Context context) { + // @NonNull after setConfigChangeListener() is called. + @GuardedBy("this") + private ConfigurationChangeListener mConfigChangeListener; + + EnvironmentImpl(@NonNull Context context, @NonNull Handler handler, + @NonNull ServiceConfigAccessor serviceConfigAccessor) { mContext = Objects.requireNonNull(context); mContentResolver = Objects.requireNonNull(context.getContentResolver()); + mHandler = Objects.requireNonNull(handler); + mServiceConfigAccessor = Objects.requireNonNull(serviceConfigAccessor); PowerManager powerManager = context.getSystemService(PowerManager.class); mWakeLock = Objects.requireNonNull( - powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG)); + powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOG_TAG)); mAlarmManager = Objects.requireNonNull(context.getSystemService(AlarmManager.class)); mUserManager = Objects.requireNonNull(context.getSystemService(UserManager.class)); - mSystemClockUpdateThresholdMillis = - SystemProperties.getInt("ro.sys.time_detector_update_diff", - SYSTEM_CLOCK_UPDATE_THRESHOLD_MILLIS_DEFAULT); + // Wire up the config change listeners. All invocations are performed on the mHandler + // thread. + + ContentResolver contentResolver = context.getContentResolver(); + contentResolver.registerContentObserver( + Settings.Global.getUriFor(Settings.Global.AUTO_TIME), true, + new ContentObserver(mHandler) { + @Override + public void onChange(boolean selfChange) { + handleAutoTimeDetectionChangedOnHandlerThread(); + } + }); + } + + /** Internal method for handling the auto time setting being changed. */ + private void handleAutoTimeDetectionChangedOnHandlerThread() { + synchronized (this) { + if (mConfigChangeListener == null) { + Slog.wtf(LOG_TAG, "mConfigChangeListener is unexpectedly null"); + } + mConfigChangeListener.onChange(); + } + } - mOriginPriorities = getOriginPriorities(context); + @Override + public void setConfigChangeListener(@NonNull ConfigurationChangeListener listener) { + synchronized (this) { + mConfigChangeListener = Objects.requireNonNull(listener); + } } @Override public int systemClockUpdateThresholdMillis() { - return mSystemClockUpdateThresholdMillis; + return mServiceConfigAccessor.systemClockUpdateThresholdMillis(); } @Override @@ -112,12 +117,12 @@ public final class EnvironmentImpl implements TimeDetectorStrategyImpl.Environme @Override public Instant autoTimeLowerBound() { - return TIME_LOWER_BOUND; + return mServiceConfigAccessor.autoTimeLowerBound(); } @Override public int[] autoOriginPriorities() { - return mOriginPriorities; + return mServiceConfigAccessor.getOriginPriorities(); } @Override @@ -131,7 +136,7 @@ public final class EnvironmentImpl implements TimeDetectorStrategyImpl.Environme @Override public void acquireWakeLock() { if (mWakeLock.isHeld()) { - Slog.wtf(TAG, "WakeLock " + mWakeLock + " already held"); + Slog.wtf(LOG_TAG, "WakeLock " + mWakeLock + " already held"); } mWakeLock.acquire(); } @@ -160,7 +165,7 @@ public final class EnvironmentImpl implements TimeDetectorStrategyImpl.Environme private void checkWakeLockHeld() { if (!mWakeLock.isHeld()) { - Slog.wtf(TAG, "WakeLock " + mWakeLock + " not held"); + Slog.wtf(LOG_TAG, "WakeLock " + mWakeLock + " not held"); } } @@ -168,20 +173,4 @@ public final class EnvironmentImpl implements TimeDetectorStrategyImpl.Environme UserHandle userHandle = UserHandle.of(userId); return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_DATE_TIME, userHandle); } - - private static int[] getOriginPriorities(@NonNull Context context) { - String[] originStrings = - context.getResources().getStringArray(R.array.config_autoTimeSourcesPriority); - if (originStrings.length == 0) { - return DEFAULT_AUTOMATIC_TIME_ORIGIN_PRIORITIES; - } else { - int[] origins = new int[originStrings.length]; - for (int i = 0; i < originStrings.length; i++) { - int origin = stringToOrigin(originStrings[i]); - origins[i] = origin; - } - - return origins; - } - } } diff --git a/services/core/java/com/android/server/timedetector/ServiceConfigAccessor.java b/services/core/java/com/android/server/timedetector/ServiceConfigAccessor.java new file mode 100644 index 000000000000..be4432ab61bf --- /dev/null +++ b/services/core/java/com/android/server/timedetector/ServiceConfigAccessor.java @@ -0,0 +1,141 @@ +/* + * Copyright 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.timedetector; + +import static com.android.server.timedetector.TimeDetectorStrategy.ORIGIN_NETWORK; +import static com.android.server.timedetector.TimeDetectorStrategy.ORIGIN_TELEPHONY; +import static com.android.server.timedetector.TimeDetectorStrategy.stringToOrigin; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.Context; +import android.os.Build; +import android.os.SystemProperties; +import android.util.ArraySet; + +import com.android.internal.R; +import com.android.internal.annotations.GuardedBy; +import com.android.server.timezonedetector.ConfigurationChangeListener; + +import java.time.Instant; +import java.util.Collections; +import java.util.Objects; +import java.util.Set; + +/** + * A singleton that provides access to service configuration for time detection. This hides how + * configuration is split between static, compile-time config and dynamic, server-pushed flags. It + * provides a rudimentary mechanism to signal when values have changed. + */ +final class ServiceConfigAccessor { + + private static final int SYSTEM_CLOCK_UPDATE_THRESHOLD_MILLIS_DEFAULT = 2 * 1000; + + /** + * By default telephony and network only suggestions are accepted and telephony takes + * precedence over network. + */ + private static final @TimeDetectorStrategy.Origin int[] + DEFAULT_AUTOMATIC_TIME_ORIGIN_PRIORITIES = { ORIGIN_TELEPHONY, ORIGIN_NETWORK }; + + /** + * Time in the past. If an automatic time suggestion is before this point, it is sure to be + * incorrect. + */ + private static final Instant TIME_LOWER_BOUND_DEFAULT = Instant.ofEpochMilli( + Long.max(android.os.Environment.getRootDirectory().lastModified(), Build.TIME)); + + private static final Set<String> SERVER_FLAGS_KEYS_TO_WATCH = Collections.unmodifiableSet( + new ArraySet<>(new String[] { + })); + + private static final Object SLOCK = new Object(); + + /** The singleton instance. Initialized once in {@link #getInstance(Context)}. */ + @GuardedBy("SLOCK") + @Nullable + private static ServiceConfigAccessor sInstance; + + @NonNull private final Context mContext; + @NonNull private final ServerFlags mServerFlags; + @NonNull private final int[] mOriginPriorities; + + /** + * If a newly calculated system clock time and the current system clock time differs by this or + * more the system clock will actually be updated. Used to prevent the system clock being set + * for only minor differences. + */ + private final int mSystemClockUpdateThresholdMillis; + + private ServiceConfigAccessor(@NonNull Context context) { + mContext = Objects.requireNonNull(context); + mServerFlags = ServerFlags.getInstance(mContext); + mOriginPriorities = getOriginPrioritiesInternal(); + mSystemClockUpdateThresholdMillis = + SystemProperties.getInt("ro.sys.time_detector_update_diff", + SYSTEM_CLOCK_UPDATE_THRESHOLD_MILLIS_DEFAULT); + } + + /** Returns the singleton instance. */ + static ServiceConfigAccessor getInstance(Context context) { + synchronized (SLOCK) { + if (sInstance == null) { + sInstance = new ServiceConfigAccessor(context); + } + return sInstance; + } + } + + /** + * Adds a listener that will be called when server flags related to this class change. The + * callbacks are delivered on the main looper thread. + * + * <p>Note: Only for use by long-lived objects. There is deliberately no associated remove + * method. + */ + void addListener(@NonNull ConfigurationChangeListener listener) { + mServerFlags.addListener(listener, SERVER_FLAGS_KEYS_TO_WATCH); + } + + @NonNull + int[] getOriginPriorities() { + return mOriginPriorities; + } + + int systemClockUpdateThresholdMillis() { + return mSystemClockUpdateThresholdMillis; + } + + Instant autoTimeLowerBound() { + return TIME_LOWER_BOUND_DEFAULT; + } + + private int[] getOriginPrioritiesInternal() { + String[] originStrings = + mContext.getResources().getStringArray(R.array.config_autoTimeSourcesPriority); + if (originStrings.length == 0) { + return DEFAULT_AUTOMATIC_TIME_ORIGIN_PRIORITIES; + } else { + int[] origins = new int[originStrings.length]; + for (int i = 0; i < originStrings.length; i++) { + int origin = stringToOrigin(originStrings[i]); + origins[i] = origin; + } + + return origins; + } + } +} diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorService.java b/services/core/java/com/android/server/timedetector/TimeDetectorService.java index 27e2ee585a20..20c1c3c8b738 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorService.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorService.java @@ -27,12 +27,9 @@ import android.app.timedetector.ITimeDetectorService; import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.NetworkTimeSuggestion; import android.app.timedetector.TelephonyTimeSuggestion; -import android.content.ContentResolver; import android.content.Context; -import android.database.ContentObserver; import android.os.Binder; import android.os.Handler; -import android.provider.Settings; import android.util.IndentingPrintWriter; import com.android.internal.annotations.VisibleForTesting; @@ -64,7 +61,16 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { @Override public void onStart() { - TimeDetectorService service = TimeDetectorService.create(getContext()); + Context context = getContext(); + Handler handler = FgThread.getHandler(); + + ServiceConfigAccessor serviceConfigAccessor = + ServiceConfigAccessor.getInstance(context); + TimeDetectorStrategy timeDetectorStrategy = + TimeDetectorStrategyImpl.create(context, handler, serviceConfigAccessor); + + TimeDetectorService service = + new TimeDetectorService(context, handler, timeDetectorStrategy); // Publish the binder service so it can be accessed from other (appropriately // permissioned) processes. @@ -77,28 +83,6 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { @NonNull private final TimeDetectorStrategy mTimeDetectorStrategy; @NonNull private final CallerIdentityInjector mCallerIdentityInjector; - private static TimeDetectorService create(@NonNull Context context) { - TimeDetectorStrategyImpl.Environment environment = new EnvironmentImpl(context); - TimeDetectorStrategy timeDetectorStrategy = new TimeDetectorStrategyImpl(environment); - - Handler handler = FgThread.getHandler(); - TimeDetectorService timeDetectorService = - new TimeDetectorService(context, handler, timeDetectorStrategy); - - // Wire up event listening. - ContentResolver contentResolver = context.getContentResolver(); - contentResolver.registerContentObserver( - Settings.Global.getUriFor(Settings.Global.AUTO_TIME), true, - new ContentObserver(handler) { - @Override - public void onChange(boolean selfChange) { - timeDetectorService.handleAutoTimeDetectionChanged(); - } - }); - - return timeDetectorService; - } - @VisibleForTesting public TimeDetectorService(@NonNull Context context, @NonNull Handler handler, @NonNull TimeDetectorStrategy timeDetectorStrategy) { @@ -185,12 +169,6 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { mHandler.post(() -> mTimeDetectorStrategy.suggestExternalTime(timeSignal)); } - /** Internal method for handling the auto time setting being changed. */ - @VisibleForTesting - public void handleAutoTimeDetectionChanged() { - mHandler.post(mTimeDetectorStrategy::handleAutoTimeConfigChanged); - } - @Override protected void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @Nullable String[] args) { diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java index cde66becdee2..be382f0409b1 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java @@ -92,12 +92,6 @@ public interface TimeDetectorStrategy extends Dumpable { /** Returns the configuration that controls time detector behaviour for specified user. */ ConfigurationInternal getConfigurationInternal(@UserIdInt int userId); - /** - * Handles the auto-time configuration changing For example, when the auto-time setting is - * toggled on or off. - */ - void handleAutoTimeConfigChanged(); - // Utility methods below are to be moved to a better home when one becomes more obvious. /** diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java index 289d8d6e648e..db8a59e0ab26 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java @@ -29,6 +29,8 @@ import android.app.timedetector.GnssTimeSuggestion; import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.NetworkTimeSuggestion; import android.app.timedetector.TelephonyTimeSuggestion; +import android.content.Context; +import android.os.Handler; import android.os.TimestampedValue; import android.util.IndentingPrintWriter; import android.util.LocalLog; @@ -37,6 +39,7 @@ import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.server.timezonedetector.ArrayMapWithHistory; +import com.android.server.timezonedetector.ConfigurationChangeListener; import com.android.server.timezonedetector.ReferenceWithHistory; import java.time.Instant; @@ -132,6 +135,12 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { public interface Environment { /** + * Sets a {@link ConfigurationChangeListener} that will be invoked when there are any + * changes that could affect time detection. This is invoked during system server setup. + */ + void setConfigChangeListener(@NonNull ConfigurationChangeListener listener); + + /** * The absolute threshold below which the system clock need not be updated. i.e. if setting * the system clock would adjust it by less than this (either backwards or forwards) then it * need not be set. @@ -178,8 +187,19 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { void releaseWakeLock(); } + static TimeDetectorStrategy create( + @NonNull Context context, @NonNull Handler handler, + @NonNull ServiceConfigAccessor serviceConfigAccessor) { + + TimeDetectorStrategyImpl.Environment environment = + new EnvironmentImpl(context, handler, serviceConfigAccessor); + return new TimeDetectorStrategyImpl(environment); + } + + @VisibleForTesting TimeDetectorStrategyImpl(@NonNull Environment environment) { mEnvironment = Objects.requireNonNull(environment); + mEnvironment.setConfigChangeListener(this::handleAutoTimeConfigChanged); } @Override @@ -279,8 +299,7 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { return mEnvironment.configurationInternal(userId); } - @Override - public synchronized void handleAutoTimeConfigChanged() { + private synchronized void handleAutoTimeConfigChanged() { boolean enabled = mEnvironment.isAutoTimeDetectionEnabled(); // When automatic time detection is enabled we update the system clock instantly if we can. // Conversely, when automatic time detection is disabled we leave the clock as it is. diff --git a/services/core/java/com/android/server/timezonedetector/EnvironmentImpl.java b/services/core/java/com/android/server/timezonedetector/EnvironmentImpl.java index 0e5f3bfbb4b1..b84f8a850ba7 100644 --- a/services/core/java/com/android/server/timezonedetector/EnvironmentImpl.java +++ b/services/core/java/com/android/server/timezonedetector/EnvironmentImpl.java @@ -47,7 +47,7 @@ import java.util.Optional; /** * The real implementation of {@link TimeZoneDetectorStrategyImpl.Environment}. */ -public final class EnvironmentImpl implements TimeZoneDetectorStrategyImpl.Environment { +final class EnvironmentImpl implements TimeZoneDetectorStrategyImpl.Environment { private static final String LOG_TAG = TimeZoneDetectorService.TAG; private static final String TIMEZONE_PROPERTY = "persist.sys.timezone"; diff --git a/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java b/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java index 50d37f42e889..dddb11b7e249 100644 --- a/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java +++ b/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java @@ -133,8 +133,8 @@ public final class ServiceConfigAccessor { } /** - * Adds a listener that will be called server flags related to this class change. The callbacks - * are delivered on the main looper thread. + * Adds a listener that will be called when server flags related to this class change. The + * callbacks are delivered on the main looper thread. * * <p>Note: Only for use by long-lived objects. There is deliberately no associated remove * method. diff --git a/services/core/java/com/android/server/utils/SnapshotCache.java b/services/core/java/com/android/server/utils/SnapshotCache.java new file mode 100644 index 000000000000..f0fb8b25b402 --- /dev/null +++ b/services/core/java/com/android/server/utils/SnapshotCache.java @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.utils; + +import android.annotation.NonNull; +import android.annotation.Nullable; + +/** + * A class that caches snapshots. Instances are instantiated on a {@link Watchable}; when the + * {@link Watchable} reports a change, the cache is cleared. The snapshot() method fetches the + * cache if it is valid, or rebuilds the cache if it has been cleared. + * + * The class is abstract; clients must implement the createSnapshot() method. + * + * @param <T> The type returned by the snapshot() method. + */ +public abstract class SnapshotCache<T> extends Watcher{ + + /** + * Global snapshot cache enable flag. Set to false for testing or debugging. + */ + private static final boolean ENABLED = true; + + // The source object from which snapshots are created. This may be null if createSnapshot() + // does not require it. + protected final T mSource; + + // The cached snapshot + private T mSnapshot = null; + + // True if the snapshot is sealed and may not be modified. + private boolean mSealed = false; + + /** + * Create a cache with a source object for rebuilding snapshots and a + * {@link Watchable} that notifies when the cache is invalid. + * @param source Source data for rebuilding snapshots. + * @param watchable The object that notifies when the cache is invalid. + */ + public SnapshotCache(@Nullable T source, @NonNull Watchable watchable) { + mSource = source; + watchable.registerObserver(this); + } + + /** + * Notify the object that the source object has changed. If the local object is sealed then + * IllegalStateException is thrown. Otherwise, the cache is cleared. + */ + public void onChange(@Nullable Watchable what) { + if (mSealed) { + throw new IllegalStateException("attempt to change a sealed object"); + } + mSnapshot = null; + } + + /** + * Seal the cache. Attempts to modify the cache will generate an exception. + */ + public void seal() { + mSealed = true; + } + + /** + * Return a snapshot. This uses the cache if it is non-null. Otherwise it creates a + * new snapshot and saves it in the cache. + * @return A snapshot as returned by createSnapshot() and possibly cached. + */ + public T snapshot() { + T s = mSnapshot; + if (s == null || !ENABLED) { + s = createSnapshot(); + mSnapshot = s; + } + return s; + } + + /** + * Create a single, uncached snapshot. Clients must implement this per local rules. + * @return A snapshot + */ + public abstract T createSnapshot(); +} diff --git a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java index d8a145d9ae33..19fbdbd86099 100644 --- a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java +++ b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java @@ -43,6 +43,7 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting.Visibility; +import com.android.internal.util.IndentingPrintWriter; import java.util.Collections; import java.util.HashMap; @@ -320,6 +321,17 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { && mPrivilegedPackages.equals(other.mPrivilegedPackages); } + /** Dumps the state of this snapshot for logging and debugging purposes. */ + public void dump(IndentingPrintWriter pw) { + pw.println("TelephonySubscriptionSnapshot:"); + pw.increaseIndent(); + + pw.println("mSubIdToGroupMap: " + mSubIdToGroupMap); + pw.println("mPrivilegedPackages: " + mPrivilegedPackages); + + pw.decreaseIndent(); + } + @Override public String toString() { return "TelephonySubscriptionSnapshot{ " diff --git a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java index ab9de77005b3..a59b368ec321 100644 --- a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java +++ b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java @@ -31,6 +31,7 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting.Visibility; +import com.android.internal.util.IndentingPrintWriter; import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot; import java.util.ArrayList; @@ -396,6 +397,18 @@ public class UnderlyingNetworkTracker { return Objects.hash(network, networkCapabilities, linkProperties, isBlocked); } + /** Dumps the state of this record for logging and debugging purposes. */ + public void dump(IndentingPrintWriter pw) { + pw.println("UnderlyingNetworkRecord:"); + pw.increaseIndent(); + + pw.println("mNetwork: " + network); + pw.println("mNetworkCapabilities: " + networkCapabilities); + pw.println("mLinkProperties: " + linkProperties); + + pw.decreaseIndent(); + } + /** Builder to incrementally construct an UnderlyingNetworkRecord. */ private static class Builder { @NonNull private final Network mNetwork; diff --git a/services/core/java/com/android/server/vcn/Vcn.java b/services/core/java/com/android/server/vcn/Vcn.java index 7bc6056f91f3..cccb0968fc6a 100644 --- a/services/core/java/com/android/server/vcn/Vcn.java +++ b/services/core/java/com/android/server/vcn/Vcn.java @@ -16,6 +16,8 @@ package com.android.server.vcn; +import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.vcn.VcnManager.VCN_STATUS_CODE_ACTIVE; @@ -26,14 +28,21 @@ import static com.android.server.VcnManagementService.VDBG; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.ContentResolver; +import android.database.ContentObserver; import android.net.NetworkCapabilities; import android.net.NetworkRequest; +import android.net.NetworkScore; +import android.net.Uri; import android.net.vcn.VcnConfig; import android.net.vcn.VcnGatewayConnectionConfig; import android.net.vcn.VcnManager.VcnErrorCode; import android.os.Handler; import android.os.Message; import android.os.ParcelUuid; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.util.ArraySet; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; @@ -42,9 +51,11 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.server.VcnManagementService.VcnCallback; import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; @@ -61,6 +72,11 @@ import java.util.Set; public class Vcn extends Handler { private static final String TAG = Vcn.class.getSimpleName(); + private static final int VCN_LEGACY_SCORE_INT = 52; + + private static final List<Integer> CAPS_REQUIRING_MOBILE_DATA = + Arrays.asList(NET_CAPABILITY_INTERNET, NET_CAPABILITY_DUN); + private static final int MSG_EVENT_BASE = 0; private static final int MSG_CMD_BASE = 100; @@ -110,6 +126,15 @@ public class Vcn extends Handler { */ private static final int MSG_EVENT_SAFE_MODE_STATE_CHANGED = MSG_EVENT_BASE + 4; + /** + * Triggers reevaluation of mobile data enabled conditions. + * + * <p>Upon this notification, the VCN will check if any of the underlying subIds have mobile + * data enabled. If not, the VCN will restart any GatewayConnections providing INTERNET or DUN + * with the current mobile data toggle status. + */ + private static final int MSG_EVENT_MOBILE_DATA_TOGGLED = MSG_EVENT_BASE + 5; + /** Triggers an immediate teardown of the entire Vcn, including GatewayConnections. */ private static final int MSG_CMD_TEARDOWN = MSG_CMD_BASE; @@ -118,6 +143,8 @@ public class Vcn extends Handler { @NonNull private final Dependencies mDeps; @NonNull private final VcnNetworkRequestListener mRequestListener; @NonNull private final VcnCallback mVcnCallback; + @NonNull private final VcnContentResolver mContentResolver; + @NonNull private final ContentObserver mMobileDataSettingsObserver; /** * Map containing all VcnGatewayConnections and their VcnGatewayConnectionConfigs. @@ -154,6 +181,8 @@ public class Vcn extends Handler { // Accessed from different threads, but always under lock in VcnManagementService private volatile int mCurrentStatus = VCN_STATUS_CODE_ACTIVE; + private boolean mIsMobileDataEnabled = false; + public Vcn( @NonNull VcnContext vcnContext, @NonNull ParcelUuid subscriptionGroup, @@ -177,10 +206,19 @@ public class Vcn extends Handler { mVcnCallback = Objects.requireNonNull(vcnCallback, "Missing vcnCallback"); mDeps = Objects.requireNonNull(deps, "Missing deps"); mRequestListener = new VcnNetworkRequestListener(); + mContentResolver = mDeps.newVcnContentResolver(mVcnContext); + mMobileDataSettingsObserver = new VcnMobileDataContentObserver(this /* handler */); + + final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA); + mContentResolver.registerContentObserver( + uri, true /* notifyForDescendants */, mMobileDataSettingsObserver); mConfig = Objects.requireNonNull(config, "Missing config"); mLastSnapshot = Objects.requireNonNull(snapshot, "Missing snapshot"); + // Update mIsMobileDataEnabled before starting handling of NetworkRequests. + mIsMobileDataEnabled = getMobileDataStatus(); + // Register to receive cached and future NetworkRequests mVcnContext.getVcnNetworkProvider().registerListener(mRequestListener); } @@ -230,10 +268,10 @@ public class Vcn extends Handler { private class VcnNetworkRequestListener implements VcnNetworkProvider.NetworkRequestListener { @Override - public void onNetworkRequested(@NonNull NetworkRequest request, int score, int providerId) { + public void onNetworkRequested(@NonNull NetworkRequest request) { Objects.requireNonNull(request, "Missing request"); - sendMessage(obtainMessage(MSG_EVENT_NETWORK_REQUESTED, score, providerId, request)); + sendMessage(obtainMessage(MSG_EVENT_NETWORK_REQUESTED, request)); } } @@ -249,7 +287,7 @@ public class Vcn extends Handler { handleConfigUpdated((VcnConfig) msg.obj); break; case MSG_EVENT_NETWORK_REQUESTED: - handleNetworkRequested((NetworkRequest) msg.obj, msg.arg1, msg.arg2); + handleNetworkRequested((NetworkRequest) msg.obj); break; case MSG_EVENT_SUBSCRIPTIONS_CHANGED: handleSubscriptionsChanged((TelephonySubscriptionSnapshot) msg.obj); @@ -260,6 +298,9 @@ public class Vcn extends Handler { case MSG_EVENT_SAFE_MODE_STATE_CHANGED: handleSafeModeStatusChanged(); break; + case MSG_EVENT_MOBILE_DATA_TOGGLED: + handleMobileDataToggled(); + break; case MSG_CMD_TEARDOWN: handleTeardown(); break; @@ -327,25 +368,9 @@ public class Vcn extends Handler { } } - private void handleNetworkRequested( - @NonNull NetworkRequest request, int score, int providerId) { + private void handleNetworkRequested(@NonNull NetworkRequest request) { Slog.v(getLogTag(), "Received request " + request); - if (score > getNetworkScore()) { - if (VDBG) { - Slog.v( - getLogTag(), - "Request already satisfied by higher-scoring (" - + score - + ") network from " - + "provider " - + providerId - + ": " - + request); - } - return; - } - // If preexisting VcnGatewayConnection(s) satisfy request, return for (VcnGatewayConnectionConfig gatewayConnectionConfig : mVcnGatewayConnections.keySet()) { if (isRequestSatisfiedByGatewayConnectionConfig(request, gatewayConnectionConfig)) { @@ -366,18 +391,37 @@ public class Vcn extends Handler { if (isRequestSatisfiedByGatewayConnectionConfig(request, gatewayConnectionConfig)) { Slog.v(getLogTag(), "Bringing up new VcnGatewayConnection for request " + request); + if (getExposedCapabilitiesForMobileDataState(gatewayConnectionConfig).isEmpty()) { + // Skip; this network does not provide any services if mobile data is disabled. + continue; + } + final VcnGatewayConnection vcnGatewayConnection = mDeps.newVcnGatewayConnection( mVcnContext, mSubscriptionGroup, mLastSnapshot, gatewayConnectionConfig, - new VcnGatewayStatusCallbackImpl(gatewayConnectionConfig)); + new VcnGatewayStatusCallbackImpl(gatewayConnectionConfig), + mIsMobileDataEnabled); mVcnGatewayConnections.put(gatewayConnectionConfig, vcnGatewayConnection); } } } + private Set<Integer> getExposedCapabilitiesForMobileDataState( + VcnGatewayConnectionConfig gatewayConnectionConfig) { + if (mIsMobileDataEnabled) { + return gatewayConnectionConfig.getAllExposedCapabilities(); + } + + final Set<Integer> exposedCapsWithoutMobileData = + new ArraySet<>(gatewayConnectionConfig.getAllExposedCapabilities()); + exposedCapsWithoutMobileData.removeAll(CAPS_REQUIRING_MOBILE_DATA); + + return exposedCapsWithoutMobileData; + } + private void handleGatewayConnectionQuit(VcnGatewayConnectionConfig config) { Slog.v(getLogTag(), "VcnGatewayConnection quit: " + config); mVcnGatewayConnections.remove(config); @@ -396,12 +440,55 @@ public class Vcn extends Handler { } } + private void handleMobileDataToggled() { + final boolean oldMobileDataEnabledStatus = mIsMobileDataEnabled; + mIsMobileDataEnabled = getMobileDataStatus(); + + if (oldMobileDataEnabledStatus != mIsMobileDataEnabled) { + // Teardown any GatewayConnections that advertise INTERNET or DUN. If they provide other + // services, the VcnGatewayConnections will be restarted without advertising INTERNET or + // DUN. + for (Entry<VcnGatewayConnectionConfig, VcnGatewayConnection> entry : + mVcnGatewayConnections.entrySet()) { + final VcnGatewayConnectionConfig gatewayConnectionConfig = entry.getKey(); + final VcnGatewayConnection gatewayConnection = entry.getValue(); + + final Set<Integer> exposedCaps = + gatewayConnectionConfig.getAllExposedCapabilities(); + if (exposedCaps.contains(NET_CAPABILITY_INTERNET) + || exposedCaps.contains(NET_CAPABILITY_DUN)) { + if (gatewayConnection == null) { + Slog.wtf( + getLogTag(), + "Found gatewayConnectionConfig without GatewayConnection"); + } else { + // TODO(b/184868850): Optimize by restarting NetworkAgents without teardown. + gatewayConnection.teardownAsynchronously(); + } + } + } + } + } + + private boolean getMobileDataStatus() { + final TelephonyManager genericTelMan = + mVcnContext.getContext().getSystemService(TelephonyManager.class); + + for (int subId : mLastSnapshot.getAllSubIdsInGroup(mSubscriptionGroup)) { + if (genericTelMan.createForSubscriptionId(subId).isDataEnabled()) { + return true; + } + } + + return false; + } + private boolean isRequestSatisfiedByGatewayConnectionConfig( @NonNull NetworkRequest request, @NonNull VcnGatewayConnectionConfig config) { final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(); builder.addTransportType(TRANSPORT_CELLULAR); builder.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED); - for (int cap : config.getAllExposedCapabilities()) { + for (int cap : getExposedCapabilitiesForMobileDataState(config)) { builder.addCapability(cap); } @@ -432,12 +519,20 @@ public class Vcn extends Handler { pw.decreaseIndent(); } + @VisibleForTesting(visibility = Visibility.PRIVATE) + public boolean isMobileDataEnabled() { + return mIsMobileDataEnabled; + } + + @VisibleForTesting(visibility = Visibility.PRIVATE) + public void setMobileDataEnabled(boolean isMobileDataEnabled) { + mIsMobileDataEnabled = isMobileDataEnabled; + } + /** Retrieves the network score for a VCN Network */ - // Package visibility for use in VcnGatewayConnection - static int getNetworkScore() { - // TODO: STOPSHIP (b/173549607): Make this use new NetworkSelection, or some magic "max in - // subGrp" value - return 52; + // Package visibility for use in VcnGatewayConnection and VcnNetworkProvider + static NetworkScore getNetworkScore() { + return new NetworkScore.Builder().setLegacyInt(VCN_LEGACY_SCORE_INT).build(); } /** Callback used for passing status signals from a VcnGatewayConnection to its managing Vcn. */ @@ -485,6 +580,17 @@ public class Vcn extends Handler { } } + private class VcnMobileDataContentObserver extends ContentObserver { + private VcnMobileDataContentObserver(Handler handler) { + super(handler); + } + + @Override + public void onChange(boolean selfChange) { + sendMessage(obtainMessage(MSG_EVENT_MOBILE_DATA_TOGGLED)); + } + } + /** External dependencies used by Vcn, for injection in tests */ @VisibleForTesting(visibility = Visibility.PRIVATE) public static class Dependencies { @@ -494,13 +600,36 @@ public class Vcn extends Handler { ParcelUuid subscriptionGroup, TelephonySubscriptionSnapshot snapshot, VcnGatewayConnectionConfig connectionConfig, - VcnGatewayStatusCallback gatewayStatusCallback) { + VcnGatewayStatusCallback gatewayStatusCallback, + boolean isMobileDataEnabled) { return new VcnGatewayConnection( vcnContext, subscriptionGroup, snapshot, connectionConfig, - gatewayStatusCallback); + gatewayStatusCallback, + isMobileDataEnabled); + } + + /** Builds a new VcnContentResolver instance */ + public VcnContentResolver newVcnContentResolver(VcnContext vcnContext) { + return new VcnContentResolver(vcnContext); + } + } + + /** Proxy Implementation of NetworkAgent, used for testing. */ + @VisibleForTesting(visibility = Visibility.PRIVATE) + public static class VcnContentResolver { + private final ContentResolver mImpl; + + public VcnContentResolver(VcnContext vcnContext) { + mImpl = vcnContext.getContext().getContentResolver(); + } + + /** Registers the content observer */ + public void registerContentObserver( + @NonNull Uri uri, boolean notifyForDescendants, @NonNull ContentObserver observer) { + mImpl.registerContentObserver(uri, notifyForDescendants, observer); } } } diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java index 1d55ba464f51..23fb95b4fa40 100644 --- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java +++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java @@ -16,6 +16,8 @@ package com.android.server.vcn; +import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; @@ -47,6 +49,7 @@ import android.net.NetworkAgent; import android.net.NetworkAgentConfig; import android.net.NetworkCapabilities; import android.net.NetworkProvider; +import android.net.NetworkScore; import android.net.RouteInfo; import android.net.TelephonyNetworkSpecifier; import android.net.Uri; @@ -517,6 +520,7 @@ public class VcnGatewayConnection extends StateMachine { @NonNull private final VcnGatewayStatusCallback mGatewayStatusCallback; @NonNull private final Dependencies mDeps; @NonNull private final VcnUnderlyingNetworkTrackerCallback mUnderlyingNetworkTrackerCallback; + private final boolean mIsMobileDataEnabled; @NonNull private final IpSecManager mIpSecManager; @@ -626,13 +630,15 @@ public class VcnGatewayConnection extends StateMachine { @NonNull ParcelUuid subscriptionGroup, @NonNull TelephonySubscriptionSnapshot snapshot, @NonNull VcnGatewayConnectionConfig connectionConfig, - @NonNull VcnGatewayStatusCallback gatewayStatusCallback) { + @NonNull VcnGatewayStatusCallback gatewayStatusCallback, + boolean isMobileDataEnabled) { this( vcnContext, subscriptionGroup, snapshot, connectionConfig, gatewayStatusCallback, + isMobileDataEnabled, new Dependencies()); } @@ -643,6 +649,7 @@ public class VcnGatewayConnection extends StateMachine { @NonNull TelephonySubscriptionSnapshot snapshot, @NonNull VcnGatewayConnectionConfig connectionConfig, @NonNull VcnGatewayStatusCallback gatewayStatusCallback, + boolean isMobileDataEnabled, @NonNull Dependencies deps) { super(TAG, Objects.requireNonNull(vcnContext, "Missing vcnContext").getLooper()); mVcnContext = vcnContext; @@ -650,6 +657,7 @@ public class VcnGatewayConnection extends StateMachine { mConnectionConfig = Objects.requireNonNull(connectionConfig, "Missing connectionConfig"); mGatewayStatusCallback = Objects.requireNonNull(gatewayStatusCallback, "Missing gatewayStatusCallback"); + mIsMobileDataEnabled = isMobileDataEnabled; mDeps = Objects.requireNonNull(deps, "Missing deps"); mLastSnapshot = Objects.requireNonNull(snapshot, "Missing snapshot"); @@ -1502,7 +1510,7 @@ public class VcnGatewayConnection extends StateMachine { @NonNull VcnNetworkAgent agent, @NonNull VcnChildSessionConfiguration childConfig) { final NetworkCapabilities caps = - buildNetworkCapabilities(mConnectionConfig, mUnderlying); + buildNetworkCapabilities(mConnectionConfig, mUnderlying, mIsMobileDataEnabled); final LinkProperties lp = buildConnectedLinkProperties( mConnectionConfig, tunnelIface, childConfig, mUnderlying); @@ -1515,7 +1523,7 @@ public class VcnGatewayConnection extends StateMachine { @NonNull IpSecTunnelInterface tunnelIface, @NonNull VcnChildSessionConfiguration childConfig) { final NetworkCapabilities caps = - buildNetworkCapabilities(mConnectionConfig, mUnderlying); + buildNetworkCapabilities(mConnectionConfig, mUnderlying, mIsMobileDataEnabled); final LinkProperties lp = buildConnectedLinkProperties( mConnectionConfig, tunnelIface, childConfig, mUnderlying); @@ -1843,7 +1851,8 @@ public class VcnGatewayConnection extends StateMachine { @VisibleForTesting(visibility = Visibility.PRIVATE) static NetworkCapabilities buildNetworkCapabilities( @NonNull VcnGatewayConnectionConfig gatewayConnectionConfig, - @Nullable UnderlyingNetworkRecord underlying) { + @Nullable UnderlyingNetworkRecord underlying, + boolean isMobileDataEnabled) { final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(); builder.addTransportType(TRANSPORT_CELLULAR); @@ -1853,6 +1862,12 @@ public class VcnGatewayConnection extends StateMachine { // Add exposed capabilities for (int cap : gatewayConnectionConfig.getAllExposedCapabilities()) { + // Skip adding INTERNET or DUN if mobile data is disabled. + if (!isMobileDataEnabled + && (cap == NET_CAPABILITY_INTERNET || cap == NET_CAPABILITY_DUN)) { + continue; + } + builder.addCapability(cap); } @@ -2040,6 +2055,12 @@ public class VcnGatewayConnection extends StateMachine { "mNetworkAgent.getNetwork(): " + (mNetworkAgent == null ? null : mNetworkAgent.getNetwork())); + pw.println("mUnderlying:"); + pw.increaseIndent(); + mUnderlying.dump(pw); + pw.decreaseIndent(); + pw.println(); + pw.decreaseIndent(); } @@ -2183,7 +2204,7 @@ public class VcnGatewayConnection extends StateMachine { @NonNull String tag, @NonNull NetworkCapabilities caps, @NonNull LinkProperties lp, - @NonNull int score, + @NonNull NetworkScore score, @NonNull NetworkAgentConfig nac, @NonNull NetworkProvider provider, @NonNull Consumer<VcnNetworkAgent> networkUnwantedCallback, @@ -2324,7 +2345,7 @@ public class VcnGatewayConnection extends StateMachine { @NonNull String tag, @NonNull NetworkCapabilities caps, @NonNull LinkProperties lp, - @NonNull int score, + @NonNull NetworkScore score, @NonNull NetworkAgentConfig nac, @NonNull NetworkProvider provider, @NonNull Consumer<VcnNetworkAgent> networkUnwantedCallback, diff --git a/services/core/java/com/android/server/vcn/VcnNetworkProvider.java b/services/core/java/com/android/server/vcn/VcnNetworkProvider.java index be0deb57ee76..72cd7880325f 100644 --- a/services/core/java/com/android/server/vcn/VcnNetworkProvider.java +++ b/services/core/java/com/android/server/vcn/VcnNetworkProvider.java @@ -16,14 +16,25 @@ package com.android.server.vcn; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED; +import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; + import static com.android.server.VcnManagementService.VDBG; import android.annotation.NonNull; import android.content.Context; +import android.net.ConnectivityManager; +import android.net.NetworkCapabilities; import android.net.NetworkProvider; import android.net.NetworkRequest; +import android.net.NetworkScore; +import android.net.vcn.VcnGatewayConnectionConfig; +import android.os.Handler; +import android.os.HandlerExecutor; import android.os.Looper; -import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; @@ -33,6 +44,7 @@ import com.android.internal.util.IndentingPrintWriter; import java.util.Objects; import java.util.Set; +import java.util.concurrent.Executor; /** * VCN Network Provider routes NetworkRequests to listeners to bring up tunnels as needed. @@ -47,15 +59,70 @@ public class VcnNetworkProvider extends NetworkProvider { private final Set<NetworkRequestListener> mListeners = new ArraySet<>(); + private final Context mContext; + private final Handler mHandler; + private final Dependencies mDeps; + /** - * Cache of NetworkRequest(s), scores and network providers, keyed by NetworkRequest + * Cache of NetworkRequest(s). * * <p>NetworkRequests are immutable once created, and therefore can be used as stable keys. */ - private final ArrayMap<NetworkRequest, NetworkRequestEntry> mRequests = new ArrayMap<>(); + private final Set<NetworkRequest> mRequests = new ArraySet<>(); + + public VcnNetworkProvider(@NonNull Context context, @NonNull Looper looper) { + this(context, looper, new Dependencies()); + } - public VcnNetworkProvider(Context context, Looper looper) { - super(context, looper, VcnNetworkProvider.class.getSimpleName()); + @VisibleForTesting(visibility = Visibility.PRIVATE) + public VcnNetworkProvider( + @NonNull Context context, @NonNull Looper looper, @NonNull Dependencies dependencies) { + super( + Objects.requireNonNull(context, "Missing context"), + Objects.requireNonNull(looper, "Missing looper"), + TAG); + + mContext = context; + mHandler = new Handler(looper); + mDeps = Objects.requireNonNull(dependencies, "Missing dependencies"); + } + + /** Registers this VcnNetworkProvider and a generic network offer with ConnectivityService. */ + public void register() { + mContext.getSystemService(ConnectivityManager.class).registerNetworkProvider(this); + mDeps.registerNetworkOffer( + this, + Vcn.getNetworkScore(), // score filter + buildCapabilityFilter(), + new HandlerExecutor(mHandler), + new NetworkOfferCallback() { + @Override + public void onNetworkNeeded(@NonNull NetworkRequest request) { + handleNetworkRequested(request); + } + + @Override + public void onNetworkUnneeded(@NonNull NetworkRequest request) { + handleNetworkRequestWithdrawn(request); + } + }); + } + + /** Builds the filter for NetworkRequests that can be served by the VcnNetworkProvider. */ + private NetworkCapabilities buildCapabilityFilter() { + final NetworkCapabilities.Builder builder = + new NetworkCapabilities.Builder() + .addTransportType(TRANSPORT_CELLULAR) + .addCapability(NET_CAPABILITY_TRUSTED) + .addCapability(NET_CAPABILITY_NOT_RESTRICTED) + .addCapability(NET_CAPABILITY_NOT_VPN) + .addCapability(NET_CAPABILITY_NOT_VCN_MANAGED); + + for (int cap : VcnGatewayConnectionConfig.ALLOWED_CAPABILITIES) { + builder.addCapability(cap); + } + + return builder.build(); } /** @@ -80,77 +147,37 @@ public class VcnNetworkProvider extends NetworkProvider { /** Sends all cached NetworkRequest(s) to the specified listener. */ @VisibleForTesting(visibility = Visibility.PACKAGE) public void resendAllRequests(@NonNull NetworkRequestListener listener) { - for (NetworkRequestEntry entry : mRequests.values()) { - notifyListenerForEvent(listener, entry); + for (NetworkRequest request : mRequests) { + notifyListenerForEvent(listener, request); } } private void notifyListenerForEvent( - @NonNull NetworkRequestListener listener, @NonNull NetworkRequestEntry entry) { - listener.onNetworkRequested(entry.mRequest, entry.mScore, entry.mProviderId); + @NonNull NetworkRequestListener listener, @NonNull NetworkRequest request) { + listener.onNetworkRequested(request); } - @Override - public void onNetworkRequested(@NonNull NetworkRequest request, int score, int providerId) { + private void handleNetworkRequested(@NonNull NetworkRequest request) { if (VDBG) { - Slog.v( - TAG, - "Network requested: Request = " - + request - + ", score = " - + score - + ", providerId = " - + providerId); + Slog.v(TAG, "Network requested: Request = " + request); } - final NetworkRequestEntry entry = new NetworkRequestEntry(request, score, providerId); - - // NetworkRequests are immutable once created, and therefore can be used as stable keys. - mRequests.put(request, entry); + mRequests.add(request); // TODO(b/176939047): Intelligently route requests to prioritized VcnInstances (based on // Default Data Sub, or similar) for (NetworkRequestListener listener : mListeners) { - notifyListenerForEvent(listener, entry); + notifyListenerForEvent(listener, request); } } - @Override - public void onNetworkRequestWithdrawn(@NonNull NetworkRequest request) { + private void handleNetworkRequestWithdrawn(@NonNull NetworkRequest request) { mRequests.remove(request); } - private static class NetworkRequestEntry { - public final NetworkRequest mRequest; - public final int mScore; - public final int mProviderId; - - private NetworkRequestEntry(@NonNull NetworkRequest request, int score, int providerId) { - mRequest = Objects.requireNonNull(request, "Missing request"); - mScore = score; - mProviderId = providerId; - } - - /** - * Dumps the state of this NetworkRequestEntry for logging and debugging purposes. - * - * <p>PII and credentials MUST NEVER be dumped here. - */ - public void dump(IndentingPrintWriter pw) { - pw.println("NetworkRequestEntry:"); - pw.increaseIndent(); - - pw.println("mRequest: " + mRequest); - pw.println("mScore: " + mScore); - pw.println("mProviderId: " + mProviderId); - - pw.decreaseIndent(); - } - } - // package-private interface NetworkRequestListener { - void onNetworkRequested(@NonNull NetworkRequest request, int score, int providerId); + void onNetworkRequested(@NonNull NetworkRequest request); } /** @@ -163,17 +190,35 @@ public class VcnNetworkProvider extends NetworkProvider { pw.increaseIndent(); pw.println("mListeners:"); + pw.increaseIndent(); for (NetworkRequestListener listener : mListeners) { pw.println(listener); } + pw.decreaseIndent(); pw.println(); - pw.println("mRequests.values:"); - for (NetworkRequestEntry entry : mRequests.values()) { - entry.dump(pw); + pw.println("mRequests:"); + pw.increaseIndent(); + for (NetworkRequest request : mRequests) { + pw.println(request); } + pw.decreaseIndent(); pw.println(); pw.decreaseIndent(); } + + /** Proxy class for dependencies used for testing. */ + @VisibleForTesting(visibility = Visibility.PRIVATE) + public static class Dependencies { + /** Registers a given network offer for the given provider. */ + public void registerNetworkOffer( + @NonNull VcnNetworkProvider provider, + @NonNull NetworkScore score, + @NonNull NetworkCapabilities capabilitiesFilter, + @NonNull Executor executor, + @NonNull NetworkOfferCallback callback) { + provider.registerNetworkOffer(score, capabilitiesFilter, executor, callback); + } + } } diff --git a/services/core/java/com/android/server/vcn/util/MtuUtils.java b/services/core/java/com/android/server/vcn/util/MtuUtils.java index 49c1a02215e3..5d40cca3e19d 100644 --- a/services/core/java/com/android/server/vcn/util/MtuUtils.java +++ b/services/core/java/com/android/server/vcn/util/MtuUtils.java @@ -113,7 +113,6 @@ public class MtuUtils { return IPV6_MIN_MTU; } - boolean hasUnknownAlgorithm = false; int maxAuthOverhead = 0; int maxCryptOverhead = 0; int maxAuthCryptOverhead = 0; diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 5b4e6a032050..c8b7038fd3c2 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4655,7 +4655,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // still check DC#okToAnimate again if the transition animation is fine to apply. // TODO(new-app-transition): Rewrite this logic using WM Shell. final boolean recentsAnimating = isAnimating(PARENTS, ANIMATION_TYPE_RECENTS); - if (okToAnimate(true /* ignoreFrozen */) && (appTransition.isTransitionSet() + if (okToAnimate(true /* ignoreFrozen */, canTurnScreenOn()) + && (appTransition.isTransitionSet() || (recentsAnimating && !isActivityTypeHome()))) { if (visible) { displayContent.mOpeningApps.add(this); diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index 99289e0139b0..394ae7e94b72 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -1679,11 +1679,15 @@ public class AppTransition implements Dump { || transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER; } - static boolean isKeyguardTransitOld(@TransitionOldType int transit) { - return isKeyguardGoingAwayTransitOld(transit) || transit == TRANSIT_OLD_KEYGUARD_OCCLUDE + static boolean isKeyguardOccludeTransitOld(@TransitionOldType int transit) { + return transit == TRANSIT_OLD_KEYGUARD_OCCLUDE || transit == TRANSIT_OLD_KEYGUARD_UNOCCLUDE; } + static boolean isKeyguardTransitOld(@TransitionOldType int transit) { + return isKeyguardGoingAwayTransitOld(transit) || isKeyguardOccludeTransitOld(transit); + } + static boolean isTaskTransitOld(@TransitionOldType int transit) { return isTaskOpenTransitOld(transit) || transit == TRANSIT_OLD_TASK_CLOSE diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 9a43ca8794da..e7c51a4ac65a 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -68,7 +68,6 @@ import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACT import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Trace; import android.util.ArrayMap; @@ -428,43 +427,37 @@ public class AppTransitionController { return mainWindow != null ? mainWindow.mAttrs : null; } - RemoteAnimationAdapter getRemoteAnimationOverride(@NonNull WindowContainer container, + RemoteAnimationAdapter getRemoteAnimationOverride(@Nullable WindowContainer container, @TransitionOldType int transit, ArraySet<Integer> activityTypes) { - final RemoteAnimationDefinition definition = container.getRemoteAnimationDefinition(); - if (definition != null) { - final RemoteAnimationAdapter adapter = definition.getAdapter(transit, activityTypes); - if (adapter != null) { - return adapter; - } - } - if (mRemoteAnimationDefinition != null) { - final RemoteAnimationAdapter adapter = mRemoteAnimationDefinition.getAdapter( - transit, activityTypes); - if (adapter != null) { - return adapter; + if (container != null) { + final RemoteAnimationDefinition definition = container.getRemoteAnimationDefinition(); + if (definition != null) { + final RemoteAnimationAdapter adapter = definition.getAdapter(transit, + activityTypes); + if (adapter != null) { + return adapter; + } } } - return null; + return mRemoteAnimationDefinition != null + ? mRemoteAnimationDefinition.getAdapter(transit, activityTypes) + : null; } /** * Overrides the pending transition with the remote animation defined for the transition in the * set of defined remote animations in the app window token. */ - private void overrideWithRemoteAnimationIfSet(ActivityRecord animLpActivity, + private void overrideWithRemoteAnimationIfSet(@Nullable ActivityRecord animLpActivity, @TransitionOldType int transit, ArraySet<Integer> activityTypes) { if (transit == TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE) { // The crash transition has higher priority than any involved remote animations. return; } - if (animLpActivity == null) { - return; - } final RemoteAnimationAdapter adapter = getRemoteAnimationOverride(animLpActivity, transit, activityTypes); if (adapter != null) { - animLpActivity.getDisplayContent().mAppTransition.overridePendingAppTransitionRemote( - adapter); + mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter); } } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 4b735c2c218e..c44f4e3cbd71 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -4436,9 +4436,14 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } boolean okToDisplay(boolean ignoreFrozen) { + return okToDisplay(ignoreFrozen, false /* ignoreScreenOn */); + } + + boolean okToDisplay(boolean ignoreFrozen, boolean ignoreScreenOn) { if (mDisplayId == DEFAULT_DISPLAY) { return (!mWmService.mDisplayFrozen || ignoreFrozen) - && mWmService.mDisplayEnabled && mWmService.mPolicy.isScreenOn(); + && mWmService.mDisplayEnabled + && (ignoreScreenOn || mWmService.mPolicy.isScreenOn()); } return mDisplayInfo.state == Display.STATE_ON; } @@ -4448,8 +4453,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } boolean okToAnimate(boolean ignoreFrozen) { - return okToDisplay(ignoreFrozen) && - (mDisplayId != DEFAULT_DISPLAY || mWmService.mPolicy.okToAnimate()); + return okToAnimate(ignoreFrozen, false /* ignoreScreenOn */); + } + + boolean okToAnimate(boolean ignoreFrozen, boolean ignoreScreenOn) { + return okToDisplay(ignoreFrozen, ignoreScreenOn) + && (mDisplayId != DEFAULT_DISPLAY + || mWmService.mPolicy.okToAnimate(ignoreScreenOn)); } static final class TaskForResizePointSearchResult { diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index 9ff701cafd66..e1fc75e6fd9f 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -731,7 +731,7 @@ public class DisplayRotation { private RotationAnimationPair selectRotationAnimation() { // If the screen is off or non-interactive, force a jumpcut. final boolean forceJumpcut = !mDisplayPolicy.isScreenOnFully() - || !mService.mPolicy.okToAnimate(); + || !mService.mPolicy.okToAnimate(false /* ignoreScreenOn */); final WindowState topFullscreen = mDisplayPolicy.getTopFullscreenOpaqueWindow(); if (DEBUG_ANIM) Slog.i(TAG, "selectRotationAnimation topFullscreen=" + topFullscreen + " rotationAnimation=" diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index 20216c3afcd4..8ff9fbaa3995 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -341,11 +341,10 @@ class KeyguardController { /** * Called when occluded state changed. * - * @param currentTaskControllingOcclusion the task that controls the state whether keyguard - * should be occluded. That is the task to be shown on top of keyguard if it requests so. + * @param topActivity the activity that controls the state whether keyguard should + * be occluded. That is the activity to be shown on top of keyguard if it requests so. */ - private void handleOccludedChanged( - int displayId, @Nullable Task currentTaskControllingOcclusion) { + private void handleOccludedChanged(int displayId, @Nullable ActivityRecord topActivity) { // TODO(b/113840485): Handle app transition for individual display, and apply occluded // state change to secondary displays. // For now, only default display fully supports occluded change. Other displays only @@ -364,6 +363,13 @@ class KeyguardController { isDisplayOccluded(DEFAULT_DISPLAY) ? TRANSIT_KEYGUARD_OCCLUDE : TRANSIT_KEYGUARD_UNOCCLUDE); + // When the occluding activity also turns on the display, visibility of the activity + // can be committed before KEYGUARD_OCCLUDE transition is handled. + // Set mRequestForceTransition flag to make sure that the app transition animation + // is applied for such case. + if (topActivity != null) { + topActivity.mRequestForceTransition = true; + } updateKeyguardSleepToken(DEFAULT_DISPLAY); mWindowManager.executeAppTransition(); } finally { @@ -580,7 +586,7 @@ class KeyguardController { if (lastOccluded != mOccluded) { occludingChange = true; - controller.handleOccludedChanged(mDisplayId, task); + controller.handleOccludedChanged(mDisplayId, mTopOccludesActivity); } if (occludingChange || turningScreenOn) { diff --git a/services/core/java/com/android/server/wm/RemoteAnimationController.java b/services/core/java/com/android/server/wm/RemoteAnimationController.java index f851e3559def..67bc7af6dc28 100644 --- a/services/core/java/com/android/server/wm/RemoteAnimationController.java +++ b/services/core/java/com/android/server/wm/RemoteAnimationController.java @@ -121,7 +121,10 @@ class RemoteAnimationController implements DeathRecipient { // Create the app targets final RemoteAnimationTarget[] appTargets = createAppAnimations(); - if (appTargets.length == 0) { + if (appTargets.length == 0 && !AppTransition.isKeyguardOccludeTransitOld(transit)) { + // Keyguard occlude transition can be executed before the occluding activity becomes + // visible. Even in this case, KeyguardService expects to receive binder call, so we + // don't cancel remote animation. ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "goodToGo(): No apps to animate, mPendingAnimations=%d", mPendingAnimations.size()); @@ -133,12 +136,16 @@ class RemoteAnimationController implements DeathRecipient { // Create the remote wallpaper animation targets (if any) final RemoteAnimationTarget[] wallpaperTargets = createWallpaperAnimations(); - // TODO(bc-unlock): Create the remote non app animation targets (if any) + // Create the remote non app animation targets (if any) final RemoteAnimationTarget[] nonAppTargets = createNonAppWindowAnimations(transit); mService.mAnimator.addAfterPrepareSurfacesRunnable(() -> { try { linkToDeathOfRunner(); + ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "goodToGo(): onAnimationStart," + + " transit=%s, apps=%d, wallpapers=%d, nonApps=%d", + AppTransition.appTransitionOldToString(transit), appTargets.length, + wallpaperTargets.length, nonAppTargets.length); mRemoteAnimationAdapter.getRunner().onAnimationStart(transit, appTargets, wallpaperTargets, nonAppTargets, mFinishedCallback); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 070a7252a3bf..191c3a117e85 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -2796,6 +2796,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< return dc != null && dc.okToAnimate(ignoreFrozen); } + boolean okToAnimate(boolean ignoreFrozen, boolean ignoreScreenOn) { + final DisplayContent dc = getDisplayContent(); + return dc != null && dc.okToAnimate(ignoreFrozen, ignoreScreenOn); + } + @Override public void commitPendingTransaction() { scheduleAnimation(); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 43dceeda3026..7650fa1f3f5e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -1183,7 +1183,8 @@ public class WindowManagerService extends IWindowManager.Stub final boolean showBootMsgs, final boolean onlyCore, WindowManagerPolicy policy, ActivityTaskManagerService atm) { return main(context, im, showBootMsgs, onlyCore, policy, atm, - SurfaceControl.Transaction::new, Surface::new, SurfaceControl.Builder::new); + new DisplayWindowSettingsProvider(), SurfaceControl.Transaction::new, Surface::new, + SurfaceControl.Builder::new); } /** @@ -1193,12 +1194,14 @@ public class WindowManagerService extends IWindowManager.Stub @VisibleForTesting public static WindowManagerService main(final Context context, final InputManagerService im, final boolean showBootMsgs, final boolean onlyCore, WindowManagerPolicy policy, - ActivityTaskManagerService atm, Supplier<SurfaceControl.Transaction> transactionFactory, + ActivityTaskManagerService atm, DisplayWindowSettingsProvider + displayWindowSettingsProvider, Supplier<SurfaceControl.Transaction> transactionFactory, Supplier<Surface> surfaceFactory, Function<SurfaceSession, SurfaceControl.Builder> surfaceControlFactory) { DisplayThread.getHandler().runWithScissors(() -> sInstance = new WindowManagerService(context, im, showBootMsgs, onlyCore, policy, - atm, transactionFactory, surfaceFactory, surfaceControlFactory), 0); + atm, displayWindowSettingsProvider, transactionFactory, surfaceFactory, + surfaceControlFactory), 0); return sInstance; } @@ -1220,7 +1223,8 @@ public class WindowManagerService extends IWindowManager.Stub private WindowManagerService(Context context, InputManagerService inputManager, boolean showBootMsgs, boolean onlyCore, WindowManagerPolicy policy, - ActivityTaskManagerService atm, Supplier<SurfaceControl.Transaction> transactionFactory, + ActivityTaskManagerService atm, DisplayWindowSettingsProvider + displayWindowSettingsProvider, Supplier<SurfaceControl.Transaction> transactionFactory, Supplier<Surface> surfaceFactory, Function<SurfaceSession, SurfaceControl.Builder> surfaceControlFactory) { installLock(this, INDEX_WINDOW); @@ -1370,7 +1374,7 @@ public class WindowManagerService extends IWindowManager.Stub final String displaySettingsPath = Settings.Global.getString(resolver, DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH); - mDisplayWindowSettingsProvider = new DisplayWindowSettingsProvider(); + mDisplayWindowSettingsProvider = displayWindowSettingsProvider; if (displaySettingsPath != null) { mDisplayWindowSettingsProvider.setBaseSettingsFilePath(displaySettingsPath); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 1ba57fd0251b..ddcb2bf7be22 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -173,6 +173,7 @@ import android.app.admin.FactoryResetProtectionPolicy; import android.app.admin.FullyManagedDeviceProvisioningParams; import android.app.admin.ManagedProfileProvisioningParams; import android.app.admin.NetworkEvent; +import android.app.admin.ParcelableGranteeMap; import android.app.admin.PasswordMetrics; import android.app.admin.PasswordPolicy; import android.app.admin.SecurityLog; @@ -278,6 +279,7 @@ import android.telephony.TelephonyManager; import android.telephony.data.ApnSetting; import android.text.TextUtils; import android.text.format.DateUtils; +import android.util.ArrayMap; import android.util.ArraySet; import android.util.AtomicFile; import android.util.IndentingPrintWriter; @@ -5649,41 +5651,33 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public List<String> getKeyPairGrants(String callerPackage, String alias) { + public ParcelableGranteeMap getKeyPairGrants(String callerPackage, String alias) { final CallerIdentity caller = getCallerIdentity(callerPackage); Preconditions.checkCallAuthorization(canManageCertificates(caller)); - return mInjector.binderWithCleanCallingIdentity(() -> { + final ArrayMap<Integer, Set<String>> result = new ArrayMap<>(); + mInjector.binderWithCleanCallingIdentity(() -> { try (KeyChainConnection keyChainConnection = KeyChain.bindAsUser(mContext, caller.getUserHandle())) { - final List<String> result = new ArrayList<>(); final int[] granteeUids = keyChainConnection.getService().getGrants(alias); final PackageManager pm = mInjector.getPackageManager(caller.getUserId()); - // TODO: Return Set<Set<String>> when AIDL supports it: b/136048684 - // Public API returns a set of sets, where each internal set contains all package - // names corresponding to the same UID. For now a set of sets is marshalled as a - // null-separated list. for (final int uid : granteeUids) { final String[] packages = pm.getPackagesForUid(uid); if (packages == null) { Slogf.wtf(LOG_TAG, "No packages found for uid " + uid); continue; } - if (!result.isEmpty()) { - result.add(null); - } - result.addAll(Arrays.asList(packages)); + result.put(uid, new ArraySet<String>(packages)); } - return result; } catch (RemoteException e) { Slogf.e(LOG_TAG, "Querying keypair grants", e); } catch (InterruptedException e) { Slogf.w(LOG_TAG, "Interrupted while querying keypair grants", e); Thread.currentThread().interrupt(); } - return Collections.emptyList(); }); + return new ParcelableGranteeMap(result); } /** @@ -8125,20 +8119,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { + " as device owner for user " + userId); return false; } - if (admin == null - || !isPackageInstalledForUser(admin.getPackageName(), userId)) { - throw new IllegalArgumentException("Invalid component " + admin - + " for device owner"); - } + Preconditions.checkArgument(admin != null); final CallerIdentity caller = getCallerIdentity(); synchronized (getLockObject()) { enforceCanSetDeviceOwnerLocked(caller, admin, userId); + Preconditions.checkArgument(isPackageInstalledForUser(admin.getPackageName(), userId), + "Invalid component " + admin + " for device owner"); final ActiveAdmin activeAdmin = getActiveAdminUncheckedLocked(admin, userId); - if (activeAdmin == null - || getUserData(userId).mRemovingAdmins.contains(admin)) { - throw new IllegalArgumentException("Not active admin: " + admin); - } + Preconditions.checkArgument(activeAdmin != null && !getUserData( + userId).mRemovingAdmins.contains(admin), "Not active admin: " + admin); // Shutting down backup manager service permanently. toggleBackupServiceActive(UserHandle.USER_SYSTEM, /* makeActive= */ false); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 912b8cad952c..4c4c5821a2db 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -384,6 +384,7 @@ public final class SystemServer implements Dumpable { private static final String ROLE_SERVICE_CLASS = "com.android.role.RoleService"; private static final String GAME_MANAGER_SERVICE_CLASS = "com.android.server.app.GameManagerService$Lifecycle"; + private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService"; private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector"; @@ -2637,6 +2638,12 @@ public final class SystemServer implements Dumpable { LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal()); t.traceEnd(); + if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)) { + t.traceBegin("UwbService"); + mSystemServiceManager.startService(UWB_SERVICE_CLASS); + t.traceEnd(); + } + t.traceBegin("StartBootPhaseDeviceSpecificServicesReady"); mSystemServiceManager.startBootPhase(t, SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY); t.traceEnd(); diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt index adc1dab1572e..7fea4ee42317 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt @@ -22,6 +22,7 @@ import android.content.pm.PackageManager import android.content.pm.PackageUserState import android.content.pm.parsing.component.ParsedActivity import android.content.pm.parsing.component.ParsedIntentInfo +import android.content.pm.verify.domain.DomainOwner import android.content.pm.verify.domain.DomainVerificationInfo import android.content.pm.verify.domain.DomainVerificationManager import android.content.pm.verify.domain.DomainVerificationUserState @@ -33,6 +34,7 @@ import android.util.ArraySet import com.android.server.pm.PackageSetting import com.android.server.pm.parsing.pkg.AndroidPackage import com.android.server.pm.test.verify.domain.DomainVerificationTestUtils.mockPackageSettings +import com.android.server.pm.verify.domain.DomainVerificationManagerStub import com.android.server.pm.verify.domain.DomainVerificationService import com.android.server.testutils.mockThrowOnUnmocked import com.android.server.testutils.whenever @@ -108,7 +110,7 @@ class DomainVerificationManagerApiTest { assertThat(infoOne.packageName).isEqualTo(pkgWithDomains.getName()) assertThat(infoOne.hostToStateMap).containsExactlyEntriesIn(mapOf( DOMAIN_1 to DomainVerificationInfo.STATE_NO_RESPONSE, - DOMAIN_2 to DomainVerificationInfo.STATE_NO_RESPONSE, + DOMAIN_2 to DomainVerificationInfo.STATE_NO_RESPONSE )) assertThat(service.getDomainVerificationInfo(pkgWithoutDomains.getName())).isNull() @@ -155,7 +157,7 @@ class DomainVerificationManagerApiTest { } map.clear() - assertFailsWith(PackageManager.NameNotFoundException::class){ + assertFailsWith(PackageManager.NameNotFoundException::class) { service.setStatus(UUID_ONE, setOf(DOMAIN_1), 1100) } } @@ -168,7 +170,7 @@ class DomainVerificationManagerApiTest { val map = mutableMapOf(pkg1.getName() to pkg1, pkg2.getName() to pkg2) val service = makeService(map::get).apply { addPackages(pkg1, pkg2) } - service.setDomainVerificationLinkHandlingAllowed(PKG_ONE, false, 0); + service.setDomainVerificationLinkHandlingAllowed(PKG_ONE, false, 0) // Should edit same package, same user assertThat(service.getDomainVerificationUserState(PKG_ONE, 0) @@ -182,8 +184,8 @@ class DomainVerificationManagerApiTest { assertThat(service.getDomainVerificationUserState(PKG_TWO, 0) ?.isLinkHandlingAllowed).isEqualTo(true) - assertFailsWith(PackageManager.NameNotFoundException::class){ - service.setDomainVerificationLinkHandlingAllowed("invalid.pkg.name", false, 0); + assertFailsWith(PackageManager.NameNotFoundException::class) { + service.setDomainVerificationLinkHandlingAllowed("invalid.pkg.name", false, 0) } } @@ -232,7 +234,7 @@ class DomainVerificationManagerApiTest { .isEqualTo(DomainVerificationManager.ERROR_UNABLE_TO_APPROVE) map.clear() - assertFailsWith(PackageManager.NameNotFoundException::class){ + assertFailsWith(PackageManager.NameNotFoundException::class) { service.setUserSelection(UUID_ONE, setOf(DOMAIN_1), true, 0) } } @@ -253,7 +255,7 @@ class DomainVerificationManagerApiTest { assertThat(infoOne.isLinkHandlingAllowed).isTrue() assertThat(infoOne.hostToStateMap).containsExactlyEntriesIn(mapOf( DOMAIN_1 to DomainVerificationUserState.DOMAIN_STATE_NONE, - DOMAIN_2 to DomainVerificationUserState.DOMAIN_STATE_NONE, + DOMAIN_2 to DomainVerificationUserState.DOMAIN_STATE_NONE )) val infoTwo = service.getDomainVerificationUserState(pkgWithoutDomains.getName(), 0) @@ -286,7 +288,12 @@ class DomainVerificationManagerApiTest { addPackages(pkg1, pkg2) } + // DomainVerificationManager converts the owner list to a SortedSet, so test that, too + val manager0 = makeManager(service, 0) + val manager1 = makeManager(service, 1) + assertThat(service.getOwnersForDomain(DOMAIN_1, 0)).isEmpty() + assertThat(manager0.getOwnersForDomain(DOMAIN_1)).isEmpty() assertThat( service.setStatus( @@ -306,25 +313,33 @@ class DomainVerificationManagerApiTest { service.setUserSelection(pkg1.domainSetId, setOf(DOMAIN_2), true, 0) service.getOwnersForDomain(DOMAIN_1, 0).let { - assertThat(it).hasSize(2) - assertThat(it[0].packageName).isEqualTo(pkg1.getName()) - assertThat(it[0].isOverrideable).isEqualTo(false) - assertThat(it[1].packageName).isEqualTo(pkg2.getName()) - assertThat(it[1].isOverrideable).isEqualTo(false) + assertThat(it).containsExactly( + DomainOwner(pkg1.getName(), false), + DomainOwner(pkg2.getName(), false) + ).inOrder() + } + manager0.getOwnersForDomain(DOMAIN_1).let { + assertThat(it).containsExactly( + DomainOwner(pkg1.getName(), false), + DomainOwner(pkg2.getName(), false) + ).inOrder() } service.getOwnersForDomain(DOMAIN_2, 0).let { - assertThat(it).hasSize(1) - assertThat(it.single().packageName).isEqualTo(pkg1.getName()) - assertThat(it.single().isOverrideable).isEqualTo(true) + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) + } + manager0.getOwnersForDomain(DOMAIN_2).let { + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) } assertThat(service.getOwnersForDomain(DOMAIN_2, 1)).isEmpty() + assertThat(manager1.getOwnersForDomain(DOMAIN_2)).isEmpty() service.setUserSelection(pkg1.domainSetId, setOf(DOMAIN_2), true, 1) service.getOwnersForDomain(DOMAIN_2, 1).let { - assertThat(it).hasSize(1) - assertThat(it.single().packageName).isEqualTo(pkg1.getName()) - assertThat(it.single().isOverrideable).isEqualTo(true) + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) + } + manager1.getOwnersForDomain(DOMAIN_2).let { + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) } // "Uninstall" the package from user 0 and ensure it's stripped from the results @@ -332,9 +347,10 @@ class DomainVerificationManagerApiTest { service.clearPackageForUser(pkg1.getName(), 0) service.getOwnersForDomain(DOMAIN_1, 0).let { - assertThat(it).hasSize(1) - assertThat(it.single().packageName).isEqualTo(pkg2.getName()) - assertThat(it.single().isOverrideable).isEqualTo(false) + assertThat(it).containsExactly(DomainOwner(pkg2.getName(), false)) + } + manager0.getOwnersForDomain(DOMAIN_1).let { + assertThat(it).containsExactly(DomainOwner(pkg2.getName(), false)) } // Domain 2 user selection gone for user 0 @@ -342,26 +358,33 @@ class DomainVerificationManagerApiTest { // Domain 2 user selection still around for user 1 service.getOwnersForDomain(DOMAIN_2, 1).let { - assertThat(it).hasSize(1) - assertThat(it.single().packageName).isEqualTo(pkg1.getName()) - assertThat(it.single().isOverrideable).isEqualTo(true) + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) + } + manager1.getOwnersForDomain(DOMAIN_2).let { + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) } // Now assert for user 1 that it was unaffected by the change to user 0 service.getOwnersForDomain(DOMAIN_1, 1).let { - assertThat(it).hasSize(2) - assertThat(it[0].packageName).isEqualTo(pkg1.getName()) - assertThat(it[0].isOverrideable).isEqualTo(false) - assertThat(it[1].packageName).isEqualTo(pkg2.getName()) - assertThat(it[1].isOverrideable).isEqualTo(false) + assertThat(it).containsExactly( + DomainOwner(pkg1.getName(), false), + DomainOwner(pkg2.getName(), false) + ).inOrder() + } + manager1.getOwnersForDomain(DOMAIN_1).let { + assertThat(it).containsExactly( + DomainOwner(pkg1.getName(), false), + DomainOwner(pkg2.getName(), false) + ).inOrder() } service.setUserSelection(pkg1.domainSetId, setOf(DOMAIN_2), true, 0) service.getOwnersForDomain(DOMAIN_2, 1).let { - assertThat(it).hasSize(1) - assertThat(it.single().packageName).isEqualTo(pkg1.getName()) - assertThat(it.single().isOverrideable).isEqualTo(true) + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) + } + manager1.getOwnersForDomain(DOMAIN_2).let { + assertThat(it).containsExactly(DomainOwner(pkg1.getName(), true)) } // "Reinstall" the package to user 0 @@ -369,13 +392,15 @@ class DomainVerificationManagerApiTest { // This state should have been cleared when the package was uninstalled assertThat(service.getOwnersForDomain(DOMAIN_2, 0)).isEmpty() + assertThat(manager0.getOwnersForDomain(DOMAIN_2)).isEmpty() // Other package unaffected service.setUserSelection(pkg2.domainSetId, setOf(DOMAIN_2), true, 0) service.getOwnersForDomain(DOMAIN_2, 0).let { - assertThat(it).hasSize(1) - assertThat(it.single().packageName).isEqualTo(pkg2.getName()) - assertThat(it.single().isOverrideable).isEqualTo(true) + assertThat(it).containsExactly(DomainOwner(pkg2.getName(), true)) + } + manager0.getOwnersForDomain(DOMAIN_2).let { + assertThat(it).containsExactly(DomainOwner(pkg2.getName(), true)) } } @@ -480,7 +505,7 @@ class DomainVerificationManagerApiTest { } ) } - }, + } ) whenever(activities) { activityList } @@ -495,6 +520,10 @@ class DomainVerificationManagerApiTest { whenever(readUserState(1)) { pkgUserState1() } } - fun DomainVerificationService.addPackages(vararg pkgSettings: PackageSetting) = + private fun DomainVerificationService.addPackages(vararg pkgSettings: PackageSetting) = pkgSettings.forEach(::addPackage) + + private fun makeManager(service: DomainVerificationService, userId: Int) = + DomainVerificationManager(mockThrowOnUnmocked { whenever(this.userId) { userId } }, + DomainVerificationManagerStub(service)) } diff --git a/services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreManagerServiceTest.java index 924ad7f3f5a1..76f7e80a3412 100644 --- a/services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreManagerServiceTest.java @@ -35,7 +35,6 @@ import android.os.Looper; import android.os.Message; import android.os.UserHandle; import android.platform.test.annotations.Presubmit; -import android.util.ArrayMap; import android.util.LongSparseArray; import androidx.test.InstrumentationRegistry; @@ -68,7 +67,6 @@ public class BlobStoreManagerServiceTest { private File mBlobsDir; private LongSparseArray<BlobStoreSession> mUserSessions; - private ArrayMap<BlobHandle, BlobMetadata> mUserBlobs; private static final String TEST_PKG1 = "com.example1"; private static final String TEST_PKG2 = "com.example2"; @@ -99,10 +97,8 @@ public class BlobStoreManagerServiceTest { mHandler = new TestHandler(Looper.getMainLooper()); mService = new BlobStoreManagerService(mContext, new TestInjector()); mUserSessions = new LongSparseArray<>(); - mUserBlobs = new ArrayMap<>(); mService.addUserSessionsForTest(mUserSessions, UserHandle.myUserId()); - mService.addUserBlobsForTest(mUserBlobs, UserHandle.myUserId()); } @After @@ -147,7 +143,7 @@ public class BlobStoreManagerServiceTest { final BlobMetadata blobMetadata1 = createBlobMetadataMock(blobId1, blobFile1, blobHandle1, true /* hasLeases */); doReturn(true).when(blobMetadata1).isACommitter(TEST_PKG1, TEST_UID1); - mUserBlobs.put(blobHandle1, blobMetadata1); + addBlob(blobHandle1, blobMetadata1); final long blobId2 = 347; final File blobFile2 = mock(File.class); @@ -156,7 +152,7 @@ public class BlobStoreManagerServiceTest { final BlobMetadata blobMetadata2 = createBlobMetadataMock(blobId2, blobFile2, blobHandle2, false /* hasLeases */); doReturn(false).when(blobMetadata2).isACommitter(TEST_PKG1, TEST_UID1); - mUserBlobs.put(blobHandle2, blobMetadata2); + addBlob(blobHandle2, blobMetadata2); final long blobId3 = 49875; final File blobFile3 = mock(File.class); @@ -165,7 +161,7 @@ public class BlobStoreManagerServiceTest { final BlobMetadata blobMetadata3 = createBlobMetadataMock(blobId3, blobFile3, blobHandle3, true /* hasLeases */); doReturn(true).when(blobMetadata3).isACommitter(TEST_PKG1, TEST_UID1); - mUserBlobs.put(blobHandle3, blobMetadata3); + addBlob(blobHandle3, blobMetadata3); mService.addActiveIdsForTest(sessionId1, sessionId2, sessionId3, sessionId4, blobId1, blobId2, blobId3); @@ -197,10 +193,10 @@ public class BlobStoreManagerServiceTest { verify(blobMetadata2).destroy(); verify(blobMetadata3).destroy(); - assertThat(mUserBlobs.size()).isEqualTo(1); - assertThat(mUserBlobs.get(blobHandle1)).isNotNull(); - assertThat(mUserBlobs.get(blobHandle2)).isNull(); - assertThat(mUserBlobs.get(blobHandle3)).isNull(); + assertThat(mService.getBlobsCountForTest()).isEqualTo(1); + assertThat(mService.getBlobForTest(blobHandle1)).isNotNull(); + assertThat(mService.getBlobForTest(blobHandle2)).isNull(); + assertThat(mService.getBlobForTest(blobHandle3)).isNull(); assertThat(mService.getActiveIdsForTest()).containsExactly( sessionId2, sessionId3, blobId1); @@ -293,7 +289,7 @@ public class BlobStoreManagerServiceTest { "label1", System.currentTimeMillis() - 2000, "tag1"); final BlobMetadata blobMetadata1 = createBlobMetadataMock(blobId1, blobFile1, blobHandle1, true /* hasLeases */); - mUserBlobs.put(blobHandle1, blobMetadata1); + addBlob(blobHandle1, blobMetadata1); final long blobId2 = 78974; final File blobFile2 = mock(File.class); @@ -301,7 +297,7 @@ public class BlobStoreManagerServiceTest { "label2", System.currentTimeMillis() + 30000, "tag2"); final BlobMetadata blobMetadata2 = createBlobMetadataMock(blobId2, blobFile2, blobHandle2, true /* hasLeases */); - mUserBlobs.put(blobHandle2, blobMetadata2); + addBlob(blobHandle2, blobMetadata2); final long blobId3 = 97; final File blobFile3 = mock(File.class); @@ -309,7 +305,7 @@ public class BlobStoreManagerServiceTest { "label3", System.currentTimeMillis() + 4400000, "tag3"); final BlobMetadata blobMetadata3 = createBlobMetadataMock(blobId3, blobFile3, blobHandle3, false /* hasLeases */); - mUserBlobs.put(blobHandle3, blobMetadata3); + addBlob(blobHandle3, blobMetadata3); mService.addActiveIdsForTest(blobId1, blobId2, blobId3); @@ -321,8 +317,8 @@ public class BlobStoreManagerServiceTest { verify(blobMetadata2, never()).destroy(); verify(blobMetadata3).destroy(); - assertThat(mUserBlobs.size()).isEqualTo(1); - assertThat(mUserBlobs.get(blobHandle2)).isNotNull(); + assertThat(mService.getBlobsCountForTest()).isEqualTo(1); + assertThat(mService.getBlobForTest(blobHandle2)).isNotNull(); assertThat(mService.getActiveIdsForTest()).containsExactly(blobId2); assertThat(mService.getKnownIdsForTest()).containsExactly(blobId1, blobId2, blobId3); @@ -336,21 +332,21 @@ public class BlobStoreManagerServiceTest { doReturn(size1).when(blobMetadata1).getSize(); doReturn(true).when(blobMetadata1).isALeasee(TEST_PKG1, TEST_UID1); doReturn(true).when(blobMetadata1).isALeasee(TEST_PKG2, TEST_UID2); - mUserBlobs.put(mock(BlobHandle.class), blobMetadata1); + addBlob(mock(BlobHandle.class), blobMetadata1); final BlobMetadata blobMetadata2 = mock(BlobMetadata.class); final long size2 = 89475; doReturn(size2).when(blobMetadata2).getSize(); doReturn(false).when(blobMetadata2).isALeasee(TEST_PKG1, TEST_UID1); doReturn(true).when(blobMetadata2).isALeasee(TEST_PKG2, TEST_UID2); - mUserBlobs.put(mock(BlobHandle.class), blobMetadata2); + addBlob(mock(BlobHandle.class), blobMetadata2); final BlobMetadata blobMetadata3 = mock(BlobMetadata.class); final long size3 = 328732; doReturn(size3).when(blobMetadata3).getSize(); doReturn(true).when(blobMetadata3).isALeasee(TEST_PKG1, TEST_UID1); doReturn(false).when(blobMetadata3).isALeasee(TEST_PKG2, TEST_UID2); - mUserBlobs.put(mock(BlobHandle.class), blobMetadata3); + addBlob(mock(BlobHandle.class), blobMetadata3); // Verify usage is calculated correctly assertThat(mService.getTotalUsageBytesLocked(TEST_UID1, TEST_PKG1)) @@ -388,6 +384,11 @@ public class BlobStoreManagerServiceTest { return blobMetadata; } + private void addBlob(BlobHandle blobHandle, BlobMetadata blobMetadata) { + doReturn(blobHandle).when(blobMetadata).getBlobHandle(); + mService.addBlobLocked(blobMetadata); + } + private class TestHandler extends Handler { TestHandler(Looper looper) { super(looper); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java index 4bab8e51874c..64687908dc9b 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java @@ -81,6 +81,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.platform.test.annotations.LargeTest; import android.provider.DeviceConfig; +import android.util.ArraySet; import android.util.SparseBooleanArray; import androidx.test.runner.AndroidJUnit4; @@ -254,6 +255,9 @@ public class QuotaControllerTest { any()); mUidObserver = uidObserverCaptor.getValue(); mSourceUid = AppGlobals.getPackageManager().getPackageUid(SOURCE_PACKAGE, 0, 0); + // Need to do this since we're using a mock JS and not a real object. + doReturn(new ArraySet<>(new String[]{SOURCE_PACKAGE})) + .when(mJobSchedulerService).getPackagesForUidLocked(mSourceUid); } catch (RemoteException e) { fail(e.getMessage()); } @@ -1803,12 +1807,10 @@ public class QuotaControllerTest { setStandbyBucket(ACTIVE_INDEX, fgStateChanger); setProcessState(ActivityManager.PROCESS_STATE_BACKUP, fgChangerUid); - IPackageManager packageManager = AppGlobals.getPackageManager(); - spyOn(packageManager); - doReturn(new String[]{unaffectedPkgName}) - .when(packageManager).getPackagesForUid(unaffectedUid); - doReturn(new String[]{fgChangerPkgName}) - .when(packageManager).getPackagesForUid(fgChangerUid); + doReturn(new ArraySet<>(new String[]{unaffectedPkgName})) + .when(mJobSchedulerService).getPackagesForUidLocked(unaffectedUid); + doReturn(new ArraySet<>(new String[]{fgChangerPkgName})) + .when(mJobSchedulerService).getPackagesForUidLocked(fgChangerUid); synchronized (mQuotaController.mLock) { mQuotaController.maybeStartTrackingJobLocked(unaffected, null); diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index d7fbd4913b2c..9d055e0d431f 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -37,6 +37,7 @@ android_test { "services.net", "services.people", "services.usage", + "services.uwb", "guava", "androidx.test.core", "androidx.test.ext.truth", diff --git a/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java b/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java index 5bef877e2f39..e9b5b6243089 100644 --- a/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java +++ b/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java @@ -184,6 +184,7 @@ public class BroadcastRecordTest { false /* callerInstantApp */, null /* resolvedType */, null /* requiredPermissions */, + null /* excludedPermissions */, 0 /* appOp */, null /* options */, new ArrayList<>(receivers), // Make a copy to not affect the original list. diff --git a/services/tests/servicestests/src/com/android/server/am/MeasuredEnergySnapshotTest.java b/services/tests/servicestests/src/com/android/server/am/MeasuredEnergySnapshotTest.java index 3231f6204a12..6ca1102b23ef 100644 --- a/services/tests/servicestests/src/com/android/server/am/MeasuredEnergySnapshotTest.java +++ b/services/tests/servicestests/src/com/android/server/am/MeasuredEnergySnapshotTest.java @@ -18,6 +18,8 @@ package com.android.server.am; import static com.android.server.am.MeasuredEnergySnapshot.UNAVAILABLE; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -224,15 +226,15 @@ public final class MeasuredEnergySnapshotTest { } @Test - public void testGetNumOtherOrdinals() { + public void testGetOtherOrdinalNames() { final MeasuredEnergySnapshot snapshot = new MeasuredEnergySnapshot(ALL_ID_CONSUMER_MAP); - assertEquals(3, snapshot.getNumOtherOrdinals()); + assertThat(snapshot.getOtherOrdinalNames()).asList().containsExactly("GPU", "HPU", "IPU"); } @Test - public void testGetNumOtherOrdinals_none() { + public void testGetOtherOrdinalNames_none() { final MeasuredEnergySnapshot snapshot = new MeasuredEnergySnapshot(SOME_ID_CONSUMER_MAP); - assertEquals(0, snapshot.getNumOtherOrdinals()); + assertEquals(0, snapshot.getOtherOrdinalNames().length); } private static EnergyConsumer createEnergyConsumer(int id, int ord, byte type, String name) { diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 78e2dee7acf8..73ec5b8d3522 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -1304,6 +1304,16 @@ public class DevicePolicyManagerTest extends DpmTestBase { @Test public void testSetDeviceOwner_failures() throws Exception { // TODO Test more failure cases. Basically test all chacks in enforceCanSetDeviceOwner(). + // Package doesn't exist and caller is not system + assertExpectException(SecurityException.class, + /* messageRegex= */ "Calling identity is not authorized", + () -> dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)); + + // Package exists, but caller is not system + setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID); + assertExpectException(SecurityException.class, + /* messageRegex= */ "Calling identity is not authorized", + () -> dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)); } @Test diff --git a/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java b/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java index 5363a17e42df..8e5136d9659b 100644 --- a/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java +++ b/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java @@ -44,8 +44,10 @@ import org.xmlpull.v1.XmlPullParser; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -413,6 +415,10 @@ public final class UpdatableFontDirTest { assertThat(mapBeforeUpgrade).containsKey("test.ttf"); assertWithMessage("Older fonts should not be deleted until next loadFontFileMap") .that(parser.getRevision(mapBeforeUpgrade.get("test.ttf"))).isEqualTo(1); + // Check that updatedFontDirs is pruned. + assertWithMessage("config.updatedFontDirs should only list latest active dirs") + .that(readConfig(mConfigFile).updatedFontDirs) + .containsExactly(dir.getFontFileMap().get("test.ttf").getParentFile().getName()); } @Test @@ -450,6 +456,10 @@ public final class UpdatableFontDirTest { assertThat(dir.getFontFileMap()).containsKey("test.ttf"); assertWithMessage("Font should not be downgraded to an older revision") .that(parser.getRevision(dir.getFontFileMap().get("test.ttf"))).isEqualTo(2); + // Check that updatedFontDirs is not updated. + assertWithMessage("config.updatedFontDirs should only list latest active dirs") + .that(readConfig(mConfigFile).updatedFontDirs) + .containsExactly(dir.getFontFileMap().get("test.ttf").getParentFile().getName()); } @Test @@ -875,7 +885,15 @@ public final class UpdatableFontDirTest { return new FontUpdateRequest(family); } - private void writeConfig(PersistentSystemFontConfig.Config config, + private static PersistentSystemFontConfig.Config readConfig(File file) throws Exception { + PersistentSystemFontConfig.Config config = new PersistentSystemFontConfig.Config(); + try (InputStream is = new FileInputStream(file)) { + PersistentSystemFontConfig.loadFromXml(is, config); + } + return config; + } + + private static void writeConfig(PersistentSystemFontConfig.Config config, File file) throws IOException { try (FileOutputStream fos = new FileOutputStream(file)) { PersistentSystemFontConfig.writeToXml(fos, config); diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java index 39e06a3a362d..950b8a254007 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java @@ -25,6 +25,13 @@ import static com.android.server.hdmi.HdmiControlService.INITIATED_BY_ENABLE_CEC import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import android.content.Context; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiDeviceInfo; @@ -494,4 +501,99 @@ public class HdmiCecLocalDeviceTvTest { ABORT_UNRECOGNIZED_OPCODE); assertThat(mNativeWrapper.getResultMessages()).doesNotContain(featureAbort); } + + @Test + public void handleReportAudioStatus_SamOnArcOff_setStreamVolumeNotCalled() { + // Emulate Audio device on port 0x1000 (does not support ARC) + mNativeWrapper.setPortConnectionStatus(1, true); + HdmiCecMessage hdmiCecMessage = HdmiCecMessageBuilder.buildReportPhysicalAddressCommand( + ADDR_AUDIO_SYSTEM, 0x1000, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM); + mNativeWrapper.onCecMessage(hdmiCecMessage); + + HdmiCecFeatureAction systemAudioAutoInitiationAction = + new SystemAudioAutoInitiationAction(mHdmiCecLocalDeviceTv, ADDR_AUDIO_SYSTEM); + mHdmiCecLocalDeviceTv.addAndStartAction(systemAudioAutoInitiationAction); + HdmiCecMessage reportSystemAudioMode = HdmiCecMessageBuilder.buildReportSystemAudioMode( + ADDR_AUDIO_SYSTEM, mHdmiCecLocalDeviceTv.mAddress, true); + mHdmiControlService.handleCecCommand(reportSystemAudioMode); + + mTestLooper.dispatchAll(); + + // SAM must be on; ARC must be off + assertTrue(mHdmiCecLocalDeviceTv.isSystemAudioActivated()); + assertFalse(mHdmiCecLocalDeviceTv.isArcEstablished()); + + HdmiCecMessage reportAudioStatus = HdmiCecMessageBuilder.buildReportAudioStatus( + ADDR_AUDIO_SYSTEM, + ADDR_TV, + 50, // Volume of incoming message does not affect HDMI-CEC logic + false); + mNativeWrapper.onCecMessage(reportAudioStatus); + + mTestLooper.dispatchAll(); + + verify(mAudioManager, never()).setStreamVolume(anyInt(), anyInt(), anyInt()); + } + + @Test + public void handleReportAudioStatus_SamOnArcOn_setStreamVolumeCalled() { + mNativeWrapper.setPortConnectionStatus(2, true); + HdmiCecMessage hdmiCecMessage = HdmiCecMessageBuilder.buildReportPhysicalAddressCommand( + ADDR_AUDIO_SYSTEM, 0x2000, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM); + mNativeWrapper.onCecMessage(hdmiCecMessage); + + HdmiCecFeatureAction systemAudioAutoInitiationAction = + new SystemAudioAutoInitiationAction(mHdmiCecLocalDeviceTv, ADDR_AUDIO_SYSTEM); + mHdmiCecLocalDeviceTv.addAndStartAction(systemAudioAutoInitiationAction); + + HdmiCecMessage reportSystemAudioMode = HdmiCecMessageBuilder.buildReportSystemAudioMode( + ADDR_AUDIO_SYSTEM, mHdmiCecLocalDeviceTv.mAddress, true); + mHdmiControlService.handleCecCommand(reportSystemAudioMode); + + HdmiCecMessage requestArcInitiation = HdmiCecMessageBuilder.buildInitiateArc( + ADDR_AUDIO_SYSTEM, + ADDR_TV); + mNativeWrapper.onCecMessage(requestArcInitiation); + + mTestLooper.dispatchAll(); + + // SAM and ARC must be on + assertTrue(mHdmiCecLocalDeviceTv.isSystemAudioActivated()); + assertTrue(mHdmiCecLocalDeviceTv.isArcEstablished()); + + HdmiCecMessage reportAudioStatus = HdmiCecMessageBuilder.buildReportAudioStatus( + ADDR_AUDIO_SYSTEM, + ADDR_TV, + 50, // Volume of incoming message does not affect HDMI-CEC logic + false); + mNativeWrapper.onCecMessage(reportAudioStatus); + + mTestLooper.dispatchAll(); + + verify(mAudioManager, times(1)).setStreamVolume(anyInt(), anyInt(), anyInt()); + } + + @Test + public void handleReportAudioStatus_SamOff_setStreamVolumeNotCalled() { + // Emulate Audio device on port 0x1000 (does not support ARC) + mNativeWrapper.setPortConnectionStatus(1, true); + HdmiCecMessage hdmiCecMessage = HdmiCecMessageBuilder.buildReportPhysicalAddressCommand( + ADDR_AUDIO_SYSTEM, 0x1000, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM); + mNativeWrapper.onCecMessage(hdmiCecMessage); + + mTestLooper.dispatchAll(); + + assertFalse(mHdmiCecLocalDeviceTv.isSystemAudioActivated()); + + HdmiCecMessage reportAudioStatus = HdmiCecMessageBuilder.buildReportAudioStatus( + ADDR_AUDIO_SYSTEM, + ADDR_TV, + 50, // Volume of incoming message does not affect HDMI-CEC logic + false); + mNativeWrapper.onCecMessage(reportAudioStatus); + + mTestLooper.dispatchAll(); + + verify(mAudioManager, never()).setStreamVolume(anyInt(), anyInt(), anyInt()); + } } diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTestable.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTestable.java index 691d174f55f8..f2bb1d662ed9 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTestable.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTestable.java @@ -87,6 +87,11 @@ public class LockSettingsStorageTestable extends LockSettingsStorage { } @Override + String getRebootEscrowFile(int userId) { + return makeDirs(mStorageDir, super.getRebootEscrowFile(userId)).getAbsolutePath(); + } + + @Override protected File getSyntheticPasswordDirectoryForUser(int userId) { return makeDirs(mStorageDir, super.getSyntheticPasswordDirectoryForUser( userId).getAbsolutePath()); diff --git a/services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java b/services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java index 8c08226201a8..49a54ec1354b 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java @@ -21,6 +21,11 @@ import static android.content.pm.UserInfo.FLAG_PRIMARY; import static android.content.pm.UserInfo.FLAG_PROFILE; import static android.os.UserHandle.USER_SYSTEM; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_ESCROW_NOT_READY; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_NONE; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_PROVIDER_MISMATCH; +import static com.android.internal.widget.LockSettingsInternal.ARM_REBOOT_ERROR_STORE_ESCROW_KEY; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -327,7 +332,7 @@ public class RebootEscrowManagerTests { assertNull( mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); assertNotNull( mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); verify(mRebootEscrow).storeKey(any()); @@ -351,7 +356,7 @@ public class RebootEscrowManagerTests { when(mServiceConnection.wrapBlob(any(), anyLong(), anyLong())) .thenAnswer(invocation -> invocation.getArgument(0)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mServiceConnection).wrapBlob(any(), anyLong(), anyLong()); assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID)); @@ -373,7 +378,7 @@ public class RebootEscrowManagerTests { assertNull( mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); doThrow(ServiceSpecificException.class).when(mRebootEscrow).storeKey(any()); - assertFalse(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_STORE_ESCROW_KEY, mService.armRebootEscrowIfNeeded()); verify(mRebootEscrow).storeKey(any()); } @@ -396,7 +401,7 @@ public class RebootEscrowManagerTests { assertNull( mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); assertNotNull( mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); verify(mRebootEscrow, times(1)).storeKey(any()); @@ -408,15 +413,24 @@ public class RebootEscrowManagerTests { @Test public void armService_NoInitialization_Failure() throws Exception { - assertFalse(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_ESCROW_NOT_READY, mService.armRebootEscrowIfNeeded()); verifyNoMoreInteractions(mRebootEscrow); } @Test public void armService_RebootEscrowServiceException_Failure() throws Exception { + RebootEscrowListener mockListener = mock(RebootEscrowListener.class); + mService.setRebootEscrowListener(mockListener); + mService.prepareRebootEscrow(); + + clearInvocations(mRebootEscrow); + mService.callToRebootEscrowIfNeeded(PRIMARY_USER_ID, FAKE_SP_VERSION, FAKE_AUTH_TOKEN); + verify(mockListener).onPreparedForReboot(eq(true)); + verify(mRebootEscrow, never()).storeKey(any()); + doThrow(RemoteException.class).when(mRebootEscrow).storeKey(any()); - assertFalse(mService.armRebootEscrowIfNeeded()); - verifyNoMoreInteractions(mRebootEscrow); + assertEquals(ARM_REBOOT_ERROR_STORE_ESCROW_KEY, mService.armRebootEscrowIfNeeded()); + verify(mRebootEscrow).storeKey(any()); } @Test @@ -439,7 +453,7 @@ public class RebootEscrowManagerTests { verify(mRebootEscrow, never()).storeKey(any()); ArgumentCaptor<byte[]> keyByteCaptor = ArgumentCaptor.forClass(byte[].class); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mRebootEscrow).storeKey(keyByteCaptor.capture()); verify(mKeyStoreManager).getKeyStoreEncryptionKey(); @@ -483,7 +497,7 @@ public class RebootEscrowManagerTests { // Use x -> x for both wrap & unwrap functions. when(mServiceConnection.wrapBlob(any(), anyLong(), anyLong())) .thenAnswer(invocation -> invocation.getArgument(0)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mServiceConnection).wrapBlob(any(), anyLong(), anyLong()); assertTrue(mStorage.hasRebootEscrowServerBlob()); @@ -520,7 +534,7 @@ public class RebootEscrowManagerTests { // Use x -> x for both wrap & unwrap functions. when(mServiceConnection.wrapBlob(any(), anyLong(), anyLong())) .thenAnswer(invocation -> invocation.getArgument(0)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mServiceConnection).wrapBlob(any(), anyLong(), anyLong()); assertTrue(mStorage.hasRebootEscrowServerBlob()); @@ -557,7 +571,7 @@ public class RebootEscrowManagerTests { // Use x -> x for both wrap & unwrap functions. when(mServiceConnection.wrapBlob(any(), anyLong(), anyLong())) .thenAnswer(invocation -> invocation.getArgument(0)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mServiceConnection).wrapBlob(any(), anyLong(), anyLong()); assertTrue(mStorage.hasRebootEscrowServerBlob()); @@ -597,7 +611,7 @@ public class RebootEscrowManagerTests { // Use x -> x for both wrap & unwrap functions. when(mServiceConnection.wrapBlob(any(), anyLong(), anyLong())) .thenAnswer(invocation -> invocation.getArgument(0)); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mServiceConnection).wrapBlob(any(), anyLong(), anyLong()); assertTrue(mStorage.hasRebootEscrowServerBlob()); @@ -635,7 +649,7 @@ public class RebootEscrowManagerTests { verify(mRebootEscrow, never()).storeKey(any()); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mRebootEscrow).storeKey(any()); assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID)); @@ -695,7 +709,7 @@ public class RebootEscrowManagerTests { verify(mRebootEscrow, never()).storeKey(any()); ArgumentCaptor<byte[]> keyByteCaptor = ArgumentCaptor.forClass(byte[].class); - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mRebootEscrow).storeKey(keyByteCaptor.capture()); assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID)); @@ -732,8 +746,7 @@ public class RebootEscrowManagerTests { verify(mockListener).onPreparedForReboot(eq(true)); verify(mRebootEscrow, never()).storeKey(any()); - - assertTrue(mService.armRebootEscrowIfNeeded()); + assertEquals(ARM_REBOOT_ERROR_NONE, mService.armRebootEscrowIfNeeded()); verify(mRebootEscrow).storeKey(any()); assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID)); @@ -756,4 +769,28 @@ public class RebootEscrowManagerTests { assertEquals(Integer.valueOf(RebootEscrowManager.ERROR_LOAD_ESCROW_KEY), metricsErrorCodeCaptor.getValue()); } + + @Test + public void armServiceProviderMismatch_Failure() throws Exception { + RebootEscrowListener mockListener = mock(RebootEscrowListener.class); + mService.setRebootEscrowListener(mockListener); + mService.prepareRebootEscrow(); + + clearInvocations(mRebootEscrow); + mService.callToRebootEscrowIfNeeded(PRIMARY_USER_ID, FAKE_SP_VERSION, FAKE_AUTH_TOKEN); + verify(mockListener).onPreparedForReboot(eq(true)); + assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID)); + verify(mRebootEscrow, never()).storeKey(any()); + + assertNull( + mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); + // Change the provider to server based, expect the reboot to fail + when(mInjected.forceServerBased()).thenReturn(true); + assertEquals(ARM_REBOOT_ERROR_PROVIDER_MISMATCH, mService.armRebootEscrowIfNeeded()); + assertNull( + mStorage.getString(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, null, USER_SYSTEM)); + // Verify that the escrow key & data have been cleared. + verify(mRebootEscrow).storeKey(eq(new byte[32])); + assertFalse(mStorage.hasRebootEscrow(PRIMARY_USER_ID)); + } } diff --git a/services/tests/servicestests/src/com/android/server/pm/WatchedIntentHandlingTest.java b/services/tests/servicestests/src/com/android/server/pm/WatchedIntentHandlingTest.java new file mode 100644 index 000000000000..153938cbbbf1 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/pm/WatchedIntentHandlingTest.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import static org.junit.Assert.assertTrue; + +import android.content.IntentFilter; + +import androidx.test.filters.SmallTest; + +import com.android.server.utils.WatchableTester; + +import org.junit.Test; + +import java.util.Iterator; + +@SmallTest +public class WatchedIntentHandlingTest { + + @Test + public void testWatchedIntentFilter() { + IntentFilter i = new IntentFilter("TEST_ACTION"); + WatchedIntentFilter f = new WatchedIntentFilter(i); + final WatchableTester watcher = + new WatchableTester(f, "WatchedIntentFilter"); + watcher.register(); + int wantPriority = 3; + f.setPriority(wantPriority); + watcher.verifyChangeReported("setPriority"); + f.getPriority(); + watcher.verifyNoChangeReported("getPriority"); + assertTrue(f.getPriority() == wantPriority); + f.setPriority(f.getPriority() + 1); + watcher.verifyChangeReported("setPriority"); + assertTrue(f.getPriority() == wantPriority + 1); + + i.setPriority(wantPriority + 3); + watcher.verifyNoChangeReported("indendent intent"); + assertTrue(f.getPriority() == wantPriority + 1); + + f.addAction("action-1"); + f.addAction("action-2"); + f.addAction("action-3"); + f.addAction("action-4"); + watcher.verifyChangeReported("addAction"); + int actionCount = f.countActions(); + + Iterator<String> actions = f.actionsIterator(); + watcher.verifyNoChangeReported("actionsIterator 1"); + int count = 0; + while (actions.hasNext()) { + assertTrue(f.hasAction(actions.next())); + count++; + } + watcher.verifyNoChangeReported("actionsIterator 2"); + assertTrue(count == actionCount); + + actions = f.actionsIterator(); + watcher.verifyNoChangeReported("actionsIterator 1"); + while (actions.hasNext()) { + if (actions.next().equals("action-3")) { + actions.remove(); + watcher.verifyChangeReported("remove action"); + } + } + assertTrue(f.countActions() == actionCount - 1); + + WatchedIntentFilter s1 = f.snapshot(); + watcher.verifyNoChangeReported("pulled snapshot"); + } + +} diff --git a/services/tests/servicestests/src/com/android/server/recoverysystem/RecoverySystemServiceTest.java b/services/tests/servicestests/src/com/android/server/recoverysystem/RecoverySystemServiceTest.java index 2b358ea5e105..b64810b66542 100644 --- a/services/tests/servicestests/src/com/android/server/recoverysystem/RecoverySystemServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/recoverysystem/RecoverySystemServiceTest.java @@ -18,11 +18,14 @@ package com.android.server.recoverysystem; import static android.os.RecoverySystem.RESUME_ON_REBOOT_REBOOT_ERROR_INVALID_PACKAGE_NAME; import static android.os.RecoverySystem.RESUME_ON_REBOOT_REBOOT_ERROR_LSKF_NOT_CAPTURED; +import static android.os.RecoverySystem.RESUME_ON_REBOOT_REBOOT_ERROR_PROVIDER_PREPARATION_FAILURE; import static android.os.RecoverySystem.RESUME_ON_REBOOT_REBOOT_ERROR_SLOT_MISMATCH; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.mockito.AdditionalMatchers.not; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -31,6 +34,7 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -91,7 +95,8 @@ public class RecoverySystemServiceTest { mUncryptUpdateFileWriter = mock(FileWriter.class); mLockSettingsInternal = mock(LockSettingsInternal.class); - when(mLockSettingsInternal.armRebootEscrow()).thenReturn(true); + doReturn(LockSettingsInternal.ARM_REBOOT_ERROR_NONE).when(mLockSettingsInternal) + .armRebootEscrow(); Looper looper = InstrumentationRegistry.getContext().getMainLooper(); mIPowerManager = mock(IPowerManager.class); @@ -489,4 +494,27 @@ public class RecoverySystemServiceTest { } // TODO(xunchang) add more multi client tests + + @Test + public void rebootWithLskf_armEscrowDataFatalError_Failure() throws Exception { + doReturn(LockSettingsInternal.ARM_REBOOT_ERROR_PROVIDER_MISMATCH) + .when(mLockSettingsInternal).armRebootEscrow(); + + assertTrue(mRecoverySystemService.requestLskf(FAKE_OTA_PACKAGE_NAME, null)); + mRecoverySystemService.onPreparedForReboot(true); + assertTrue(mRecoverySystemService.isLskfCaptured(FAKE_OTA_PACKAGE_NAME)); + + when(mSharedPreferences.getInt(eq(FAKE_OTA_PACKAGE_NAME + + RecoverySystemService.REQUEST_LSKF_COUNT_PREF_SUFFIX), anyInt())).thenReturn(1); + when(mSharedPreferences.getInt(eq(RecoverySystemService.LSKF_CAPTURED_COUNT_PREF), + anyInt())).thenReturn(1); + assertEquals(RESUME_ON_REBOOT_REBOOT_ERROR_PROVIDER_PREPARATION_FAILURE, + mRecoverySystemService.rebootWithLskf(FAKE_OTA_PACKAGE_NAME, "ab-update", true)); + // Verify that the RoR preparation state has been cleared. + assertFalse(mRecoverySystemService.isLskfCaptured(FAKE_OTA_PACKAGE_NAME)); + verify(mMetricsReporter).reportRebootEscrowRebootMetrics(eq(5004 /* provider mismatch */), + eq(1000), eq(1) /* client count */, eq(1) /* request count */, + eq(true) /* slot switch */, anyBoolean(), anyInt(), + eq(1) /* lskf capture count */); + } } diff --git a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java index 742f5034a248..32fed3bc3dc1 100644 --- a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java @@ -248,21 +248,6 @@ public class TimeDetectorServiceTest { mStubbedTimeDetectorStrategy.verifyDumpCalled(); } - @Test - public void testAutoTimeDetectionToggle() throws Exception { - mTimeDetectorService.handleAutoTimeDetectionChanged(); - mTestHandler.assertTotalMessagesEnqueued(1); - mTestHandler.waitForMessagesToBeProcessed(); - mStubbedTimeDetectorStrategy.verifyHandleAutoTimeDetectionChangedCalled(); - - mStubbedTimeDetectorStrategy.resetCallTracking(); - - mTimeDetectorService.handleAutoTimeDetectionChanged(); - mTestHandler.assertTotalMessagesEnqueued(2); - mTestHandler.waitForMessagesToBeProcessed(); - mStubbedTimeDetectorStrategy.verifyHandleAutoTimeDetectionChangedCalled(); - } - private static TelephonyTimeSuggestion createTelephonyTimeSuggestion() { int slotIndex = 1234; TimestampedValue<Long> timeValue = new TimestampedValue<>(100L, 1_000_000L); @@ -298,7 +283,6 @@ public class TimeDetectorServiceTest { private NetworkTimeSuggestion mLastNetworkSuggestion; private GnssTimeSuggestion mLastGnssSuggestion; private ExternalTimeSuggestion mLastExternalSuggestion; - private boolean mHandleAutoTimeDetectionChangedCalled; private boolean mDumpCalled; @Override @@ -333,11 +317,6 @@ public class TimeDetectorServiceTest { } @Override - public void handleAutoTimeConfigChanged() { - mHandleAutoTimeDetectionChangedCalled = true; - } - - @Override public void dump(IndentingPrintWriter pw, String[] args) { mDumpCalled = true; } @@ -348,7 +327,6 @@ public class TimeDetectorServiceTest { mLastNetworkSuggestion = null; mLastGnssSuggestion = null; mLastExternalSuggestion = null; - mHandleAutoTimeDetectionChangedCalled = false; mDumpCalled = false; } @@ -372,10 +350,6 @@ public class TimeDetectorServiceTest { assertEquals(expectedSuggestion, mLastExternalSuggestion); } - void verifyHandleAutoTimeDetectionChangedCalled() { - assertTrue(mHandleAutoTimeDetectionChangedCalled); - } - void verifyDumpCalled() { assertTrue(mDumpCalled); } diff --git a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java index 095703e6b939..0d5b5a565d5a 100644 --- a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java +++ b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java @@ -37,6 +37,7 @@ import android.os.TimestampedValue; import androidx.test.runner.AndroidJUnit4; import com.android.server.timedetector.TimeDetectorStrategy.Origin; +import com.android.server.timezonedetector.ConfigurationChangeListener; import org.junit.Before; import org.junit.Test; @@ -46,6 +47,7 @@ import java.time.Duration; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; +import java.util.Objects; @RunWith(AndroidJUnit4.class) public class TimeDetectorStrategyImplTest { @@ -1133,11 +1135,17 @@ public class TimeDetectorStrategyImplTest { private long mSystemClockMillis; private int mSystemClockUpdateThresholdMillis = 2000; private int[] mAutoOriginPriorities = PROVIDERS_PRIORITY; + private ConfigurationChangeListener mConfigChangeListener; // Tracking operations. private boolean mSystemClockWasSet; @Override + public void setConfigChangeListener(ConfigurationChangeListener listener) { + mConfigChangeListener = Objects.requireNonNull(listener); + } + + @Override public int systemClockUpdateThresholdMillis() { return mSystemClockUpdateThresholdMillis; } @@ -1230,6 +1238,7 @@ public class TimeDetectorStrategyImplTest { void simulateAutoTimeZoneDetectionToggle() { mAutoTimeDetectionEnabled = !mAutoTimeDetectionEnabled; + mConfigChangeListener.onChange(); } void verifySystemClockNotSet() { @@ -1330,7 +1339,6 @@ public class TimeDetectorStrategyImplTest { Script simulateAutoTimeDetectionToggle() { mFakeEnvironment.simulateAutoTimeZoneDetectionToggle(); - mTimeDetectorStrategy.handleAutoTimeConfigChanged(); return this; } diff --git a/services/tests/servicestests/src/com/android/server/utils/WatcherTest.java b/services/tests/servicestests/src/com/android/server/utils/WatcherTest.java index 57e95d714593..f255c67cf47d 100644 --- a/services/tests/servicestests/src/com/android/server/utils/WatcherTest.java +++ b/services/tests/servicestests/src/com/android/server/utils/WatcherTest.java @@ -896,4 +896,25 @@ public class WatcherTest { leafD.tick(); tester.verify(3, "tick leafD"); } + + @Test + public void testSnapshotCache() { + final String name = "SnapshotCache"; + WatchableTester tester; + + Leaf leafA = new Leaf(); + SnapshotCache<Leaf> cache = new SnapshotCache<>(leafA, leafA) { + @Override + public Leaf createSnapshot() { + return mSource.snapshot(); + }}; + + Leaf s1 = cache.snapshot(); + assertTrue(s1 == cache.snapshot()); + leafA.tick(); + Leaf s2 = cache.snapshot(); + assertTrue(s1 != s2); + assertTrue(leafA.get() == s1.get() + 1); + assertTrue(leafA.get() == s2.get()); + } } diff --git a/services/tests/servicestests/src/com/android/server/uwb/UwbServiceImplTest.java b/services/tests/servicestests/src/com/android/server/uwb/UwbServiceImplTest.java new file mode 100644 index 000000000000..2f5a5cc97117 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/uwb/UwbServiceImplTest.java @@ -0,0 +1,299 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.uwb; + +import static com.google.common.truth.Truth.assertThat; + +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.os.IBinder; +import android.os.PersistableBundle; +import android.platform.test.annotations.Presubmit; +import android.test.suitebuilder.annotation.SmallTest; +import android.uwb.IUwbAdapter; +import android.uwb.IUwbAdapterStateCallbacks; +import android.uwb.IUwbRangingCallbacks; +import android.uwb.RangingReport; +import android.uwb.RangingSession; +import android.uwb.SessionHandle; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * Tests for {@link UwbServiceImpl}. + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +@Presubmit +public class UwbServiceImplTest { + @Mock private IUwbAdapter mVendorService; + @Mock private IBinder mVendorServiceBinder; + @Mock private Context mContext; + @Mock private UwbInjector mUwbInjector; + @Captor private ArgumentCaptor<IUwbRangingCallbacks> mRangingCbCaptor; + @Captor private ArgumentCaptor<IBinder.DeathRecipient> mClientDeathCaptor; + @Captor private ArgumentCaptor<IBinder.DeathRecipient> mVendorServiceDeathCaptor; + + private UwbServiceImpl mUwbServiceImpl; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + when(mUwbInjector.getVendorService()).thenReturn(mVendorService); + when(mVendorService.asBinder()).thenReturn(mVendorServiceBinder); + mUwbServiceImpl = new UwbServiceImpl(mContext, mUwbInjector); + } + + @Test + public void testApiCallThrowsIllegalStateExceptionIfVendorServiceNotFound() throws Exception { + when(mUwbInjector.getVendorService()).thenReturn(null); + + final IUwbAdapterStateCallbacks cb = mock(IUwbAdapterStateCallbacks.class); + try { + mUwbServiceImpl.registerAdapterStateCallbacks(cb); + fail(); + } catch (IllegalStateException e) { /* pass */ } + } + + @Test + public void testRegisterAdapterStateCallbacks() throws Exception { + final IUwbAdapterStateCallbacks cb = mock(IUwbAdapterStateCallbacks.class); + mUwbServiceImpl.registerAdapterStateCallbacks(cb); + + verify(mVendorService).registerAdapterStateCallbacks(cb); + } + + @Test + public void testUnregisterAdapterStateCallbacks() throws Exception { + final IUwbAdapterStateCallbacks cb = mock(IUwbAdapterStateCallbacks.class); + mUwbServiceImpl.unregisterAdapterStateCallbacks(cb); + + verify(mVendorService).unregisterAdapterStateCallbacks(cb); + } + + @Test + public void testGetTimestampResolutionNanos() throws Exception { + final long timestamp = 34L; + when(mVendorService.getTimestampResolutionNanos()).thenReturn(timestamp); + assertThat(mUwbServiceImpl.getTimestampResolutionNanos()).isEqualTo(timestamp); + + verify(mVendorService).getTimestampResolutionNanos(); + } + + @Test + public void testGetSpecificationInfo() throws Exception { + final PersistableBundle specification = new PersistableBundle(); + when(mVendorService.getSpecificationInfo()).thenReturn(specification); + assertThat(mUwbServiceImpl.getSpecificationInfo()).isEqualTo(specification); + + verify(mVendorService).getSpecificationInfo(); + } + + @Test + public void testOpenRanging() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + final IUwbRangingCallbacks cb = mock(IUwbRangingCallbacks.class); + final PersistableBundle parameters = new PersistableBundle(); + final IBinder cbBinder = mock(IBinder.class); + when(cb.asBinder()).thenReturn(cbBinder); + + mUwbServiceImpl.openRanging(sessionHandle, cb, parameters); + + verify(mVendorService).openRanging( + eq(sessionHandle), mRangingCbCaptor.capture(), eq(parameters)); + assertThat(mRangingCbCaptor.getValue()).isNotNull(); + } + + @Test + public void testStartRanging() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + final PersistableBundle parameters = new PersistableBundle(); + + mUwbServiceImpl.startRanging(sessionHandle, parameters); + + verify(mVendorService).startRanging(sessionHandle, parameters); + } + + @Test + public void testReconfigureRanging() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + final PersistableBundle parameters = new PersistableBundle(); + + mUwbServiceImpl.reconfigureRanging(sessionHandle, parameters); + + verify(mVendorService).reconfigureRanging(sessionHandle, parameters); + } + + @Test + public void testStopRanging() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + + mUwbServiceImpl.stopRanging(sessionHandle); + + verify(mVendorService).stopRanging(sessionHandle); + } + + @Test + public void testCloseRanging() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + + mUwbServiceImpl.closeRanging(sessionHandle); + + verify(mVendorService).closeRanging(sessionHandle); + } + + @Test + public void testRangingCallbacks() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + final IUwbRangingCallbacks cb = mock(IUwbRangingCallbacks.class); + final PersistableBundle parameters = new PersistableBundle(); + final IBinder cbBinder = mock(IBinder.class); + when(cb.asBinder()).thenReturn(cbBinder); + + mUwbServiceImpl.openRanging(sessionHandle, cb, parameters); + + verify(mVendorService).openRanging( + eq(sessionHandle), mRangingCbCaptor.capture(), eq(parameters)); + assertThat(mRangingCbCaptor.getValue()).isNotNull(); + + // Invoke vendor service callbacks and ensure that the corresponding app callback is + // invoked. + mRangingCbCaptor.getValue().onRangingOpened(sessionHandle); + verify(cb).onRangingOpened(sessionHandle); + + mRangingCbCaptor.getValue().onRangingOpenFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + verify(cb).onRangingOpenFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + + mRangingCbCaptor.getValue().onRangingStarted(sessionHandle, parameters); + verify(cb).onRangingStarted(sessionHandle, parameters); + + mRangingCbCaptor.getValue().onRangingStartFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + verify(cb).onRangingStartFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + + mRangingCbCaptor.getValue().onRangingReconfigured(sessionHandle, parameters); + verify(cb).onRangingReconfigured(sessionHandle, parameters); + + mRangingCbCaptor.getValue().onRangingReconfigureFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + verify(cb).onRangingReconfigureFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + + mRangingCbCaptor.getValue().onRangingStopped( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + verify(cb).onRangingStopped( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + + mRangingCbCaptor.getValue().onRangingStopFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + verify(cb).onRangingStopFailed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + + final RangingReport rangingReport = new RangingReport.Builder().build(); + mRangingCbCaptor.getValue().onRangingResult(sessionHandle, rangingReport); + verify(cb).onRangingResult(sessionHandle, rangingReport); + + mRangingCbCaptor.getValue().onRangingClosed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + verify(cb).onRangingClosed( + sessionHandle, RangingSession.Callback.REASON_GENERIC_ERROR, parameters); + } + + @Test + public void testHandleClientDeath() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + final IUwbRangingCallbacks cb = mock(IUwbRangingCallbacks.class); + final PersistableBundle parameters = new PersistableBundle(); + final IBinder cbBinder = mock(IBinder.class); + when(cb.asBinder()).thenReturn(cbBinder); + + mUwbServiceImpl.openRanging(sessionHandle, cb, parameters); + + verify(mVendorService).openRanging( + eq(sessionHandle), mRangingCbCaptor.capture(), eq(parameters)); + assertThat(mRangingCbCaptor.getValue()).isNotNull(); + + verify(cbBinder).linkToDeath(mClientDeathCaptor.capture(), anyInt()); + assertThat(mClientDeathCaptor.getValue()).isNotNull(); + + clearInvocations(cb); + + // Invoke cb, ensure it reaches the client. + mRangingCbCaptor.getValue().onRangingOpened(sessionHandle); + verify(cb).onRangingOpened(sessionHandle); + + // Trigger client death and ensure the session is stopped. + mClientDeathCaptor.getValue().binderDied(); + verify(mVendorService).stopRanging(sessionHandle); + verify(mVendorService).closeRanging(sessionHandle); + + // Invoke cb, it should be ignored. + mRangingCbCaptor.getValue().onRangingStarted(sessionHandle, parameters); + verify(cb, never()).onRangingStarted(any(), any()); + } + + @Test + public void testHandleVendorServiceDeath() throws Exception { + final SessionHandle sessionHandle = new SessionHandle(5); + final IUwbRangingCallbacks cb = mock(IUwbRangingCallbacks.class); + final PersistableBundle parameters = new PersistableBundle(); + final IBinder cbBinder = mock(IBinder.class); + when(cb.asBinder()).thenReturn(cbBinder); + + mUwbServiceImpl.openRanging(sessionHandle, cb, parameters); + + verify(mVendorServiceBinder).linkToDeath(mVendorServiceDeathCaptor.capture(), anyInt()); + assertThat(mVendorServiceDeathCaptor.getValue()).isNotNull(); + + verify(mVendorService).openRanging( + eq(sessionHandle), mRangingCbCaptor.capture(), eq(parameters)); + assertThat(mRangingCbCaptor.getValue()).isNotNull(); + + clearInvocations(cb); + + // Invoke cb, ensure it reaches the client. + mRangingCbCaptor.getValue().onRangingOpened(sessionHandle); + verify(cb).onRangingOpened(sessionHandle); + + // Trigger vendor service death and ensure that the client is informed of session end. + mVendorServiceDeathCaptor.getValue().binderDied(); + verify(cb).onRangingClosed( + eq(sessionHandle), eq(RangingSession.Callback.REASON_UNKNOWN), + argThat((p) -> p.isEmpty())); + } +} diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java index 678defe36566..57cf865268ef 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -23,17 +23,27 @@ import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_OLD_ACTIVITY_OPEN; +import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_UNOCCLUDE; import static android.view.WindowManager.TRANSIT_OLD_TASK_CHANGE_WINDOWING_MODE; import static android.view.WindowManager.TRANSIT_OLD_TASK_OPEN; import static android.view.WindowManager.TRANSIT_OPEN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doCallRealMethod; +import android.os.Binder; +import android.os.IBinder; +import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.util.ArraySet; +import android.view.IRemoteAnimationFinishedCallback; +import android.view.IRemoteAnimationRunner; +import android.view.RemoteAnimationAdapter; +import android.view.RemoteAnimationDefinition; +import android.view.RemoteAnimationTarget; import android.view.WindowManager; import androidx.test.filters.FlakyTest; @@ -426,4 +436,104 @@ public class AppTransitionControllerTest extends WindowTestsBase { AppTransitionController.getAnimationTargets( opening, closing, false /* visible */)); } -} + + static class TestRemoteAnimationRunner implements IRemoteAnimationRunner { + @Override + public void onAnimationStart(int transit, RemoteAnimationTarget[] apps, + RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps, + IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException { + } + + @Override + public void onAnimationCancelled() throws RemoteException { + } + + @Override + public IBinder asBinder() { + return new Binder(); + } + } + + @Test + public void testGetRemoteAnimationOverrideEmpty() { + final ActivityRecord activity = createActivityRecord(mDisplayContent); + assertNull(mAppTransitionController.getRemoteAnimationOverride(activity, + TRANSIT_OLD_ACTIVITY_OPEN, new ArraySet<Integer>())); + } + + @Test + public void testGetRemoteAnimationOverrideWindowContainer() { + final ActivityRecord activity = createActivityRecord(mDisplayContent); + final RemoteAnimationDefinition definition = new RemoteAnimationDefinition(); + final RemoteAnimationAdapter adapter = new RemoteAnimationAdapter( + new TestRemoteAnimationRunner(), 10, 1); + definition.addRemoteAnimation(TRANSIT_OLD_ACTIVITY_OPEN, adapter); + activity.registerRemoteAnimations(definition); + + assertEquals(adapter, + mAppTransitionController.getRemoteAnimationOverride( + activity, TRANSIT_OLD_ACTIVITY_OPEN, new ArraySet<Integer>())); + assertNull(mAppTransitionController.getRemoteAnimationOverride( + null, TRANSIT_OLD_ACTIVITY_OPEN, new ArraySet<Integer>())); + } + + @Test + public void testGetRemoteAnimationOverrideTransitionController() { + final ActivityRecord activity = createActivityRecord(mDisplayContent); + final RemoteAnimationDefinition definition = new RemoteAnimationDefinition(); + final RemoteAnimationAdapter adapter = new RemoteAnimationAdapter( + new TestRemoteAnimationRunner(), 10, 1); + definition.addRemoteAnimation(TRANSIT_OLD_ACTIVITY_OPEN, adapter); + mAppTransitionController.registerRemoteAnimations(definition); + + assertEquals(adapter, + mAppTransitionController.getRemoteAnimationOverride( + activity, TRANSIT_OLD_ACTIVITY_OPEN, new ArraySet<Integer>())); + assertEquals(adapter, + mAppTransitionController.getRemoteAnimationOverride( + null, TRANSIT_OLD_ACTIVITY_OPEN, new ArraySet<Integer>())); + } + + @Test + public void testGetRemoteAnimationOverrideBoth() { + final ActivityRecord activity = createActivityRecord(mDisplayContent); + final RemoteAnimationDefinition definition1 = new RemoteAnimationDefinition(); + final RemoteAnimationAdapter adapter1 = new RemoteAnimationAdapter( + new TestRemoteAnimationRunner(), 10, 1); + definition1.addRemoteAnimation(TRANSIT_OLD_ACTIVITY_OPEN, adapter1); + activity.registerRemoteAnimations(definition1); + + final RemoteAnimationDefinition definition2 = new RemoteAnimationDefinition(); + final RemoteAnimationAdapter adapter2 = new RemoteAnimationAdapter( + new TestRemoteAnimationRunner(), 10, 1); + definition2.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_UNOCCLUDE, adapter2); + mAppTransitionController.registerRemoteAnimations(definition2); + + assertEquals(adapter2, + mAppTransitionController.getRemoteAnimationOverride( + activity, TRANSIT_OLD_KEYGUARD_UNOCCLUDE, new ArraySet<Integer>())); + assertEquals(adapter2, + mAppTransitionController.getRemoteAnimationOverride( + null, TRANSIT_OLD_KEYGUARD_UNOCCLUDE, new ArraySet<Integer>())); + } + + @Test + public void testGetRemoteAnimationOverrideWindowContainerHasPriority() { + final ActivityRecord activity = createActivityRecord(mDisplayContent); + final RemoteAnimationDefinition definition1 = new RemoteAnimationDefinition(); + final RemoteAnimationAdapter adapter1 = new RemoteAnimationAdapter( + new TestRemoteAnimationRunner(), 10, 1); + definition1.addRemoteAnimation(TRANSIT_OLD_ACTIVITY_OPEN, adapter1); + activity.registerRemoteAnimations(definition1); + + final RemoteAnimationDefinition definition2 = new RemoteAnimationDefinition(); + final RemoteAnimationAdapter adapter2 = new RemoteAnimationAdapter( + new TestRemoteAnimationRunner(), 10, 1); + definition2.addRemoteAnimation(TRANSIT_OLD_ACTIVITY_OPEN, adapter2); + mAppTransitionController.registerRemoteAnimations(definition2); + + assertEquals(adapter1, + mAppTransitionController.getRemoteAnimationOverride( + activity, TRANSIT_OLD_ACTIVITY_OPEN, new ArraySet<Integer>())); + } +}
\ No newline at end of file diff --git a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java index bb9e24fa6813..f3616da6c102 100644 --- a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java +++ b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java @@ -146,12 +146,6 @@ public class StubTransaction extends SurfaceControl.Transaction { } @Override - public SurfaceControl.Transaction deferTransactionUntil(SurfaceControl sc, - SurfaceControl barrier, long frameNumber) { - return this; - } - - @Override public SurfaceControl.Transaction reparent(SurfaceControl sc, SurfaceControl newParent) { return this; } diff --git a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java index afaf1b1fea0a..491fe98660c0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java +++ b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java @@ -110,6 +110,7 @@ public class SystemServicesTestRule implements TestRule { private ActivityTaskManagerService mAtmService; private WindowManagerService mWmService; private TestWindowManagerPolicy mWMPolicy; + private TestDisplayWindowSettingsProvider mTestDisplayWindowSettingsProvider; private WindowState.PowerManagerWrapper mPowerManagerWrapper; private InputManagerService mImService; private InputChannel mInputChannel; @@ -284,10 +285,12 @@ public class SystemServicesTestRule implements TestRule { mPowerManagerWrapper = mock(WindowState.PowerManagerWrapper.class); mWMPolicy = new TestWindowManagerPolicy(this::getWindowManagerService, mPowerManagerWrapper); + mTestDisplayWindowSettingsProvider = new TestDisplayWindowSettingsProvider(); // Suppress StrictMode violation (DisplayWindowSettings) to avoid log flood. DisplayThread.getHandler().post(StrictMode::allowThreadDiskWritesMask); mWmService = WindowManagerService.main( - mContext, mImService, false, false, mWMPolicy, mAtmService, StubTransaction::new, + mContext, mImService, false, false, mWMPolicy, mAtmService, + mTestDisplayWindowSettingsProvider, StubTransaction::new, () -> mSurfaceFactory.get(), (unused) -> new MockSurfaceControlBuilder()); spyOn(mWmService); spyOn(mWmService.mRoot); diff --git a/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java b/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java index 777149b60098..ce2d74859931 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java +++ b/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java @@ -147,10 +147,6 @@ class TestDisplayContent extends DisplayContent { final Display display = new Display(DisplayManagerGlobal.getInstance(), displayId, mInfo, DEFAULT_DISPLAY_ADJUSTMENTS); final TestDisplayContent newDisplay = createInternal(display); - // Ensure letterbox aspect ratio is not overridden on any device target. - // {@link com.android.internal.R.dimen.config_taskLetterboxAspectRatio}, provided by - // the below method, is set on some device form factors. - mService.mWindowManager.setFixedOrientationLetterboxAspectRatio(0); // disable the normal system decorations final DisplayPolicy displayPolicy = newDisplay.getDisplayPolicy(); spyOn(displayPolicy); diff --git a/services/tests/wmtests/src/com/android/server/wm/TestDisplayWindowSettingsProvider.java b/services/tests/wmtests/src/com/android/server/wm/TestDisplayWindowSettingsProvider.java new file mode 100644 index 000000000000..b2e44b1421f4 --- /dev/null +++ b/services/tests/wmtests/src/com/android/server/wm/TestDisplayWindowSettingsProvider.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import android.annotation.NonNull; +import android.view.DisplayInfo; + +import java.util.HashMap; +import java.util.Map; + +/** + * In-memory DisplayWindowSettingsProvider used in tests. Ensures no settings are read from or + * written to device-specific display settings files. + */ +public final class TestDisplayWindowSettingsProvider extends DisplayWindowSettingsProvider { + + private final Map<String, SettingsEntry> mOverrideSettingsMap = new HashMap<>(); + + @Override + @NonNull + public SettingsEntry getSettings(@NonNull DisplayInfo info) { + // Because no settings are read from settings files, there is no need to store base + // settings. Only override settings are necessary to track because they can be modified + // during tests (e.g. display size, ignore orientation requests). + return getOverrideSettings(info); + } + + @Override + @NonNull + public SettingsEntry getOverrideSettings(@NonNull DisplayInfo info) { + return new SettingsEntry(getOrCreateOverrideSettingsEntry(info)); + } + + @Override + public void updateOverrideSettings(@NonNull DisplayInfo info, + @NonNull SettingsEntry overrides) { + final SettingsEntry overrideSettings = getOrCreateOverrideSettingsEntry(info); + overrideSettings.setTo(overrides); + } + + @NonNull + private SettingsEntry getOrCreateOverrideSettingsEntry(DisplayInfo info) { + final String identifier = getIdentifier(info); + SettingsEntry settings; + if ((settings = mOverrideSettingsMap.get(identifier)) != null) { + return settings; + } + settings = new SettingsEntry(); + mOverrideSettingsMap.put(identifier, settings); + return settings; + } + + /** + * In {@link TestDisplayWindowSettingsProvider}, always use uniqueId as the identifier. + */ + private static String getIdentifier(DisplayInfo displayInfo) { + return displayInfo.uniqueId; + } +} diff --git a/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java index ae8e2ded359d..acadb74d333f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java +++ b/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java @@ -210,7 +210,7 @@ class TestWindowManagerPolicy implements WindowManagerPolicy { } @Override - public boolean okToAnimate() { + public boolean okToAnimate(boolean ignoreScreenOn) { return mOkToAnimate; } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index 39fdb2d48a70..5bafbbd2bdf7 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -55,6 +55,8 @@ import static com.android.server.wm.StartingSurfaceController.DEBUG_ENABLE_SHELL import static com.android.server.wm.WindowContainer.POSITION_BOTTOM; import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; @@ -153,6 +155,22 @@ class WindowTestsBase extends SystemServiceTestsBase { */ Transaction mTransaction; + /** + * Whether device-specific global overrides have already been checked in + * {@link WindowTestsBase#setUpBase()}. + */ + private static boolean sGlobalOverridesChecked; + /** + * Whether device-specific overrides have already been checked in + * {@link WindowTestsBase#setUpBase()} when the default display is used. + */ + private static boolean sOverridesCheckedDefaultDisplay; + /** + * Whether device-specific overrides have already been checked in + * {@link WindowTestsBase#setUpBase()} when a {@link TestDisplayContent} is used. + */ + private static boolean sOverridesCheckedTestDisplay; + @BeforeClass public static void setUpOnceBase() { AttributeCache.init(getInstrumentation().getTargetContext()); @@ -190,6 +208,28 @@ class WindowTestsBase extends SystemServiceTestsBase { // {@link com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio}, is set // on some device form factors. mAtm.mWindowManager.setFixedOrientationLetterboxAspectRatio(0); + + checkDeviceSpecificOverridesNotApplied(); + } + + /** + * Check that device-specific overrides are not applied. Only need to check once during entire + * test run for each case: global overrides, default display, and test display. + */ + private void checkDeviceSpecificOverridesNotApplied() { + // Check global overrides + if (!sGlobalOverridesChecked) { + assertEquals(0, mWm.getFixedOrientationLetterboxAspectRatio(), 0 /* delta */); + sGlobalOverridesChecked = true; + } + // Check display-specific overrides + if (!sOverridesCheckedDefaultDisplay && mDisplayContent == mDefaultDisplay) { + assertFalse(mDisplayContent.getIgnoreOrientationRequest()); + sOverridesCheckedDefaultDisplay = true; + } else if (!sOverridesCheckedTestDisplay && mDisplayContent instanceof TestDisplayContent) { + assertFalse(mDisplayContent.getIgnoreOrientationRequest()); + sOverridesCheckedTestDisplay = true; + } } private void createTestDisplay(UseTestDisplay annotation) { diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index a6b68e1e2ab2..309673d72dd4 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -24,6 +24,7 @@ import static android.app.usage.UsageEvents.Event.FLUSH_TO_DISK; import static android.app.usage.UsageEvents.Event.LOCUS_ID_SET; import static android.app.usage.UsageEvents.Event.NOTIFICATION_INTERRUPTION; import static android.app.usage.UsageEvents.Event.SHORTCUT_INVOCATION; +import static android.app.usage.UsageEvents.Event.USER_INTERACTION; import static android.app.usage.UsageEvents.Event.USER_STOPPED; import static android.app.usage.UsageEvents.Event.USER_UNLOCKED; import static android.app.usage.UsageStatsManager.USAGE_SOURCE_CURRENT_ACTIVITY; @@ -112,6 +113,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.TimeUnit; @@ -1988,6 +1990,17 @@ public class UsageStatsService extends SystemService implements } @Override + public void reportUserInteraction(String packageName, int userId) { + Objects.requireNonNull(packageName); + if (!isCallingUidSystem()) { + throw new SecurityException("Only system is allowed to call reportUserInteraction"); + } + final Event event = new Event(USER_INTERACTION, SystemClock.elapsedRealtime()); + event.mPackage = packageName; + reportEventOrAddToQueue(userId, event); + } + + @Override public void registerAppUsageObserver(int observerId, String[] packages, long timeLimitMs, PendingIntent callbackIntent, String callingPackage) { diff --git a/services/uwb/Android.bp b/services/uwb/Android.bp new file mode 100644 index 000000000000..da30d43a4536 --- /dev/null +++ b/services/uwb/Android.bp @@ -0,0 +1,26 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +filegroup { + name: "services.uwb-sources", + srcs: ["java/**/*.java"], + path: "java", + visibility: ["//frameworks/base/services"], +} + +java_library_static { + name: "services.uwb", + defaults: ["platform_service_defaults"], + srcs: [ + ":services.uwb-sources", + ], + libs: [ + "services.core", + ], +} diff --git a/services/uwb/java/com/android/server/uwb/UwbInjector.java b/services/uwb/java/com/android/server/uwb/UwbInjector.java new file mode 100644 index 000000000000..00c0acabcb3b --- /dev/null +++ b/services/uwb/java/com/android/server/uwb/UwbInjector.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.uwb; + +import android.annotation.NonNull; +import android.content.Context; +import android.os.IBinder; +import android.os.ServiceManager; +import android.uwb.IUwbAdapter; + + +/** + * To be used for dependency injection (especially helps mocking static dependencies). + */ +public class UwbInjector { + private static final String TAG = "UwbInjector"; + + private static final String VENDOR_SERVICE_NAME = "uwb_vendor"; + + private final Context mContext; + + public UwbInjector(@NonNull Context context) { + mContext = context; + } + + /** + * @return Returns the vendor service handle. + */ + public IUwbAdapter getVendorService() { + IBinder b = ServiceManager.getService(VENDOR_SERVICE_NAME); + if (b == null) return null; + return IUwbAdapter.Stub.asInterface(b); + } +} diff --git a/services/uwb/java/com/android/server/uwb/UwbService.java b/services/uwb/java/com/android/server/uwb/UwbService.java new file mode 100644 index 000000000000..4bb280f75ed1 --- /dev/null +++ b/services/uwb/java/com/android/server/uwb/UwbService.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.uwb; + +import android.content.Context; +import android.util.Log; + +import com.android.server.SystemService; + +/** + * Uwb System service. + */ +public class UwbService extends SystemService { + private static final String TAG = "UwbService"; + + private final UwbServiceImpl mImpl; + + public UwbService(Context context) { + super(context); + mImpl = new UwbServiceImpl(context, new UwbInjector(context)); + } + + @Override + public void onStart() { + Log.i(TAG, "Registering " + Context.UWB_SERVICE); + publishBinderService(Context.UWB_SERVICE, mImpl); + } +} diff --git a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java new file mode 100644 index 000000000000..70bd20e0014e --- /dev/null +++ b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java @@ -0,0 +1,288 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.uwb; + +import android.annotation.NonNull; +import android.content.Context; +import android.os.IBinder; +import android.os.PersistableBundle; +import android.os.RemoteException; +import android.util.ArrayMap; +import android.util.Log; +import android.uwb.IUwbAdapter; +import android.uwb.IUwbAdapterStateCallbacks; +import android.uwb.IUwbRangingCallbacks; +import android.uwb.RangingReport; +import android.uwb.RangingSession; +import android.uwb.SessionHandle; + +import com.android.internal.annotations.GuardedBy; + +import java.util.Map; + +/** + * Implementation of {@link android.uwb.IUwbAdapter} binder service. + */ +public class UwbServiceImpl extends IUwbAdapter.Stub implements IBinder.DeathRecipient{ + private static final String TAG = "UwbServiceImpl"; + + private final Context mContext; + private final UwbInjector mUwbInjector; + /** + * Map for storing the callbacks wrapper for each session. + */ + @GuardedBy("mCallbacksMap") + private final Map<SessionHandle, UwbRangingCallbacksWrapper> mCallbacksMap = new ArrayMap<>(); + + /** + * Used for caching the vendor implementation of {@link IUwbAdapter} interface. + */ + private IUwbAdapter mVendorUwbAdapter; + + /** + * Wrapper for callback registered with vendor service. This wrapper is needed for performing + * permission check before sending the callback to the external app. + * + * Access to these callbacks are synchronized. + */ + private class UwbRangingCallbacksWrapper extends IUwbRangingCallbacks.Stub + implements IBinder.DeathRecipient{ + private final SessionHandle mSessionHandle; + private final IUwbRangingCallbacks mExternalCb; + private boolean mIsValid; + + UwbRangingCallbacksWrapper(@NonNull SessionHandle sessionHandle, + @NonNull IUwbRangingCallbacks externalCb) { + mSessionHandle = sessionHandle; + mExternalCb = externalCb; + mIsValid = true; + + // Link to death for external callback. + linkToDeath(); + } + + private void linkToDeath() { + IBinder binder = mExternalCb.asBinder(); + try { + binder.linkToDeath(this, 0); + } catch (RemoteException e) { + Log.e(TAG, "Unable to link to client death event.", e); + } + } + + private void removeClientAndUnlinkToDeath() { + // Remove from the map. + synchronized (mCallbacksMap) { + mCallbacksMap.remove(mSessionHandle); + } + IBinder binder = mExternalCb.asBinder(); + binder.unlinkToDeath(this, 0); + mIsValid = false; + } + + + @Override + public synchronized void onRangingOpened(SessionHandle sessionHandle) + throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingOpened(sessionHandle); + } + + @Override + public synchronized void onRangingOpenFailed(SessionHandle sessionHandle, + int reason, PersistableBundle parameters) throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingOpenFailed(sessionHandle, reason, parameters); + } + + @Override + public synchronized void onRangingStarted(SessionHandle sessionHandle, + PersistableBundle parameters) + throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingStarted(sessionHandle, parameters); + } + + @Override + public synchronized void onRangingStartFailed(SessionHandle sessionHandle, + int reason, PersistableBundle parameters) throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingStartFailed(sessionHandle, reason, parameters); + } + + @Override + public synchronized void onRangingReconfigured(SessionHandle sessionHandle, + PersistableBundle parameters) + throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingReconfigured(sessionHandle, parameters); + } + + @Override + public synchronized void onRangingReconfigureFailed(SessionHandle sessionHandle, + int reason, PersistableBundle parameters) throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingReconfigureFailed(sessionHandle, reason, parameters); + } + + @Override + public synchronized void onRangingStopped(SessionHandle sessionHandle, int reason, + PersistableBundle parameters) + throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingStopped(sessionHandle, reason, parameters); + } + + @Override + public synchronized void onRangingStopFailed(SessionHandle sessionHandle, int reason, + PersistableBundle parameters) throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingStopFailed(sessionHandle, reason, parameters); + } + + @Override + public synchronized void onRangingClosed(SessionHandle sessionHandle, int reason, + PersistableBundle parameters) throws RemoteException { + if (!mIsValid) return; + mExternalCb.onRangingClosed(sessionHandle, reason, parameters); + removeClientAndUnlinkToDeath(); + } + + @Override + public synchronized void onRangingResult(SessionHandle sessionHandle, + RangingReport rangingReport) + throws RemoteException { + if (!mIsValid) return; + // TODO: Perform permission checks and noteOp. + mExternalCb.onRangingResult(sessionHandle, rangingReport); + } + + @Override + public synchronized void binderDied() { + if (!mIsValid) return; + Log.i(TAG, "Client died: ending session: " + mSessionHandle); + try { + removeClientAndUnlinkToDeath(); + stopRanging(mSessionHandle); + closeRanging(mSessionHandle); + } catch (RemoteException e) { + Log.e(TAG, "Remote exception while handling client death", e); + } + } + } + + private void linkToVendorServiceDeath() { + IBinder binder = mVendorUwbAdapter.asBinder(); + try { + binder.linkToDeath(this, 0); + } catch (RemoteException e) { + Log.e(TAG, "Unable to link to vendor service death event.", e); + } + } + + @Override + public void binderDied() { + Log.i(TAG, "Vendor service died: sending session close callbacks"); + synchronized (mCallbacksMap) { + for (Map.Entry<SessionHandle, UwbRangingCallbacksWrapper> e : mCallbacksMap.entrySet()) { + try { + e.getValue().mExternalCb.onRangingClosed( + e.getKey(), RangingSession.Callback.REASON_UNKNOWN, + new PersistableBundle()); + } catch (RemoteException ex) { + Log.e(TAG, "Failed to send session close callback " + e.getKey(), ex); + } + } + // Clear all sessions. + mCallbacksMap.clear(); + } + mVendorUwbAdapter = null; + } + + private synchronized IUwbAdapter getVendorUwbAdapter() throws IllegalStateException { + if (mVendorUwbAdapter != null) return mVendorUwbAdapter; + mVendorUwbAdapter = mUwbInjector.getVendorService(); + if (mVendorUwbAdapter == null) { + throw new IllegalStateException("No vendor service found!"); + } + Log.i(TAG, "Retrieved vendor service"); + linkToVendorServiceDeath(); + return mVendorUwbAdapter; + } + + UwbServiceImpl(@NonNull Context context, @NonNull UwbInjector uwbInjector) { + mContext = context; + mUwbInjector = uwbInjector; + } + + @Override + public void registerAdapterStateCallbacks(IUwbAdapterStateCallbacks adapterStateCallbacks) + throws RemoteException { + getVendorUwbAdapter().registerAdapterStateCallbacks(adapterStateCallbacks); + } + + @Override + public void unregisterAdapterStateCallbacks(IUwbAdapterStateCallbacks adapterStateCallbacks) + throws RemoteException { + getVendorUwbAdapter().unregisterAdapterStateCallbacks(adapterStateCallbacks); + } + + @Override + public long getTimestampResolutionNanos() throws RemoteException { + return getVendorUwbAdapter().getTimestampResolutionNanos(); + } + + @Override + public PersistableBundle getSpecificationInfo() throws RemoteException { + return getVendorUwbAdapter().getSpecificationInfo(); + } + + @Override + public void openRanging(SessionHandle sessionHandle, IUwbRangingCallbacks rangingCallbacks, + PersistableBundle parameters) throws RemoteException { + UwbRangingCallbacksWrapper wrapperCb = + new UwbRangingCallbacksWrapper(sessionHandle, rangingCallbacks); + synchronized (mCallbacksMap) { + mCallbacksMap.put(sessionHandle, wrapperCb); + } + getVendorUwbAdapter().openRanging(sessionHandle, wrapperCb, parameters); + } + + @Override + public void startRanging(SessionHandle sessionHandle, PersistableBundle parameters) + throws RemoteException { + // TODO: Perform permission checks. + getVendorUwbAdapter().startRanging(sessionHandle, parameters); + } + + @Override + public void reconfigureRanging(SessionHandle sessionHandle, PersistableBundle parameters) + throws RemoteException { + getVendorUwbAdapter().reconfigureRanging(sessionHandle, parameters); + } + + @Override + public void stopRanging(SessionHandle sessionHandle) throws RemoteException { + getVendorUwbAdapter().stopRanging(sessionHandle); + } + + @Override + public void closeRanging(SessionHandle sessionHandle) throws RemoteException { + getVendorUwbAdapter().closeRanging(sessionHandle); + } + +} diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java index f6d18fcd9ab3..96e715ee0495 100644 --- a/telephony/java/android/telephony/AccessNetworkConstants.java +++ b/telephony/java/android/telephony/AccessNetworkConstants.java @@ -637,18 +637,18 @@ public final class AccessNetworkConstants { this.band = band; this.downlinkLowKhz = downlinkLowKhz; this.downlinkOffset = downlinkOffset; + this.downlinkRange = downlinkRange; this.uplinkLowKhz = uplinkLowKhz; this.uplinkOffset = uplinkOffset; - this.downlinkRange = downlinkRange; this.uplinkRange = uplinkRange; } int band; int downlinkLowKhz; int downlinkOffset; + int downlinkRange; int uplinkLowKhz; int uplinkOffset; - int downlinkRange; int uplinkRange; } diff --git a/telephony/java/android/telephony/AccessNetworkUtils.java b/telephony/java/android/telephony/AccessNetworkUtils.java index f29f3bd352be..6b820459be98 100644 --- a/telephony/java/android/telephony/AccessNetworkUtils.java +++ b/telephony/java/android/telephony/AccessNetworkUtils.java @@ -598,7 +598,8 @@ public class AccessNetworkUtils { : earfcnFrequency.downlinkOffset; break; } else { - Log.e(TAG, "Band and the range of EARFCN are not consistent."); + Rlog.w(TAG,"Band and the range of EARFCN are not consistent: band = " + band + + " ,earfcn = " + earfcn + " ,isUplink = " + isUplink); return INVALID_FREQUENCY; } } @@ -617,7 +618,7 @@ public class AccessNetworkUtils { } private static boolean isInEarfcnRange(int earfcn, EutranBandArfcnFrequency earfcnFrequency, - boolean isUplink) { + boolean isUplink) { if (isUplink) { return earfcn >= earfcnFrequency.uplinkOffset && earfcn <= earfcnFrequency.uplinkRange; } else { @@ -640,7 +641,8 @@ public class AccessNetworkUtils { : uarfcnFrequency.downlinkOffset; break; } else { - Log.e(TAG, "Band and the range of UARFCN are not consistent."); + Rlog.w(TAG,"Band and the range of UARFCN are not consistent: band = " + band + + " ,uarfcn = " + uarfcn + " ,isUplink = " + isUplink); return INVALID_FREQUENCY; } } @@ -716,7 +718,8 @@ public class AccessNetworkUtils { arfcnOffset); break; } else { - Log.e(TAG, "Band and the range of ARFCN are not consistent."); + Rlog.w(TAG,"Band and the range of ARFCN are not consistent: band = " + band + + " ,arfcn = " + arfcn + " ,isUplink = " + isUplink); return INVALID_FREQUENCY; } } @@ -733,7 +736,7 @@ public class AccessNetworkUtils { * Downlink actual frequency(kHz) = Uplink actual frequency + 10 */ private static int convertArfcnToFrequency(int arfcn, int uplinkFrequencyFirstKhz, - int arfcnOffset) { + int arfcnOffset) { return uplinkFrequencyFirstKhz + 200 * (arfcn - arfcnOffset); } diff --git a/telephony/java/android/telephony/ims/SipMessage.java b/telephony/java/android/telephony/ims/SipMessage.java index d21fcab264d3..391372ac8ac1 100644 --- a/telephony/java/android/telephony/ims/SipMessage.java +++ b/telephony/java/android/telephony/ims/SipMessage.java @@ -203,23 +203,6 @@ public final class SipMessage implements Parcelable { } /** - * @return the UTF-8 encoded SIP message. - * @deprecated Use {@link #toEncodedMessage} instead - */ - @Deprecated - public @NonNull byte[] getEncodedMessage() { - byte[] header = new StringBuilder() - .append(mStartLine) - .append(mHeaderSection) - .append(CRLF) - .toString().getBytes(UTF_8); - byte[] sipMessage = new byte[header.length + mContent.length]; - System.arraycopy(header, 0, sipMessage, 0, header.length); - System.arraycopy(mContent, 0, sipMessage, header.length, mContent.length); - return sipMessage; - } - - /** * According RFC-3261 section 7, SIP is a text protocol and uses the UTF-8 charset. Its format * consists of a start-line, one or more header fields, an empty line indicating the end of the * header fields, and an optional message-body. diff --git a/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java b/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java index ec859955694c..2d230a74a477 100644 --- a/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java +++ b/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java @@ -23,6 +23,7 @@ import android.app.blob.BlobStoreManager; import android.app.blob.LeaseInfo; import android.content.Context; import android.content.res.Resources; +import android.os.FileUtils; import android.os.ParcelFileDescriptor; import android.util.Log; @@ -56,6 +57,16 @@ public class Utils { } } + public static void writeToSession(BlobStoreManager.Session session, ParcelFileDescriptor input) + throws IOException { + try (FileInputStream in = new ParcelFileDescriptor.AutoCloseInputStream(input)) { + try (FileOutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream( + session.openWrite(0, -1))) { + FileUtils.copy(in, out); + } + } + } + public static void writeToSession(BlobStoreManager.Session session, ParcelFileDescriptor input, long lengthBytes) throws IOException { try (FileInputStream in = new ParcelFileDescriptor.AutoCloseInputStream(input)) { 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 ed0a98d3c1ec..059361525733 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -19,19 +19,21 @@ package com.android.server.wm.flicker import android.platform.helpers.IAppHelper import com.android.server.wm.flicker.helpers.WindowUtils import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.NAV_BAR_LAYER_NAME +import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.NAV_BAR_WINDOW_NAME +import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.STATUS_BAR_LAYER_NAME import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.STATUS_BAR_WINDOW_NAME -const val WALLPAPER_TITLE = "Wallpaper" +val LAUNCHER_TITLE = arrayOf("Wallpaper", "Launcher", "com.google.android.googlequicksearchbox") fun FlickerTestParameter.statusBarWindowIsAlwaysVisible() { assertWm { - this.showsAboveAppWindow(NAV_BAR_LAYER_NAME) + this.showsAboveAppWindow(STATUS_BAR_WINDOW_NAME) } } fun FlickerTestParameter.navBarWindowIsAlwaysVisible() { assertWm { - this.showsAboveAppWindow(NAV_BAR_LAYER_NAME) + this.showsAboveAppWindow(NAV_BAR_WINDOW_NAME) } } @@ -39,23 +41,23 @@ fun FlickerTestParameter.launcherReplacesAppWindowAsTopWindow(testApp: IAppHelpe assertWm { this.showsAppWindowOnTop(testApp.getPackage()) .then() - .showsAppWindowOnTop("Launcher") + .showsAppWindowOnTop(*LAUNCHER_TITLE) } } -fun FlickerTestParameter.wallpaperWindowBecomesVisible() { +fun FlickerTestParameter.launcherWindowBecomesVisible() { assertWm { - this.hidesBelowAppWindow(WALLPAPER_TITLE) + this.hidesBelowAppWindow(*LAUNCHER_TITLE) .then() - .showsBelowAppWindow(WALLPAPER_TITLE) + .showsBelowAppWindow(*LAUNCHER_TITLE) } } -fun FlickerTestParameter.wallpaperWindowBecomesInvisible() { +fun FlickerTestParameter.launcherWindowBecomesInvisible() { assertWm { - this.showsBelowAppWindow(WALLPAPER_TITLE) + this.showsBelowAppWindow(*LAUNCHER_TITLE) .then() - .hidesBelowAppWindow(WALLPAPER_TITLE) + .hidesBelowAppWindow(*LAUNCHER_TITLE) } } @@ -130,15 +132,15 @@ fun FlickerTestParameter.navBarLayerIsAlwaysVisible(rotatesScreen: Boolean = fal fun FlickerTestParameter.statusBarLayerIsAlwaysVisible(rotatesScreen: Boolean = false) { if (rotatesScreen) { assertLayers { - this.isVisible(STATUS_BAR_WINDOW_NAME) + this.isVisible(STATUS_BAR_LAYER_NAME) .then() - .isInvisible(STATUS_BAR_WINDOW_NAME) + .isInvisible(STATUS_BAR_LAYER_NAME) .then() - .isVisible(STATUS_BAR_WINDOW_NAME) + .isVisible(STATUS_BAR_LAYER_NAME) } } else { assertLayers { - this.isVisible(STATUS_BAR_WINDOW_NAME) + this.isVisible(STATUS_BAR_LAYER_NAME) } } } @@ -168,34 +170,27 @@ fun FlickerTestParameter.statusBarLayerRotatesScales( val endingPos = WindowUtils.getStatusBarPosition(endRotation) assertLayersStart { - this.visibleRegion(STATUS_BAR_WINDOW_NAME).coversExactly(startingPos) + this.visibleRegion(STATUS_BAR_LAYER_NAME).coversExactly(startingPos) } assertLayersEnd { - this.visibleRegion(STATUS_BAR_WINDOW_NAME).coversExactly(endingPos) + this.visibleRegion(STATUS_BAR_LAYER_NAME).coversExactly(endingPos) } } -fun FlickerTestParameter.appLayerReplacesWallpaperLayer(appName: String) { +fun FlickerTestParameter.appLayerReplacesLauncher(appName: String) { assertLayers { - this.isVisible(WALLPAPER_TITLE) + this.isVisible(*LAUNCHER_TITLE) .then() - .isInvisible(WALLPAPER_TITLE) .isVisible(appName) } } -fun FlickerTestParameter.wallpaperLayerReplacesAppLayer(testApp: IAppHelper) { +fun FlickerTestParameter.launcherLayerReplacesApp(testApp: IAppHelper) { assertLayers { this.isVisible(testApp.getPackage()) .then() .isInvisible(testApp.getPackage()) - .isVisible(WALLPAPER_TITLE) - } -} - -fun FlickerTestParameter.layerAlwaysVisible(packageName: String) { - assertLayers { - this.isVisible(packageName) + .isVisible(*LAUNCHER_TITLE) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt index a524466328f5..9ac504ba3e6f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt @@ -36,8 +36,8 @@ import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible import com.android.server.wm.flicker.statusBarLayerRotatesScales import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible -import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer -import com.android.server.wm.flicker.wallpaperWindowBecomesVisible +import com.android.server.wm.flicker.launcherLayerReplacesApp +import com.android.server.wm.flicker.launcherWindowBecomesVisible import org.junit.Test abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) { @@ -76,16 +76,16 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) testSpec.statusBarWindowIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun navBarLayerIsAlwaysVisible() { - testSpec.navBarLayerIsAlwaysVisible() + testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) } - @Presubmit + @FlakyTest @Test open fun statusBarLayerIsAlwaysVisible() { - testSpec.statusBarLayerIsAlwaysVisible() + testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) } @FlakyTest @@ -130,13 +130,13 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) @Presubmit @Test - open fun wallpaperWindowBecomesVisible() { - testSpec.wallpaperWindowBecomesVisible() + open fun launcherWindowBecomesVisible() { + testSpec.launcherWindowBecomesVisible() } @Presubmit @Test - open fun wallpaperLayerReplacesAppLayer() { - testSpec.wallpaperLayerReplacesAppLayer(testApp) + open fun launcherLayerReplacesApp() { + testSpec.launcherLayerReplacesApp(testApp) } }
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt index 90c23385d16b..0bae8f617038 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.ime import android.app.Instrumentation import android.platform.test.annotations.Presubmit +import android.view.WindowManagerPolicyConstants import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry @@ -64,7 +65,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter } } teardown { - test { + eachRun { testApp.exit(wmHelper) } } @@ -104,7 +105,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter @Test fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation) @@ -141,7 +142,10 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter @JvmStatic fun getParams(): Collection<FlickerTestParameter> { return FlickerTestParameterFactory.getInstance() - .getConfigNonRotationTests(repetitions = 5) + .getConfigNonRotationTests(repetitions = 5, + supportedNavigationModes = listOf( + WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY) + ) } } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index dfb229d54c99..3cb58b9b25d6 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -19,6 +19,7 @@ package com.android.server.wm.flicker.ime import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface +import android.view.WindowManagerPolicyConstants import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry @@ -65,7 +66,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete } } teardown { - test { + eachRun { testApp.exit(wmHelper) } } @@ -95,24 +96,24 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete } } - @Presubmit + @FlakyTest @Test fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible() - @Presubmit + @FlakyTest @Test fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp) - @Presubmit + @FlakyTest @Test fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0) - @Presubmit + @FlakyTest @Test fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible() - @Presubmit + @FlakyTest @Test fun imeAppLayerBecomesInvisible() = testSpec.imeAppLayerBecomesInvisible(testApp) @@ -132,7 +133,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete @Test fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible() @@ -150,7 +151,10 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete @JvmStatic fun getParams(): Collection<FlickerTestParameter> { return FlickerTestParameterFactory.getInstance() - .getConfigNonRotationTests(repetitions = 5) + .getConfigNonRotationTests(repetitions = 1, + supportedNavigationModes = listOf( + WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY) + ) } } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt index 6b8bf63aa926..cdec51d25d7f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt @@ -76,11 +76,11 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { } } - @Presubmit + @FlakyTest @Test fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible() @@ -106,7 +106,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { @Test fun statusBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation) @@ -138,7 +138,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation) } - @Presubmit + @FlakyTest @Test fun visibleLayersShownMoreThanOneConsecutiveEntry() { testSpec.assertLayers { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index 9b37cafa74c3..22d341866088 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -20,6 +20,7 @@ import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -97,11 +98,11 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { } } - @Presubmit + @FlakyTest @Test fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible() - @Presubmit + @FlakyTest @Test fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt index 7ba9db19dd52..bb9cd6fef4a2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt @@ -34,7 +34,6 @@ import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible import com.android.server.wm.flicker.noUncoveredRegions import com.android.server.wm.flicker.appWindowAlwaysVisibleOnTop import com.android.server.wm.flicker.dsl.FlickerBuilder -import com.android.server.wm.flicker.layerAlwaysVisible import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible import com.android.server.wm.flicker.statusBarLayerRotatesScales @@ -113,7 +112,11 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Presubmit @Test - fun layerAlwaysVisible() = testSpec.layerAlwaysVisible(testApp.`package`) + fun layerAlwaysVisible() { + testSpec.assertLayers { + this.isVisible(testApp.`package`) + } + } @Presubmit @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index be0357e826a8..55bbe3aa2b5c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -33,8 +33,8 @@ import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible import com.android.server.wm.flicker.navBarLayerRotatesAndScales import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible -import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible -import com.android.server.wm.flicker.appLayerReplacesWallpaperLayer +import com.android.server.wm.flicker.launcherWindowBecomesInvisible +import com.android.server.wm.flicker.appLayerReplacesLauncher import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.noUncoveredRegions import com.android.server.wm.flicker.startRotation @@ -107,7 +107,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Presubmit @Test - fun wallpaperWindowBecomesInvisible() = testSpec.wallpaperWindowBecomesInvisible() + fun launcherWindowBecomesInvisible() = testSpec.launcherWindowBecomesInvisible() @Presubmit @Test @@ -138,8 +138,8 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Presubmit @Test - fun appLayerReplacesWallpaperLayer() = - testSpec.appLayerReplacesWallpaperLayer(testAppComponentName.className) + fun appLayerReplacesLauncher() = + testSpec.appLayerReplacesLauncher(testAppComponentName.className) @FlakyTest @Test @@ -168,9 +168,9 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { return FlickerTestParameterFactory.getInstance() .getConfigNonRotationTests( repetitions = 1, + supportedRotations = listOf(Surface.ROTATION_0), supportedNavigationModes = listOf( - WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY, - WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY + WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY ) ) } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt index 8e73ab18fc95..d0e95566f1b5 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt @@ -19,6 +19,7 @@ package com.android.server.wm.flicker.ime import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.WindowManagerPolicyConstants +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry @@ -51,6 +52,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FlakyTest class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestParameter) { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() private val testApp = SimpleAppHelper(instrumentation) @@ -131,7 +133,7 @@ class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestParame .getConfigNonRotationTests( repetitions = 3, supportedNavigationModes = listOf( - WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY, + WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY, WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY ) ) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt index 130860d31ac1..6a7309c4c120 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt @@ -18,10 +18,11 @@ package com.android.server.wm.flicker.launch import android.platform.helpers.IAppHelper import com.android.server.wm.flicker.FlickerTestParameter +import com.android.server.wm.flicker.LAUNCHER_TITLE fun FlickerTestParameter.appWindowReplacesLauncherAsTopWindow(testApp: IAppHelper) { assertWm { - this.showsAppWindowOnTop("Launcher") + this.showsAppWindowOnTop(*LAUNCHER_TITLE) .then() .showsAppWindowOnTop("Snapshot", testApp.getPackage()) } 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 024983d68b21..559d95376b65 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 @@ -66,6 +66,18 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp super.visibleLayersShownMoreThanOneConsecutiveEntry() } + @FlakyTest + @Test + override fun navBarLayerRotatesAndScales() { + super.navBarLayerRotatesAndScales() + } + + @FlakyTest + @Test + override fun focusChanges() { + super.focusChanges() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic 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 62b9b81ac35d..1c97be32629f 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 @@ -25,7 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.startRotation -import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible +import com.android.server.wm.flicker.launcherWindowBecomesInvisible import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder import org.junit.Test @@ -70,8 +70,8 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio @Postsubmit @Test - override fun wallpaperWindowBecomesInvisible() { - testSpec.wallpaperWindowBecomesInvisible() + override fun launcherWindowBecomesInvisible() { + testSpec.launcherWindowBecomesInvisible() } @FlakyTest diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt index cd5c61a5a927..26e77b6c4828 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt @@ -19,10 +19,11 @@ package com.android.server.wm.flicker.launch import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerTestParameter -import com.android.server.wm.flicker.appLayerReplacesWallpaperLayer +import com.android.server.wm.flicker.appLayerReplacesLauncher import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.endRotation import com.android.server.wm.flicker.focusChanges @@ -39,7 +40,7 @@ import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible import com.android.server.wm.flicker.statusBarLayerRotatesScales import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible -import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible +import com.android.server.wm.flicker.launcherWindowBecomesInvisible import org.junit.Test abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { @@ -75,13 +76,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { testSpec.navBarWindowIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun navBarLayerIsAlwaysVisible() { - testSpec.navBarLayerIsAlwaysVisible() + testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) } - @Presubmit + @FlakyTest @Test open fun navBarLayerRotatesAndScales() { testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation) @@ -93,10 +94,10 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { testSpec.statusBarWindowIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun statusBarLayerIsAlwaysVisible() { - testSpec.statusBarLayerIsAlwaysVisible() + testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) } @Presubmit @@ -134,13 +135,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { testSpec.focusChanges("NexusLauncherActivity", testApp.`package`) } - @Presubmit + @FlakyTest @Test - open fun appLayerReplacesWallpaperLayer() { - testSpec.appLayerReplacesWallpaperLayer(testApp.`package`) + open fun appLayerReplacesLauncher() { + testSpec.appLayerReplacesLauncher(testApp.`package`) } - @Presubmit + @FlakyTest @Test open fun appWindowReplacesLauncherAsTopWindow() { testSpec.appWindowReplacesLauncherAsTopWindow(testApp) @@ -148,7 +149,7 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { @Presubmit @Test - open fun wallpaperWindowBecomesInvisible() { - testSpec.wallpaperWindowBecomesInvisible() + open fun launcherWindowBecomesInvisible() { + testSpec.launcherWindowBecomesInvisible() } }
\ No newline at end of file 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 38af8a7d24df..741aad714934 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 @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -71,10 +72,28 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp @FlakyTest @Test + override fun navBarLayerRotatesAndScales() { + super.navBarLayerRotatesAndScales() + } + + @FlakyTest + @Test override fun visibleLayersShownMoreThanOneConsecutiveEntry() { super.visibleLayersShownMoreThanOneConsecutiveEntry() } + @Presubmit + @Test + override fun launcherWindowBecomesInvisible() { + super.launcherWindowBecomesInvisible() + } + + @FlakyTest + @Test + override fun noUncoveredRegions() { + super.noUncoveredRegions() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt index 35ad59751639..5a8162efcb07 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.rotation -import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -58,7 +57,13 @@ class ChangeAppRotationTest( super.focusDoesNotChange() } - @Presubmit + @FlakyTest + @Test + override fun noUncoveredRegions() { + super.noUncoveredRegions() + } + + @FlakyTest @Test fun screenshotLayerBecomesInvisible() { testSpec.assertLayers { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt index 298903570e76..ab8ebd923fd3 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt @@ -36,6 +36,7 @@ import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible import com.android.server.wm.flicker.statusBarLayerRotatesScales import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible +import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper import org.junit.Test abstract class RotationTransition(protected val testSpec: FlickerTestParameter) { @@ -68,16 +69,16 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) } } - @Presubmit + @FlakyTest @Test open fun navBarWindowIsAlwaysVisible() { testSpec.navBarWindowIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun navBarLayerIsAlwaysVisible() { - testSpec.navBarLayerIsAlwaysVisible() + testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = true) } @FlakyTest @@ -87,16 +88,16 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) testSpec.config.startRotation, testSpec.config.endRotation) } - @Presubmit + @FlakyTest @Test open fun statusBarWindowIsAlwaysVisible() { testSpec.statusBarWindowIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun statusBarLayerIsAlwaysVisible() { - testSpec.statusBarLayerIsAlwaysVisible() + testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = true) } @FlakyTest @@ -110,7 +111,12 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) @Test open fun visibleLayersShownMoreThanOneConsecutiveEntry() { testSpec.assertLayers { - this.visibleLayersShownMoreThanOneConsecutiveEntry() + this.visibleLayersShownMoreThanOneConsecutiveEntry( + ignoreLayers = listOf(WindowManagerStateHelper.SPLASH_SCREEN_NAME, + WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME, + "SecondaryHomeHandle" + ) + ) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt index fe444bdecba7..742a2d1b0eeb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt @@ -24,7 +24,6 @@ import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.SeamlessRotationAppHelper -import com.android.server.wm.flicker.layerAlwaysVisible import com.android.server.wm.flicker.testapp.ActivityOptions import org.junit.FixMethodOrder import org.junit.Test @@ -60,20 +59,28 @@ class SeamlessAppRotationTest( @FlakyTest(bugId = 140855415) @Test - override fun navBarLayerRotatesAndScales() { - super.navBarLayerRotatesAndScales() + override fun statusBarWindowIsAlwaysVisible() { + super.statusBarWindowIsAlwaysVisible() } @FlakyTest(bugId = 140855415) @Test - override fun statusBarLayerRotatesScales() { - super.statusBarLayerRotatesScales() + override fun statusBarLayerIsAlwaysVisible() { + super.statusBarLayerIsAlwaysVisible() + } + + @FlakyTest + @Test + override fun noUncoveredRegions() { + super.noUncoveredRegions() } @Presubmit @Test fun appLayerAlwaysVisible() { - testSpec.layerAlwaysVisible(testApp.`package`) + testSpec.assertLayers { + isVisible(testApp.`package`) + } } @Presubmit @@ -81,6 +88,8 @@ class SeamlessAppRotationTest( fun appLayerRotates() { testSpec.assertLayers { this.coversExactly(startingPos, testApp.`package`) + .then() + .coversExactly(endingPos, testApp.`package`) } } diff --git a/tests/UpdatableSystemFontTest/AndroidTest.xml b/tests/UpdatableSystemFontTest/AndroidTest.xml index d573e93e4a4c..4f116698ba72 100644 --- a/tests/UpdatableSystemFontTest/AndroidTest.xml +++ b/tests/UpdatableSystemFontTest/AndroidTest.xml @@ -19,6 +19,11 @@ <!-- This test requires root to side load fs-verity cert. --> <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="test-file-name" value="EmojiRenderingTestApp.apk" /> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="cleanup" value="true" /> <option name="push" value="UpdatableSystemFontTestCert.der->/data/local/tmp/UpdatableSystemFontTestCert.der" /> diff --git a/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/Android.bp b/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/Android.bp new file mode 100644 index 000000000000..ed34fa9fc1d0 --- /dev/null +++ b/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/Android.bp @@ -0,0 +1,32 @@ +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +android_test_helper_app { + name: "EmojiRenderingTestApp", + manifest: "AndroidManifest.xml", + srcs: ["src/**/*.java"], + test_suites: [ + "general-tests", + "vts", + ], +} diff --git a/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/AndroidManifest.xml b/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/AndroidManifest.xml new file mode 100644 index 000000000000..5d8f5fc2da93 --- /dev/null +++ b/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/AndroidManifest.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.emojirenderingtestapp"> + <application> + <activity android:name=".EmojiRenderingTestActivity"/> + </application> +</manifest> diff --git a/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/src/com/android/emojirenderingtestapp/EmojiRenderingTestActivity.java b/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/src/com/android/emojirenderingtestapp/EmojiRenderingTestActivity.java new file mode 100644 index 000000000000..947e9c2ff56a --- /dev/null +++ b/tests/UpdatableSystemFontTest/EmojiRenderingTestApp/src/com/android/emojirenderingtestapp/EmojiRenderingTestActivity.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.emojirenderingtestapp; + +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; +import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.LinearLayout; +import android.widget.TextView; + +/** Test app to render an emoji. */ +public class EmojiRenderingTestActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + LinearLayout container = new LinearLayout(this); + container.setOrientation(LinearLayout.VERTICAL); + TextView textView = new TextView(this); + textView.setText("\uD83E\uDD72"); // 🥲 + container.addView(textView, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); + setContentView(container); + } +} diff --git a/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java b/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java index e68455612c7e..032da3f0af75 100644 --- a/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java +++ b/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java @@ -36,7 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -47,6 +46,9 @@ import java.util.regex.Pattern; @RunWith(DeviceJUnit4ClassRunner.class) public class UpdatableSystemFontTest extends BaseHostJUnit4Test { + private static final String SYSTEM_FONTS_DIR = "/system/fonts/"; + private static final String DATA_FONTS_DIR = "/data/fonts/files/"; + private static final String CERT_PATH = "/data/local/tmp/UpdatableSystemFontTestCert.der"; private static final Pattern PATTERN_FONT = Pattern.compile("path = ([^, \n]*)"); @@ -72,6 +74,14 @@ public class UpdatableSystemFontTest extends BaseHostJUnit4Test { private static final String TEST_NOTO_COLOR_EMOJI_VPLUS2_TTF_FSV_SIG = "/data/local/tmp/UpdatableSystemFontTestNotoColorEmojiVPlus2.ttf.fsv_sig"; + private static final String EMOJI_RENDERING_TEST_APP_ID = "com.android.emojirenderingtestapp"; + private static final String EMOJI_RENDERING_TEST_ACTIVITY = + EMOJI_RENDERING_TEST_APP_ID + "/.EmojiRenderingTestActivity"; + + private interface ThrowingSupplier<T> { + T get() throws Exception; + } + @Rule public final AddFsVerityCertRule mAddFsverityCertRule = new AddFsVerityCertRule(this, CERT_PATH); @@ -91,7 +101,10 @@ public class UpdatableSystemFontTest extends BaseHostJUnit4Test { expectRemoteCommandToSucceed(String.format("cmd font update %s %s", TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF_FSV_SIG)); String fontPath = getFontPath(NOTO_COLOR_EMOJI_TTF); - assertThat(fontPath).startsWith("/data/fonts/files/"); + assertThat(fontPath).startsWith(DATA_FONTS_DIR); + // The updated font should be readable and unmodifiable. + expectRemoteCommandToSucceed("cat " + fontPath + " > /dev/null"); + expectRemoteCommandToFail("echo -n '' >> " + fontPath); } @Test @@ -102,8 +115,12 @@ public class UpdatableSystemFontTest extends BaseHostJUnit4Test { expectRemoteCommandToSucceed(String.format("cmd font update %s %s", TEST_NOTO_COLOR_EMOJI_VPLUS2_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS2_TTF_FSV_SIG)); String fontPath2 = getFontPath(NOTO_COLOR_EMOJI_TTF); - assertThat(fontPath2).startsWith("/data/fonts/files/"); + assertThat(fontPath2).startsWith(DATA_FONTS_DIR); assertThat(fontPath2).isNotEqualTo(fontPath); + // The new file should be readable. + expectRemoteCommandToSucceed("cat " + fontPath2 + " > /dev/null"); + // The old file should be still readable. + expectRemoteCommandToSucceed("cat " + fontPath + " > /dev/null"); } @Test @@ -119,25 +136,14 @@ public class UpdatableSystemFontTest extends BaseHostJUnit4Test { expectRemoteCommandToSucceed(String.format("cmd font update %s %s", TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF_FSV_SIG)); String fontPath3 = getFontPath(NOTO_COLOR_EMOJI_TTF); - assertThat(fontPath).startsWith("/data/fonts/files/"); + assertThat(fontPath).startsWith(DATA_FONTS_DIR); assertThat(fontPath2).isNotEqualTo(fontPath); - assertThat(fontPath2).startsWith("/data/fonts/files/"); - assertThat(fontPath3).startsWith("/data/fonts/files/"); + assertThat(fontPath2).startsWith(DATA_FONTS_DIR); + assertThat(fontPath3).startsWith(DATA_FONTS_DIR); assertThat(fontPath3).isNotEqualTo(fontPath); } @Test - public void updatedFont_dataFileIsImmutableAndReadable() throws Exception { - expectRemoteCommandToSucceed(String.format("cmd font update %s %s", - TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF_FSV_SIG)); - String fontPath = getFontPath(NOTO_COLOR_EMOJI_TTF); - assertThat(fontPath).startsWith("/data"); - - expectRemoteCommandToFail("echo -n '' >> " + fontPath); - expectRemoteCommandToSucceed("cat " + fontPath + " > /dev/null"); - } - - @Test public void updateFont_invalidCert() throws Exception { expectRemoteCommandToFail(String.format("cmd font update %s %s", TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS2_TTF_FSV_SIG)); @@ -158,11 +164,37 @@ public class UpdatableSystemFontTest extends BaseHostJUnit4Test { } @Test + public void launchApp() throws Exception { + String fontPath = getFontPath(NOTO_COLOR_EMOJI_TTF); + assertThat(fontPath).startsWith(SYSTEM_FONTS_DIR); + expectRemoteCommandToSucceed("am force-stop " + EMOJI_RENDERING_TEST_APP_ID); + expectRemoteCommandToSucceed("am start-activity -n " + EMOJI_RENDERING_TEST_ACTIVITY); + waitUntil(TimeUnit.SECONDS.toMillis(5), () -> + isFileOpenedBy(fontPath, EMOJI_RENDERING_TEST_APP_ID)); + } + + @Test + public void launchApp_afterUpdateFont() throws Exception { + String originalFontPath = getFontPath(NOTO_COLOR_EMOJI_TTF); + assertThat(originalFontPath).startsWith(SYSTEM_FONTS_DIR); + expectRemoteCommandToSucceed(String.format("cmd font update %s %s", + TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF_FSV_SIG)); + String updatedFontPath = getFontPath(NOTO_COLOR_EMOJI_TTF); + assertThat(updatedFontPath).startsWith(DATA_FONTS_DIR); + expectRemoteCommandToSucceed("am force-stop " + EMOJI_RENDERING_TEST_APP_ID); + expectRemoteCommandToSucceed("am start-activity -n " + EMOJI_RENDERING_TEST_ACTIVITY); + // The original font should NOT be opened by the app. + waitUntil(TimeUnit.SECONDS.toMillis(5), () -> + isFileOpenedBy(updatedFontPath, EMOJI_RENDERING_TEST_APP_ID) + && !isFileOpenedBy(originalFontPath, EMOJI_RENDERING_TEST_APP_ID)); + } + + @Test public void reboot() throws Exception { expectRemoteCommandToSucceed(String.format("cmd font update %s %s", TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF, TEST_NOTO_COLOR_EMOJI_VPLUS1_TTF_FSV_SIG)); String fontPath = getFontPath(NOTO_COLOR_EMOJI_TTF); - assertThat(fontPath).startsWith("/data/fonts/files/"); + assertThat(fontPath).startsWith(DATA_FONTS_DIR); expectRemoteCommandToSucceed("stop"); expectRemoteCommandToSucceed("start"); @@ -210,16 +242,40 @@ public class UpdatableSystemFontTest extends BaseHostJUnit4Test { }); } - private void waitUntil(long timeoutMillis, Supplier<Boolean> func) { + private void waitUntil(long timeoutMillis, ThrowingSupplier<Boolean> func) { long untilMillis = System.currentTimeMillis() + timeoutMillis; do { - if (func.get()) return; try { + if (func.get()) return; Thread.sleep(100); } catch (InterruptedException e) { throw new AssertionError("Interrupted", e); + } catch (Exception e) { + throw new AssertionError("Unexpected exception", e); } } while (System.currentTimeMillis() < untilMillis); throw new AssertionError("Timed out"); } + + private boolean isFileOpenedBy(String path, String appId) throws DeviceNotAvailableException { + String pid = pidOf(appId); + if (pid.isEmpty()) { + return false; + } + CommandResult result = getDevice().executeShellV2Command( + String.format("lsof -t -p %s '%s'", pid, path)); + if (result.getStatus() != CommandStatus.SUCCESS) { + return false; + } + // The file is open if the output of lsof is non-empty. + return !result.getStdout().trim().isEmpty(); + } + + private String pidOf(String appId) throws DeviceNotAvailableException { + CommandResult result = getDevice().executeShellV2Command("pidof " + appId); + if (result.getStatus() != CommandStatus.SUCCESS) { + return ""; + } + return result.getStdout().trim(); + } } diff --git a/tests/net/integration/Android.bp b/tests/net/integration/Android.bp index 56f9df78c83e..730ef3b98fa7 100644 --- a/tests/net/integration/Android.bp +++ b/tests/net/integration/Android.bp @@ -25,6 +25,7 @@ package { android_test { name: "FrameworksNetIntegrationTests", + defaults: ["framework-connectivity-test-defaults"], platform_apis: true, certificate: "platform", srcs: [ diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java index a2223e8c1e9a..95a972652bf4 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java @@ -89,7 +89,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection mNetworkAgent = mock(VcnNetworkAgent.class); doReturn(mNetworkAgent) .when(mDeps) - .newNetworkAgent(any(), any(), any(), any(), anyInt(), any(), any(), any(), any()); + .newNetworkAgent(any(), any(), any(), any(), any(), any(), any(), any(), any()); mGatewayConnection.setUnderlyingNetwork(TEST_UNDERLYING_NETWORK_RECORD_1); @@ -216,7 +216,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection any(), any(), any(), - anyInt(), + any(), any(), any(), any(), @@ -244,7 +244,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection any(String.class), ncCaptor.capture(), lpCaptor.capture(), - anyInt(), + any(), argThat(nac -> nac.getLegacyType() == ConnectivityManager.TYPE_MOBILE), any(), any(), @@ -297,7 +297,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection startingInternalAddrs.equals(lp.getLinkAddresses()) && Collections.singletonList(TEST_DNS_ADDR) .equals(lp.getDnsServers())), - anyInt(), + any(), any(), any(), any(), @@ -356,7 +356,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection any(), any(), any(), - anyInt(), + any(), any(), any(), unwantedCallbackCaptor.capture(), diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionDisconnectedStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionDisconnectedStateTest.java index 5f27fabb62b0..ac0edaa3b579 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionDisconnectedStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionDisconnectedStateTest.java @@ -65,6 +65,7 @@ public class VcnGatewayConnectionDisconnectedStateTest extends VcnGatewayConnect TEST_SUBSCRIPTION_SNAPSHOT, mConfig, mGatewayStatusCallback, + true /* isMobileDataEnabled */, mDeps); vgc.setIsQuitting(true); diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTest.java index ced8745e89c9..9705f0fc6bbc 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTest.java @@ -16,6 +16,8 @@ package com.android.server.vcn; +import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED; @@ -89,7 +91,8 @@ public class VcnGatewayConnectionTest extends VcnGatewayConnectionTestBase { doReturn(mWifiInfo).when(mWifiInfo).makeCopy(anyLong()); } - private void verifyBuildNetworkCapabilitiesCommon(int transportType) { + private void verifyBuildNetworkCapabilitiesCommon( + int transportType, boolean isMobileDataEnabled) { final NetworkCapabilities.Builder capBuilder = new NetworkCapabilities.Builder(); capBuilder.addTransportType(transportType); capBuilder.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED); @@ -109,10 +112,22 @@ public class VcnGatewayConnectionTest extends VcnGatewayConnectionTestBase { capBuilder.build(), new LinkProperties(), false); final NetworkCapabilities vcnCaps = VcnGatewayConnection.buildNetworkCapabilities( - VcnGatewayConnectionConfigTest.buildTestConfig(), record); + VcnGatewayConnectionConfigTest.buildTestConfig(), + record, + isMobileDataEnabled); + assertTrue(vcnCaps.hasTransport(TRANSPORT_CELLULAR)); assertTrue(vcnCaps.hasCapability(NET_CAPABILITY_NOT_METERED)); assertTrue(vcnCaps.hasCapability(NET_CAPABILITY_NOT_ROAMING)); + + for (int cap : VcnGatewayConnectionConfigTest.EXPOSED_CAPS) { + if (cap == NET_CAPABILITY_INTERNET || cap == NET_CAPABILITY_DUN) { + assertEquals(isMobileDataEnabled, vcnCaps.hasCapability(cap)); + } else { + assertTrue(vcnCaps.hasCapability(cap)); + } + } + assertArrayEquals(new int[] {TEST_UID}, vcnCaps.getAdministratorUids()); assertTrue(vcnCaps.getTransportInfo() instanceof VcnTransportInfo); @@ -126,12 +141,17 @@ public class VcnGatewayConnectionTest extends VcnGatewayConnectionTestBase { @Test public void testBuildNetworkCapabilitiesUnderlyingWifi() throws Exception { - verifyBuildNetworkCapabilitiesCommon(TRANSPORT_WIFI); + verifyBuildNetworkCapabilitiesCommon(TRANSPORT_WIFI, true /* isMobileDataEnabled */); } @Test public void testBuildNetworkCapabilitiesUnderlyingCell() throws Exception { - verifyBuildNetworkCapabilitiesCommon(TRANSPORT_CELLULAR); + verifyBuildNetworkCapabilitiesCommon(TRANSPORT_CELLULAR, true /* isMobileDataEnabled */); + } + + @Test + public void testBuildNetworkCapabilitiesMobileDataDisabled() throws Exception { + verifyBuildNetworkCapabilitiesCommon(TRANSPORT_CELLULAR, false /* isMobileDataEnabled */); } @Test diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java index 98d553dab01a..284f1f88658e 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java @@ -202,6 +202,7 @@ public class VcnGatewayConnectionTestBase { TEST_SUBSCRIPTION_SNAPSHOT, mConfig, mGatewayStatusCallback, + true /* isMobileDataEnabled */, mDeps); } diff --git a/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java b/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java index f943f34c9d52..72db55b3f4c5 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java @@ -16,12 +16,18 @@ package com.android.server.vcn; +import static android.net.NetworkProvider.NetworkOfferCallback; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import android.annotation.NonNull; import android.content.Context; +import android.net.ConnectivityManager; import android.net.NetworkRequest; import android.os.test.TestLooper; @@ -33,18 +39,23 @@ import com.android.server.vcn.VcnNetworkProvider.NetworkRequestListener; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; + +import java.util.ArrayList; +import java.util.List; /** Tests for TelephonySubscriptionTracker */ @RunWith(AndroidJUnit4.class) @SmallTest public class VcnNetworkProviderTest { private static final int TEST_SCORE_UNSATISFIED = 0; - private static final int TEST_SCORE_HIGH = 100; private static final int TEST_PROVIDER_ID = 1; @NonNull private final Context mContext; @NonNull private final TestLooper mTestLooper; + @NonNull private VcnNetworkProvider.Dependencies mDeps; + @NonNull private ConnectivityManager mConnMgr; @NonNull private VcnNetworkProvider mVcnNetworkProvider; @NonNull private NetworkRequestListener mListener; @@ -55,27 +66,48 @@ public class VcnNetworkProviderTest { @Before public void setUp() throws Exception { - mVcnNetworkProvider = new VcnNetworkProvider(mContext, mTestLooper.getLooper()); + mDeps = mock(VcnNetworkProvider.Dependencies.class); + mConnMgr = mock(ConnectivityManager.class); + VcnTestUtils.setupSystemService( + mContext, mConnMgr, Context.CONNECTIVITY_SERVICE, ConnectivityManager.class); + + mVcnNetworkProvider = new VcnNetworkProvider(mContext, mTestLooper.getLooper(), mDeps); mListener = mock(NetworkRequestListener.class); } - @Test - public void testRequestsPassedToRegisteredListeners() throws Exception { - mVcnNetworkProvider.registerListener(mListener); + private NetworkOfferCallback verifyRegisterAndGetOfferCallback() throws Exception { + mVcnNetworkProvider.register(); + + final ArgumentCaptor<NetworkOfferCallback> cbCaptor = + ArgumentCaptor.forClass(NetworkOfferCallback.class); + + verify(mConnMgr).registerNetworkProvider(eq(mVcnNetworkProvider)); + verify(mDeps) + .registerNetworkOffer( + eq(mVcnNetworkProvider), + argThat( + score -> + score.getLegacyInt() + == Vcn.getNetworkScore().getLegacyInt()), + any(), + any(), + cbCaptor.capture()); + + return cbCaptor.getValue(); + } - final NetworkRequest request = mock(NetworkRequest.class); - mVcnNetworkProvider.onNetworkRequested(request, TEST_SCORE_UNSATISFIED, TEST_PROVIDER_ID); - verify(mListener).onNetworkRequested(request, TEST_SCORE_UNSATISFIED, TEST_PROVIDER_ID); + @Test + public void testRegister() throws Exception { + verifyRegisterAndGetOfferCallback(); } @Test - public void testRequestsPassedToRegisteredListeners_satisfiedByHighScoringProvider() - throws Exception { + public void testRequestsPassedToRegisteredListeners() throws Exception { mVcnNetworkProvider.registerListener(mListener); final NetworkRequest request = mock(NetworkRequest.class); - mVcnNetworkProvider.onNetworkRequested(request, TEST_SCORE_HIGH, TEST_PROVIDER_ID); - verify(mListener).onNetworkRequested(request, TEST_SCORE_HIGH, TEST_PROVIDER_ID); + verifyRegisterAndGetOfferCallback().onNetworkNeeded(request); + verify(mListener).onNetworkRequested(request); } @Test @@ -84,7 +116,33 @@ public class VcnNetworkProviderTest { mVcnNetworkProvider.unregisterListener(mListener); final NetworkRequest request = mock(NetworkRequest.class); - mVcnNetworkProvider.onNetworkRequested(request, TEST_SCORE_UNSATISFIED, TEST_PROVIDER_ID); + verifyRegisterAndGetOfferCallback().onNetworkNeeded(request); + verifyNoMoreInteractions(mListener); + } + + @Test + public void testCachedRequestsPassedOnRegister() throws Exception { + final List<NetworkRequest> requests = new ArrayList<>(); + final NetworkOfferCallback offerCb = verifyRegisterAndGetOfferCallback(); + + for (int i = 0; i < 10; i++) { + // Build unique network requests; in this case, iterate down the capabilities as a way + // to unique-ify requests. + final NetworkRequest request = + new NetworkRequest.Builder().clearCapabilities().addCapability(i).build(); + + requests.add(request); + offerCb.onNetworkNeeded(request); + } + + // Remove one, and verify that it is never sent to the listeners. + final NetworkRequest removed = requests.remove(0); + offerCb.onNetworkUnneeded(removed); + + mVcnNetworkProvider.registerListener(mListener); + for (NetworkRequest request : requests) { + verify(mListener).onNetworkRequested(request); + } verifyNoMoreInteractions(mListener); } } diff --git a/tests/vcn/java/com/android/server/vcn/VcnTest.java b/tests/vcn/java/com/android/server/vcn/VcnTest.java index 90eb75e865e7..736fabdb1ac5 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnTest.java @@ -16,16 +16,24 @@ package com.android.server.vcn; +import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS; import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_FOTA; +import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.vcn.VcnManager.VCN_STATUS_CODE_ACTIVE; import static android.net.vcn.VcnManager.VCN_STATUS_CODE_SAFE_MODE; +import static com.android.server.vcn.Vcn.VcnContentResolver; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -35,12 +43,16 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Context; +import android.database.ContentObserver; import android.net.NetworkRequest; +import android.net.Uri; import android.net.vcn.VcnConfig; import android.net.vcn.VcnGatewayConnectionConfig; import android.net.vcn.VcnGatewayConnectionConfigTest; import android.os.ParcelUuid; import android.os.test.TestLooper; +import android.provider.Settings; +import android.telephony.TelephonyManager; import android.util.ArraySet; import com.android.server.VcnManagementService.VcnCallback; @@ -53,23 +65,31 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.UUID; public class VcnTest { private static final String PKG_NAME = VcnTest.class.getPackage().getName(); private static final ParcelUuid TEST_SUB_GROUP = new ParcelUuid(new UUID(0, 0)); - private static final int NETWORK_SCORE = 0; - private static final int PROVIDER_ID = 5; + private static final boolean MOBILE_DATA_ENABLED = true; + private static final Set<Integer> TEST_SUB_IDS_IN_GROUP = + new ArraySet<>(Arrays.asList(1, 2, 3)); private static final int[][] TEST_CAPS = new int[][] { - new int[] {NET_CAPABILITY_MMS, NET_CAPABILITY_INTERNET}, - new int[] {NET_CAPABILITY_DUN} + new int[] {NET_CAPABILITY_IMS, NET_CAPABILITY_INTERNET, NET_CAPABILITY_DUN}, + new int[] {NET_CAPABILITY_CBS, NET_CAPABILITY_INTERNET}, + new int[] {NET_CAPABILITY_FOTA, NET_CAPABILITY_DUN}, + new int[] {NET_CAPABILITY_MMS} }; private Context mContext; private VcnContext mVcnContext; + private TelephonyManager mTelephonyManager; + private VcnContentResolver mContentResolver; private TelephonySubscriptionSnapshot mSubscriptionSnapshot; private VcnNetworkProvider mVcnNetworkProvider; private VcnCallback mVcnCallback; @@ -86,6 +106,9 @@ public class VcnTest { public void setUp() { mContext = mock(Context.class); mVcnContext = mock(VcnContext.class); + mTelephonyManager = + setupAndGetTelephonyManager(MOBILE_DATA_ENABLED /* isMobileDataEnabled */); + mContentResolver = mock(VcnContentResolver.class); mSubscriptionSnapshot = mock(TelephonySubscriptionSnapshot.class); mVcnNetworkProvider = mock(VcnNetworkProvider.class); mVcnCallback = mock(VcnCallback.class); @@ -97,12 +120,15 @@ public class VcnTest { doReturn(mContext).when(mVcnContext).getContext(); doReturn(mTestLooper.getLooper()).when(mVcnContext).getLooper(); doReturn(mVcnNetworkProvider).when(mVcnContext).getVcnNetworkProvider(); + doReturn(mContentResolver).when(mDeps).newVcnContentResolver(eq(mVcnContext)); // Setup VcnGatewayConnection instance generation doAnswer((invocation) -> { // Mock-within a doAnswer is safe, because it doesn't actually run nested. return mock(VcnGatewayConnection.class); - }).when(mDeps).newVcnGatewayConnection(any(), any(), any(), any(), any()); + }).when(mDeps).newVcnGatewayConnection(any(), any(), any(), any(), any(), anyBoolean()); + + doReturn(TEST_SUB_IDS_IN_GROUP).when(mSubscriptionSnapshot).getAllSubIdsInGroup(any()); mGatewayStatusCallbackCaptor = ArgumentCaptor.forClass(VcnGatewayStatusCallback.class); @@ -123,6 +149,16 @@ public class VcnTest { mDeps); } + private TelephonyManager setupAndGetTelephonyManager(boolean isMobileDataEnabled) { + final TelephonyManager telephonyManager = mock(TelephonyManager.class); + VcnTestUtils.setupSystemService( + mContext, telephonyManager, Context.TELEPHONY_SERVICE, TelephonyManager.class); + doReturn(telephonyManager).when(telephonyManager).createForSubscriptionId(anyInt()); + doReturn(isMobileDataEnabled).when(telephonyManager).isDataEnabled(); + + return telephonyManager; + } + private NetworkRequestListener verifyAndGetRequestListener() { ArgumentCaptor<NetworkRequestListener> mNetworkRequestListenerCaptor = ArgumentCaptor.forClass(NetworkRequestListener.class); @@ -139,7 +175,7 @@ public class VcnTest { requestBuilder.addCapability(netCapability); } - requestListener.onNetworkRequested(requestBuilder.build(), NETWORK_SCORE, PROVIDER_ID); + requestListener.onNetworkRequested(requestBuilder.build()); mTestLooper.dispatchAll(); } @@ -164,6 +200,39 @@ public class VcnTest { } @Test + public void testContentObserverRegistered() { + // Validate state from setUp() + final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA); + verify(mContentResolver) + .registerContentObserver(eq(uri), eq(true), any(ContentObserver.class)); + } + + @Test + public void testMobileDataStateCheckedOnInitialization_enabled() { + // Validate state from setUp() + assertTrue(mVcn.isMobileDataEnabled()); + verify(mTelephonyManager).isDataEnabled(); + } + + @Test + public void testMobileDataStateCheckedOnInitialization_disabled() { + // Build and setup new telephonyManager to ensure method call count is reset. + final TelephonyManager telephonyManager = + setupAndGetTelephonyManager(false /* isMobileDataEnabled */); + final Vcn vcn = + new Vcn( + mVcnContext, + TEST_SUB_GROUP, + mConfig, + mSubscriptionSnapshot, + mVcnCallback, + mDeps); + + assertFalse(vcn.isMobileDataEnabled()); + verify(mTelephonyManager).isDataEnabled(); + } + + @Test public void testSubscriptionSnapshotUpdatesVcnGatewayConnections() { verifyUpdateSubscriptionSnapshotNotifiesGatewayConnections(VCN_STATUS_CODE_ACTIVE); } @@ -193,7 +262,8 @@ public class VcnTest { eq(TEST_SUB_GROUP), eq(mSubscriptionSnapshot), any(), - mGatewayStatusCallbackCaptor.capture()); + mGatewayStatusCallbackCaptor.capture(), + eq(MOBILE_DATA_ENABLED)); return gatewayConnections; } @@ -256,20 +326,21 @@ public class VcnTest { mTestLooper.dispatchAll(); // Verify that the VCN requests the networkRequests be resent - assertEquals(1, mVcn.getVcnGatewayConnections().size()); + assertEquals(gatewayConnections.size() - 1, mVcn.getVcnGatewayConnections().size()); verify(mVcnNetworkProvider).resendAllRequests(requestListener); // Verify that the VcnGatewayConnection is restarted if a request exists for it triggerVcnRequestListeners(requestListener); mTestLooper.dispatchAll(); - assertEquals(2, mVcn.getVcnGatewayConnections().size()); + assertEquals(gatewayConnections.size(), mVcn.getVcnGatewayConnections().size()); verify(mDeps, times(gatewayConnections.size() + 1)) .newVcnGatewayConnection( eq(mVcnContext), eq(TEST_SUB_GROUP), eq(mSubscriptionSnapshot), any(), - mGatewayStatusCallbackCaptor.capture()); + mGatewayStatusCallbackCaptor.capture(), + anyBoolean()); } @Test @@ -286,7 +357,7 @@ public class VcnTest { public void testUpdateConfigReevaluatesGatewayConnections() { final NetworkRequestListener requestListener = verifyAndGetRequestListener(); startGatewaysAndGetGatewayConnections(requestListener); - assertEquals(2, mVcn.getVcnGatewayConnectionConfigMap().size()); + assertEquals(TEST_CAPS.length, mVcn.getVcnGatewayConnectionConfigMap().size()); // Create VcnConfig with only one VcnGatewayConnectionConfig so a gateway connection is torn // down. Reuse existing VcnGatewayConnectionConfig so that the gateway connection name @@ -309,4 +380,57 @@ public class VcnTest { verify(removedGatewayConnection).teardownAsynchronously(); verify(mVcnNetworkProvider).resendAllRequests(requestListener); } + + private void verifyMobileDataToggled(boolean startingToggleState, boolean endingToggleState) { + final ArgumentCaptor<ContentObserver> captor = + ArgumentCaptor.forClass(ContentObserver.class); + verify(mContentResolver).registerContentObserver(any(), anyBoolean(), captor.capture()); + final ContentObserver contentObserver = captor.getValue(); + + // Start VcnGatewayConnections + mVcn.setMobileDataEnabled(startingToggleState); + triggerVcnRequestListeners(verifyAndGetRequestListener()); + final Map<VcnGatewayConnectionConfig, VcnGatewayConnection> gateways = + mVcn.getVcnGatewayConnectionConfigMap(); + + // Trigger data toggle change. + doReturn(endingToggleState).when(mTelephonyManager).isDataEnabled(); + contentObserver.onChange(false /* selfChange, ignored */); + mTestLooper.dispatchAll(); + + // Verify that data toggle changes restart ONLY INTERNET or DUN networks, and only if the + // toggle state changed. + for (Entry<VcnGatewayConnectionConfig, VcnGatewayConnection> entry : gateways.entrySet()) { + final Set<Integer> exposedCaps = entry.getKey().getAllExposedCapabilities(); + if (startingToggleState != endingToggleState + && (exposedCaps.contains(NET_CAPABILITY_INTERNET) + || exposedCaps.contains(NET_CAPABILITY_DUN))) { + verify(entry.getValue()).teardownAsynchronously(); + } else { + verify(entry.getValue(), never()).teardownAsynchronously(); + } + } + + assertEquals(endingToggleState, mVcn.isMobileDataEnabled()); + } + + @Test + public void testMobileDataEnabled() { + verifyMobileDataToggled(false /* startingToggleState */, true /* endingToggleState */); + } + + @Test + public void testMobileDataDisabled() { + verifyMobileDataToggled(true /* startingToggleState */, false /* endingToggleState */); + } + + @Test + public void testMobileDataObserverFiredWithoutChanges_dataEnabled() { + verifyMobileDataToggled(false /* startingToggleState */, false /* endingToggleState */); + } + + @Test + public void testMobileDataObserverFiredWithoutChanges_dataDisabled() { + verifyMobileDataToggled(true /* startingToggleState */, true /* endingToggleState */); + } } diff --git a/tools/hiddenapi/checksorted_sha.sh b/tools/hiddenapi/checksorted_sha.sh index 451fed6be353..72fb86737488 100755 --- a/tools/hiddenapi/checksorted_sha.sh +++ b/tools/hiddenapi/checksorted_sha.sh @@ -1,10 +1,10 @@ #!/bin/bash set -e LOCAL_DIR="$( dirname ${BASH_SOURCE} )" -git show --name-only --pretty=format: $1 | grep "boot/hiddenapi/hiddenapi-.*txt" | while read file; do +git show --name-only --pretty=format: $1 | grep "hiddenapi/hiddenapi-.*txt" | while read file; do diff <(git show $1:$file) <(git show $1:$file | $LOCAL_DIR/sort_api.sh ) || { echo -e "\e[1m\e[31m$file $1 is not sorted or contains duplicates. To sort it correctly:\e[0m" - echo -e "\e[33m${LOCAL_DIR}/sort_api.sh $2/frameworks/base/$file\e[0m" + echo -e "\e[33m${LOCAL_DIR}/sort_api.sh $PWD/$file\e[0m" exit 1 } done diff --git a/tools/hiddenapi/exclude.sh b/tools/hiddenapi/exclude.sh index 822aba4ee43b..8b18f9b1920e 100755 --- a/tools/hiddenapi/exclude.sh +++ b/tools/hiddenapi/exclude.sh @@ -10,7 +10,6 @@ LIBCORE_PACKAGES="\ android.system \ android.test \ com.android.bouncycastle \ - com.android.i18n.phonenumbers \ com.android.okhttp \ com.sun \ dalvik \ |